From 969805c647c9601acb9f4de41b291fcfc54a2c1e Mon Sep 17 00:00:00 2001
From: DesislavaBorisova <desibori@yahoo.com>
Date: Mon, 11 Apr 2022 12:53:59 +0300
Subject: [PATCH 01/23] GDB-6329 - add new license is expired message to views
 that need SPARQL queries to work

---
 src/js/angular/explore/controllers.js              | 12 +++++++-----
 .../directives/rdf-class-hierarchy.directive.js    |  2 +-
 src/js/angular/jdbc/controllers.js                 |  6 +++---
 src/js/angular/namespaces/controllers.js           |  6 +++---
 src/pages/explore.html                             |  4 ++--
 src/pages/jdbc-create.html                         | 14 +++++++-------
 src/pages/namespaces.html                          |  4 ++--
 7 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/src/js/angular/explore/controllers.js b/src/js/angular/explore/controllers.js
index 193ca1e31a..f19af5bf24 100644
--- a/src/js/angular/explore/controllers.js
+++ b/src/js/angular/explore/controllers.js
@@ -1,6 +1,7 @@
 import 'angular/utils/file-types';
 import YASR from 'lib/yasr.bundled';
 import {saveAs} from 'lib/FileSaver-patch';
+import 'angular/core/services/license.service';
 
 const modules = [
     'ngCookies',
@@ -10,7 +11,8 @@ const modules = [
     'graphdb.framework.core',
     'graphdb.framework.core.services.repositories',
     'graphdb.framework.explore.services',
-    'graphdb.workbench.utils.filetypes'
+    'graphdb.workbench.utils.filetypes',
+    'graphdb.framework.core.services.licenseService'
 ];
 
 angular
@@ -20,9 +22,9 @@ angular
     .controller('EditResourceCtrl', EditResourceCtrl)
     .controller('ViewTrigCtrl', ViewTrigCtrl);
 
-ExploreCtrl.$inject = ['$scope', '$http', '$location', 'toastr', '$routeParams', '$repositories', 'ClassInstanceDetailsService', 'ModalService', 'RDF4JRepositoriesRestService', 'FileTypes', '$jwtAuth'];
+ExploreCtrl.$inject = ['$scope', '$http', '$location', 'toastr', '$licenseService', '$routeParams', '$repositories', 'ClassInstanceDetailsService', 'ModalService', 'RDF4JRepositoriesRestService', 'FileTypes', '$jwtAuth'];
 
-function ExploreCtrl($scope, $http, $location, toastr, $routeParams, $repositories, ClassInstanceDetailsService, ModalService, RDF4JRepositoriesRestService, FileTypes, $jwtAuth) {
+function ExploreCtrl($scope, $http, $location, toastr, $licenseService, $routeParams, $repositories, ClassInstanceDetailsService, ModalService, RDF4JRepositoriesRestService, FileTypes, $jwtAuth) {
 
     // We need to get sameAs and inference for the current user
     const principal = $jwtAuth.getPrincipal();
@@ -81,9 +83,9 @@ function ExploreCtrl($scope, $http, $location, toastr, $routeParams, $repositori
     };
 
     $scope.$watch(function () {
-        return $repositories.getActiveRepository();
+            return $repositories.getActiveRepository();
     }, function () {
-        if ($scope.getActiveRepository()) {
+        if ($scope.getActiveRepository() && $licenseService.isLicenseValid()) {
             if ($scope.usedPrefixes) {
                 $scope.loadResource();
             } else {
diff --git a/src/js/angular/graphexplore/directives/rdf-class-hierarchy.directive.js b/src/js/angular/graphexplore/directives/rdf-class-hierarchy.directive.js
index 96128f95bf..ac2ec71b7b 100644
--- a/src/js/angular/graphexplore/directives/rdf-class-hierarchy.directive.js
+++ b/src/js/angular/graphexplore/directives/rdf-class-hierarchy.directive.js
@@ -119,7 +119,7 @@ function classHierarchyDirective($rootScope, $location, GraphDataRestService, $w
 
         var g = appendMainGroup();
 
-        if (!scope.classHierarchyData.classCount && $repositories.getActiveRepository() && !$repositories.isSystemRepository()) {
+        if (!scope.classHierarchyData.classCount && $repositories.getActiveRepository() && !$repositories.isSystemRepository() && $licenseService.isLicenseValid()) {
             $rootScope.loader = true;
             $rootScope.hierarchyError = false;
             const selGraphFromCache = LocalStorageAdapter.get(`classHierarchy-selectedGraph-${$repositories.getActiveRepository()}`);
diff --git a/src/js/angular/jdbc/controllers.js b/src/js/angular/jdbc/controllers.js
index 2d7debf62a..fd5cef1140 100644
--- a/src/js/angular/jdbc/controllers.js
+++ b/src/js/angular/jdbc/controllers.js
@@ -60,9 +60,9 @@ function JdbcListCtrl($scope, $repositories, JdbcRestService, toastr, ModalServi
     };
 }
 
-JdbcCreateCtrl.$inject = ['$scope', '$location', 'toastr', '$repositories', '$window', '$timeout', 'JdbcRestService', 'RDF4JRepositoriesRestService', 'SparqlRestService', 'ModalService'];
+JdbcCreateCtrl.$inject = ['$scope', '$location', 'toastr', '$repositories', '$window', '$timeout', '$licenseService', 'JdbcRestService', 'RDF4JRepositoriesRestService', 'SparqlRestService', 'ModalService'];
 
-function JdbcCreateCtrl($scope, $location, toastr, $repositories, $window, $timeout, JdbcRestService, RDF4JRepositoriesRestService, SparqlRestService, ModalService) {
+function JdbcCreateCtrl($scope, $location, toastr, $repositories, $window, $timeout, $licenseService, JdbcRestService, RDF4JRepositoriesRestService, SparqlRestService, ModalService) {
 
     $scope.name = $location.search().name || '';
     $scope.getNamespaces = getNamespaces;
@@ -407,7 +407,7 @@ function JdbcCreateCtrl($scope, $location, toastr, $repositories, $window, $time
     };
 
     function getSuggestions() {
-        if (!validateQuery()) {
+        if (!validateQuery() || !$licenseService.isLicenseValid()) {
             return;
         }
 
diff --git a/src/js/angular/namespaces/controllers.js b/src/js/angular/namespaces/controllers.js
index 73b288fe04..a5e78f4398 100644
--- a/src/js/angular/namespaces/controllers.js
+++ b/src/js/angular/namespaces/controllers.js
@@ -30,8 +30,8 @@ function validatePrefix(prefix) {
     return prefix === '' || prefix.match(pnPrefixRe);
 }
 
-namespaces.controller('NamespacesCtrl', ['$scope', '$http', '$repositories', 'toastr', '$modal', 'ModalService', 'RepositoriesRestService', 'RDF4JRepositoriesRestService',
-    function ($scope, $http, $repositories, toastr, $modal, ModalService, RepositoriesRestService, RDF4JRepositoriesRestService) {
+namespaces.controller('NamespacesCtrl', ['$scope', '$http', '$repositories', 'toastr', '$licenseService', '$modal', 'ModalService', 'RepositoriesRestService', 'RDF4JRepositoriesRestService',
+    function ($scope, $http, $repositories, toastr, $licenseService, $modal, ModalService, RepositoriesRestService, RDF4JRepositoriesRestService) {
         $scope.namespaces = {};
         $scope.namespace = {};
         $scope.loader = false;
@@ -42,7 +42,7 @@ namespaces.controller('NamespacesCtrl', ['$scope', '$http', '$repositories', 'to
         $scope.displayedNamespaces = [];
 
         $scope.getNamespaces = function () {
-            if (!$repositories.getActiveRepository()) {
+            if (!$repositories.getActiveRepository() || !$licenseService.isLicenseValid()) {
                 return;
             }
 
diff --git a/src/pages/explore.html b/src/pages/explore.html
index 51e8349e71..b490855158 100644
--- a/src/pages/explore.html
+++ b/src/pages/explore.html
@@ -1,6 +1,6 @@
 <link href="css/explore.css?v=[AIV]{version}[/AIV]" rel="stylesheet"/>
-<div core-errors></div>
-<div class="page" ng-show="getActiveRepository()">
+<div core-errors license></div>
+<div class="page" ng-show="getActiveRepository() && isLicenseValid()">
     <div class="resource-info" ng-if="!isTripleResource()">
         <div class="thumb" ng-show="{{details.img}}">
             <a href="{{details.img}}"><img ng-src="{{details.img}}" alt="details image"/></a>
diff --git a/src/pages/jdbc-create.html b/src/pages/jdbc-create.html
index ae604ddf34..579038cb2f 100644
--- a/src/pages/jdbc-create.html
+++ b/src/pages/jdbc-create.html
@@ -17,7 +17,7 @@ <h1>
               popover-placement="bottom-right"
               popover-append-to-body="true"><span class="icon-info"></span></span>
     </h1>
-    <div core-errors></div>
+    <div core-errors license></div>
     <div system-repo-warning></div>
     <div class="alert alert-danger" ng-show="repositoryError">
         <p>The currently selected repository cannot be used for queries due to an error:</p>
@@ -25,7 +25,7 @@ <h1>
         <p>{{repositoryError}}</p>
     </div>
 
-    <div class="card mb-2 sql-table-config">
+    <div class="card mb-2 sql-table-config" ng-if="isLicenseValid()">
         <div class="card-block pt-1">
             <p class="lead">Table name</p>
             <div class="table-group table-group-lg">
@@ -116,7 +116,7 @@ <h1>
 
             <div class="clearfix">
                 <div class="pull-right">
-                    <button ng-if="page === 2 && canWriteActiveRepo()" class="btn btn-lg preview-btn" ng-click="getColumnsSuggestions()"
+                    <button ng-if="page === 2 && canWriteActiveRepo() && isLicenseValid()" class="btn btn-lg preview-btn" ng-click="getColumnsSuggestions()"
                             popover="Get columns suggestions"
                             popover-placement="top"
                             popover-trigger="mouseenter">
@@ -138,24 +138,24 @@ <h1>
             popover="Save SQL configuration"
             popover-placement="top"
             popover-trigger="mouseenter"
-            ng-if="canWriteActiveRepo()">
+            ng-if="canWriteActiveRepo() && isLicenseValid()">
         Save
     </button>
     <a ng-href="jdbc" class="btn btn-lg btn-secondary cancel-query-btn"
        popover="Cancel SQL configuration"
        popover-placement="top"
        popover-trigger="mouseenter"
-       ng-if="canWriteActiveRepo()">
+       ng-if="canWriteActiveRepo() && isLicenseValid()">
         Cancel
     </a>
     <a ng-href="jdbc" class="btn btn-lg btn-secondary"
        popover="Cancel SQL configuration"
        popover-placement="top"
        popover-trigger="mouseenter"
-       ng-if="!canWriteActiveRepo()">
+       ng-if="!canWriteActiveRepo() && isLicenseValid()">
         Close
     </a>
-    <div class="pull-right">
+    <div class="pull-right" ng-if="isLicenseValid()">
         <button class="btn btn-lg preview-btn" ng-click="getPreview()"
                 popover="Preview SQL configuration table"
                 popover-placement="top"
diff --git a/src/pages/namespaces.html b/src/pages/namespaces.html
index d0d8129cca..828ce364fc 100644
--- a/src/pages/namespaces.html
+++ b/src/pages/namespaces.html
@@ -15,8 +15,8 @@ <h1>
 
 <div class="ot-loader ot-main-loader" onto-loader size="50" ng-show="loader"></div>
 <div id="wb-namespaces" ng-hide="loader">
-    <div core-errors></div>
-    <div ng-show="getActiveRepository()">
+    <div core-errors license></div>
+    <div ng-show="getActiveRepository() && isLicenseValid()">
         <div class="clearfix mb-2">
             <form novalidate name="form" class="form-inline pull-right add-namespace-form" ng-show="canWriteActiveRepo()">
                 <div class="form-group" style="width: 130px;">

From a5a3f7bcd5eb7f31c6aa8053093d5ca5ba125ded Mon Sep 17 00:00:00 2001
From: DesislavaBorisova <desibori@yahoo.com>
Date: Mon, 11 Apr 2022 12:53:59 +0300
Subject: [PATCH 02/23] GDB-6329 - add new license is expired message to views
 that need SPARQL queries to work

---
 src/js/angular/explore/controllers.js              | 12 +++++++-----
 .../directives/rdf-class-hierarchy.directive.js    |  2 +-
 src/js/angular/jdbc/controllers.js                 |  6 +++---
 src/js/angular/namespaces/controllers.js           |  6 +++---
 src/pages/explore.html                             |  4 ++--
 src/pages/jdbc-create.html                         | 14 +++++++-------
 src/pages/namespaces.html                          |  4 ++--
 7 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/src/js/angular/explore/controllers.js b/src/js/angular/explore/controllers.js
index fa0a182a53..874c7e7e57 100644
--- a/src/js/angular/explore/controllers.js
+++ b/src/js/angular/explore/controllers.js
@@ -2,6 +2,7 @@ import 'angular/utils/file-types';
 import YASR from 'lib/yasr.bundled';
 import {saveAs} from 'lib/FileSaver-patch';
 import {decodeHTML} from "../../../app";
+import 'angular/core/services/license.service';
 
 const modules = [
     'ngCookies',
@@ -11,7 +12,8 @@ const modules = [
     'graphdb.framework.core',
     'graphdb.framework.core.services.repositories',
     'graphdb.framework.explore.services',
-    'graphdb.workbench.utils.filetypes'
+    'graphdb.workbench.utils.filetypes',
+    'graphdb.framework.core.services.licenseService'
 ];
 
 angular
@@ -21,9 +23,9 @@ angular
     .controller('EditResourceCtrl', EditResourceCtrl)
     .controller('ViewTrigCtrl', ViewTrigCtrl);
 
-ExploreCtrl.$inject = ['$scope', '$http', '$location', 'toastr', '$routeParams', '$repositories', 'ClassInstanceDetailsService', 'ModalService', 'RDF4JRepositoriesRestService', 'FileTypes', '$jwtAuth', '$translate'];
+ExploreCtrl.$inject = ['$scope', '$http', '$location', 'toastr', '$licenseService', '$routeParams', '$repositories', 'ClassInstanceDetailsService', 'ModalService', 'RDF4JRepositoriesRestService', 'FileTypes', '$jwtAuth', '$translate'];
 
-function ExploreCtrl($scope, $http, $location, toastr, $routeParams, $repositories, ClassInstanceDetailsService, ModalService, RDF4JRepositoriesRestService, FileTypes, $jwtAuth, $translate) {
+function ExploreCtrl($scope, $http, $location, toastr, $licenseService, $routeParams, $repositories, ClassInstanceDetailsService, ModalService, RDF4JRepositoriesRestService, FileTypes, $jwtAuth, $translate) {
 
     // We need to get sameAs and inference for the current user
     const principal = $jwtAuth.getPrincipal();
@@ -82,9 +84,9 @@ function ExploreCtrl($scope, $http, $location, toastr, $routeParams, $repositori
     };
 
     $scope.$watch(function () {
-        return $repositories.getActiveRepository();
+            return $repositories.getActiveRepository();
     }, function () {
-        if ($scope.getActiveRepository()) {
+        if ($scope.getActiveRepository() && $licenseService.isLicenseValid()) {
             if ($scope.usedPrefixes) {
                 $scope.loadResource();
             } else {
diff --git a/src/js/angular/graphexplore/directives/rdf-class-hierarchy.directive.js b/src/js/angular/graphexplore/directives/rdf-class-hierarchy.directive.js
index 6763354fe9..e0a8d90975 100644
--- a/src/js/angular/graphexplore/directives/rdf-class-hierarchy.directive.js
+++ b/src/js/angular/graphexplore/directives/rdf-class-hierarchy.directive.js
@@ -119,7 +119,7 @@ function classHierarchyDirective($rootScope, $location, GraphDataRestService, $w
 
         var g = appendMainGroup();
 
-        if (!scope.classHierarchyData.classCount && $repositories.getActiveRepository() && !$repositories.isSystemRepository()) {
+        if (!scope.classHierarchyData.classCount && $repositories.getActiveRepository() && !$repositories.isSystemRepository() && $licenseService.isLicenseValid()) {
             $rootScope.loader = true;
             $rootScope.hierarchyError = false;
             const selGraphFromCache = LocalStorageAdapter.get(`classHierarchy-selectedGraph-${$repositories.getActiveRepository()}`);
diff --git a/src/js/angular/jdbc/controllers.js b/src/js/angular/jdbc/controllers.js
index 73f34c2605..66718b9035 100644
--- a/src/js/angular/jdbc/controllers.js
+++ b/src/js/angular/jdbc/controllers.js
@@ -60,9 +60,9 @@ function JdbcListCtrl($scope, $repositories, JdbcRestService, toastr, ModalServi
     };
 }
 
-JdbcCreateCtrl.$inject = ['$scope', '$location', 'toastr', '$repositories', '$window', '$timeout', 'JdbcRestService', 'RDF4JRepositoriesRestService', 'SparqlRestService', 'ModalService', '$translate'];
+JdbcCreateCtrl.$inject = ['$scope', '$location', 'toastr', '$repositories', '$window', '$timeout', '$licenseService', 'JdbcRestService', 'RDF4JRepositoriesRestService', 'SparqlRestService', 'ModalService', '$translate'];
 
-function JdbcCreateCtrl($scope, $location, toastr, $repositories, $window, $timeout, JdbcRestService, RDF4JRepositoriesRestService, SparqlRestService, ModalService, $translate) {
+function JdbcCreateCtrl($scope, $location, toastr, $repositories, $window, $timeout, $licenseService, JdbcRestService, RDF4JRepositoriesRestService, SparqlRestService, ModalService, $translate) {
 
     $scope.name = $location.search().name || '';
     $scope.getNamespaces = getNamespaces;
@@ -407,7 +407,7 @@ function JdbcCreateCtrl($scope, $location, toastr, $repositories, $window, $time
     };
 
     function getSuggestions() {
-        if (!validateQuery()) {
+        if (!validateQuery() || !$licenseService.isLicenseValid()) {
             return;
         }
 
diff --git a/src/js/angular/namespaces/controllers.js b/src/js/angular/namespaces/controllers.js
index c492e8ac08..793f12bf41 100644
--- a/src/js/angular/namespaces/controllers.js
+++ b/src/js/angular/namespaces/controllers.js
@@ -30,8 +30,8 @@ function validatePrefix(prefix) {
     return prefix === '' || prefix.match(pnPrefixRe);
 }
 
-namespaces.controller('NamespacesCtrl', ['$scope', '$http', '$repositories', 'toastr', '$modal', 'ModalService', 'RepositoriesRestService', 'RDF4JRepositoriesRestService', '$translate',
-    function ($scope, $http, $repositories, toastr, $modal, ModalService, RepositoriesRestService, RDF4JRepositoriesRestService, $translate) {
+namespaces.controller('NamespacesCtrl', ['$scope', '$http', '$repositories', 'toastr', '$licenseService', '$modal', 'ModalService', 'RepositoriesRestService', 'RDF4JRepositoriesRestService', '$translate',
+    function ($scope, $http, $repositories, toastr, $licenseService, $modal, ModalService, RepositoriesRestService, RDF4JRepositoriesRestService, $translate) {
         $scope.namespaces = {};
         $scope.namespace = {};
         $scope.loader = false;
@@ -42,7 +42,7 @@ namespaces.controller('NamespacesCtrl', ['$scope', '$http', '$repositories', 'to
         $scope.displayedNamespaces = [];
 
         $scope.getNamespaces = function () {
-            if (!$repositories.getActiveRepository()) {
+            if (!$repositories.getActiveRepository() || !$licenseService.isLicenseValid()) {
                 return;
             }
 
diff --git a/src/pages/explore.html b/src/pages/explore.html
index 169d6b5491..6a2baf436f 100644
--- a/src/pages/explore.html
+++ b/src/pages/explore.html
@@ -1,6 +1,6 @@
 <link href="css/explore.css?v=[AIV]{version}[/AIV]" rel="stylesheet"/>
-<div core-errors></div>
-<div class="page" ng-show="getActiveRepository()">
+<div core-errors license></div>
+<div class="page" ng-show="getActiveRepository() && isLicenseValid()">
     <div class="resource-info" ng-if="!isTripleResource()">
         <div class="thumb" ng-show="{{details.img}}">
             <a href="{{details.img}}"><img ng-src="{{details.img}}" alt="details image"/></a>
diff --git a/src/pages/jdbc-create.html b/src/pages/jdbc-create.html
index b2c6e2c6f5..aacac0c157 100644
--- a/src/pages/jdbc-create.html
+++ b/src/pages/jdbc-create.html
@@ -17,7 +17,7 @@ <h1>
               popover-placement="bottom-right"
               popover-append-to-body="true"><span class="icon-info"></span></span>
     </h1>
-    <div core-errors></div>
+    <div core-errors license></div>
     <div system-repo-warning></div>
     <div class="alert alert-danger" ng-show="repositoryError">
         <p>{{'not.usable.active.repo.error' | translate}}</p>
@@ -25,7 +25,7 @@ <h1>
         <p>{{repositoryError}}</p>
     </div>
 
-    <div class="card mb-2 sql-table-config">
+    <div class="card mb-2 sql-table-config" ng-if="isLicenseValid()">
         <div class="card-block pt-1">
             <p class="lead">{{'table.name' | translate}}</p>
             <div class="table-group table-group-lg">
@@ -116,7 +116,7 @@ <h1>
 
             <div class="clearfix">
                 <div class="pull-right">
-                    <button ng-if="page === 2 && canWriteActiveRepo()" class="btn btn-lg preview-btn" ng-click="getColumnsSuggestions()"
+                    <button ng-if="page === 2 && canWriteActiveRepo() && isLicenseValid()" class="btn btn-lg preview-btn" ng-click="getColumnsSuggestions()"
                             popover="{{'jdbc.column.suggestions' | translate}}"
                             popover-placement="top"
                             popover-trigger="mouseenter">
@@ -138,24 +138,24 @@ <h1>
             popover="{{'jdbc.save.configuration' | translate}}"
             popover-placement="top"
             popover-trigger="mouseenter"
-            ng-if="canWriteActiveRepo()">
+            ng-if="canWriteActiveRepo() && isLicenseValid()">
         {{'common.save.btn' | translate}}
     </button>
     <a ng-href="jdbc" class="btn btn-lg btn-secondary cancel-query-btn"
        popover="{{'jdbc.cancel.configuration' | translate}}"
        popover-placement="top"
        popover-trigger="mouseenter"
-       ng-if="canWriteActiveRepo()">
+       ng-if="canWriteActiveRepo() && isLicenseValid()">
         {{'common.cancel.btn' | translate}}
     </a>
     <a ng-href="jdbc" class="btn btn-lg btn-secondary"
        popover="{{'jdbc.cancel.configuration' | translate}}"
        popover-placement="top"
        popover-trigger="mouseenter"
-       ng-if="!canWriteActiveRepo()">
+       ng-if="!canWriteActiveRepo() && isLicenseValid()">
         {{'common.close' | translate}}
     </a>
-    <div class="pull-right">
+    <div class="pull-right" ng-if="isLicenseValid()">
         <button class="btn btn-lg preview-btn" ng-click="getPreview()"
                 popover="{{'jdbc.preview.configuration' | translate}}"
                 popover-placement="top"
diff --git a/src/pages/namespaces.html b/src/pages/namespaces.html
index 29813e458e..5672f27bbb 100644
--- a/src/pages/namespaces.html
+++ b/src/pages/namespaces.html
@@ -15,8 +15,8 @@ <h1>
 
 <div class="ot-loader ot-main-loader" onto-loader size="50" ng-show="loader"></div>
 <div id="wb-namespaces" ng-hide="loader">
-    <div core-errors></div>
-    <div ng-show="getActiveRepository()">
+    <div core-errors license></div>
+    <div ng-show="getActiveRepository() && isLicenseValid()">
         <div class="clearfix mb-2">
             <form novalidate name="form" class="form-inline pull-right add-namespace-form" ng-show="canWriteActiveRepo()">
                 <div class="form-group" style="width: 130px;">

From 50e60b6eb469e75ba5ea148b0540b00c081c1ce1 Mon Sep 17 00:00:00 2001
From: DesislavaBorisova <desibori@yahoo.com>
Date: Wed, 27 Apr 2022 16:17:40 +0300
Subject: [PATCH 03/23] GDB-6329 - fix failing karma tests due to new license
 expired message

---
 test/namespaces/controllers.spec.js | 13 +++++++++----
 test/resource/controllers.spec.js   |  8 ++++++--
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/test/namespaces/controllers.spec.js b/test/namespaces/controllers.spec.js
index f1eec1f44b..934fe01c1e 100644
--- a/test/namespaces/controllers.spec.js
+++ b/test/namespaces/controllers.spec.js
@@ -23,9 +23,10 @@ describe('=> NamespacesCtrl tests', function () {
         toastr,
         httpGetNamespaces,
         modalInstance,
-        $translate;
+        $translate,
+        $licenseService;
 
-    beforeEach(angular.mock.inject(function (_$httpBackend_, _$repositories_, _RDF4JRepositoriesRestService_, _toastr_, _$location_, _$controller_, _$window_, _$timeout_, $rootScope, $q, _$translate_) {
+    beforeEach(angular.mock.inject(function (_$httpBackend_, _$repositories_, _RDF4JRepositoriesRestService_, _toastr_, _$location_, _$controller_, _$window_, _$timeout_, $rootScope, $q, _$translate_, _$licenseService_) {
         $httpBackend = _$httpBackend_;
         $controller = _$controller_;
         $timeout = _$timeout_;
@@ -34,6 +35,7 @@ describe('=> NamespacesCtrl tests', function () {
         toastr = _toastr_;
         $scope = $rootScope.$new();
         $translate = _$translate_;
+        $licenseService = _$licenseService_;
 
         $translate.instant = function (key) {
             return bundle[key];
@@ -41,6 +43,8 @@ describe('=> NamespacesCtrl tests', function () {
 
         modalInstance = new FakeModal($q, $rootScope);
 
+        $httpBackend.when('GET', 'rest/graphdb-settings/license').respond(200, 'licenseinfo');
+        $httpBackend.when('GET', 'rest/graphdb-settings/license/hardcoded').respond(200, 'true');
         $httpBackend.when('GET', 'rest/security/all').respond(200, {
             enabled: false,
             freeAcesss: {enabled: false},
@@ -94,7 +98,8 @@ describe('=> NamespacesCtrl tests', function () {
                     return modalInstance;
                 }
             },
-            $translate: $translate
+            $translate: $translate,
+            $licenseService: $licenseService
         });
     }));
 
@@ -104,7 +109,7 @@ describe('=> NamespacesCtrl tests', function () {
     });
 
     describe('$scope.getNamespaces()', function () {
-        it('should set $scope.namespaces', function () {
+        xit('should set $scope.namespaces', function () {
             $httpBackend.flush();
             expect($scope.namespaces).toEqual([{prefix: 'prefix', namespace: 'namespace'}, {
                 prefix: 'prefix2',
diff --git a/test/resource/controllers.spec.js b/test/resource/controllers.spec.js
index b4433e6517..f79a478952 100644
--- a/test/resource/controllers.spec.js
+++ b/test/resource/controllers.spec.js
@@ -11,9 +11,10 @@ describe('=> ExploreCtrl tests', function () {
         $timeout,
         $window,
         $scope,
-        $jwtAuth;
+        $jwtAuth,
+        $licenseService;
 
-    beforeEach(angular.mock.inject(function (_$repositories_, _ClassInstanceDetailsService_, _$httpBackend_, _$location_, _$controller_, _$window_, _$timeout_, $rootScope, _$jwtAuth_) {
+    beforeEach(angular.mock.inject(function (_$repositories_, _ClassInstanceDetailsService_, _$httpBackend_, _$location_, _$controller_, _$window_, _$timeout_, $rootScope, _$jwtAuth_, _$licenseService_) {
         $repositories = _$repositories_;
         ClassInstanceDetailsService = _ClassInstanceDetailsService_;
         $httpBackend = _$httpBackend_;
@@ -22,6 +23,7 @@ describe('=> ExploreCtrl tests', function () {
         $window = _$window_;
         $timeout = _$timeout_;
         $jwtAuth = _$jwtAuth_;
+        $licenseService = _$licenseService_;
 
         $scope = $rootScope.$new();
 
@@ -37,6 +39,8 @@ describe('=> ExploreCtrl tests', function () {
 
         $controller('ExploreCtrl', {$scope: $scope, $jwtAuth: $jwtAuth});
 
+        $httpBackend.when('GET', 'rest/graphdb-settings/license').respond(200, 'licenseinfo');
+        $httpBackend.when('GET', 'rest/graphdb-settings/license/hardcoded').respond(200, 'true');
         $httpBackend.when('GET', 'rest/security/all').respond(200, {
             enabled: true,
             freeAccess: {enabled: false},

From 63e675e910b68744779b8c9a309c656f5c12dad1 Mon Sep 17 00:00:00 2001
From: DesislavaBorisova <desibori@yahoo.com>
Date: Wed, 27 Apr 2022 16:39:45 +0300
Subject: [PATCH 04/23] GDB-6329 - fix failing karma tests due to new license
 expired message, run skipped test

---
 test/namespaces/controllers.spec.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/namespaces/controllers.spec.js b/test/namespaces/controllers.spec.js
index 934fe01c1e..fef57f1cea 100644
--- a/test/namespaces/controllers.spec.js
+++ b/test/namespaces/controllers.spec.js
@@ -43,6 +43,9 @@ describe('=> NamespacesCtrl tests', function () {
 
         modalInstance = new FakeModal($q, $rootScope);
 
+        $licenseService.isLicenseValid = function () {
+            return true;
+        }
         $httpBackend.when('GET', 'rest/graphdb-settings/license').respond(200, 'licenseinfo');
         $httpBackend.when('GET', 'rest/graphdb-settings/license/hardcoded').respond(200, 'true');
         $httpBackend.when('GET', 'rest/security/all').respond(200, {
@@ -109,7 +112,7 @@ describe('=> NamespacesCtrl tests', function () {
     });
 
     describe('$scope.getNamespaces()', function () {
-        xit('should set $scope.namespaces', function () {
+        it('should set $scope.namespaces', function () {
             $httpBackend.flush();
             expect($scope.namespaces).toEqual([{prefix: 'prefix', namespace: 'namespace'}, {
                 prefix: 'prefix2',

From 0a7f4871ee8c4d130844ffbe5284ae56031e64c7 Mon Sep 17 00:00:00 2001
From: DesislavaBorisova <desibori@yahoo.com>
Date: Mon, 11 Apr 2022 12:53:59 +0300
Subject: [PATCH 05/23] GDB-6329 - add new license is expired message to views
 that need SPARQL queries to work

---
 src/js/angular/explore/controllers.js          | 18 ++++++++++--------
 .../rdf-class-hierarchy.directive.js           |  2 +-
 src/js/angular/jdbc/controllers.js             |  6 +++---
 src/js/angular/namespaces/controllers.js       |  6 +++---
 src/pages/explore.html                         |  4 ++--
 src/pages/jdbc-create.html                     | 14 +++++++-------
 src/pages/namespaces.html                      |  4 ++--
 7 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/src/js/angular/explore/controllers.js b/src/js/angular/explore/controllers.js
index ad9cb181b1..c8f99c481b 100644
--- a/src/js/angular/explore/controllers.js
+++ b/src/js/angular/explore/controllers.js
@@ -2,6 +2,7 @@ import 'angular/utils/file-types';
 import YASR from 'lib/yasr.bundled';
 import {saveAs} from 'lib/FileSaver-patch';
 import {decodeHTML} from "../../../app";
+import 'angular/core/services/license.service';
 
 const modules = [
     'ngCookies',
@@ -11,7 +12,8 @@ const modules = [
     'graphdb.framework.core',
     'graphdb.framework.core.services.repositories',
     'graphdb.framework.explore.services',
-    'graphdb.workbench.utils.filetypes'
+    'graphdb.workbench.utils.filetypes',
+    'graphdb.framework.core.services.licenseService'
 ];
 
 angular
@@ -21,9 +23,9 @@ angular
     .controller('EditResourceCtrl', EditResourceCtrl)
     .controller('ViewTrigCtrl', ViewTrigCtrl);
 
-ExploreCtrl.$inject = ['$scope', '$http', '$location', 'toastr', '$routeParams', '$repositories', 'ClassInstanceDetailsService', 'ModalService', 'RDF4JRepositoriesRestService', 'FileTypes', '$jwtAuth', '$translate', '$languageService'];
+ExploreCtrl.$inject = ['$scope', '$http', '$location', 'toastr', '$licenseService', '$routeParams', '$repositories', 'ClassInstanceDetailsService', 'ModalService', 'RDF4JRepositoriesRestService', 'FileTypes', '$jwtAuth', '$translate', '$languageService'];
 
-function ExploreCtrl($scope, $http, $location, toastr, $routeParams, $repositories, ClassInstanceDetailsService, ModalService, RDF4JRepositoriesRestService, FileTypes, $jwtAuth, $translate, $languageService) {
+function ExploreCtrl($scope, $http, $location, toastr, $licenseService, $routeParams, $repositories, ClassInstanceDetailsService, ModalService, RDF4JRepositoriesRestService, FileTypes, $jwtAuth, $translate, $languageService) {
 
     // We need to get sameAs and inference for the current user
     const principal = $jwtAuth.getPrincipal();
@@ -56,9 +58,9 @@ function ExploreCtrl($scope, $http, $location, toastr, $routeParams, $repositori
     // Fixed inference when we're showing the context tab and a named graph
     $scope.inferenceNamed = 'explicit';
     $scope.inferences = [
-        {id: 'all', title: 'explore.explicit.implicit'},
-        {id: 'explicit', title: 'explore.explicit'},
-        {id: 'implicit', title: 'explore.implicit'}
+        {id: 'all', title: $translate.instant('explore.explicit.implicit')},
+        {id: 'explicit', title: $translate.instant('explore.explicit')},
+        {id: 'implicit', title: $translate.instant('explore.implicit')}
     ];
     $scope.context = '';
 
@@ -82,9 +84,9 @@ function ExploreCtrl($scope, $http, $location, toastr, $routeParams, $repositori
     };
 
     $scope.$watch(function () {
-        return $repositories.getActiveRepository();
+            return $repositories.getActiveRepository();
     }, function () {
-        if ($scope.getActiveRepository()) {
+        if ($scope.getActiveRepository() && $licenseService.isLicenseValid()) {
             if ($scope.usedPrefixes) {
                 $scope.loadResource();
             } else {
diff --git a/src/js/angular/graphexplore/directives/rdf-class-hierarchy.directive.js b/src/js/angular/graphexplore/directives/rdf-class-hierarchy.directive.js
index 6763354fe9..e0a8d90975 100644
--- a/src/js/angular/graphexplore/directives/rdf-class-hierarchy.directive.js
+++ b/src/js/angular/graphexplore/directives/rdf-class-hierarchy.directive.js
@@ -119,7 +119,7 @@ function classHierarchyDirective($rootScope, $location, GraphDataRestService, $w
 
         var g = appendMainGroup();
 
-        if (!scope.classHierarchyData.classCount && $repositories.getActiveRepository() && !$repositories.isSystemRepository()) {
+        if (!scope.classHierarchyData.classCount && $repositories.getActiveRepository() && !$repositories.isSystemRepository() && $licenseService.isLicenseValid()) {
             $rootScope.loader = true;
             $rootScope.hierarchyError = false;
             const selGraphFromCache = LocalStorageAdapter.get(`classHierarchy-selectedGraph-${$repositories.getActiveRepository()}`);
diff --git a/src/js/angular/jdbc/controllers.js b/src/js/angular/jdbc/controllers.js
index 73f34c2605..66718b9035 100644
--- a/src/js/angular/jdbc/controllers.js
+++ b/src/js/angular/jdbc/controllers.js
@@ -60,9 +60,9 @@ function JdbcListCtrl($scope, $repositories, JdbcRestService, toastr, ModalServi
     };
 }
 
-JdbcCreateCtrl.$inject = ['$scope', '$location', 'toastr', '$repositories', '$window', '$timeout', 'JdbcRestService', 'RDF4JRepositoriesRestService', 'SparqlRestService', 'ModalService', '$translate'];
+JdbcCreateCtrl.$inject = ['$scope', '$location', 'toastr', '$repositories', '$window', '$timeout', '$licenseService', 'JdbcRestService', 'RDF4JRepositoriesRestService', 'SparqlRestService', 'ModalService', '$translate'];
 
-function JdbcCreateCtrl($scope, $location, toastr, $repositories, $window, $timeout, JdbcRestService, RDF4JRepositoriesRestService, SparqlRestService, ModalService, $translate) {
+function JdbcCreateCtrl($scope, $location, toastr, $repositories, $window, $timeout, $licenseService, JdbcRestService, RDF4JRepositoriesRestService, SparqlRestService, ModalService, $translate) {
 
     $scope.name = $location.search().name || '';
     $scope.getNamespaces = getNamespaces;
@@ -407,7 +407,7 @@ function JdbcCreateCtrl($scope, $location, toastr, $repositories, $window, $time
     };
 
     function getSuggestions() {
-        if (!validateQuery()) {
+        if (!validateQuery() || !$licenseService.isLicenseValid()) {
             return;
         }
 
diff --git a/src/js/angular/namespaces/controllers.js b/src/js/angular/namespaces/controllers.js
index 19d36cb2a3..1c3a5381cb 100644
--- a/src/js/angular/namespaces/controllers.js
+++ b/src/js/angular/namespaces/controllers.js
@@ -30,8 +30,8 @@ function validatePrefix(prefix) {
     return prefix === '' || prefix.match(pnPrefixRe);
 }
 
-namespaces.controller('NamespacesCtrl', ['$scope', '$http', '$repositories', 'toastr', '$modal', 'ModalService', 'RepositoriesRestService', 'RDF4JRepositoriesRestService', '$translate',
-    function ($scope, $http, $repositories, toastr, $modal, ModalService, RepositoriesRestService, RDF4JRepositoriesRestService, $translate) {
+namespaces.controller('NamespacesCtrl', ['$scope', '$http', '$repositories', 'toastr', '$licenseService', '$modal', 'ModalService', 'RepositoriesRestService', 'RDF4JRepositoriesRestService', '$translate',
+    function ($scope, $http, $repositories, toastr, $licenseService, $modal, ModalService, RepositoriesRestService, RDF4JRepositoriesRestService, $translate) {
         $scope.namespaces = {};
         $scope.namespace = {};
         $scope.loader = false;
@@ -42,7 +42,7 @@ namespaces.controller('NamespacesCtrl', ['$scope', '$http', '$repositories', 'to
         $scope.displayedNamespaces = [];
 
         $scope.getNamespaces = function () {
-            if (!$repositories.getActiveRepository()) {
+            if (!$repositories.getActiveRepository() || !$licenseService.isLicenseValid()) {
                 return;
             }
 
diff --git a/src/pages/explore.html b/src/pages/explore.html
index 6fe84cc13c..679a21f1a3 100644
--- a/src/pages/explore.html
+++ b/src/pages/explore.html
@@ -1,6 +1,6 @@
 <link href="css/explore.css?v=[AIV]{version}[/AIV]" rel="stylesheet"/>
-<div core-errors></div>
-<div class="page" ng-show="getActiveRepository()">
+<div core-errors license></div>
+<div class="page" ng-show="getActiveRepository() && isLicenseValid()">
     <div class="resource-info" ng-if="!isTripleResource()">
         <div class="thumb" ng-show="{{details.img}}">
             <a href="{{details.img}}"><img ng-src="{{details.img}}" alt="details image"/></a>
diff --git a/src/pages/jdbc-create.html b/src/pages/jdbc-create.html
index b2c6e2c6f5..aacac0c157 100644
--- a/src/pages/jdbc-create.html
+++ b/src/pages/jdbc-create.html
@@ -17,7 +17,7 @@ <h1>
               popover-placement="bottom-right"
               popover-append-to-body="true"><span class="icon-info"></span></span>
     </h1>
-    <div core-errors></div>
+    <div core-errors license></div>
     <div system-repo-warning></div>
     <div class="alert alert-danger" ng-show="repositoryError">
         <p>{{'not.usable.active.repo.error' | translate}}</p>
@@ -25,7 +25,7 @@ <h1>
         <p>{{repositoryError}}</p>
     </div>
 
-    <div class="card mb-2 sql-table-config">
+    <div class="card mb-2 sql-table-config" ng-if="isLicenseValid()">
         <div class="card-block pt-1">
             <p class="lead">{{'table.name' | translate}}</p>
             <div class="table-group table-group-lg">
@@ -116,7 +116,7 @@ <h1>
 
             <div class="clearfix">
                 <div class="pull-right">
-                    <button ng-if="page === 2 && canWriteActiveRepo()" class="btn btn-lg preview-btn" ng-click="getColumnsSuggestions()"
+                    <button ng-if="page === 2 && canWriteActiveRepo() && isLicenseValid()" class="btn btn-lg preview-btn" ng-click="getColumnsSuggestions()"
                             popover="{{'jdbc.column.suggestions' | translate}}"
                             popover-placement="top"
                             popover-trigger="mouseenter">
@@ -138,24 +138,24 @@ <h1>
             popover="{{'jdbc.save.configuration' | translate}}"
             popover-placement="top"
             popover-trigger="mouseenter"
-            ng-if="canWriteActiveRepo()">
+            ng-if="canWriteActiveRepo() && isLicenseValid()">
         {{'common.save.btn' | translate}}
     </button>
     <a ng-href="jdbc" class="btn btn-lg btn-secondary cancel-query-btn"
        popover="{{'jdbc.cancel.configuration' | translate}}"
        popover-placement="top"
        popover-trigger="mouseenter"
-       ng-if="canWriteActiveRepo()">
+       ng-if="canWriteActiveRepo() && isLicenseValid()">
         {{'common.cancel.btn' | translate}}
     </a>
     <a ng-href="jdbc" class="btn btn-lg btn-secondary"
        popover="{{'jdbc.cancel.configuration' | translate}}"
        popover-placement="top"
        popover-trigger="mouseenter"
-       ng-if="!canWriteActiveRepo()">
+       ng-if="!canWriteActiveRepo() && isLicenseValid()">
         {{'common.close' | translate}}
     </a>
-    <div class="pull-right">
+    <div class="pull-right" ng-if="isLicenseValid()">
         <button class="btn btn-lg preview-btn" ng-click="getPreview()"
                 popover="{{'jdbc.preview.configuration' | translate}}"
                 popover-placement="top"
diff --git a/src/pages/namespaces.html b/src/pages/namespaces.html
index 29813e458e..5672f27bbb 100644
--- a/src/pages/namespaces.html
+++ b/src/pages/namespaces.html
@@ -15,8 +15,8 @@ <h1>
 
 <div class="ot-loader ot-main-loader" onto-loader size="50" ng-show="loader"></div>
 <div id="wb-namespaces" ng-hide="loader">
-    <div core-errors></div>
-    <div ng-show="getActiveRepository()">
+    <div core-errors license></div>
+    <div ng-show="getActiveRepository() && isLicenseValid()">
         <div class="clearfix mb-2">
             <form novalidate name="form" class="form-inline pull-right add-namespace-form" ng-show="canWriteActiveRepo()">
                 <div class="form-group" style="width: 130px;">

From 3c1de4c6a7bb5094b06f34d67914fe9319a1c03f Mon Sep 17 00:00:00 2001
From: DesislavaBorisova <desibori@yahoo.com>
Date: Wed, 27 Apr 2022 16:17:40 +0300
Subject: [PATCH 06/23] GDB-6329 - fix failing karma tests due to new license
 expired message

---
 test/namespaces/controllers.spec.js | 11 ++++++++---
 test/resource/controllers.spec.js   |  6 +++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/test/namespaces/controllers.spec.js b/test/namespaces/controllers.spec.js
index 916c812724..5fb3344a3f 100644
--- a/test/namespaces/controllers.spec.js
+++ b/test/namespaces/controllers.spec.js
@@ -23,9 +23,10 @@ describe('=> NamespacesCtrl tests', function () {
         toastr,
         httpGetNamespaces,
         modalInstance,
-        $translate;
+        $translate,
+        $licenseService;
 
-    beforeEach(angular.mock.inject(function (_$httpBackend_, _$repositories_, _RDF4JRepositoriesRestService_, _toastr_, _$location_, _$controller_, _$window_, _$timeout_, $rootScope, $q, _$translate_) {
+    beforeEach(angular.mock.inject(function (_$httpBackend_, _$repositories_, _RDF4JRepositoriesRestService_, _toastr_, _$location_, _$controller_, _$window_, _$timeout_, $rootScope, $q, _$translate_, _$licenseService_) {
         $httpBackend = _$httpBackend_;
         $controller = _$controller_;
         $timeout = _$timeout_;
@@ -34,6 +35,7 @@ describe('=> NamespacesCtrl tests', function () {
         toastr = _toastr_;
         $scope = $rootScope.$new();
         $translate = _$translate_;
+        $licenseService = _$licenseService_;
 
         $translate.instant = function (key) {
             return bundle[key];
@@ -41,6 +43,8 @@ describe('=> NamespacesCtrl tests', function () {
 
         modalInstance = new FakeModal($q, $rootScope);
 
+        $httpBackend.when('GET', 'rest/graphdb-settings/license').respond(200, 'licenseinfo');
+        $httpBackend.when('GET', 'rest/graphdb-settings/license/hardcoded').respond(200, 'true');
         $httpBackend.when('GET', 'rest/locations').respond(200, {});
 
         $repositories.getActiveRepositoryObject = function () {
@@ -100,7 +104,8 @@ describe('=> NamespacesCtrl tests', function () {
                     return modalInstance;
                 }
             },
-            $translate: $translate
+            $translate: $translate,
+            $licenseService: $licenseService
         });
     }));
 
diff --git a/test/resource/controllers.spec.js b/test/resource/controllers.spec.js
index fd3e33a93a..f3771d962a 100644
--- a/test/resource/controllers.spec.js
+++ b/test/resource/controllers.spec.js
@@ -21,8 +21,9 @@ describe('=> ExploreCtrl tests', function () {
         $scope,
         $jwtAuth,
         $languageService;
+        $licenseService;
 
-    beforeEach(angular.mock.inject(function (_$repositories_, _ClassInstanceDetailsService_, _$httpBackend_, _$location_, _$controller_, _$window_, _$timeout_, $rootScope, _$jwtAuth_, _$languageService_) {
+    beforeEach(angular.mock.inject(function (_$repositories_, _ClassInstanceDetailsService_, _$httpBackend_, _$location_, _$controller_, _$window_, _$timeout_, $rootScope, _$jwtAuth_, _$licenseService_, _$languageService_) {
         $repositories = _$repositories_;
         ClassInstanceDetailsService = _ClassInstanceDetailsService_;
         $httpBackend = _$httpBackend_;
@@ -31,6 +32,7 @@ describe('=> ExploreCtrl tests', function () {
         $window = _$window_;
         $timeout = _$timeout_;
         $jwtAuth = _$jwtAuth_;
+        $licenseService = _$licenseService_;
         $languageService = _$languageService_;
 
         $scope = $rootScope.$new();
@@ -47,6 +49,8 @@ describe('=> ExploreCtrl tests', function () {
 
         $controller('ExploreCtrl', {$scope: $scope, $jwtAuth: $jwtAuth, $languageService: $languageService});
 
+        $httpBackend.when('GET', 'rest/graphdb-settings/license').respond(200, 'licenseinfo');
+        $httpBackend.when('GET', 'rest/graphdb-settings/license/hardcoded').respond(200, 'true');
         $httpBackend.when('GET', 'rest/security/all').respond(200, {
             enabled: true,
             freeAccess: {enabled: false},

From c896c2a8f61ad3446bb6bbd54e02813db1b484c8 Mon Sep 17 00:00:00 2001
From: DesislavaBorisova <desibori@yahoo.com>
Date: Wed, 27 Apr 2022 16:39:45 +0300
Subject: [PATCH 07/23] GDB-6329 - fix failing karma tests due to new license
 expired message, run skipped test

---
 test/namespaces/controllers.spec.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/namespaces/controllers.spec.js b/test/namespaces/controllers.spec.js
index 5fb3344a3f..a8938ddd08 100644
--- a/test/namespaces/controllers.spec.js
+++ b/test/namespaces/controllers.spec.js
@@ -43,6 +43,9 @@ describe('=> NamespacesCtrl tests', function () {
 
         modalInstance = new FakeModal($q, $rootScope);
 
+        $licenseService.isLicenseValid = function () {
+            return true;
+        }
         $httpBackend.when('GET', 'rest/graphdb-settings/license').respond(200, 'licenseinfo');
         $httpBackend.when('GET', 'rest/graphdb-settings/license/hardcoded').respond(200, 'true');
         $httpBackend.when('GET', 'rest/locations').respond(200, {});

From 7e69fe87bccda4b20890b1f701da135b0c3d936d Mon Sep 17 00:00:00 2001
From: DesislavaBorisova <desibori@yahoo.com>
Date: Thu, 12 May 2022 15:44:23 +0300
Subject: [PATCH 08/23] GDB-6329 - hide new toastr messages when license
 expired. Now only new message visible. Code formatting corrections.

---
 src/js/angular/core/directives.js             | 10 +++++---
 .../angular/core/services/license.service.js  |  2 ++
 src/js/angular/explore/controllers.js         |  6 ++---
 .../dependencies-chord.controller.js          |  6 +++--
 .../graphs-visualizations.controller.js       |  6 ++---
 .../rdf-class-hierarchy.controller.js         | 24 ++++++++++++-------
 .../rdf-class-hierarchy.directive.js          |  6 ++---
 src/js/angular/jdbc/controllers.js            |  9 +++----
 src/js/angular/namespaces/controllers.js      | 20 +++++++++++++---
 .../controllers/similarity-list.controller.js |  2 +-
 src/pages/create-index.html                   |  2 +-
 src/pages/monitor/queries.html                |  4 ++--
 src/pages/rdfClassHierarchyInfo.html          |  2 +-
 src/pages/sparql.html                         |  4 ++--
 .../integration/setup/namespaces.spec.js      |  8 +++----
 test/resource/controllers.spec.js             |  2 +-
 16 files changed, 71 insertions(+), 42 deletions(-)

diff --git a/src/js/angular/core/directives.js b/src/js/angular/core/directives.js
index 5a3e3857bc..e4b115fb15 100644
--- a/src/js/angular/core/directives.js
+++ b/src/js/angular/core/directives.js
@@ -248,9 +248,9 @@ function multiRequired() {
 
 const SEARCH_DISPLAY_TYPE = {table: 'table', visual: 'visual'};
 
-searchResourceInput.$inject = ['$location', 'toastr', 'ClassInstanceDetailsService', 'AutocompleteRestService', '$rootScope', '$q', '$sce', 'LocalStorageAdapter', 'LSKeys', '$repositories', '$translate'];
+searchResourceInput.$inject = ['$location', 'toastr', 'ClassInstanceDetailsService', 'AutocompleteRestService', '$rootScope', '$q', '$sce', 'LocalStorageAdapter', 'LSKeys', '$repositories', '$translate', '$licenseService'];
 
-function searchResourceInput($location, toastr, ClassInstanceDetailsService, AutocompleteRestService, $rootScope, $q, $sce, LocalStorageAdapter, LSKeys, $repositories, $translate) {
+function searchResourceInput($location, toastr, ClassInstanceDetailsService, AutocompleteRestService, $rootScope, $q, $sce, LocalStorageAdapter, LSKeys, $repositories, $translate, $licenseService) {
     return {
         restrict: 'EA',
         scope: {
@@ -314,7 +314,7 @@ function searchResourceInput($location, toastr, ClassInstanceDetailsService, Aut
             };
 
             $scope.$watch('namespacespromise', function () {
-                if (angular.isDefined($scope.namespacespromise)) {
+                if (angular.isDefined($scope.namespacespromise) && $scope.isLicenseValid()) {
                     $scope.namespacespromise.success(function (data) {
                         element.namespaces = data.results.bindings.map(function (e) {
                             return {
@@ -329,6 +329,10 @@ function searchResourceInput($location, toastr, ClassInstanceDetailsService, Aut
                 }
             });
 
+            $scope.isLicenseValid = function() {
+                return $licenseService.isLicenseValid();
+            }
+
             $scope.$watch('autocompletepromisestatus', function () {
                 if (!$repositories.isActiveRepoFedXType() && angular.isDefined($scope.autocompletepromisestatus)) {
                     $scope.autocompletepromisestatus.success(function (response) {
diff --git a/src/js/angular/core/services/license.service.js b/src/js/angular/core/services/license.service.js
index a03a28351c..0bc93129d5 100644
--- a/src/js/angular/core/services/license.service.js
+++ b/src/js/angular/core/services/license.service.js
@@ -23,6 +23,8 @@ function licenseService($rootScope, LicenseRestService, $translate) {
                 that.loadingLicense = false;
                 updateProductType(that.license);
             });
+        }). finally(function () {
+            $rootScope.$broadcast('license.set')
         });
     };
 
diff --git a/src/js/angular/explore/controllers.js b/src/js/angular/explore/controllers.js
index c8f99c481b..c4ab248b25 100644
--- a/src/js/angular/explore/controllers.js
+++ b/src/js/angular/explore/controllers.js
@@ -23,9 +23,9 @@ angular
     .controller('EditResourceCtrl', EditResourceCtrl)
     .controller('ViewTrigCtrl', ViewTrigCtrl);
 
-ExploreCtrl.$inject = ['$scope', '$http', '$location', 'toastr', '$licenseService', '$routeParams', '$repositories', 'ClassInstanceDetailsService', 'ModalService', 'RDF4JRepositoriesRestService', 'FileTypes', '$jwtAuth', '$translate', '$languageService'];
+ExploreCtrl.$inject = ['$scope', '$http', '$location', 'toastr', '$routeParams', '$repositories', 'ClassInstanceDetailsService', 'ModalService', 'RDF4JRepositoriesRestService', 'FileTypes', '$jwtAuth', '$translate', '$languageService'];
 
-function ExploreCtrl($scope, $http, $location, toastr, $licenseService, $routeParams, $repositories, ClassInstanceDetailsService, ModalService, RDF4JRepositoriesRestService, FileTypes, $jwtAuth, $translate, $languageService) {
+function ExploreCtrl($scope, $http, $location, toastr, $routeParams, $repositories, ClassInstanceDetailsService, ModalService, RDF4JRepositoriesRestService, FileTypes, $jwtAuth, $translate, $languageService) {
 
     // We need to get sameAs and inference for the current user
     const principal = $jwtAuth.getPrincipal();
@@ -86,7 +86,7 @@ function ExploreCtrl($scope, $http, $location, toastr, $licenseService, $routePa
     $scope.$watch(function () {
             return $repositories.getActiveRepository();
     }, function () {
-        if ($scope.getActiveRepository() && $licenseService.isLicenseValid()) {
+        if ($scope.getActiveRepository() && $scope.isLicenseValid()) {
             if ($scope.usedPrefixes) {
                 $scope.loadResource();
             } else {
diff --git a/src/js/angular/graphexplore/controllers/dependencies-chord.controller.js b/src/js/angular/graphexplore/controllers/dependencies-chord.controller.js
index 8896d0c855..6bbe5fbd08 100644
--- a/src/js/angular/graphexplore/controllers/dependencies-chord.controller.js
+++ b/src/js/angular/graphexplore/controllers/dependencies-chord.controller.js
@@ -68,8 +68,10 @@ function DependenciesChordCtrl($scope, $rootScope, $repositories, toastr, $timeo
                     getRelationshipsStatus();
                 }
             }).error(function (data) {
-            $scope.repositoryError = getError(data);
-            toastr.error(getError(data), $translate.instant('graphexplore.error.getting.graph'));
+                if ($scope.isLicenseValid()) {
+                    $scope.repositoryError = getError(data);
+                    toastr.error(getError(data), $translate.instant('graphexplore.error.getting.graph'));
+                }
         });
     };
 
diff --git a/src/js/angular/graphexplore/controllers/graphs-visualizations.controller.js b/src/js/angular/graphexplore/controllers/graphs-visualizations.controller.js
index b7011b7dc5..6cbdb9722e 100644
--- a/src/js/angular/graphexplore/controllers/graphs-visualizations.controller.js
+++ b/src/js/angular/graphexplore/controllers/graphs-visualizations.controller.js
@@ -1111,7 +1111,7 @@ function GraphsVisualizationsCtrl($scope, $rootScope, $repositories, $licenseSer
     // time but then we'll be called again by the event, so we need the above flag to avoid double
     // initialization and weirdness.
     function initForRepository(newRepo) {
-        if (!$repositories.getActiveRepository() || $scope.hasInitedRepository && !newRepo) {
+        if (!$scope.isLicenseValid() || !$repositories.getActiveRepository() || $scope.hasInitedRepository && !newRepo) {
             return;
         }
 
@@ -1134,12 +1134,12 @@ function GraphsVisualizationsCtrl($scope, $rootScope, $repositories, $licenseSer
 
                 checkAutocompleteStatus();
             }).error(function (data) {
-                toastr.error(getError(data), $translate.instant('graphexplore.error.view.will.not.work'));
+                    toastr.error(getError(data), $translate.instant('graphexplore.error.view.will.not.work'));
             });
     }
 
     function checkAutocompleteStatus() {
-        if ($licenseService.isLicenseValid()) {
+        if ($scope.isLicenseValid()) {
             $scope.getAutocompletePromise = AutocompleteRestService.checkAutocompleteStatus();
         }
     }
diff --git a/src/js/angular/graphexplore/controllers/rdf-class-hierarchy.controller.js b/src/js/angular/graphexplore/controllers/rdf-class-hierarchy.controller.js
index 950f10fd28..b8169b7255 100644
--- a/src/js/angular/graphexplore/controllers/rdf-class-hierarchy.controller.js
+++ b/src/js/angular/graphexplore/controllers/rdf-class-hierarchy.controller.js
@@ -57,14 +57,18 @@ function RdfClassHierarchyCtlr($scope, $rootScope, $location, $repositories, $li
         if (!$scope.getActiveRepository()) {
             return;
         }
+
+        if (!$scope.isLicenseValid()) {
+            return;
+        }
         return RDF4JRepositoriesRestService.resolveGraphs()
             .success(function (graphsInRepo) {
                 $scope.graphsInRepo = graphsInRepo.results.bindings;
                 setSelectedGraphFromCache();
             }).error(function (data) {
-            $scope.repositoryError = getError(data);
-            toastr.error(getError(data), $translate.instant('graphexplore.error.getting.graphs'));
-        });
+                    $scope.repositoryError = getError(data);
+                    toastr.error(getError(data), $translate.instant('graphexplore.error.getting.graphs'));
+            });
     };
 
     const setSelectedGraphFromCache = function () {
@@ -156,7 +160,10 @@ function RdfClassHierarchyCtlr($scope, $rootScope, $location, $repositories, $li
                 toastr.warning($translate.instant('graphexplore.disabling.animations', {classLimit: classLimit}),
                     $translate.instant('graphexplore.reducing.visual.effects'));
             } else {
-                toastr.warning($translate.instant('graphexplore.browser.performance', {browser: bowser.name, classLimit: classLimit}),
+                toastr.warning($translate.instant('graphexplore.browser.performance', {
+                        browser: bowser.name,
+                        classLimit: classLimit
+                    }),
                     $translate.instant('graphexplore.reducing.visual.effects'));
             }
         };
@@ -264,8 +271,8 @@ function RdfClassHierarchyCtlr($scope, $rootScope, $location, $repositories, $li
                         .search("name", name);
                 }
             }).error(function () {
-                toastr.error($translate.instant('graphexplore.error.request.failed', {name: name}));
-            });
+            toastr.error($translate.instant('graphexplore.error.request.failed', {name: name}));
+        });
     }
 
     function onGoToDomainRangeGraphView(event, selectedClass) {
@@ -317,7 +324,7 @@ function RdfClassHierarchyCtlr($scope, $rootScope, $location, $repositories, $li
                 _.each(response, function (value, key) {
                     const obj = {};
                     // TODO extract in core function isTriple(str)
-                    obj.type = (value.startsWith("<<") && value.endsWith(">>")) ? "triple": "uri";
+                    obj.type = (value.startsWith("<<") && value.endsWith(">>")) ? "triple" : "uri";
                     obj.absUri = encodeURIComponent(value);
                     obj.absUriNonEncoded = value;
                     obj.resolvedUri = key;
@@ -426,8 +433,9 @@ function RdfClassHierarchyCtlr($scope, $rootScope, $location, $repositories, $li
     }
 
     let currentActiveRepository = $repositories.getActiveRepository();
+
     function onRepositoryIsSet() {
-        if (!$licenseService.isLicenseValid()) {
+        if (!$scope.isLicenseValid()) {
             return;
         }
         if (currentActiveRepository === $repositories.getActiveRepository()) {
diff --git a/src/js/angular/graphexplore/directives/rdf-class-hierarchy.directive.js b/src/js/angular/graphexplore/directives/rdf-class-hierarchy.directive.js
index e0a8d90975..441121f900 100644
--- a/src/js/angular/graphexplore/directives/rdf-class-hierarchy.directive.js
+++ b/src/js/angular/graphexplore/directives/rdf-class-hierarchy.directive.js
@@ -13,9 +13,9 @@ angular
     .constant("ROOT_OBJ_NAME", "RDF Class Hierarchy")
     .directive('rdfClassHierarchy', classHierarchyDirective);
 
-classHierarchyDirective.$inject = ['$rootScope', '$location', 'GraphDataRestService', '$window', '$timeout', '$repositories', '$licenseService', 'toastr', 'ZOOM_DURATION', 'ROOT_OBJ_NAME', 'LocalStorageAdapter', 'LSKeys', '$translate'];
+classHierarchyDirective.$inject = ['$rootScope', '$location', 'GraphDataRestService', '$window', '$timeout', '$repositories', 'toastr', 'ZOOM_DURATION', 'ROOT_OBJ_NAME', 'LocalStorageAdapter', 'LSKeys', '$translate'];
 
-function classHierarchyDirective($rootScope, $location, GraphDataRestService, $window, $timeout, $repositories, $licenseService, toastr, ZOOM_DURATION, ROOT_OBJ_NAME, LocalStorageAdapter, LSKeys, $translate) {
+function classHierarchyDirective($rootScope, $location, GraphDataRestService, $window, $timeout, $repositories, toastr, ZOOM_DURATION, ROOT_OBJ_NAME, LocalStorageAdapter, LSKeys, $translate) {
     return {
         restrict: 'AE',
         template: '<div id="classChart"></div>',
@@ -119,7 +119,7 @@ function classHierarchyDirective($rootScope, $location, GraphDataRestService, $w
 
         var g = appendMainGroup();
 
-        if (!scope.classHierarchyData.classCount && $repositories.getActiveRepository() && !$repositories.isSystemRepository() && $licenseService.isLicenseValid()) {
+        if (!scope.classHierarchyData.classCount && $repositories.getActiveRepository() && !$repositories.isSystemRepository()) {
             $rootScope.loader = true;
             $rootScope.hierarchyError = false;
             const selGraphFromCache = LocalStorageAdapter.get(`classHierarchy-selectedGraph-${$repositories.getActiveRepository()}`);
diff --git a/src/js/angular/jdbc/controllers.js b/src/js/angular/jdbc/controllers.js
index 66718b9035..ba196fc3b5 100644
--- a/src/js/angular/jdbc/controllers.js
+++ b/src/js/angular/jdbc/controllers.js
@@ -24,7 +24,8 @@ function JdbcListCtrl($scope, $repositories, JdbcRestService, toastr, ModalServi
     $scope.getSqlConfigurations = function () {
         // Only do this if there is an active repo that isn't an Ontop or FedX repo.
         // Ontop and FedX repos don't support JDBC.
-        if ($repositories.getActiveRepository()
+        if ($scope.isLicenseValid()
+            && $repositories.getActiveRepository()
                 && !$repositories.isActiveRepoOntopType()
                     && !$repositories.isActiveRepoFedXType()) {
             JdbcRestService.getJdbcConfigurations().success(function (data) {
@@ -60,9 +61,9 @@ function JdbcListCtrl($scope, $repositories, JdbcRestService, toastr, ModalServi
     };
 }
 
-JdbcCreateCtrl.$inject = ['$scope', '$location', 'toastr', '$repositories', '$window', '$timeout', '$licenseService', 'JdbcRestService', 'RDF4JRepositoriesRestService', 'SparqlRestService', 'ModalService', '$translate'];
+JdbcCreateCtrl.$inject = ['$scope', '$location', 'toastr', '$repositories', '$window', '$timeout', 'JdbcRestService', 'RDF4JRepositoriesRestService', 'SparqlRestService', 'ModalService', '$translate'];
 
-function JdbcCreateCtrl($scope, $location, toastr, $repositories, $window, $timeout, $licenseService, JdbcRestService, RDF4JRepositoriesRestService, SparqlRestService, ModalService, $translate) {
+function JdbcCreateCtrl($scope, $location, toastr, $repositories, $window, $timeout, JdbcRestService, RDF4JRepositoriesRestService, SparqlRestService, ModalService, $translate) {
 
     $scope.name = $location.search().name || '';
     $scope.getNamespaces = getNamespaces;
@@ -407,7 +408,7 @@ function JdbcCreateCtrl($scope, $location, toastr, $repositories, $window, $time
     };
 
     function getSuggestions() {
-        if (!validateQuery() || !$licenseService.isLicenseValid()) {
+        if (!validateQuery() || !$scope.isLicenseValid()) {
             return;
         }
 
diff --git a/src/js/angular/namespaces/controllers.js b/src/js/angular/namespaces/controllers.js
index 1c3a5381cb..ae158acd01 100644
--- a/src/js/angular/namespaces/controllers.js
+++ b/src/js/angular/namespaces/controllers.js
@@ -30,8 +30,8 @@ function validatePrefix(prefix) {
     return prefix === '' || prefix.match(pnPrefixRe);
 }
 
-namespaces.controller('NamespacesCtrl', ['$scope', '$http', '$repositories', 'toastr', '$licenseService', '$modal', 'ModalService', 'RepositoriesRestService', 'RDF4JRepositoriesRestService', '$translate',
-    function ($scope, $http, $repositories, toastr, $licenseService, $modal, ModalService, RepositoriesRestService, RDF4JRepositoriesRestService, $translate) {
+namespaces.controller('NamespacesCtrl', ['$scope', '$http', '$repositories', 'toastr', '$modal', 'ModalService', 'RepositoriesRestService', 'RDF4JRepositoriesRestService', '$translate', '$licenseService',
+    function ($scope, $http, $repositories, toastr, $modal, ModalService, RepositoriesRestService, RDF4JRepositoriesRestService, $translate, $licenseService) {
         $scope.namespaces = {};
         $scope.namespace = {};
         $scope.loader = false;
@@ -42,7 +42,11 @@ namespaces.controller('NamespacesCtrl', ['$scope', '$http', '$repositories', 'to
         $scope.displayedNamespaces = [];
 
         $scope.getNamespaces = function () {
-            if (!$repositories.getActiveRepository() || !$licenseService.isLicenseValid()) {
+            if (!$repositories.getActiveRepository()) {
+                return;
+            }
+
+            if (!$scope.isLicenseValid()) {
                 return;
             }
 
@@ -82,6 +86,10 @@ namespaces.controller('NamespacesCtrl', ['$scope', '$http', '$repositories', 'to
                 });
         };
 
+        $scope.isLicenseValid = function() {
+            return $licenseService.isLicenseValid();
+        }
+
         $scope.changePagination = function () {
             if (angular.isDefined($scope.namespaces)) {
                 $scope.displayedNamespaces = $scope.namespaces.slice($scope.pageSize * ($scope.page - 1), $scope.pageSize * $scope.page);
@@ -112,6 +120,12 @@ namespaces.controller('NamespacesCtrl', ['$scope', '$http', '$repositories', 'to
             $scope.selectedAll = false;
         });
 
+        $scope.$on('license.set', function () {
+            $scope.searchNamespaces = '';
+            $scope.getNamespaces();
+            $scope.selectedAll = false;
+        });
+
         $scope.onNamespaceSearch = function() {
             $scope.haveSelected = false;
             $scope.selectedAll = false;
diff --git a/src/js/angular/similarity/controllers/similarity-list.controller.js b/src/js/angular/similarity/controllers/similarity-list.controller.js
index 3abc21aebb..31896c8a7b 100644
--- a/src/js/angular/similarity/controllers/similarity-list.controller.js
+++ b/src/js/angular/similarity/controllers/similarity-list.controller.js
@@ -99,7 +99,7 @@ function SimilarityCtrl($scope, $interval, toastr, $repositories, $licenseServic
         return $repositories.getActiveRepository();
     }, function () {
         // Don't try to get namespaces for ontop or fedx repository
-        if ($scope.getActiveRepository() && !$scope.isActiveRepoOntopType() && !$scope.isActiveRepoFedXType()) {
+        if ($scope.isLicenseValid() && $scope.getActiveRepository() && !$scope.isActiveRepoOntopType() && !$scope.isActiveRepoFedXType()) {
             $scope.getNamespacesPromise = RDF4JRepositoriesRestService.getNamespaces($scope.getActiveRepository())
                 .success(function (data) {
                     checkAutocompleteStatus();
diff --git a/src/pages/create-index.html b/src/pages/create-index.html
index f5b13665ee..3c23a5a138 100644
--- a/src/pages/create-index.html
+++ b/src/pages/create-index.html
@@ -17,7 +17,7 @@ <h1>
               popover-placement="bottom-right"
               popover-append-to-body="true"><span class="icon-info"></span></span>
     </h1>
-    <div core-errors></div>
+    <div core-errors license></div>
     <div system-repo-warning></div>
     <div class="alert alert-danger" ng-show="repositoryError">
         <p>{{'current.repo.error' | translate}}</p>
diff --git a/src/pages/monitor/queries.html b/src/pages/monitor/queries.html
index 56504c87ba..2c6c7a3bb5 100644
--- a/src/pages/monitor/queries.html
+++ b/src/pages/monitor/queries.html
@@ -14,10 +14,10 @@ <h1>
 		   popover-append-to-body="true"><span class="icon-info"></span></span>
 	</h1>
 
-    <div core-errors ontop></div>
+    <div core-errors license></div>
 
 	<div id="wb-monitoringQueries" class="ot-owlim-monitoring-queries" ng-if="!isActiveRepoOntopType()">
-		<div ng-show="getActiveRepository()">
+		<div ng-show="getActiveRepository() && isLicenseValid()">
 			<div class="ot-loader ot-main-loader" onto-loader size="50" ng-show="loader"></div>
 
 			<div class="ng-scope" ng-show="!loader && error">
diff --git a/src/pages/rdfClassHierarchyInfo.html b/src/pages/rdfClassHierarchyInfo.html
index 93e19c94f3..e2f3ee3fae 100644
--- a/src/pages/rdfClassHierarchyInfo.html
+++ b/src/pages/rdfClassHierarchyInfo.html
@@ -140,7 +140,7 @@ <h1>
                 show-external-elements="showExternalElements"
                 hide-prefixes="hidePrefixes"
                 current-browser-limit="currentBrowserLimit"
-                ng-show="isLicenseValid() && hasClassHierarchy()">
+                ng-if="isLicenseValid() && hasClassHierarchy()">
         </rdf-class-hierarchy>
 
         <pageslide
diff --git a/src/pages/sparql.html b/src/pages/sparql.html
index a87b2786af..b0a4bda047 100644
--- a/src/pages/sparql.html
+++ b/src/pages/sparql.html
@@ -36,8 +36,8 @@ <h1>
               popover-append-to-body="true"><span class="icon-info"></span></span>
     </h1>
 
-    <div core-errors></div>
-    <div class="alert alert-danger" ng-show="repositoryError && getActiveRepository()">
+    <div core-errors license></div>
+    <div class="alert alert-danger" ng-show="repositoryError && getActiveRepository() && isLicenseValid()">
         <p>{{'not.usable.active.repo.error' | translate}}</p>
         <p>{{repositoryError}}</p>
     </div>
diff --git a/test-cypress/integration/setup/namespaces.spec.js b/test-cypress/integration/setup/namespaces.spec.js
index 50a21a3cdc..94c932193b 100644
--- a/test-cypress/integration/setup/namespaces.spec.js
+++ b/test-cypress/integration/setup/namespaces.spec.js
@@ -14,13 +14,11 @@ describe('Namespaces', () => {
                     DEFAULT_NAMESPACES[e.prefix.value] = e.namespace.value;
                 });
             }).then(() => {
+            cy.visit('/namespaces');
+            cy.window();
 
+            waitUntilPageIsLoaded();
         });
-
-        cy.visit('/namespaces');
-        cy.window();
-
-        waitUntilPageIsLoaded();
     });
 
     afterEach(() => {
diff --git a/test/resource/controllers.spec.js b/test/resource/controllers.spec.js
index f3771d962a..2d6c963c33 100644
--- a/test/resource/controllers.spec.js
+++ b/test/resource/controllers.spec.js
@@ -20,7 +20,7 @@ describe('=> ExploreCtrl tests', function () {
         $window,
         $scope,
         $jwtAuth,
-        $languageService;
+        $languageService,
         $licenseService;
 
     beforeEach(angular.mock.inject(function (_$repositories_, _ClassInstanceDetailsService_, _$httpBackend_, _$location_, _$controller_, _$window_, _$timeout_, $rootScope, _$jwtAuth_, _$licenseService_, _$languageService_) {

From f1df7b72476277984fbd1c04ac6f2e1675c5175b Mon Sep 17 00:00:00 2001
From: DesislavaBorisova <desibori@yahoo.com>
Date: Fri, 13 May 2022 17:00:54 +0300
Subject: [PATCH 09/23] GDB-6329 - correct calls to License Service

---
 .../rdf-class-hierarchy.controller.js            | 16 ++++++----------
 .../directives/rdf-class-hierarchy.directive.js  |  6 ++++--
 src/pages/rdfClassHierarchyInfo.html             |  3 ++-
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/js/angular/graphexplore/controllers/rdf-class-hierarchy.controller.js b/src/js/angular/graphexplore/controllers/rdf-class-hierarchy.controller.js
index b8169b7255..8ed8aecf62 100644
--- a/src/js/angular/graphexplore/controllers/rdf-class-hierarchy.controller.js
+++ b/src/js/angular/graphexplore/controllers/rdf-class-hierarchy.controller.js
@@ -53,12 +53,16 @@ function RdfClassHierarchyCtlr($scope, $rootScope, $location, $repositories, $li
 
     let selectedGraph = allGraphs;
 
+    $scope.isLicenseValid = function () {
+        return $licenseService.isLicenseValid();
+    };
+
     const initView = function () {
         if (!$scope.getActiveRepository()) {
             return;
         }
 
-        if (!$scope.isLicenseValid()) {
+        if (!$licenseService.isLicenseValid()) {
             return;
         }
         return RDF4JRepositoriesRestService.resolveGraphs()
@@ -435,9 +439,6 @@ function RdfClassHierarchyCtlr($scope, $rootScope, $location, $repositories, $li
     let currentActiveRepository = $repositories.getActiveRepository();
 
     function onRepositoryIsSet() {
-        if (!$scope.isLicenseValid()) {
-            return;
-        }
         if (currentActiveRepository === $repositories.getActiveRepository()) {
             return;
         } else {
@@ -456,7 +457,7 @@ function RdfClassHierarchyCtlr($scope, $rootScope, $location, $repositories, $li
 
         refreshDiagramExternalElements();
 
-        if (!$scope.isSystemRepository() && $scope.isLicenseValid()) {
+        if (!$scope.isSystemRepository() && $licenseService.isLicenseValid()) {
             $scope.hierarchyError = false;
             $scope.loader = true;
             GraphDataRestService.getClassHierarchyData(selectedGraph.contextID.uri)
@@ -480,11 +481,6 @@ function RdfClassHierarchyCtlr($scope, $rootScope, $location, $repositories, $li
         return $scope.classHierarchyData.classCount && $scope.getActiveRepositoryNoError() && !$scope.isSystemRepository();
     };
 
-    $scope.isLicenseValid = function () {
-        return $licenseService.isLicenseValid();
-    };
-
-
     $scope.chosenGraph = function (graph) {
         selectedGraph = graph;
         getClassHierarchyData();
diff --git a/src/js/angular/graphexplore/directives/rdf-class-hierarchy.directive.js b/src/js/angular/graphexplore/directives/rdf-class-hierarchy.directive.js
index 441121f900..e705130c10 100644
--- a/src/js/angular/graphexplore/directives/rdf-class-hierarchy.directive.js
+++ b/src/js/angular/graphexplore/directives/rdf-class-hierarchy.directive.js
@@ -18,6 +18,7 @@ classHierarchyDirective.$inject = ['$rootScope', '$location', 'GraphDataRestServ
 function classHierarchyDirective($rootScope, $location, GraphDataRestService, $window, $timeout, $repositories, toastr, ZOOM_DURATION, ROOT_OBJ_NAME, LocalStorageAdapter, LSKeys, $translate) {
     return {
         restrict: 'AE',
+        transclude: true,
         template: '<div id="classChart"></div>',
         scope: {
             classHierarchyData: '=',
@@ -27,7 +28,8 @@ function classHierarchyDirective($rootScope, $location, GraphDataRestService, $w
             showClassInfoPanel: '=',
             showExternalElements: '=',
             hidePrefixes: '=',
-            currentBrowserLimit: '='
+            currentBrowserLimit: '=',
+            isLicenseValid: '&'
         },
         link: linkFunc
     };
@@ -119,7 +121,7 @@ function classHierarchyDirective($rootScope, $location, GraphDataRestService, $w
 
         var g = appendMainGroup();
 
-        if (!scope.classHierarchyData.classCount && $repositories.getActiveRepository() && !$repositories.isSystemRepository()) {
+        if (!scope.classHierarchyData.classCount && $repositories.getActiveRepository() && !$repositories.isSystemRepository() && scope.isLicenseValid()) {
             $rootScope.loader = true;
             $rootScope.hierarchyError = false;
             const selGraphFromCache = LocalStorageAdapter.get(`classHierarchy-selectedGraph-${$repositories.getActiveRepository()}`);
diff --git a/src/pages/rdfClassHierarchyInfo.html b/src/pages/rdfClassHierarchyInfo.html
index e2f3ee3fae..5b676d42fb 100644
--- a/src/pages/rdfClassHierarchyInfo.html
+++ b/src/pages/rdfClassHierarchyInfo.html
@@ -140,7 +140,8 @@ <h1>
                 show-external-elements="showExternalElements"
                 hide-prefixes="hidePrefixes"
                 current-browser-limit="currentBrowserLimit"
-                ng-if="isLicenseValid() && hasClassHierarchy()">
+                is-license-valid="isLicenseValid"
+                ng-show="hasClassHierarchy() && isLicenseValid()">
         </rdf-class-hierarchy>
 
         <pageslide

From ae2dc56e2ef758e9cf7b1b8a8d825903c81a9a2c Mon Sep 17 00:00:00 2001
From: Desislava Borisova <desislava.borisova@ontotext.com>
Date: Mon, 16 May 2022 09:54:54 +0300
Subject: [PATCH 10/23] GDB-6329 - correct concurrency problem with initView
 which failed some Cypress tests.

---
 .../controllers/rdf-class-hierarchy.controller.js         | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/js/angular/graphexplore/controllers/rdf-class-hierarchy.controller.js b/src/js/angular/graphexplore/controllers/rdf-class-hierarchy.controller.js
index 8ed8aecf62..aff7a013a4 100644
--- a/src/js/angular/graphexplore/controllers/rdf-class-hierarchy.controller.js
+++ b/src/js/angular/graphexplore/controllers/rdf-class-hierarchy.controller.js
@@ -123,8 +123,6 @@ function RdfClassHierarchyCtlr($scope, $rootScope, $location, $repositories, $li
     $scope.instancesQueryObj.query = "";
     $scope.instancesFilterFunc = instancesFilterFunc;
 
-    initView();
-
     $scope.$watch('instancesObj.items', function () {
         if ($scope.instancesObj.items.length > 0) {
             $timeout(function () {
@@ -494,4 +492,10 @@ function RdfClassHierarchyCtlr($scope, $rootScope, $location, $repositories, $li
     $scope.isAllGraphsSelected = function () {
         return $scope.getSelGraphValue() === 'all.graphs.label'
     }
+
+    window.addEventListener('load', initView);
+
+    $scope.$on('$destroy', function (event) {
+        window.removeEventListener('load', initView);
+    });
 }

From d1c8185d952f8bf5582255d1a7c0e32691bee30b Mon Sep 17 00:00:00 2001
From: Desislava Borisova <desislava.borisova@ontotext.com>
Date: Mon, 16 May 2022 14:49:57 +0300
Subject: [PATCH 11/23] GDB-6329 - hide remaining toastr messages, by stopping
 requests sent to backend. Corrected strings for translation service.

---
 src/js/angular/explore/controllers.js         |  6 ++---
 .../dependencies-chord.controller.js          | 27 +++++++++++++------
 .../rdf-class-hierarchy.controller.js         |  6 +++--
 .../rdf-class-hierarchy.directive.js          |  6 ++++-
 4 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/src/js/angular/explore/controllers.js b/src/js/angular/explore/controllers.js
index c4ab248b25..2fb1dd553f 100644
--- a/src/js/angular/explore/controllers.js
+++ b/src/js/angular/explore/controllers.js
@@ -58,9 +58,9 @@ function ExploreCtrl($scope, $http, $location, toastr, $routeParams, $repositori
     // Fixed inference when we're showing the context tab and a named graph
     $scope.inferenceNamed = 'explicit';
     $scope.inferences = [
-        {id: 'all', title: $translate.instant('explore.explicit.implicit')},
-        {id: 'explicit', title: $translate.instant('explore.explicit')},
-        {id: 'implicit', title: $translate.instant('explore.implicit')}
+        {id: 'all', title: 'explore.explicit.implicit'},
+        {id: 'explicit', title: 'explore.explicit'},
+        {id: 'implicit', title: 'explore.implicit'}
     ];
     $scope.context = '';
 
diff --git a/src/js/angular/graphexplore/controllers/dependencies-chord.controller.js b/src/js/angular/graphexplore/controllers/dependencies-chord.controller.js
index 6bbe5fbd08..cf32cc4121 100644
--- a/src/js/angular/graphexplore/controllers/dependencies-chord.controller.js
+++ b/src/js/angular/graphexplore/controllers/dependencies-chord.controller.js
@@ -22,7 +22,9 @@ const allGraphs = {
     }
 };
 Object.defineProperty(global, 'allGraphs', {
-    get: () => {return allGraphs;}
+    get: () => {
+        return allGraphs;
+    }
 });
 
 angular
@@ -68,10 +70,8 @@ function DependenciesChordCtrl($scope, $rootScope, $repositories, toastr, $timeo
                     getRelationshipsStatus();
                 }
             }).error(function (data) {
-                if ($scope.isLicenseValid()) {
-                    $scope.repositoryError = getError(data);
-                    toastr.error(getError(data), $translate.instant('graphexplore.error.getting.graph'));
-                }
+            $scope.repositoryError = getError(data);
+            toastr.error(getError(data), $translate.instant('graphexplore.error.getting.graph'));
         });
     };
 
@@ -147,7 +147,7 @@ function DependenciesChordCtrl($scope, $rootScope, $repositories, toastr, $timeo
                 }
                 if ($scope.status.indexOf('ERROR;') === 0) {
                     $scope.status = STATUS.ERROR;
-                    toastr.error($translate.instant('graphexplore.error.dependencies.calc', {error:$scope.status.substring('ERROR;'.length)}));
+                    toastr.error($translate.instant('graphexplore.error.dependencies.calc', {error: $scope.status.substring('ERROR;'.length)}));
                 }
             })
             .error(function (data) {
@@ -210,7 +210,7 @@ function DependenciesChordCtrl($scope, $rootScope, $repositories, toastr, $timeo
 
     $scope.$watch('direction', function () {
         if (!$repositories.getActiveRepository() ||
-                $scope.isSystemRepository() || $repositories.isActiveRepoFedXType()) {
+            $scope.isSystemRepository() || $repositories.isActiveRepoFedXType() || !$scope.isLicenseValid()) {
             return;
         }
         initView();
@@ -241,7 +241,7 @@ function DependenciesChordCtrl($scope, $rootScope, $repositories, toastr, $timeo
         GraphDataRestService.calculateRelationships(selectedGraph.contextID.uri)
             .success(function (data) {
                 if (data.indexOf('ERROR;') === 0) {
-                    toastr.error($translate.instant('graphexplore.error.dependencies.calc', {error:$scope.status.substring('ERROR;'.length)}));
+                    toastr.error($translate.instant('graphexplore.error.dependencies.calc', {error: $scope.status.substring('ERROR;'.length)}));
                 } else {
                     getRelationshipsStatus();
                 }
@@ -303,6 +303,11 @@ function DependenciesChordCtrl($scope, $rootScope, $repositories, toastr, $timeo
             $scope.status = STATUS.NO_REPO;
             return;
         }
+
+        if (!$scope.isLicenseValid()) {
+            return;
+        }
+
         initView();
     }
 
@@ -328,4 +333,10 @@ function DependenciesChordCtrl($scope, $rootScope, $repositories, toastr, $timeo
     $scope.isAllGraphsSelected = function () {
         return $scope.getSelectedGraphValue() === 'all.graphs.label'
     }
+
+    window.addEventListener('load', initView);
+
+    $scope.$on('$destroy', function (event) {
+        window.removeEventListener('load', initView);
+    });
 }
diff --git a/src/js/angular/graphexplore/controllers/rdf-class-hierarchy.controller.js b/src/js/angular/graphexplore/controllers/rdf-class-hierarchy.controller.js
index aff7a013a4..8dcec64422 100644
--- a/src/js/angular/graphexplore/controllers/rdf-class-hierarchy.controller.js
+++ b/src/js/angular/graphexplore/controllers/rdf-class-hierarchy.controller.js
@@ -452,10 +452,12 @@ function RdfClassHierarchyCtlr($scope, $rootScope, $location, $repositories, $li
     }
 
     function getClassHierarchyData() {
-
+        if (!$licenseService.isLicenseValid()) {
+            return;
+        }
         refreshDiagramExternalElements();
 
-        if (!$scope.isSystemRepository() && $licenseService.isLicenseValid()) {
+        if (!$scope.isSystemRepository()) {
             $scope.hierarchyError = false;
             $scope.loader = true;
             GraphDataRestService.getClassHierarchyData(selectedGraph.contextID.uri)
diff --git a/src/js/angular/graphexplore/directives/rdf-class-hierarchy.directive.js b/src/js/angular/graphexplore/directives/rdf-class-hierarchy.directive.js
index e705130c10..af1e3b1014 100644
--- a/src/js/angular/graphexplore/directives/rdf-class-hierarchy.directive.js
+++ b/src/js/angular/graphexplore/directives/rdf-class-hierarchy.directive.js
@@ -35,7 +35,11 @@ function classHierarchyDirective($rootScope, $location, GraphDataRestService, $w
     };
 
     function linkFunc(scope, element, attrs) {
-        renderCirclePacking(scope, element);
+        window.addEventListener('load', renderCirclePacking);
+
+        scope.$on('$destroy', function (event) {
+            window.removeEventListener('load', renderCirclePacking);
+        });
     }
 
     function renderCirclePacking(scope, element) {

From c5ca9be3e4e3d3443bc8c0791d982e9527d2a453 Mon Sep 17 00:00:00 2001
From: Desislava Borisova <desislava.borisova@ontotext.com>
Date: Mon, 16 May 2022 14:54:20 +0300
Subject: [PATCH 12/23] GDB-6329 - remove unnecessary event listener.

---
 .../controllers/dependencies-chord.controller.js            | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/js/angular/graphexplore/controllers/dependencies-chord.controller.js b/src/js/angular/graphexplore/controllers/dependencies-chord.controller.js
index cf32cc4121..e00ddb30e7 100644
--- a/src/js/angular/graphexplore/controllers/dependencies-chord.controller.js
+++ b/src/js/angular/graphexplore/controllers/dependencies-chord.controller.js
@@ -333,10 +333,4 @@ function DependenciesChordCtrl($scope, $rootScope, $repositories, toastr, $timeo
     $scope.isAllGraphsSelected = function () {
         return $scope.getSelectedGraphValue() === 'all.graphs.label'
     }
-
-    window.addEventListener('load', initView);
-
-    $scope.$on('$destroy', function (event) {
-        window.removeEventListener('load', initView);
-    });
 }

From a0b5135e19dac77d8321a8652975f9549d73d487 Mon Sep 17 00:00:00 2001
From: sava-savov-ontotext <sava.savov@ontotext.com>
Date: Mon, 16 May 2022 17:19:06 +0300
Subject: [PATCH 13/23] GDB-6329 Update package-lock.json file and removed on
 load event from rdf-class-hierarchy.directive.js, because latter has
 concurrency issues with the

---
 package-lock.json                             | 720 +++++++++---------
 .../rdf-class-hierarchy.directive.js          |  41 +-
 .../integration/setup/namespaces.spec.js      |   2 +-
 3 files changed, 373 insertions(+), 390 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 14b105e73b..cb1f5dd989 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -33,7 +33,7 @@
                 "js-tokens": {
                     "version": "4.0.0",
                     "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-                    "integrity": "sha1-GSA/tZmR35jjoocFDUZHzerzJJk=",
+                    "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
                     "dev": true
                 }
             }
@@ -88,7 +88,7 @@
         "@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": "sha1-AHiDYGP/rxdBI0m7o2QIfgrALsk=",
+            "integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==",
             "dev": true
         },
         "@types/tapable": {
@@ -109,7 +109,7 @@
                 "source-map": {
                     "version": "0.6.1",
                     "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
                     "dev": true
                 }
             }
@@ -131,7 +131,7 @@
                 "source-map": {
                     "version": "0.6.1",
                     "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
                     "dev": true
                 }
             }
@@ -344,13 +344,13 @@
         "@xtuc/ieee754": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-            "integrity": "sha1-7vAUoxRa5Hehy8AM0eVSM23Ot5A=",
+            "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": "sha1-0pHGpOl5ibXGHZrPOWrk/hM6cY0=",
+            "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
             "dev": true
         },
         "abbrev": {
@@ -414,7 +414,7 @@
         "ajv-errors": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
-            "integrity": "sha1-81mGrOuRr63sQQL72FAUlQzvpk0=",
+            "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
             "dev": true
         },
         "ajv-keywords": {
@@ -467,7 +467,7 @@
         "angular-pageslide-directive": {
             "version": "2.2.0",
             "resolved": "https://registry.npmjs.org/angular-pageslide-directive/-/angular-pageslide-directive-2.2.0.tgz",
-            "integrity": "sha1-54pGJA1B4iJ6bhlszZ/yn7RbZ34="
+            "integrity": "sha512-/DnqC3lgc1aCtGSNfu+fK5qQ40eVN+dsq+9TmKQffS7ZISe0LEq6Vj/DhnE1kOzR3pXhWjXKEyJOS1gGZpG+1g=="
         },
         "angular-route": {
             "version": "1.3.8",
@@ -487,7 +487,7 @@
         "angular-translate": {
             "version": "2.19.0",
             "resolved": "https://registry.npmjs.org/angular-translate/-/angular-translate-2.19.0.tgz",
-            "integrity": "sha1-Ezx1rWRyexHZa8u4tTz5x8ep/eQ=",
+            "integrity": "sha512-Z/Fip5uUT2N85dPQ0sMEe1JdF5AehcDe4tg/9mWXNDVU531emHCg53ZND9Oe0dyNiGX5rWcJKmsL1Fujus1vGQ==",
             "requires": {
                 "angular": "^1.8.0"
             }
@@ -495,7 +495,7 @@
         "angular-translate-loader-static-files": {
             "version": "2.19.0",
             "resolved": "https://registry.npmjs.org/angular-translate-loader-static-files/-/angular-translate-loader-static-files-2.19.0.tgz",
-            "integrity": "sha1-QJKQ4aZS39WCz/35eiFleFbZDf8=",
+            "integrity": "sha512-B0LiFzn+rHGgL0okl+uAcQKtmySskTlhw6vsnQODUqARV0IcgMUi2tl9RhybgGy3MbGmdF1JjJFjITCbXzWZQA==",
             "requires": {
                 "angular-translate": "~2.19.0"
             }
@@ -526,13 +526,13 @@
         "ansi-colors": {
             "version": "3.2.4",
             "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
-            "integrity": "sha1-46PaS/uubIapwoViXeEkojQCb78=",
+            "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
             "dev": true
         },
         "ansi-escapes": {
             "version": "3.2.0",
             "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
-            "integrity": "sha1-h4C5j/nb9WOBUtHx/lwde0RCl2s=",
+            "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
             "dev": true
         },
         "ansi-gray": {
@@ -595,7 +595,7 @@
         "aproba": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-            "integrity": "sha1-aALmJk79GMeQobDVF/DyYnvyyUo=",
+            "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
             "dev": true
         },
         "archive-type": {
@@ -618,7 +618,7 @@
         "argparse": {
             "version": "1.0.10",
             "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-            "integrity": "sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE=",
+            "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
             "dev": true,
             "requires": {
                 "sprintf-js": "~1.0.2"
@@ -633,7 +633,7 @@
         "arr-flatten": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-            "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=",
+            "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
             "dev": true
         },
         "arr-union": {
@@ -651,7 +651,7 @@
         "array-flatten": {
             "version": "2.1.2",
             "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
-            "integrity": "sha1-JO+AoowaiTYX4hSbDG0NeIKTsJk=",
+            "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
             "dev": true
         },
         "array-union": {
@@ -678,7 +678,7 @@
         "arraybuffer.slice": {
             "version": "0.0.7",
             "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz",
-            "integrity": "sha1-O7xCdd1YTMGxCAm4nU6LY6aednU=",
+            "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==",
             "dev": true
         },
         "asap": {
@@ -711,7 +711,7 @@
         "assert": {
             "version": "1.5.0",
             "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
-            "integrity": "sha1-VcEJqvbgrv2z3EtxJAxwv1dLGOs=",
+            "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
             "dev": true,
             "requires": {
                 "object-assign": "^4.1.1",
@@ -756,7 +756,7 @@
         "astral-regex": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
-            "integrity": "sha1-bIw/uCfdQ+45GPJ7gngqt2WKb9k=",
+            "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
             "dev": true
         },
         "async": {
@@ -768,7 +768,7 @@
         "async-each": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
-            "integrity": "sha1-tyfb+H12UWAvBvTUrDh/R9kbDL8=",
+            "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
             "dev": true
         },
         "async-limiter": {
@@ -786,7 +786,7 @@
         "atob": {
             "version": "2.1.2",
             "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-            "integrity": "sha1-bZUX654DDSQ2ZmZR6GvZ9vE1M8k=",
+            "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
             "dev": true
         },
         "autofill-event": {
@@ -862,7 +862,7 @@
         "babel-core": {
             "version": "6.26.3",
             "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz",
-            "integrity": "sha1-suLwnjQtDwyI4vAuBneUEl51wgc=",
+            "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==",
             "dev": true,
             "requires": {
                 "babel-code-frame": "^6.26.0",
@@ -912,7 +912,7 @@
         "babel-generator": {
             "version": "6.26.1",
             "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz",
-            "integrity": "sha1-GERAjTuPDTWkBOp6wYDwh6YBvZA=",
+            "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
             "dev": true,
             "requires": {
                 "babel-messages": "^6.23.0",
@@ -1175,7 +1175,7 @@
         "babel-plugin-add-module-exports": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/babel-plugin-add-module-exports/-/babel-plugin-add-module-exports-1.0.4.tgz",
-            "integrity": "sha1-bKpN2+H1eMalJk1NPmyKJyCnyis=",
+            "integrity": "sha512-g+8yxHUZ60RcyaUpfNzy56OtWW+x9cyEe9j+CranqLiqbju2yf/Cy6ZtYK40EZxtrdHllzlVZgLmcOUCTlJ7Jg==",
             "dev": true
         },
         "babel-plugin-check-es2015-constants": {
@@ -1344,7 +1344,7 @@
         "babel-plugin-transform-es2015-modules-commonjs": {
             "version": "6.26.2",
             "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz",
-            "integrity": "sha1-WKeThjqefKhwvcWogRF/+sJ9tvM=",
+            "integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==",
             "dev": true,
             "requires": {
                 "babel-plugin-transform-strict-mode": "^6.24.1",
@@ -1502,7 +1502,7 @@
         "babel-preset-env": {
             "version": "1.7.0",
             "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.7.0.tgz",
-            "integrity": "sha1-3qefpOvriDzTXasH4mDBycBN93o=",
+            "integrity": "sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg==",
             "dev": true,
             "requires": {
                 "babel-plugin-check-es2015-constants": "^6.22.0",
@@ -1700,7 +1700,7 @@
         "babylon": {
             "version": "6.18.0",
             "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-            "integrity": "sha1-ry87iPpvXB5MY00aD46sT1WzleM=",
+            "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
             "dev": true
         },
         "backo2": {
@@ -1718,7 +1718,7 @@
         "base": {
             "version": "0.11.2",
             "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-            "integrity": "sha1-e95c7RRbbVUakNuH+DxVi060io8=",
+            "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
             "dev": true,
             "requires": {
                 "cache-base": "^1.0.1",
@@ -1742,7 +1742,7 @@
                 "is-accessor-descriptor": {
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-                    "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
+                    "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
                     "dev": true,
                     "requires": {
                         "kind-of": "^6.0.0"
@@ -1751,7 +1751,7 @@
                 "is-data-descriptor": {
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-                    "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
+                    "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
                     "dev": true,
                     "requires": {
                         "kind-of": "^6.0.0"
@@ -1760,7 +1760,7 @@
                 "is-descriptor": {
                     "version": "1.0.2",
                     "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-                    "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
+                    "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
                     "dev": true,
                     "requires": {
                         "is-accessor-descriptor": "^1.0.0",
@@ -1815,7 +1815,7 @@
         "big.js": {
             "version": "5.2.2",
             "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-            "integrity": "sha1-ZfCvOC9Xi83HQr2cKB6cstd2gyg=",
+            "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
             "dev": true
         },
         "binary-extensions": {
@@ -1861,7 +1861,7 @@
         "blob": {
             "version": "0.0.5",
             "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz",
-            "integrity": "sha1-1oDu7yX4zZGtUz9bAe7UjmTK9oM=",
+            "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==",
             "dev": true
         },
         "bluebird": {
@@ -1925,12 +1925,12 @@
         "bootstrap-switch": {
             "version": "3.4.0",
             "resolved": "https://registry.npmjs.org/bootstrap-switch/-/bootstrap-switch-3.4.0.tgz",
-            "integrity": "sha1-a7sERa2LQmSIPQY2bUiq08BpiPQ="
+            "integrity": "sha512-P4Qdx7mLjqgilKQeeuDCf8AHWeO7992+NFfh0doAA/ExaJqr02QFHhq18GL8EYd2XRviJ16pUUyMRsfOVaPEVg=="
         },
         "brace-expansion": {
             "version": "1.1.11",
             "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-            "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=",
+            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
             "dev": true,
             "requires": {
                 "balanced-match": "^1.0.0",
@@ -1975,7 +1975,7 @@
         "browserify-aes": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-            "integrity": "sha1-Mmc0ZC9APavDADIJhTu3CtQo70g=",
+            "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
             "dev": true,
             "requires": {
                 "buffer-xor": "^1.0.3",
@@ -1989,7 +1989,7 @@
         "browserify-cipher": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-            "integrity": "sha1-jWR0wbhwv9q807z8wZNKEOlPFfA=",
+            "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
             "dev": true,
             "requires": {
                 "browserify-aes": "^1.0.4",
@@ -2000,7 +2000,7 @@
         "browserify-des": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
-            "integrity": "sha1-OvTx9Zg5QDVy8cZiBDdfen9wPpw=",
+            "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
             "dev": true,
             "requires": {
                 "cipher-base": "^1.0.1",
@@ -2037,7 +2037,7 @@
         "browserify-zlib": {
             "version": "0.2.0",
             "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
-            "integrity": "sha1-KGlFnZqjviRf6P4sofRuLn9U1z8=",
+            "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
             "dev": true,
             "requires": {
                 "pako": "~1.0.5"
@@ -2057,7 +2057,7 @@
         "btoa": {
             "version": "1.2.1",
             "resolved": "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz",
-            "integrity": "sha1-AamQn4ssk/a/aAuiYTHrMPf6PXM=",
+            "integrity": "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g==",
             "dev": true
         },
         "buffer": {
@@ -2074,7 +2074,7 @@
         "buffer-alloc": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
-            "integrity": "sha1-iQ3ZDZI6hz4I4Q5f1RpX5bfM4Ow=",
+            "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
             "dev": true,
             "requires": {
                 "buffer-alloc-unsafe": "^1.1.0",
@@ -2084,7 +2084,7 @@
         "buffer-alloc-unsafe": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
-            "integrity": "sha1-vX3CauKXLQ7aJTvgYdupkjScGfA=",
+            "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
             "dev": true
         },
         "buffer-crc32": {
@@ -2108,7 +2108,7 @@
         "buffer-indexof": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
-            "integrity": "sha1-Uvq8xqYG0aADAoAmSO9o9jnaJow=",
+            "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==",
             "dev": true
         },
         "buffer-xor": {
@@ -2155,7 +2155,7 @@
         "cache-base": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-            "integrity": "sha1-Cn9GQWgxyLZi7jb+TnxZ129marI=",
+            "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
             "dev": true,
             "requires": {
                 "collection-visit": "^1.0.0",
@@ -2270,7 +2270,7 @@
         "callsites": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-            "integrity": "sha1-s2MKvYlDQy9Us/BRkjjjPNffL3M=",
+            "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
             "dev": true
         },
         "camel-case": {
@@ -2286,7 +2286,7 @@
         "camelcase": {
             "version": "5.3.1",
             "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-            "integrity": "sha1-48mzFWnhBoEd8kL3FXJaH0xJQyA=",
+            "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
             "dev": true
         },
         "camelcase-keys": {
@@ -2310,7 +2310,7 @@
         "caniuse-api": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
-            "integrity": "sha1-Xk2Q4idJYdRikZl99Znj7QCO5MA=",
+            "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
             "dev": true,
             "requires": {
                 "browserslist": "^4.0.0",
@@ -2368,7 +2368,7 @@
         "chardet": {
             "version": "0.7.0",
             "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-            "integrity": "sha1-kAlISfCTfy7twkJdDSip5fDLrZ4=",
+            "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
             "dev": true
         },
         "chokidar": {
@@ -2418,7 +2418,7 @@
         "cipher-base": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-            "integrity": "sha1-h2Dk7MJy9MNjUy+SbYdKriwTl94=",
+            "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
             "dev": true,
             "requires": {
                 "inherits": "^2.0.1",
@@ -2428,7 +2428,7 @@
         "class-utils": {
             "version": "0.3.6",
             "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-            "integrity": "sha1-+TNprouafOAv1B+q0MqDAzGQxGM=",
+            "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
             "dev": true,
             "requires": {
                 "arr-union": "^3.1.0",
@@ -2460,7 +2460,7 @@
                 "source-map": {
                     "version": "0.6.1",
                     "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
                     "dev": true
                 }
             }
@@ -2468,7 +2468,7 @@
         "clean-webpack-plugin": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-3.0.0.tgz",
-            "integrity": "sha1-qZ2Ow0wcYopFQVZ6p7RXRGRgxis=",
+            "integrity": "sha512-MciirUH5r+cYLGCOL5JX/ZLzOZbVr1ot3Fw+KcvbhUb6PM+yycqd9ZhIlcigQ5gl+XhppNmw3bEFuaaMNyLj3A==",
             "dev": true,
             "requires": {
                 "@types/webpack": "^4.4.31",
@@ -2493,7 +2493,7 @@
         "cliui": {
             "version": "5.0.0",
             "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-            "integrity": "sha1-3u/P2y6AB4SqNPRvoI4GhRx7u8U=",
+            "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
             "dev": true,
             "requires": {
                 "string-width": "^3.1.0",
@@ -2510,7 +2510,7 @@
         "clone-deep": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
-            "integrity": "sha1-wZ/Zvbv4WUK0/ZechNz31fB8I4c=",
+            "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
             "dev": true,
             "requires": {
                 "is-plain-object": "^2.0.4",
@@ -2536,7 +2536,7 @@
         "coa": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
-            "integrity": "sha1-Q/bCEVG07yv1cYfbDXPeIp4+fsM=",
+            "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
             "dev": true,
             "requires": {
                 "@types/q": "^1.5.1",
@@ -2567,7 +2567,7 @@
         "color-convert": {
             "version": "1.9.3",
             "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-            "integrity": "sha1-u3GFBpDh8TZWfeYp0tVHHe2kweg=",
+            "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
             "dev": true,
             "requires": {
                 "color-name": "1.1.3"
@@ -2598,13 +2598,13 @@
         "colors": {
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
-            "integrity": "sha1-xQSRR51MG9rtLJztMs98fcI2D3g=",
+            "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
             "dev": true
         },
         "combined-stream": {
             "version": "1.0.8",
             "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-            "integrity": "sha1-w9RaizT9cwYxoRCoolIGgrMdWn8=",
+            "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
             "dev": true,
             "requires": {
                 "delayed-stream": "~1.0.0"
@@ -2643,7 +2643,7 @@
         "compressible": {
             "version": "2.0.18",
             "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
-            "integrity": "sha1-r1PMprBw1MPAdQ+9dyhqbXzEb7o=",
+            "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
             "dev": true,
             "requires": {
                 "mime-db": ">= 1.43.0 < 2"
@@ -2660,7 +2660,7 @@
         "compression": {
             "version": "1.7.4",
             "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-            "integrity": "sha1-lVI+/xcMpXwpoMpB5v4TH0Hlu48=",
+            "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
             "dev": true,
             "requires": {
                 "accepts": "~1.3.5",
@@ -2681,7 +2681,7 @@
         "concat-stream": {
             "version": "1.6.2",
             "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-            "integrity": "sha1-kEvfGUzTEi/Gdcd/xKw9T/D9GjQ=",
+            "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
             "dev": true,
             "requires": {
                 "buffer-from": "^1.0.0",
@@ -2703,7 +2703,7 @@
         "connect": {
             "version": "3.7.0",
             "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
-            "integrity": "sha1-XUk0iRDKpeB6AYALAw0MNfIEhPg=",
+            "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
             "dev": true,
             "requires": {
                 "debug": "2.6.9",
@@ -2715,13 +2715,13 @@
         "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": "sha1-izIIk1kwjRERFdgcrT/Oq4iPl7w=",
+            "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
             "dev": true
         },
         "console-browserify": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
-            "integrity": "sha1-ZwY871fOts9Jk6KrOlWECujEkzY=",
+            "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
             "dev": true
         },
         "constants-browserify": {
@@ -2742,7 +2742,7 @@
         "content-type": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-            "integrity": "sha1-4TjMdeBAxyexlm/l5fjJruJW/js=",
+            "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
             "dev": true
         },
         "convert-source-map": {
@@ -2769,7 +2769,7 @@
         "copy-concurrently": {
             "version": "1.0.5",
             "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
-            "integrity": "sha1-kilzmMrjSTf8r9bsgTnBgFHwteA=",
+            "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
             "dev": true,
             "requires": {
                 "aproba": "^1.1.1",
@@ -2887,7 +2887,7 @@
         "cosmiconfig": {
             "version": "5.2.1",
             "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
-            "integrity": "sha1-BA9yaAnFked6F8CjYmykW08Wixo=",
+            "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
             "dev": true,
             "requires": {
                 "import-fresh": "^2.0.0",
@@ -2952,7 +2952,7 @@
         "create-hash": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-            "integrity": "sha1-iJB4rxGmN1a8+1m9IhmWvjqe8ZY=",
+            "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
             "dev": true,
             "requires": {
                 "cipher-base": "^1.0.1",
@@ -2965,7 +2965,7 @@
         "create-hmac": {
             "version": "1.1.7",
             "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-            "integrity": "sha1-aRcMeLOrlXFHsriwRXLkfq0iQ/8=",
+            "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
             "dev": true,
             "requires": {
                 "cipher-base": "^1.0.3",
@@ -2979,7 +2979,7 @@
         "cross-spawn": {
             "version": "6.0.5",
             "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-            "integrity": "sha1-Sl7Hxk364iw6FBJNus3uhG2Ay8Q=",
+            "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
             "dev": true,
             "requires": {
                 "nice-try": "^1.0.4",
@@ -2992,7 +2992,7 @@
         "crypto-browserify": {
             "version": "3.12.0",
             "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-            "integrity": "sha1-OWz58xN/A+S45TLFj2mCVOAPgOw=",
+            "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
             "dev": true,
             "requires": {
                 "browserify-cipher": "^1.0.0",
@@ -3017,7 +3017,7 @@
         "css-declaration-sorter": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz",
-            "integrity": "sha1-wZiUD2OnbX42wecQGLABchBUyyI=",
+            "integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==",
             "dev": true,
             "requires": {
                 "postcss": "^7.0.1",
@@ -3088,7 +3088,7 @@
         "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": "sha1-Oy/0lyzDYquIVhUHqVQIoUMhNdc=",
+            "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
             "dev": true
         },
         "css-unit-converter": {
@@ -3106,7 +3106,7 @@
         "cssesc": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-            "integrity": "sha1-N3QZGZA7hoVl4cCep0dEXNGJg+4=",
+            "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
             "dev": true
         },
         "cssnano": {
@@ -3174,7 +3174,7 @@
         "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": "sha1-sm1f1fcqEd/np4RvtMZyYPlr8oI=",
+            "integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==",
             "dev": true,
             "requires": {
                 "postcss": "^7.0.0"
@@ -3183,7 +3183,7 @@
         "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": "sha1-V0CC+yhZ0ttDOFWDXZqEVuoYu/M=",
+            "integrity": "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==",
             "dev": true
         },
         "currently-unhandled": {
@@ -3472,7 +3472,7 @@
         "date-format": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/date-format/-/date-format-2.1.0.tgz",
-            "integrity": "sha1-MdW16iEc9f12TNOLr50DPffhJc8=",
+            "integrity": "sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA==",
             "dev": true
         },
         "dateformat": {
@@ -3488,7 +3488,7 @@
         "debug": {
             "version": "2.6.9",
             "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-            "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
+            "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
             "dev": true,
             "requires": {
                 "ms": "2.0.0"
@@ -3525,7 +3525,7 @@
                 "make-dir": {
                     "version": "1.3.0",
                     "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-                    "integrity": "sha1-ecEDO4BRW9bSTsmTPoYMp17ifww=",
+                    "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
                     "dev": true,
                     "requires": {
                         "pify": "^3.0.0"
@@ -3679,7 +3679,7 @@
         "deep-equal": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
-            "integrity": "sha1-tcmMlCzv+vfLBR4k4UNKJaLmB2o=",
+            "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
             "dev": true,
             "requires": {
                 "is-arguments": "^1.0.4",
@@ -3699,7 +3699,7 @@
         "default-gateway": {
             "version": "4.2.0",
             "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
-            "integrity": "sha1-FnEEx1AMIRX23WmwpTa7jtcgVSs=",
+            "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==",
             "dev": true,
             "requires": {
                 "execa": "^1.0.0",
@@ -3718,7 +3718,7 @@
         "define-property": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
-            "integrity": "sha1-1Flono1lS6d+AqgX+HENcCyxbp0=",
+            "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
             "dev": true,
             "requires": {
                 "is-descriptor": "^1.0.2",
@@ -3728,7 +3728,7 @@
                 "is-accessor-descriptor": {
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-                    "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
+                    "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
                     "dev": true,
                     "requires": {
                         "kind-of": "^6.0.0"
@@ -3737,7 +3737,7 @@
                 "is-data-descriptor": {
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-                    "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
+                    "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
                     "dev": true,
                     "requires": {
                         "kind-of": "^6.0.0"
@@ -3746,7 +3746,7 @@
                 "is-descriptor": {
                     "version": "1.0.2",
                     "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-                    "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
+                    "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
                     "dev": true,
                     "requires": {
                         "is-accessor-descriptor": "^1.0.0",
@@ -3759,7 +3759,7 @@
         "del": {
             "version": "4.1.1",
             "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
-            "integrity": "sha1-no8RciLqRKMf86FWwEm5kFKp8LQ=",
+            "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
             "dev": true,
             "requires": {
                 "@types/glob": "^7.1.1",
@@ -3786,7 +3786,7 @@
         "des.js": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
-            "integrity": "sha1-U4IULhvcU/hdhtU+X0qn3rkeCEM=",
+            "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
             "dev": true,
             "requires": {
                 "inherits": "^2.0.1",
@@ -3835,7 +3835,7 @@
         "diffie-hellman": {
             "version": "5.0.3",
             "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-            "integrity": "sha1-QOjumPVaIUlgcUaSHGPhrl89KHU=",
+            "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
             "dev": true,
             "requires": {
                 "bn.js": "^4.1.0",
@@ -3846,7 +3846,7 @@
         "dir-glob": {
             "version": "2.2.2",
             "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz",
-            "integrity": "sha1-+gnwaUFTyJGLGLoN6vrpR2n8UMQ=",
+            "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==",
             "dev": true,
             "requires": {
                 "path-type": "^3.0.0"
@@ -3897,7 +3897,7 @@
         "doctrine": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-            "integrity": "sha1-rd6+rXKmV023g2OdyHoSF3OXOWE=",
+            "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
             "dev": true,
             "requires": {
                 "esutils": "^2.0.2"
@@ -3906,7 +3906,7 @@
         "dom-converter": {
             "version": "0.2.0",
             "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
-            "integrity": "sha1-ZyGp2u4uKTaClVtq/kFncWJ7t2g=",
+            "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
             "dev": true,
             "requires": {
                 "utila": "~0.4"
@@ -3945,7 +3945,7 @@
         "domain-browser": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
-            "integrity": "sha1-PTH1AZGmdJ3RN1p/Ui6CPULlTto=",
+            "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
             "dev": true
         },
         "domelementtype": {
@@ -4042,7 +4042,7 @@
         "duplexify": {
             "version": "3.7.1",
             "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
-            "integrity": "sha1-Kk31MX9sz9kfhtb9JdjYoQO4gwk=",
+            "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
             "dev": true,
             "requires": {
                 "end-of-stream": "^1.0.0",
@@ -4070,7 +4070,7 @@
         "ejs-loader": {
             "version": "0.5.0",
             "resolved": "https://registry.npmjs.org/ejs-loader/-/ejs-loader-0.5.0.tgz",
-            "integrity": "sha1-6+0K+u3QpYwH/MgQzwAd88JNY5k=",
+            "integrity": "sha512-iirFqlP3tiFoedNZ7dQcjvechunl054VbW6Ki38T/pabgXMAncduSE0ZXLeVGn1NbmcUJF9Z5TC0EvQ4RIpP9Q==",
             "dev": true,
             "requires": {
                 "loader-utils": "^2.0.0",
@@ -4129,7 +4129,7 @@
         "emoji-regex": {
             "version": "7.0.3",
             "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-            "integrity": "sha1-kzoEBShgyF6DwSJHnEdIqOTHIVY=",
+            "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
             "dev": true
         },
         "emojis-list": {
@@ -4156,7 +4156,7 @@
         "engine.io": {
             "version": "3.2.1",
             "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.2.1.tgz",
-            "integrity": "sha1-tgKBw1SEpw7gNR6g6/+D7IyVIqI=",
+            "integrity": "sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==",
             "dev": true,
             "requires": {
                 "accepts": "~1.3.4",
@@ -4176,7 +4176,7 @@
                 "debug": {
                     "version": "3.1.0",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-                    "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
+                    "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
                     "dev": true,
                     "requires": {
                         "ms": "2.0.0"
@@ -4187,7 +4187,7 @@
         "engine.io-client": {
             "version": "3.2.1",
             "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz",
-            "integrity": "sha1-b1TAR13khxWKGnx30QF4cItq3TY=",
+            "integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==",
             "dev": true,
             "requires": {
                 "component-emitter": "1.2.1",
@@ -4212,7 +4212,7 @@
                 "debug": {
                     "version": "3.1.0",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-                    "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
+                    "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
                     "dev": true,
                     "requires": {
                         "ms": "2.0.0"
@@ -4223,7 +4223,7 @@
         "engine.io-parser": {
             "version": "2.1.3",
             "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.3.tgz",
-            "integrity": "sha1-dXq5cPvy37Mse3SwMyFtVznveaY=",
+            "integrity": "sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==",
             "dev": true,
             "requires": {
                 "after": "0.8.2",
@@ -4247,7 +4247,7 @@
                 "memory-fs": {
                     "version": "0.5.0",
                     "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
-                    "integrity": "sha1-MkwBKIuIZSlm0WHbd4OHIIRajjw=",
+                    "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
                     "dev": true,
                     "requires": {
                         "errno": "^0.1.3",
@@ -4280,7 +4280,7 @@
         "error-ex": {
             "version": "1.3.2",
             "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-            "integrity": "sha1-tKxAZIEH/c3PriQvQovqihTU8b8=",
+            "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
             "dev": true,
             "requires": {
                 "is-arrayish": "^0.2.1"
@@ -4379,7 +4379,7 @@
         "eslint": {
             "version": "5.16.0",
             "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.16.0.tgz",
-            "integrity": "sha1-oeOsGq5KP72Clvz496tzFMu2q+o=",
+            "integrity": "sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==",
             "dev": true,
             "requires": {
                 "@babel/code-frame": "^7.0.0",
@@ -4438,13 +4438,13 @@
                 "globals": {
                     "version": "11.12.0",
                     "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-                    "integrity": "sha1-q4eVM4hooLq9hSV1gBjCp+uVxC4=",
+                    "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": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
+                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
                     "dev": true
                 },
                 "strip-ansi": {
@@ -4461,13 +4461,13 @@
         "eslint-config-google": {
             "version": "0.13.0",
             "resolved": "https://registry.npmjs.org/eslint-config-google/-/eslint-config-google-0.13.0.tgz",
-            "integrity": "sha1-4nfRbSyyXB/9P9E/sANa10ITgv4=",
+            "integrity": "sha512-ELgMdOIpn0CFdsQS+FuxO+Ttu4p+aLaXHv9wA9yVnzqlUGV7oN/eRRnJekk7TCur6Cu2FXX0fqfIXRBaM14lpQ==",
             "dev": true
         },
         "eslint-scope": {
             "version": "4.0.3",
             "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
-            "integrity": "sha1-ygODMxD2iJoyZHgaqC5j65z+eEg=",
+            "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
             "dev": true,
             "requires": {
                 "esrecurse": "^4.1.0",
@@ -4477,7 +4477,7 @@
         "eslint-utils": {
             "version": "1.4.3",
             "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
-            "integrity": "sha1-dP7HxU0Hdrb2fgJRBAtYBlZOmB8=",
+            "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
             "dev": true,
             "requires": {
                 "eslint-visitor-keys": "^1.1.0"
@@ -4492,7 +4492,7 @@
         "espree": {
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz",
-            "integrity": "sha1-XWUm+k/H8HiKXPdbFfMDI+L4H3o=",
+            "integrity": "sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==",
             "dev": true,
             "requires": {
                 "acorn": "^6.0.7",
@@ -4503,7 +4503,7 @@
         "esprima": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-            "integrity": "sha1-E7BM2z5sXRnfkatph6hpVhmwqnE=",
+            "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
             "dev": true
         },
         "esquery": {
@@ -4574,7 +4574,7 @@
         "evp_bytestokey": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-            "integrity": "sha1-f8vbGY3HGVlDLv4ThCaE4FJaywI=",
+            "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
             "dev": true,
             "requires": {
                 "md5.js": "^1.3.4",
@@ -4584,7 +4584,7 @@
         "execa": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-            "integrity": "sha1-xiNqW7TfbW8V6I5/AXeYIWdJ3dg=",
+            "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
             "dev": true,
             "requires": {
                 "cross-spawn": "^6.0.0",
@@ -4643,7 +4643,7 @@
         "expose-loader": {
             "version": "0.7.5",
             "resolved": "https://registry.npmjs.org/expose-loader/-/expose-loader-0.7.5.tgz",
-            "integrity": "sha1-4p6i2a7u0yVKP6obNfUC25+cP28=",
+            "integrity": "sha512-iPowgKUZkTPX5PznYsmifVj9Bob0w2wTHVkt/eYNPSzyebkUgIedmskf/kcfEIWpiWjg3JRjnW+a17XypySMuw==",
             "dev": true
         },
         "express": {
@@ -4714,7 +4714,7 @@
         "extend": {
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-            "integrity": "sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo=",
+            "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
             "dev": true
         },
         "extend-shallow": {
@@ -4730,7 +4730,7 @@
                 "is-extendable": {
                     "version": "1.0.1",
                     "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-                    "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
+                    "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
                     "dev": true,
                     "requires": {
                         "is-plain-object": "^2.0.4"
@@ -4741,7 +4741,7 @@
         "external-editor": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
-            "integrity": "sha1-ywP3QL764D6k0oPK7SdBqD8zVJU=",
+            "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
             "dev": true,
             "requires": {
                 "chardet": "^0.7.0",
@@ -4752,7 +4752,7 @@
         "extglob": {
             "version": "2.0.4",
             "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-            "integrity": "sha1-rQD+TcYSqSMuhxhxHcXLWrAoVUM=",
+            "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
             "dev": true,
             "requires": {
                 "array-unique": "^0.3.2",
@@ -4786,7 +4786,7 @@
                 "is-accessor-descriptor": {
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-                    "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
+                    "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
                     "dev": true,
                     "requires": {
                         "kind-of": "^6.0.0"
@@ -4795,7 +4795,7 @@
                 "is-data-descriptor": {
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-                    "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
+                    "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
                     "dev": true,
                     "requires": {
                         "kind-of": "^6.0.0"
@@ -4804,7 +4804,7 @@
                 "is-descriptor": {
                     "version": "1.0.2",
                     "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-                    "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
+                    "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
                     "dev": true,
                     "requires": {
                         "is-accessor-descriptor": "^1.0.0",
@@ -4817,7 +4817,7 @@
         "extract-loader": {
             "version": "5.1.0",
             "resolved": "https://registry.npmjs.org/extract-loader/-/extract-loader-5.1.0.tgz",
-            "integrity": "sha1-Gy8GKNz/3YRnL7DwABPV+Wngyzc=",
+            "integrity": "sha512-+U7sMNULTgm3d3G4hE+N7Rvr/Npsxa7M1jfgvhyYdJuOnyLepm9e2gGuriKw1mrX+mJnX4krPfKI4qyLJ5x94w==",
             "dev": true,
             "requires": {
                 "babel-core": "^6.26.3",
@@ -4906,7 +4906,7 @@
         "fastparse": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz",
-            "integrity": "sha1-kXKMWllC7O2FMSg8eUQe5BIsNak=",
+            "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==",
             "dev": true
         },
         "faye-websocket": {
@@ -4945,7 +4945,7 @@
         "file-entry-cache": {
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
-            "integrity": "sha1-yg9u+m3T1WEzP7FFFQZcL6/fQ5w=",
+            "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
             "dev": true,
             "requires": {
                 "flat-cache": "^2.0.1"
@@ -4954,7 +4954,7 @@
         "file-loader": {
             "version": "4.3.0",
             "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-4.3.0.tgz",
-            "integrity": "sha1-eA8ED3KbPRgBnyBgX3I+hEuKWK8=",
+            "integrity": "sha512-aKrYPYjF1yG3oX0kWRrqrSMfgftm7oJW5M+m4owoldH5C51C0RkIwB++JbRvEW3IU6/ZG5n8UvEcdgwOt2UOWA==",
             "dev": true,
             "requires": {
                 "loader-utils": "^1.2.3",
@@ -5022,7 +5022,7 @@
         "finalhandler": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-            "integrity": "sha1-t+fQAP/RGTjQ/bBTUG9uur6fWH0=",
+            "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
             "dev": true,
             "requires": {
                 "debug": "2.6.9",
@@ -5057,7 +5057,7 @@
         "findup-sync": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
-            "integrity": "sha1-F7EI+e5RLft6XH88iyfqnhqcCNE=",
+            "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
             "dev": true,
             "requires": {
                 "detect-file": "^1.0.0",
@@ -5069,7 +5069,7 @@
         "flat-cache": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
-            "integrity": "sha1-XSltbwS9pEpGMKMBQTvbwuwIXsA=",
+            "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
             "dev": true,
             "requires": {
                 "flatted": "^2.0.0",
@@ -5086,7 +5086,7 @@
         "flush-write-stream": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
-            "integrity": "sha1-jdfYc6G6vCB9lOrQwuDkQnbr8ug=",
+            "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
             "dev": true,
             "requires": {
                 "inherits": "^2.0.3",
@@ -5119,7 +5119,7 @@
         "form-data": {
             "version": "2.3.3",
             "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-            "integrity": "sha1-3M5SwF9kTymManq5Nr1yTO/786Y=",
+            "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
             "dev": true,
             "requires": {
                 "asynckit": "^0.4.0",
@@ -5167,7 +5167,7 @@
         "fs-extra": {
             "version": "7.0.1",
             "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-            "integrity": "sha1-TxicRKoSO4lfcigE9V6iPq3DSOk=",
+            "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
             "dev": true,
             "requires": {
                 "graceful-fs": "^4.1.2",
@@ -5203,7 +5203,7 @@
         "function-bind": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-            "integrity": "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0=",
+            "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
             "dev": true
         },
         "functional-red-black-tree": {
@@ -5215,7 +5215,7 @@
         "get-caller-file": {
             "version": "2.0.5",
             "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-            "integrity": "sha1-T5RBKoLbMvNuOwuXQfipf+sDH34=",
+            "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
             "dev": true
         },
         "get-proxy": {
@@ -5295,7 +5295,7 @@
         "global-modules": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
-            "integrity": "sha1-mXYFrSNF8n9RU5vqJldEISFcd4A=",
+            "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
             "dev": true,
             "requires": {
                 "global-prefix": "^3.0.0"
@@ -5304,7 +5304,7 @@
                 "global-prefix": {
                     "version": "3.0.0",
                     "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
-                    "integrity": "sha1-/IX3MGTfafUEIfR/iD/luRO6m5c=",
+                    "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
                     "dev": true,
                     "requires": {
                         "ini": "^1.3.5",
@@ -5330,7 +5330,7 @@
         "globals": {
             "version": "9.18.0",
             "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-            "integrity": "sha1-qjiWs+abSH8X4x7SFD1pqOMMLYo=",
+            "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
             "dev": true
         },
         "globby": {
@@ -5402,7 +5402,7 @@
         "handle-thing": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
-            "integrity": "sha1-hX95zjWVgMNA1DCBzGSJcNC7I04=",
+            "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
             "dev": true
         },
         "handlebars": {
@@ -5420,7 +5420,7 @@
                 "source-map": {
                     "version": "0.6.1",
                     "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
                     "dev": true
                 }
             }
@@ -5444,7 +5444,7 @@
         "has": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-            "integrity": "sha1-ci18v8H2qoJB8W3YFOAR4fQeh5Y=",
+            "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
             "dev": true,
             "requires": {
                 "function-bind": "^1.1.1"
@@ -5470,7 +5470,7 @@
         "has-binary2": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
-            "integrity": "sha1-d3asYn8+p3JQz8My2rfd9eT10R0=",
+            "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
             "dev": true,
             "requires": {
                 "isarray": "2.0.1"
@@ -5562,7 +5562,7 @@
         "hash.js": {
             "version": "1.1.7",
             "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-            "integrity": "sha1-C6vKU46NTuSg+JiNaIZlN6ADz0I=",
+            "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
             "dev": true,
             "requires": {
                 "inherits": "^2.0.3",
@@ -5572,13 +5572,13 @@
         "he": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-            "integrity": "sha1-hK5l+n6vsWX922FWauFLrwVmTw8=",
+            "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
             "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": "sha1-TAb8y0YC/iYCs8k9+C1+fb8aio4=",
+            "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==",
             "dev": true
         },
         "hmac-drbg": {
@@ -5605,7 +5605,7 @@
         "homedir-polyfill": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
-            "integrity": "sha1-dDKYzvTlrz4ZQWH7rcwhUdOgWOg=",
+            "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
             "dev": true,
             "requires": {
                 "parse-passwd": "^1.0.0"
@@ -5656,7 +5656,7 @@
         "html-loader": {
             "version": "0.5.5",
             "resolved": "https://registry.npmjs.org/html-loader/-/html-loader-0.5.5.tgz",
-            "integrity": "sha1-Y1bb6wxJdW2OvVyjJ/Fv8Gq1+uo=",
+            "integrity": "sha512-7hIW7YinOYUpo//kSYcPB6dCKoceKLmOwjEMmhIobHuWGDVl0Nwe4l68mdG/Ru0wcUxQjVMEoZpkalZ/SE7zog==",
             "dev": true,
             "requires": {
                 "es6-templates": "^0.2.3",
@@ -5669,7 +5669,7 @@
         "html-minifier": {
             "version": "3.5.21",
             "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz",
-            "integrity": "sha1-0AQOBUcw41TbAIRjWTGUAVIS0gw=",
+            "integrity": "sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==",
             "dev": true,
             "requires": {
                 "camel-case": "3.0.x",
@@ -5731,7 +5731,7 @@
                 "big.js": {
                     "version": "3.2.0",
                     "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
-                    "integrity": "sha1-pfwpi4G54Nyi5FiCR4S2XFK6WI4=",
+                    "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
                     "dev": true
                 },
                 "json5": {
@@ -5823,7 +5823,7 @@
         "http-proxy": {
             "version": "1.18.1",
             "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
-            "integrity": "sha1-QBVB8FNIhLv5UmAzTnL4juOXZUk=",
+            "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
             "dev": true,
             "requires": {
                 "eventemitter3": "^4.0.0",
@@ -5834,7 +5834,7 @@
         "http-proxy-middleware": {
             "version": "0.19.1",
             "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz",
-            "integrity": "sha1-GDx9xKoUeRUDBkmMIQza+WCApDo=",
+            "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==",
             "dev": true,
             "requires": {
                 "http-proxy": "^1.17.0",
@@ -5890,7 +5890,7 @@
         "iconv-lite": {
             "version": "0.4.24",
             "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-            "integrity": "sha1-ICK0sl+93CHS9SSXSkdKr+czkIs=",
+            "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
             "dev": true,
             "requires": {
                 "safer-buffer": ">= 2.1.2 < 3"
@@ -5899,7 +5899,7 @@
         "icss-utils": {
             "version": "4.1.1",
             "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz",
-            "integrity": "sha1-IRcLU3ie4nRHwvR91oMIFAP5pGc=",
+            "integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==",
             "dev": true,
             "requires": {
                 "postcss": "^7.0.14"
@@ -5951,7 +5951,7 @@
         "import-local": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
-            "integrity": "sha1-VQcL44pZk88Y72236WH1vuXFoJ0=",
+            "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
             "dev": true,
             "requires": {
                 "pkg-dir": "^3.0.0",
@@ -5988,7 +5988,7 @@
         "infer-owner": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
-            "integrity": "sha1-xM78qo5RBRwqQLos6KPScpWvlGc=",
+            "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
             "dev": true
         },
         "inflight": {
@@ -6004,7 +6004,7 @@
         "inherits": {
             "version": "2.0.4",
             "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-            "integrity": "sha1-D6LGT5MpF8NDOg3tVTY6rjdBa3w=",
+            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
             "dev": true
         },
         "ini": {
@@ -6016,7 +6016,7 @@
         "inquirer": {
             "version": "6.5.2",
             "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz",
-            "integrity": "sha1-rVCUI3XQNtMn/1KMCL1fqwiZKMo=",
+            "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==",
             "dev": true,
             "requires": {
                 "ansi-escapes": "^3.2.0",
@@ -6066,7 +6066,7 @@
         "internal-ip": {
             "version": "4.3.0",
             "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz",
-            "integrity": "sha1-hFRSuq2dLKO2nGNaE3rLmg2tCQc=",
+            "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==",
             "dev": true,
             "requires": {
                 "default-gateway": "^4.2.0",
@@ -6100,7 +6100,7 @@
         "invariant": {
             "version": "2.2.4",
             "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
-            "integrity": "sha1-YQ88ksk1nOHbYW5TgAjSP/NRWOY=",
+            "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
             "dev": true,
             "requires": {
                 "loose-envify": "^1.0.0"
@@ -6127,7 +6127,7 @@
         "ipaddr.js": {
             "version": "1.9.1",
             "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-            "integrity": "sha1-v/OFQ+64mEglB5/zoqjmy9RngbM=",
+            "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
             "dev": true
         },
         "is-absolute-url": {
@@ -6180,7 +6180,7 @@
         "is-buffer": {
             "version": "1.1.6",
             "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-            "integrity": "sha1-76ouqdqg16suoTqXsritUf776L4=",
+            "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
             "dev": true
         },
         "is-callable": {
@@ -6232,7 +6232,7 @@
         "is-descriptor": {
             "version": "0.1.6",
             "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-            "integrity": "sha1-Nm2CQN3kh8pRgjsaufB6EKeCUco=",
+            "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
             "dev": true,
             "requires": {
                 "is-accessor-descriptor": "^0.1.6",
@@ -6243,7 +6243,7 @@
                 "kind-of": {
                     "version": "5.1.0",
                     "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-                    "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0=",
+                    "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
                     "dev": true
                 }
             }
@@ -6319,7 +6319,7 @@
         "is-obj": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
-            "integrity": "sha1-Rz+wXZc3BeP9liBUUBjKjiLvSYI=",
+            "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
             "dev": true
         },
         "is-object": {
@@ -6331,13 +6331,13 @@
         "is-path-cwd": {
             "version": "2.2.0",
             "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
-            "integrity": "sha1-Z9Q7gmZKe1GR/ZEZEn6zAASKn9s=",
+            "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": "sha1-v+Lcomxp85cmWkAJljYCk1oFOss=",
+            "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
             "dev": true,
             "requires": {
                 "is-path-inside": "^2.1.0"
@@ -6346,7 +6346,7 @@
         "is-path-inside": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
-            "integrity": "sha1-fJgQWH1lmkDSe8201WFuqwWUlLI=",
+            "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
             "dev": true,
             "requires": {
                 "path-is-inside": "^1.0.2"
@@ -6361,7 +6361,7 @@
         "is-plain-object": {
             "version": "2.0.4",
             "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-            "integrity": "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=",
+            "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
             "dev": true,
             "requires": {
                 "isobject": "^3.0.1"
@@ -6385,7 +6385,7 @@
         "is-resolvable": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-            "integrity": "sha1-+xj4fOH+uSUWnJpAfBkxijIG7Yg=",
+            "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
             "dev": true
         },
         "is-retry-allowed": {
@@ -6433,7 +6433,7 @@
         "is-windows": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-            "integrity": "sha1-0YUOuXkezRjmGCzhKjDzlmNLsZ0=",
+            "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
             "dev": true
         },
         "is-wsl": {
@@ -6451,7 +6451,7 @@
         "isbinaryfile": {
             "version": "3.0.3",
             "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz",
-            "integrity": "sha1-XW3vPt6/boyoyunDAYOoBLX4voA=",
+            "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==",
             "dev": true,
             "requires": {
                 "buffer-alloc": "^1.2.0"
@@ -6548,7 +6548,7 @@
         "istanbul-instrumenter-loader": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-3.0.1.tgz",
-            "integrity": "sha1-mVe9WSUrNz+uXFK3tRiOb94qCUk=",
+            "integrity": "sha512-a5SPObZgS0jB/ixaKSMdn6n/gXSrK2S6q/UfRJBT3e6gQmVjwZROTODQsYW5ZNwOu78hG62Y3fWlebaVOL0C+w==",
             "dev": true,
             "requires": {
                 "convert-source-map": "^1.5.0",
@@ -6595,13 +6595,13 @@
         "istanbul-lib-coverage": {
             "version": "1.2.1",
             "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz",
-            "integrity": "sha1-zPftzQoLubj3Kf7rCTBHD5r2ZPA=",
+            "integrity": "sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==",
             "dev": true
         },
         "istanbul-lib-instrument": {
             "version": "1.10.2",
             "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz",
-            "integrity": "sha1-H1XtEKw8R/K93dUweTUSZ1TQqco=",
+            "integrity": "sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==",
             "dev": true,
             "requires": {
                 "babel-generator": "^6.18.0",
@@ -6680,7 +6680,7 @@
         "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": "sha1-u4Z8+zRQ5pEHwTHRxRS6s9yLyqk=",
+            "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
             "dev": true
         },
         "json-schema": {
@@ -6692,7 +6692,7 @@
         "json-schema-traverse": {
             "version": "0.4.1",
             "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-            "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=",
+            "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
             "dev": true
         },
         "json-stable-stringify-without-jsonify": {
@@ -6759,7 +6759,7 @@
         "karma": {
             "version": "4.4.1",
             "resolved": "https://registry.npmjs.org/karma/-/karma-4.4.1.tgz",
-            "integrity": "sha1-bZqqsDejETbcB0ACYg7hHowuMqs=",
+            "integrity": "sha512-L5SIaXEYqzrh6b1wqYC42tNsFMx2PWuxky84pK9coK09MvmL7mxii3G3bZBh/0rvD27lqDd0le9jyhzvwif73A==",
             "dev": true,
             "requires": {
                 "bluebird": "^3.3.0",
@@ -6882,7 +6882,7 @@
                 "source-map": {
                     "version": "0.6.1",
                     "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
                     "dev": true
                 },
                 "to-regex-range": {
@@ -6908,7 +6908,7 @@
         "karma-coverage": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/karma-coverage/-/karma-coverage-1.1.2.tgz",
-            "integrity": "sha1-zAnc61iagxAayl/nDCh2Re84dok=",
+            "integrity": "sha512-eQawj4Cl3z/CjxslYy9ariU4uDh7cCNFZHNWXWRpl0pNeblY/4wHR7M7boTYXWrn9bY0z2pZmr11eKje/S/hIw==",
             "dev": true,
             "requires": {
                 "dateformat": "^1.0.6",
@@ -6921,7 +6921,7 @@
         "karma-jasmine": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-2.0.1.tgz",
-            "integrity": "sha1-JuPjHy+vJy3YDrsOGJiRTMOhl2M=",
+            "integrity": "sha512-iuC0hmr9b+SNn1DaUD2QEYtUxkS1J+bSJSn7ejdEexs7P8EYvA1CWkEdrDQ+8jVH3AgWlCNwjYsT1chjcNW9lA==",
             "dev": true,
             "requires": {
                 "jasmine-core": "^3.3"
@@ -6959,7 +6959,7 @@
         "karma-webpack": {
             "version": "4.0.2",
             "resolved": "https://registry.npmjs.org/karma-webpack/-/karma-webpack-4.0.2.tgz",
-            "integrity": "sha1-IyGb2VvdqFPjBz04dNNER8d7ztA=",
+            "integrity": "sha512-970/okAsdUOmiMOCY8sb17A2I8neS25Ad9uhyK3GHgmRSIFJbDcNEFE8dqqUhNe9OHiCC9k3DMrSmtd/0ymP1A==",
             "dev": true,
             "requires": {
                 "clone-deep": "^4.0.1",
@@ -6973,7 +6973,7 @@
                 "source-map": {
                     "version": "0.7.3",
                     "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-                    "integrity": "sha1-UwL4FpAxc1ImVECS5kmB91F1A4M=",
+                    "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
                     "dev": true
                 }
             }
@@ -6990,19 +6990,19 @@
         "killable": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
-            "integrity": "sha1-TIzkQRh6Bhx0dPuHygjipjgZSJI=",
+            "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": "sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0=",
+            "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
             "dev": true
         },
         "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": "sha1-l0LfDhDjz0blwDgcLekNOnotdVU=",
+            "integrity": "sha512-7KI2l2GIZa9p2spzPIVZBYyNKkN+e/SQPpnjlTiPhdbDW3F86tdKKELxKpzJ5sgU19wQWsACULZmpTPYHeWO5w==",
             "dev": true,
             "requires": {
                 "lodash": "^4.17.5",
@@ -7044,7 +7044,7 @@
                 "source-map": {
                     "version": "0.6.1",
                     "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
                     "dev": true,
                     "optional": true
                 }
@@ -7053,7 +7053,7 @@
         "less-loader": {
             "version": "5.0.0",
             "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-5.0.0.tgz",
-            "integrity": "sha1-SY3eOmxsT4h0WO6e0/CGoSrRtGY=",
+            "integrity": "sha512-bquCU89mO/yWLaUq0Clk7qCsKhsF/TZpJUzETRvJa9KSVEL9SO3ovCvdEHISBhrC81OwC8QSVX7E0bzElZj9cg==",
             "dev": true,
             "requires": {
                 "clone": "^2.1.1",
@@ -7095,7 +7095,7 @@
         "loader-runner": {
             "version": "2.4.0",
             "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
-            "integrity": "sha1-7UcGa/5TTX6ExMe5mYwqdWB9k1c=",
+            "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
             "dev": true
         },
         "loader-utils": {
@@ -7122,7 +7122,7 @@
         "lodash": {
             "version": "4.17.21",
             "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-            "integrity": "sha1-Z5WRxWTDv/quhFTPCz3zcMPWkRw="
+            "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
         },
         "lodash.get": {
             "version": "4.4.2",
@@ -7145,13 +7145,13 @@
         "log-driver": {
             "version": "1.2.7",
             "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz",
-            "integrity": "sha1-Y7lQIfBwL+36LJuwok53l9cYcdg=",
+            "integrity": "sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==",
             "dev": true
         },
         "log4js": {
             "version": "4.5.1",
             "resolved": "https://registry.npmjs.org/log4js/-/log4js-4.5.1.tgz",
-            "integrity": "sha1-5UNiXpfZ5vPm58n8GW3WqyyuMLU=",
+            "integrity": "sha512-EEEgFcE9bLgaYUKuozyFfytQM2wDHtXn4tAN41pkaxpNjAykv11GVdeI4tHtmPWW4Xrgh9R/2d7XYghDVjbKKw==",
             "dev": true,
             "requires": {
                 "date-format": "^2.0.0",
@@ -7173,7 +7173,7 @@
                 "ms": {
                     "version": "2.1.2",
                     "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-                    "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
+                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
                     "dev": true
                 }
             }
@@ -7187,7 +7187,7 @@
         "loose-envify": {
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-            "integrity": "sha1-ce5R+nvkyuwaY4OffmgtgTLTDK8=",
+            "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
             "dev": true,
             "requires": {
                 "js-tokens": "^3.0.0 || ^4.0.0"
@@ -7218,7 +7218,7 @@
         "lru-cache": {
             "version": "5.1.1",
             "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-            "integrity": "sha1-HaJ+ZxAnGUdpXa9oSOhH8B2EuSA=",
+            "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
             "dev": true,
             "requires": {
                 "yallist": "^3.0.2"
@@ -7273,7 +7273,7 @@
         "md5.js": {
             "version": "1.3.5",
             "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
-            "integrity": "sha1-tdB7jjIW4+J81yjXL3DR5qNCAF8=",
+            "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
             "dev": true,
             "requires": {
                 "hash-base": "^3.0.0",
@@ -7284,7 +7284,7 @@
         "mdn-data": {
             "version": "2.0.4",
             "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
-            "integrity": "sha1-aZs8OKxvHXKAkaZGULZdOIUC/Vs=",
+            "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==",
             "dev": true
         },
         "media-typer": {
@@ -7355,7 +7355,7 @@
         "micromatch": {
             "version": "3.1.10",
             "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-            "integrity": "sha1-cIWbyVyYQJUvNZoGij/En57PrCM=",
+            "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
             "dev": true,
             "requires": {
                 "arr-diff": "^4.0.0",
@@ -7376,7 +7376,7 @@
         "miller-rabin": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-            "integrity": "sha1-8IA1HIZbDcViqEYpZtqlNUPHik0=",
+            "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
             "dev": true,
             "requires": {
                 "bn.js": "^4.0.0",
@@ -7431,7 +7431,7 @@
         "minimalistic-assert": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-            "integrity": "sha1-LhlN4ERibUoQ5/f7wAznPoPk1cc=",
+            "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
             "dev": true
         },
         "minimalistic-crypto-utils": {
@@ -7458,7 +7458,7 @@
         "mississippi": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-            "integrity": "sha1-6goykfl+C16HdrNj1fChLZTGcCI=",
+            "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
             "dev": true,
             "requires": {
                 "concat-stream": "^1.5.0",
@@ -7476,7 +7476,7 @@
         "mixin-deep": {
             "version": "1.3.2",
             "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
-            "integrity": "sha1-ESC0PcNZp4Xc5ltVuC4lfM9HlWY=",
+            "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
             "dev": true,
             "requires": {
                 "for-in": "^1.0.2",
@@ -7486,7 +7486,7 @@
                 "is-extendable": {
                     "version": "1.0.1",
                     "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-                    "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
+                    "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
                     "dev": true,
                     "requires": {
                         "is-plain-object": "^2.0.4"
@@ -7532,7 +7532,7 @@
         "multicast-dns": {
             "version": "6.2.3",
             "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
-            "integrity": "sha1-oOx72QVcQoL3kMPIL04o2zsxsik=",
+            "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
             "dev": true,
             "requires": {
                 "dns-packet": "^1.3.1",
@@ -7554,7 +7554,7 @@
         "nanomatch": {
             "version": "1.2.13",
             "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-            "integrity": "sha1-uHqKpPwN6P5r6IiVs4mD/yZb0Rk=",
+            "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
             "dev": true,
             "requires": {
                 "arr-diff": "^4.0.0",
@@ -7601,13 +7601,13 @@
         "nice-try": {
             "version": "1.0.5",
             "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-            "integrity": "sha1-ozeKdpbOfSI+iPybdkvX7xCJ42Y=",
+            "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
             "dev": true
         },
         "no-case": {
             "version": "2.3.2",
             "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
-            "integrity": "sha1-YLgTOWvjmz8SiKTB7V0efSi0ZKw=",
+            "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
             "dev": true,
             "requires": {
                 "lower-case": "^1.1.1"
@@ -7628,7 +7628,7 @@
         "node-libs-browser": {
             "version": "2.2.1",
             "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
-            "integrity": "sha1-tk9RPRgzhiX5A0bSew0jXmMfZCU=",
+            "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
             "dev": true,
             "requires": {
                 "assert": "^1.1.1",
@@ -7685,7 +7685,7 @@
         "normalize-package-data": {
             "version": "2.5.0",
             "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-            "integrity": "sha1-5m2xg4sgDB38IzIl0SyzZSDiNKg=",
+            "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
             "dev": true,
             "requires": {
                 "hosted-git-info": "^2.1.4",
@@ -7697,7 +7697,7 @@
         "normalize-path": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-            "integrity": "sha1-Dc1p/yOhybEf0JeDFmRKA4ghamU=",
+            "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
             "dev": true
         },
         "normalize-url": {
@@ -7757,7 +7757,7 @@
         "oauth-sign": {
             "version": "0.9.0",
             "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-            "integrity": "sha1-R6ewFrqmi1+g7PPe4IqFxnmsZFU=",
+            "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
             "dev": true
         },
         "object-assign": {
@@ -7875,7 +7875,7 @@
         "object-keys": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-            "integrity": "sha1-HEfyct8nfzsdrwYWd9nILiMixg4=",
+            "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
             "dev": true
         },
         "object-visit": {
@@ -7933,7 +7933,7 @@
         "obuf": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
-            "integrity": "sha1-Cb6jND1BhZ69RGKS0RydTbYZCE4=",
+            "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
             "dev": true
         },
         "oclazyload": {
@@ -7953,7 +7953,7 @@
         "on-headers": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-            "integrity": "sha1-dysK5qqlJcOZ5Imt+tkMQD6zwo8=",
+            "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
             "dev": true
         },
         "once": {
@@ -7985,7 +7985,7 @@
         "opn": {
             "version": "5.5.0",
             "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz",
-            "integrity": "sha1-/HFk+rVtI1kExRw7J9pnWMo7m/w=",
+            "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==",
             "dev": true,
             "requires": {
                 "is-wsl": "^1.1.0"
@@ -8044,7 +8044,7 @@
         "original": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz",
-            "integrity": "sha1-5EKmHP/hxf0gpl8yYcJmY7MD8l8=",
+            "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==",
             "dev": true,
             "requires": {
                 "url-parse": "^1.4.3"
@@ -8133,13 +8133,13 @@
         "p-map": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
-            "integrity": "sha1-MQko/u+cnsxltosXaTAYpmXOoXU=",
+            "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": "sha1-MWtMiJPiyNwc+okfQGxLQivr8yg=",
+            "integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==",
             "dev": true,
             "requires": {
                 "retry": "^0.12.0"
@@ -8157,7 +8157,7 @@
         "p-try": {
             "version": "2.2.0",
             "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-            "integrity": "sha1-yyhoVA4xPWHeWPr741zpAE1VQOY=",
+            "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
             "dev": true
         },
         "pako": {
@@ -8189,7 +8189,7 @@
         "parent-module": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-            "integrity": "sha1-aR0nCeeMefrjoVZiJFLQB2LKqqI=",
+            "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
             "dev": true,
             "requires": {
                 "callsites": "^3.0.0"
@@ -8251,7 +8251,7 @@
         "parseurl": {
             "version": "1.3.3",
             "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-            "integrity": "sha1-naGee+6NEt/wUT7Vt2lXeTvC6NQ=",
+            "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
             "dev": true
         },
         "pascalcase": {
@@ -8263,7 +8263,7 @@
         "path-browserify": {
             "version": "0.0.1",
             "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
-            "integrity": "sha1-5sTd1+06onxoogzE5Q4aTug7vEo=",
+            "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
             "dev": true
         },
         "path-dirname": {
@@ -8361,7 +8361,7 @@
         "pify": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-            "integrity": "sha1-SyzSXFDVmHNcUCkiJP2MbfQeMjE=",
+            "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
             "dev": true
         },
         "pinkie": {
@@ -8391,7 +8391,7 @@
         "portfinder": {
             "version": "1.0.28",
             "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
-            "integrity": "sha1-Z8RiKFK9U3TdHdkA93n1NGL6x3g=",
+            "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==",
             "dev": true,
             "requires": {
                 "async": "^2.6.2",
@@ -8445,7 +8445,7 @@
                 "source-map": {
                     "version": "0.6.1",
                     "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
                     "dev": true
                 }
             }
@@ -8490,7 +8490,7 @@
         "postcss-colormin": {
             "version": "4.0.3",
             "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz",
-            "integrity": "sha1-rgYLzpPteUrHEmTwgTLVUJVr04E=",
+            "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==",
             "dev": true,
             "requires": {
                 "browserslist": "^4.0.0",
@@ -8503,7 +8503,7 @@
                 "postcss-value-parser": {
                     "version": "3.3.1",
                     "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-                    "integrity": "sha1-n/giVH4okyE88cMO+lGsX9G6goE=",
+                    "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
                     "dev": true
                 }
             }
@@ -8511,7 +8511,7 @@
         "postcss-convert-values": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz",
-            "integrity": "sha1-yjgT7U2g+BL51DcDWE5Enr4Ymn8=",
+            "integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==",
             "dev": true,
             "requires": {
                 "postcss": "^7.0.0",
@@ -8521,7 +8521,7 @@
                 "postcss-value-parser": {
                     "version": "3.3.1",
                     "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-                    "integrity": "sha1-n/giVH4okyE88cMO+lGsX9G6goE=",
+                    "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
                     "dev": true
                 }
             }
@@ -8529,7 +8529,7 @@
         "postcss-discard-comments": {
             "version": "4.0.2",
             "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz",
-            "integrity": "sha1-H7q9LCRr/2qq15l7KwkY9NevQDM=",
+            "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==",
             "dev": true,
             "requires": {
                 "postcss": "^7.0.0"
@@ -8538,7 +8538,7 @@
         "postcss-discard-duplicates": {
             "version": "4.0.2",
             "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz",
-            "integrity": "sha1-P+EzzTyCKC5VD8myORdqkge3hOs=",
+            "integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==",
             "dev": true,
             "requires": {
                 "postcss": "^7.0.0"
@@ -8547,7 +8547,7 @@
         "postcss-discard-empty": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz",
-            "integrity": "sha1-yMlR6fc+2UKAGUWERKAq2Qu592U=",
+            "integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==",
             "dev": true,
             "requires": {
                 "postcss": "^7.0.0"
@@ -8556,7 +8556,7 @@
         "postcss-discard-overridden": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz",
-            "integrity": "sha1-ZSrvipZybwKfXj4AFG7npOdV/1c=",
+            "integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==",
             "dev": true,
             "requires": {
                 "postcss": "^7.0.0"
@@ -8565,7 +8565,7 @@
         "postcss-merge-longhand": {
             "version": "4.0.11",
             "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz",
-            "integrity": "sha1-YvSaE+Sg7gTnuY9CuxYGLKJUniQ=",
+            "integrity": "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==",
             "dev": true,
             "requires": {
                 "css-color-names": "0.0.4",
@@ -8577,7 +8577,7 @@
                 "postcss-value-parser": {
                     "version": "3.3.1",
                     "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-                    "integrity": "sha1-n/giVH4okyE88cMO+lGsX9G6goE=",
+                    "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
                     "dev": true
                 }
             }
@@ -8585,7 +8585,7 @@
         "postcss-merge-rules": {
             "version": "4.0.3",
             "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz",
-            "integrity": "sha1-NivqT/Wh+Y5AdacTxsslrv75plA=",
+            "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==",
             "dev": true,
             "requires": {
                 "browserslist": "^4.0.0",
@@ -8612,7 +8612,7 @@
         "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": "sha1-zUw0TM5HQ0P6xdgiBqssvLiv1aY=",
+            "integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==",
             "dev": true,
             "requires": {
                 "postcss": "^7.0.0",
@@ -8622,7 +8622,7 @@
                 "postcss-value-parser": {
                     "version": "3.3.1",
                     "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-                    "integrity": "sha1-n/giVH4okyE88cMO+lGsX9G6goE=",
+                    "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
                     "dev": true
                 }
             }
@@ -8630,7 +8630,7 @@
         "postcss-minify-gradients": {
             "version": "4.0.2",
             "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz",
-            "integrity": "sha1-k7KcL/UJnFNe7NpWxKpuZlpmNHE=",
+            "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==",
             "dev": true,
             "requires": {
                 "cssnano-util-get-arguments": "^4.0.0",
@@ -8642,7 +8642,7 @@
                 "postcss-value-parser": {
                     "version": "3.3.1",
                     "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-                    "integrity": "sha1-n/giVH4okyE88cMO+lGsX9G6goE=",
+                    "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
                     "dev": true
                 }
             }
@@ -8650,7 +8650,7 @@
         "postcss-minify-params": {
             "version": "4.0.2",
             "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz",
-            "integrity": "sha1-a5zvAwwR41Jh+V9hjJADbWgNuHQ=",
+            "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==",
             "dev": true,
             "requires": {
                 "alphanum-sort": "^1.0.0",
@@ -8664,7 +8664,7 @@
                 "postcss-value-parser": {
                     "version": "3.3.1",
                     "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-                    "integrity": "sha1-n/giVH4okyE88cMO+lGsX9G6goE=",
+                    "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
                     "dev": true
                 }
             }
@@ -8672,7 +8672,7 @@
         "postcss-minify-selectors": {
             "version": "4.0.2",
             "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz",
-            "integrity": "sha1-4uXrQL/uUA0M2SQ1APX46kJi+9g=",
+            "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==",
             "dev": true,
             "requires": {
                 "alphanum-sort": "^1.0.0",
@@ -8697,7 +8697,7 @@
         "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": "sha1-gYcZoa4doyX5gyRGsBE27rSTzX4=",
+            "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==",
             "dev": true,
             "requires": {
                 "postcss": "^7.0.5"
@@ -8728,7 +8728,7 @@
         "postcss-modules-values": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz",
-            "integrity": "sha1-W1AA1uuuKbQlUwG0o6VFdEI+fxA=",
+            "integrity": "sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==",
             "dev": true,
             "requires": {
                 "icss-utils": "^4.0.0",
@@ -8738,7 +8738,7 @@
         "postcss-normalize-charset": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz",
-            "integrity": "sha1-izWt067oOhNrBHHg1ZvlilAoXdQ=",
+            "integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==",
             "dev": true,
             "requires": {
                 "postcss": "^7.0.0"
@@ -8747,7 +8747,7 @@
         "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": "sha1-Db4EpM6QY9RmftK+R2u4MMglk1o=",
+            "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==",
             "dev": true,
             "requires": {
                 "cssnano-util-get-match": "^4.0.0",
@@ -8758,7 +8758,7 @@
                 "postcss-value-parser": {
                     "version": "3.3.1",
                     "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-                    "integrity": "sha1-n/giVH4okyE88cMO+lGsX9G6goE=",
+                    "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
                     "dev": true
                 }
             }
@@ -8766,7 +8766,7 @@
         "postcss-normalize-positions": {
             "version": "4.0.2",
             "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz",
-            "integrity": "sha1-BfdX+E8mBDc3g2ipH4ky1LECkX8=",
+            "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==",
             "dev": true,
             "requires": {
                 "cssnano-util-get-arguments": "^4.0.0",
@@ -8778,7 +8778,7 @@
                 "postcss-value-parser": {
                     "version": "3.3.1",
                     "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-                    "integrity": "sha1-n/giVH4okyE88cMO+lGsX9G6goE=",
+                    "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
                     "dev": true
                 }
             }
@@ -8786,7 +8786,7 @@
         "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": "sha1-xOu8KJ85kaAo1EdRy90RkYsXkQw=",
+            "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==",
             "dev": true,
             "requires": {
                 "cssnano-util-get-arguments": "^4.0.0",
@@ -8798,7 +8798,7 @@
                 "postcss-value-parser": {
                     "version": "3.3.1",
                     "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-                    "integrity": "sha1-n/giVH4okyE88cMO+lGsX9G6goE=",
+                    "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
                     "dev": true
                 }
             }
@@ -8806,7 +8806,7 @@
         "postcss-normalize-string": {
             "version": "4.0.2",
             "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz",
-            "integrity": "sha1-zUTECrB6DHo23F6Zqs4eyk7CaQw=",
+            "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==",
             "dev": true,
             "requires": {
                 "has": "^1.0.0",
@@ -8817,7 +8817,7 @@
                 "postcss-value-parser": {
                     "version": "3.3.1",
                     "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-                    "integrity": "sha1-n/giVH4okyE88cMO+lGsX9G6goE=",
+                    "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
                     "dev": true
                 }
             }
@@ -8825,7 +8825,7 @@
         "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": "sha1-jgCcoqOUnNr4rSPmtquZy159KNk=",
+            "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==",
             "dev": true,
             "requires": {
                 "cssnano-util-get-match": "^4.0.0",
@@ -8836,7 +8836,7 @@
                 "postcss-value-parser": {
                     "version": "3.3.1",
                     "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-                    "integrity": "sha1-n/giVH4okyE88cMO+lGsX9G6goE=",
+                    "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
                     "dev": true
                 }
             }
@@ -8844,7 +8844,7 @@
         "postcss-normalize-unicode": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz",
-            "integrity": "sha1-hBvUj9zzAZrUuqdJOj02O1KuHPs=",
+            "integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==",
             "dev": true,
             "requires": {
                 "browserslist": "^4.0.0",
@@ -8855,7 +8855,7 @@
                 "postcss-value-parser": {
                     "version": "3.3.1",
                     "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-                    "integrity": "sha1-n/giVH4okyE88cMO+lGsX9G6goE=",
+                    "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
                     "dev": true
                 }
             }
@@ -8863,7 +8863,7 @@
         "postcss-normalize-url": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz",
-            "integrity": "sha1-EOQ3+GvHx+WPe5ZS7YeNqqlfquE=",
+            "integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==",
             "dev": true,
             "requires": {
                 "is-absolute-url": "^2.0.0",
@@ -8875,13 +8875,13 @@
                 "normalize-url": {
                     "version": "3.3.0",
                     "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz",
-                    "integrity": "sha1-suHE3E98bVd0PfczpPWXjRhlBVk=",
+                    "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==",
                     "dev": true
                 },
                 "postcss-value-parser": {
                     "version": "3.3.1",
                     "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-                    "integrity": "sha1-n/giVH4okyE88cMO+lGsX9G6goE=",
+                    "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
                     "dev": true
                 }
             }
@@ -8889,7 +8889,7 @@
         "postcss-normalize-whitespace": {
             "version": "4.0.2",
             "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz",
-            "integrity": "sha1-vx1AcP5Pzqh9E0joJdjMDF+qfYI=",
+            "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==",
             "dev": true,
             "requires": {
                 "postcss": "^7.0.0",
@@ -8899,7 +8899,7 @@
                 "postcss-value-parser": {
                     "version": "3.3.1",
                     "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-                    "integrity": "sha1-n/giVH4okyE88cMO+lGsX9G6goE=",
+                    "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
                     "dev": true
                 }
             }
@@ -8907,7 +8907,7 @@
         "postcss-ordered-values": {
             "version": "4.1.2",
             "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz",
-            "integrity": "sha1-DPdcgg7H1cTSgBiVWeC1ceusDu4=",
+            "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==",
             "dev": true,
             "requires": {
                 "cssnano-util-get-arguments": "^4.0.0",
@@ -8918,7 +8918,7 @@
                 "postcss-value-parser": {
                     "version": "3.3.1",
                     "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-                    "integrity": "sha1-n/giVH4okyE88cMO+lGsX9G6goE=",
+                    "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
                     "dev": true
                 }
             }
@@ -8926,7 +8926,7 @@
         "postcss-reduce-initial": {
             "version": "4.0.3",
             "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz",
-            "integrity": "sha1-f9QuvqXpyBRgljniwuhK4nC6SN8=",
+            "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==",
             "dev": true,
             "requires": {
                 "browserslist": "^4.0.0",
@@ -8938,7 +8938,7 @@
         "postcss-reduce-transforms": {
             "version": "4.0.2",
             "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz",
-            "integrity": "sha1-F++kBerMbge+NBSlyi0QdGgdTik=",
+            "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==",
             "dev": true,
             "requires": {
                 "cssnano-util-get-match": "^4.0.0",
@@ -8950,7 +8950,7 @@
                 "postcss-value-parser": {
                     "version": "3.3.1",
                     "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-                    "integrity": "sha1-n/giVH4okyE88cMO+lGsX9G6goE=",
+                    "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
                     "dev": true
                 }
             }
@@ -8981,7 +8981,7 @@
                 "postcss-value-parser": {
                     "version": "3.3.1",
                     "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-                    "integrity": "sha1-n/giVH4okyE88cMO+lGsX9G6goE=",
+                    "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
                     "dev": true
                 }
             }
@@ -8989,7 +8989,7 @@
         "postcss-unique-selectors": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz",
-            "integrity": "sha1-lEaRHzKJv9ZMbWgPBzwDsfnuS6w=",
+            "integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==",
             "dev": true,
             "requires": {
                 "alphanum-sort": "^1.0.0",
@@ -9028,7 +9028,7 @@
         "private": {
             "version": "0.1.8",
             "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
-            "integrity": "sha1-I4Hts2ifelPWUxkAYPz4ItLzaP8=",
+            "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
             "dev": true
         },
         "process": {
@@ -9040,13 +9040,13 @@
         "process-nextick-args": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-            "integrity": "sha1-eCDZsWEgzFXKmud5JoCufbptf+I=",
+            "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
             "dev": true
         },
         "progress": {
             "version": "2.0.3",
             "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-            "integrity": "sha1-foz42PW48jnBvGi+tOt4Vn1XLvg=",
+            "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
             "dev": true
         },
         "promise": {
@@ -9108,7 +9108,7 @@
         "public-encrypt": {
             "version": "4.0.3",
             "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
-            "integrity": "sha1-T8ydd6B+SLp1J+fL4N4z0HATMeA=",
+            "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
             "dev": true,
             "requires": {
                 "bn.js": "^4.1.0",
@@ -9122,7 +9122,7 @@
         "pump": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-            "integrity": "sha1-tKIRaBW94vTh6mAjVOjHVWUQemQ=",
+            "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
             "dev": true,
             "requires": {
                 "end-of-stream": "^1.1.0",
@@ -9132,7 +9132,7 @@
         "pumpify": {
             "version": "1.5.1",
             "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
-            "integrity": "sha1-NlE74karJ1cLGjdKXOJ4v9dDcM4=",
+            "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
             "dev": true,
             "requires": {
                 "duplexify": "^3.6.0",
@@ -9143,7 +9143,7 @@
                 "pump": {
                     "version": "2.0.1",
                     "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-                    "integrity": "sha1-Ejma3W5M91Jtlzy8i1zi4pCLOQk=",
+                    "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
                     "dev": true,
                     "requires": {
                         "end-of-stream": "^1.1.0",
@@ -9155,7 +9155,7 @@
         "punycode": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-            "integrity": "sha1-tYsBCsQMIsVldhbI0sLALHv0eew=",
+            "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
             "dev": true
         },
         "puppeteer": {
@@ -9262,7 +9262,7 @@
         "qjobs": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz",
-            "integrity": "sha1-xF6cYYAL0IfviNfiVkI73Unl0HE=",
+            "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==",
             "dev": true
         },
         "qs": {
@@ -9296,13 +9296,13 @@
         "querystringify": {
             "version": "2.2.0",
             "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-            "integrity": "sha1-M0WUG0FTy50ILY7uTNogFqmu9/Y=",
+            "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
             "dev": true
         },
         "randombytes": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-            "integrity": "sha1-32+ENy8CcNxlzfYpE0mrekc9Tyo=",
+            "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
             "dev": true,
             "requires": {
                 "safe-buffer": "^5.1.0"
@@ -9311,7 +9311,7 @@
         "randomfill": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-            "integrity": "sha1-ySGW/IarQr6YPxvzF3giSTHWFFg=",
+            "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
             "dev": true,
             "requires": {
                 "randombytes": "^2.0.5",
@@ -9321,7 +9321,7 @@
         "range-parser": {
             "version": "1.2.1",
             "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-            "integrity": "sha1-PPNwI9GZ4cJNGlW4SADC8+ZGgDE=",
+            "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
             "dev": true
         },
         "raw-body": {
@@ -9457,7 +9457,7 @@
         "regenerator-transform": {
             "version": "0.10.1",
             "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz",
-            "integrity": "sha1-HkmWg3Ix2ot/PPQRTXG1aRoGgN0=",
+            "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==",
             "dev": true,
             "requires": {
                 "babel-runtime": "^6.18.0",
@@ -9468,7 +9468,7 @@
         "regex-not": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
-            "integrity": "sha1-H07OJ+ALC2XgJHpoEOaoXYOldSw=",
+            "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
             "dev": true,
             "requires": {
                 "extend-shallow": "^3.0.2",
@@ -9541,7 +9541,7 @@
         "regexpp": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
-            "integrity": "sha1-jRnTHPYySCtYkEn4KB+T28uk0H8=",
+            "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
             "dev": true
         },
         "regexpu-core": {
@@ -9686,7 +9686,7 @@
         "require-main-filename": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-            "integrity": "sha1-0LMp7MfMD2Fkn2IhW+aa9UqomJs=",
+            "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
             "dev": true
         },
         "requires-port": {
@@ -9726,7 +9726,7 @@
                 "global-modules": {
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-                    "integrity": "sha1-bXcPDrUjrHgWTXK15xqIdyZcw+o=",
+                    "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
                     "dev": true,
                     "requires": {
                         "global-prefix": "^1.0.1",
@@ -9770,7 +9770,7 @@
         "ret": {
             "version": "0.1.15",
             "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-            "integrity": "sha1-uKSCXVvbH8P29Twrwz+BOIaBx7w=",
+            "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
             "dev": true
         },
         "retry": {
@@ -9815,7 +9815,7 @@
         "ripemd160": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-            "integrity": "sha1-ocGm9iR1FXe6XQeRTLyShQWFiQw=",
+            "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
             "dev": true,
             "requires": {
                 "hash-base": "^3.0.0",
@@ -9857,7 +9857,7 @@
         "safe-buffer": {
             "version": "5.1.2",
             "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-            "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0=",
+            "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
             "dev": true
         },
         "safe-regex": {
@@ -9872,13 +9872,13 @@
         "safer-buffer": {
             "version": "2.1.2",
             "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-            "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=",
+            "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
             "dev": true
         },
         "sax": {
             "version": "1.2.4",
             "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-            "integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk=",
+            "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
             "dev": true
         },
         "schema-utils": {
@@ -9987,7 +9987,7 @@
                 "setprototypeof": {
                     "version": "1.1.0",
                     "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-                    "integrity": "sha1-0L2FU2iHtv58DYGMuWLZ2RxU5lY=",
+                    "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
                     "dev": true
                 }
             }
@@ -10013,7 +10013,7 @@
         "set-value": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
-            "integrity": "sha1-oY1AUw5vB95CKMfe/kInr4ytAFs=",
+            "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
             "dev": true,
             "requires": {
                 "extend-shallow": "^2.0.1",
@@ -10048,7 +10048,7 @@
         "sha.js": {
             "version": "2.4.11",
             "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-            "integrity": "sha1-N6XPC4HsvGlD3hCbopYNGyZYSuc=",
+            "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
             "dev": true,
             "requires": {
                 "inherits": "^2.0.1",
@@ -10058,7 +10058,7 @@
         "shallow-clone": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
-            "integrity": "sha1-jymBrZJTH1UDWwH7IwdppA4C76M=",
+            "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
             "dev": true,
             "requires": {
                 "kind-of": "^6.0.2"
@@ -10097,7 +10097,7 @@
                 "is-arrayish": {
                     "version": "0.3.2",
                     "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
-                    "integrity": "sha1-RXSirlb3qyBolvtDHq7tBm/fjwM=",
+                    "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
                     "dev": true
                 }
             }
@@ -10111,7 +10111,7 @@
         "slice-ansi": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
-            "integrity": "sha1-ys12k0YaY3pXiNkqfdT7oGjoFjY=",
+            "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
             "dev": true,
             "requires": {
                 "ansi-styles": "^3.2.0",
@@ -10128,7 +10128,7 @@
         "snapdragon": {
             "version": "0.8.2",
             "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-            "integrity": "sha1-ZJIufFZbDhQgS6GqfWlkJ40lGC0=",
+            "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
             "dev": true,
             "requires": {
                 "base": "^0.11.1",
@@ -10164,7 +10164,7 @@
         "snapdragon-node": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-            "integrity": "sha1-bBdfhv8UvbByRWPo88GwIaKGhTs=",
+            "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
             "dev": true,
             "requires": {
                 "define-property": "^1.0.0",
@@ -10184,7 +10184,7 @@
                 "is-accessor-descriptor": {
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-                    "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
+                    "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
                     "dev": true,
                     "requires": {
                         "kind-of": "^6.0.0"
@@ -10193,7 +10193,7 @@
                 "is-data-descriptor": {
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-                    "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
+                    "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
                     "dev": true,
                     "requires": {
                         "kind-of": "^6.0.0"
@@ -10202,7 +10202,7 @@
                 "is-descriptor": {
                     "version": "1.0.2",
                     "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-                    "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
+                    "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
                     "dev": true,
                     "requires": {
                         "is-accessor-descriptor": "^1.0.0",
@@ -10215,7 +10215,7 @@
         "snapdragon-util": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-            "integrity": "sha1-+VZHlIbyrNeXAGk/b3uAXkWrVuI=",
+            "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
             "dev": true,
             "requires": {
                 "kind-of": "^3.2.0"
@@ -10235,7 +10235,7 @@
         "socket.io": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz",
-            "integrity": "sha1-oGnF/qvuPmshSnW0DOBlLhz7mYA=",
+            "integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==",
             "dev": true,
             "requires": {
                 "debug": "~3.1.0",
@@ -10249,7 +10249,7 @@
                 "debug": {
                     "version": "3.1.0",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-                    "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
+                    "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
                     "dev": true,
                     "requires": {
                         "ms": "2.0.0"
@@ -10260,13 +10260,13 @@
         "socket.io-adapter": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz",
-            "integrity": "sha1-qz8Nb2a4/H/KOVmrWZH4IiF4m+k=",
+            "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": "sha1-3LOBA0NqtFeN2wJmOK4vIbYjZx8=",
+            "integrity": "sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==",
             "dev": true,
             "requires": {
                 "backo2": "1.0.2",
@@ -10294,7 +10294,7 @@
                 "debug": {
                     "version": "3.1.0",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-                    "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
+                    "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
                     "dev": true,
                     "requires": {
                         "ms": "2.0.0"
@@ -10305,7 +10305,7 @@
         "socket.io-parser": {
             "version": "3.2.0",
             "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz",
-            "integrity": "sha1-58Yii2qh+BTmFIrqMltRqpSZ4Hc=",
+            "integrity": "sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==",
             "dev": true,
             "requires": {
                 "component-emitter": "1.2.1",
@@ -10322,7 +10322,7 @@
                 "debug": {
                     "version": "3.1.0",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-                    "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
+                    "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
                     "dev": true,
                     "requires": {
                         "ms": "2.0.0"
@@ -10485,7 +10485,7 @@
         "source-list-map": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
-            "integrity": "sha1-OZO9hzv8SEecyp6jpUeDXHwVSzQ=",
+            "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
             "dev": true
         },
         "source-map": {
@@ -10566,7 +10566,7 @@
         "spdy": {
             "version": "4.0.2",
             "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
-            "integrity": "sha1-t09GYgOj7aRSwCSSuR+56EonZ3s=",
+            "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
             "dev": true,
             "requires": {
                 "debug": "^4.1.0",
@@ -10596,7 +10596,7 @@
         "spdy-transport": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
-            "integrity": "sha1-ANSGOmQArXXfkzYaFghgXl3NzzE=",
+            "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
             "dev": true,
             "requires": {
                 "debug": "^4.1.0",
@@ -10619,13 +10619,13 @@
                 "ms": {
                     "version": "2.1.2",
                     "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-                    "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
+                    "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": "sha1-M3u9o63AcGvT4CRCaihtS0sskZg=",
+                    "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
                     "dev": true,
                     "requires": {
                         "inherits": "^2.0.3",
@@ -10638,7 +10638,7 @@
         "split-string": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-            "integrity": "sha1-fLCd2jqGWFcFxks5pkZgOGguj+I=",
+            "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
             "dev": true,
             "requires": {
                 "extend-shallow": "^3.0.0"
@@ -10679,7 +10679,7 @@
         "stable": {
             "version": "0.1.8",
             "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
-            "integrity": "sha1-g26zyDgv4pNv6vVEYxAXzn1Ho88=",
+            "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
             "dev": true
         },
         "static-extend": {
@@ -10712,7 +10712,7 @@
         "stream-browserify": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
-            "integrity": "sha1-h1IdOKRKp+6RzhzSpH3wy0ndZgs=",
+            "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
             "dev": true,
             "requires": {
                 "inherits": "~2.0.1",
@@ -10722,7 +10722,7 @@
         "stream-each": {
             "version": "1.2.3",
             "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
-            "integrity": "sha1-6+J6DDibBPvMIzZClS4Qcxr6m64=",
+            "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
             "dev": true,
             "requires": {
                 "end-of-stream": "^1.1.0",
@@ -10732,7 +10732,7 @@
         "stream-http": {
             "version": "2.8.3",
             "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
-            "integrity": "sha1-stJCRpKIpaJ+xP6JM6z2I95lFPw=",
+            "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
             "dev": true,
             "requires": {
                 "builtin-status-codes": "^3.0.0",
@@ -10751,7 +10751,7 @@
         "streamroller": {
             "version": "1.0.6",
             "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-1.0.6.tgz",
-            "integrity": "sha1-gWfYSW7Z8Z8F7ksVjZYRMhuMrNk=",
+            "integrity": "sha512-3QC47Mhv3/aZNFpDDVO44qQb9gwB9QggMEE0sQmkTAwBVYdBRWISdsywlkfm5II1Q5y/pmrHflti/IgmIzdDBg==",
             "dev": true,
             "requires": {
                 "async": "^2.6.2",
@@ -10933,7 +10933,7 @@
         "string_decoder": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-            "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=",
+            "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
             "dev": true,
             "requires": {
                 "safe-buffer": "~5.1.0"
@@ -10999,7 +10999,7 @@
         "style-loader": {
             "version": "0.23.1",
             "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.23.1.tgz",
-            "integrity": "sha1-y5FUYG8+dxq2xKtjcCahBJF02SU=",
+            "integrity": "sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==",
             "dev": true,
             "requires": {
                 "loader-utils": "^1.1.0",
@@ -11009,7 +11009,7 @@
         "stylehacks": {
             "version": "4.0.3",
             "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz",
-            "integrity": "sha1-Zxj8r00eB9ihMYaQiB6NlnJqcdU=",
+            "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==",
             "dev": true,
             "requires": {
                 "browserslist": "^4.0.0",
@@ -11042,7 +11042,7 @@
         "svgo": {
             "version": "1.3.2",
             "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
-            "integrity": "sha1-ttxRHAYzRsnkFbgeQ0ARRbltQWc=",
+            "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
             "dev": true,
             "requires": {
                 "chalk": "^2.4.1",
@@ -11063,7 +11063,7 @@
                 "css-select": {
                     "version": "2.1.0",
                     "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
-                    "integrity": "sha1-ajRlM1ZjWTSoG6ymjQJVQyEF2+8=",
+                    "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
                     "dev": true,
                     "requires": {
                         "boolbase": "^1.0.0",
@@ -11136,7 +11136,7 @@
         "table": {
             "version": "5.4.6",
             "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
-            "integrity": "sha1-EpLRlQDOP4YFOwXw6Ofko7shB54=",
+            "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
             "dev": true,
             "requires": {
                 "ajv": "^6.10.2",
@@ -11148,7 +11148,7 @@
         "tapable": {
             "version": "1.1.3",
             "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
-            "integrity": "sha1-ofzMBrWNth/XpF2i2kT186Pme6I=",
+            "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
             "dev": true
         },
         "tar-fs": {
@@ -11203,7 +11203,7 @@
                 "source-map": {
                     "version": "0.6.1",
                     "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
                     "dev": true
                 }
             }
@@ -11211,7 +11211,7 @@
         "terser-webpack-plugin": {
             "version": "1.4.5",
             "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz",
-            "integrity": "sha1-oheu+uozDnNP+sthIOwfoxLWBAs=",
+            "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==",
             "dev": true,
             "requires": {
                 "cacache": "^12.0.2",
@@ -11267,7 +11267,7 @@
         "through2": {
             "version": "2.0.5",
             "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-            "integrity": "sha1-AcHjnrMdB8t9A6lqcIIyYLIxMs0=",
+            "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
             "dev": true,
             "requires": {
                 "readable-stream": "~2.3.6",
@@ -11277,7 +11277,7 @@
         "thunky": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
-            "integrity": "sha1-Wrr3FKlAXbBQRzK7zNLO3Z75U30=",
+            "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
             "dev": true
         },
         "time-stamp": {
@@ -11310,7 +11310,7 @@
         "tmp": {
             "version": "0.0.33",
             "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-            "integrity": "sha1-bTQzWIl2jSGyvNoKonfO07G/rfk=",
+            "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
             "dev": true,
             "requires": {
                 "os-tmpdir": "~1.0.2"
@@ -11363,7 +11363,7 @@
         "to-regex": {
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-            "integrity": "sha1-E8/dmzNlUvMLUfM6iuG0Knp1mc4=",
+            "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
             "dev": true,
             "requires": {
                 "define-property": "^2.0.2",
@@ -11472,7 +11472,7 @@
         "type-is": {
             "version": "1.6.18",
             "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-            "integrity": "sha1-TlUs0F3wlGfcvE73Od6J8s83wTE=",
+            "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
             "dev": true,
             "requires": {
                 "media-typer": "0.3.0",
@@ -11499,7 +11499,7 @@
                 "source-map": {
                     "version": "0.6.1",
                     "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
                     "dev": true,
                     "optional": true
                 }
@@ -11508,7 +11508,7 @@
         "ultron": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
-            "integrity": "sha1-n+FTahCmZKZSZqHjzPhf02MCvJw=",
+            "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
             "dev": true
         },
         "unbzip2-stream": {
@@ -11536,7 +11536,7 @@
         "union-value": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
-            "integrity": "sha1-C2/nuDWuzaYcbqTU8CwUIh4QmEc=",
+            "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
             "dev": true,
             "requires": {
                 "arr-union": "^3.1.0",
@@ -11560,7 +11560,7 @@
         "unique-filename": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
-            "integrity": "sha1-HWl2k2mtoFgxA6HmrodoG1ZXMjA=",
+            "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
             "dev": true,
             "requires": {
                 "unique-slug": "^2.0.0"
@@ -11569,7 +11569,7 @@
         "unique-slug": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
-            "integrity": "sha1-uqvOkQg/xk6UWw861hPiZPfNTmw=",
+            "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
             "dev": true,
             "requires": {
                 "imurmurhash": "^0.1.4"
@@ -11578,7 +11578,7 @@
         "universalify": {
             "version": "0.1.2",
             "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-            "integrity": "sha1-tkb2m+OULavOzJ1mOcgNwQXvqmY=",
+            "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
             "dev": true
         },
         "unpipe": {
@@ -11636,7 +11636,7 @@
         "upath": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
-            "integrity": "sha1-j2bbzVWog6za5ECK+LA1pQRMGJQ=",
+            "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
             "dev": true
         },
         "upper-case": {
@@ -11681,7 +11681,7 @@
         "url-loader": {
             "version": "2.3.0",
             "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-2.3.0.tgz",
-            "integrity": "sha1-4OLvZY8APvuMpBsPP/v3a6uIZYs=",
+            "integrity": "sha512-goSdg8VY+7nPZKUEChZSEtW5gjbS66USIGCeSJ1OVOJ7Yfuh/36YxCwMi5HVEJh6mqUYOoy3NJ0vlOMrWsSHog==",
             "dev": true,
             "requires": {
                 "loader-utils": "^1.2.3",
@@ -11743,13 +11743,13 @@
         "use": {
             "version": "3.1.1",
             "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-            "integrity": "sha1-1QyMrHmhn7wg8pEfVuuXP04QBw8=",
+            "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
             "dev": true
         },
         "useragent": {
             "version": "2.3.0",
             "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz",
-            "integrity": "sha1-IX+UOtVAyyEoZYqyP8lg9qiMmXI=",
+            "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==",
             "dev": true,
             "requires": {
                 "lru-cache": "4.1.x",
@@ -11759,7 +11759,7 @@
                 "lru-cache": {
                     "version": "4.1.5",
                     "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-                    "integrity": "sha1-i75Q6oW+1ZvJ4z3KuCNe6bz0Q80=",
+                    "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
                     "dev": true,
                     "requires": {
                         "pseudomap": "^1.0.2",
@@ -11777,7 +11777,7 @@
         "util": {
             "version": "0.11.1",
             "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
-            "integrity": "sha1-MjZzNyDsZLsn9uJvQhqqLhtYjWE=",
+            "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
             "dev": true,
             "requires": {
                 "inherits": "2.0.3"
@@ -11800,7 +11800,7 @@
         "util.promisify": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
-            "integrity": "sha1-RA9xZaRZyaFtwUXrjnLzVocJcDA=",
+            "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
             "dev": true,
             "requires": {
                 "define-properties": "^1.1.2",
@@ -11834,7 +11834,7 @@
         "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": "sha1-/JH2uce6FchX9MssXe/uw51PQQo=",
+            "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
             "dev": true,
             "requires": {
                 "spdx-correct": "^3.0.0",
@@ -11867,7 +11867,7 @@
         "vm-browserify": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
-            "integrity": "sha1-eGQcSIuObKkadfUR56OzKobl3aA=",
+            "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
             "dev": true
         },
         "void-elements": {
@@ -12014,7 +12014,7 @@
         "wbuf": {
             "version": "1.7.3",
             "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
-            "integrity": "sha1-wdjRSTFtPqhShIiVy2oL/oh7h98=",
+            "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
             "dev": true,
             "requires": {
                 "minimalistic-assert": "^1.0.0"
@@ -12261,7 +12261,7 @@
         "webpack-log": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
-            "integrity": "sha1-W3ko4GN1k/EZ0y9iJ8HgrDHhtH8=",
+            "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
             "dev": true,
             "requires": {
                 "ansi-colors": "^3.0.0",
@@ -12271,7 +12271,7 @@
         "webpack-merge": {
             "version": "4.2.2",
             "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
-            "integrity": "sha1-onxS6ng9E5iv0gh/VH17nS9DY00=",
+            "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==",
             "dev": true,
             "requires": {
                 "lodash": "^4.17.15"
@@ -12301,7 +12301,7 @@
                 "source-map": {
                     "version": "0.6.1",
                     "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
                     "dev": true
                 }
             }
@@ -12318,13 +12318,13 @@
         "websocket-extensions": {
             "version": "0.1.4",
             "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
-            "integrity": "sha1-f4RzvIOd/YdgituV1+sHUhFXikI=",
+            "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
             "dev": true
         },
         "which": {
             "version": "1.3.1",
             "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-            "integrity": "sha1-pFBD1U9YBTFtqNYvn1CRjT2nCwo=",
+            "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
             "dev": true,
             "requires": {
                 "isexe": "^2.0.0"
@@ -12345,7 +12345,7 @@
         "worker-farm": {
             "version": "1.7.0",
             "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
-            "integrity": "sha1-JqlMU5G7ypJhUgAvabhKS/dy5ag=",
+            "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
             "dev": true,
             "requires": {
                 "errno": "~0.1.7"
@@ -12354,7 +12354,7 @@
         "wrap-ansi": {
             "version": "5.1.0",
             "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-            "integrity": "sha1-H9H2cjXVttD+54EFYAG/tpTAOwk=",
+            "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
             "dev": true,
             "requires": {
                 "ansi-styles": "^3.2.0",
@@ -12371,7 +12371,7 @@
         "write": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
-            "integrity": "sha1-CADhRSO5I6OH5BUSPIZWFqrg9cM=",
+            "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
             "dev": true,
             "requires": {
                 "mkdirp": "^0.5.1"
@@ -12380,7 +12380,7 @@
         "ws": {
             "version": "3.3.3",
             "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
-            "integrity": "sha1-8c+E/i1ekB686U767OeF8YeiKPI=",
+            "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
             "dev": true,
             "requires": {
                 "async-limiter": "~1.0.0",
@@ -12402,7 +12402,7 @@
         "xtend": {
             "version": "4.0.2",
             "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-            "integrity": "sha1-u3J3n1+kZRhrH0OPZ0+jR/2121Q=",
+            "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
             "dev": true
         },
         "y18n": {
@@ -12439,7 +12439,7 @@
         "yargs-parser": {
             "version": "13.1.2",
             "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-            "integrity": "sha1-Ew8JcC667vJlDVTObj5XBvek+zg=",
+            "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
             "dev": true,
             "requires": {
                 "camelcase": "^5.0.0",
diff --git a/src/js/angular/graphexplore/directives/rdf-class-hierarchy.directive.js b/src/js/angular/graphexplore/directives/rdf-class-hierarchy.directive.js
index af1e3b1014..d1813edf33 100644
--- a/src/js/angular/graphexplore/directives/rdf-class-hierarchy.directive.js
+++ b/src/js/angular/graphexplore/directives/rdf-class-hierarchy.directive.js
@@ -34,22 +34,16 @@ function classHierarchyDirective($rootScope, $location, GraphDataRestService, $w
         link: linkFunc
     };
 
-    function linkFunc(scope, element, attrs) {
-        window.addEventListener('load', renderCirclePacking);
-
-        scope.$on('$destroy', function (event) {
-            window.removeEventListener('load', renderCirclePacking);
-        });
+    function linkFunc(scope) {
+        renderCirclePacking(scope);
     }
 
-    function renderCirclePacking(scope, element) {
+    function renderCirclePacking(scope) {
 
         var width = 800,
             height = 800,
             diameter = height,
-            margin = 20,
-            node,
-            root;
+            margin = 20;
 
         var pack = d3.layout.pack()
             .size([diameter - margin, diameter - margin])
@@ -57,15 +51,6 @@ function classHierarchyDirective($rootScope, $location, GraphDataRestService, $w
                 return d.size;
             });
 
-        var colors = [
-            "hsl(33, 75%, 75%)",
-            "hsl(213, 75%, 75%)",
-            "hsl(333, 75%, 75%)",
-            "hsl(153, 75%, 75%)",
-            "hsl(273, 75%, 75%)",
-            "hsl(93, 75%, 75%)"
-        ];
-
         var color = d3.scale.linear()
             .domain([0, 4])
             .range(["hsl(19, 70%, 90%)", "hsl(19, 70%, 50%)"])
@@ -130,7 +115,7 @@ function classHierarchyDirective($rootScope, $location, GraphDataRestService, $w
             $rootScope.hierarchyError = false;
             const selGraphFromCache = LocalStorageAdapter.get(`classHierarchy-selectedGraph-${$repositories.getActiveRepository()}`);
             GraphDataRestService.getClassHierarchyData(selGraphFromCache !== null ? selGraphFromCache.contextID.uri : "")
-                .success(function (response, status, headers) {
+                .success(function (response, status) {
                     $rootScope.loader = false;
                     if (status === 207) {
                         toastr.warning($translate.instant('graphexplore.update.diagram'), $translate.instant('graphexplore.repository.data.changed'));
@@ -183,7 +168,7 @@ function classHierarchyDirective($rootScope, $location, GraphDataRestService, $w
             var tip = d3tip()
                 .attr('class', 'd3-tip')
                 //.offset([-10, 0])
-                .customPosition(function (d) {
+                .customPosition(function () {
                     return {
                         top: 'inherit',
                         bottom: ($window.innerHeight - d3.event.clientY) + 'px',
@@ -201,7 +186,7 @@ function classHierarchyDirective($rootScope, $location, GraphDataRestService, $w
                 .enter().append("g");
 
             if (config.doFade) {
-                circleGroup.each(function (d) {
+                circleGroup.each(function () {
                     D3.Transition.fadeIn(d3.select(this), 550);
                 });
             }
@@ -265,8 +250,6 @@ function classHierarchyDirective($rootScope, $location, GraphDataRestService, $w
             }
 
             var clickCancel = D3.Click.delayDblClick();
-            var parentCircles = d3.selectAll(".parent, .topLevelParent, .child, .root")
-                .call(clickCancel);
 
             doFocus = function (obj) {
                 zoom(obj);
@@ -279,7 +262,7 @@ function classHierarchyDirective($rootScope, $location, GraphDataRestService, $w
                     showClassInfoPanel();
 
                     // FIXME: is it ok to bind this event handler every time and not just once?
-                    scope.$on('sidePanelClosed', function (event) {
+                    scope.$on('sidePanelClosed', function () {
                         d3.selectAll(".selected").classed("selected", obj.selected = false);
                     });
                 }
@@ -443,7 +426,7 @@ function classHierarchyDirective($rootScope, $location, GraphDataRestService, $w
             });
 
             if (config.doFade && !config.keepPrevState) {
-                text.each(function (d) {
+                text.each(function () {
                     D3.Transition.fadeIn(d3.select(this), 550);
                 });
             }
@@ -452,7 +435,7 @@ function classHierarchyDirective($rootScope, $location, GraphDataRestService, $w
                 function focusOnCurrentClass(focusHistoryId) {
                     if (focusHistoryId) {
                         circle.each(function (d) {
-                            if (focusHistoryId == d.id) {
+                            if (focusHistoryId === d.id) {
                                 doFocus(d);
                             }
                         });
@@ -614,7 +597,7 @@ function classHierarchyDirective($rootScope, $location, GraphDataRestService, $w
                     // the fancy version for faster browsers
                     var transition = d3.transition()
                         .duration(ZOOM_DURATION)
-                        .tween("zoom", function (d) {
+                        .tween("zoom", function () {
                             var i = d3.interpolateZoom(view, [focus.x, focus.y, adjustRadius(focus.r)]);
                             return function (t) {
                                 zoomTo(i(t));
@@ -821,7 +804,7 @@ function classHierarchyDirective($rootScope, $location, GraphDataRestService, $w
                 // hit enter again on the already selected class in order again react and zoom to it again
                 // if we are not at the moment
                 var currentSearchedClass;
-                onEnterClassSearchBroadcast = scope.$on('onEnterKeypressSearchAction', function (event) {
+                onEnterClassSearchBroadcast = scope.$on('onEnterKeypressSearchAction', function () {
                     if (currentSearchedClass) {
                         doFocus(currentSearchedClass);
                     }
diff --git a/test-cypress/integration/setup/namespaces.spec.js b/test-cypress/integration/setup/namespaces.spec.js
index 94c932193b..4b0e82a205 100644
--- a/test-cypress/integration/setup/namespaces.spec.js
+++ b/test-cypress/integration/setup/namespaces.spec.js
@@ -44,7 +44,7 @@ describe('Namespaces', () => {
         getAddNamespaceButton().should('be.visible').and('not.be.disabled');
 
         // Should render a table with some default namespaces
-        getNamespacesTable().should('be.visible');
+        getNamespacesTable().scrollIntoView().should('be.visible');
         getNamespaces().should('have.length', getDefaultNamespacesLength());
 
         // Should provide pagination options

From 61a88ddc21e43a70fbc678f0c6f1615b9b338fd8 Mon Sep 17 00:00:00 2001
From: Desislava Borisova <desislava.borisova@ontotext.com>
Date: Mon, 23 May 2022 16:38:21 +0300
Subject: [PATCH 14/23] GDB-6329 - correct tests due to CI build fail.

---
 src/js/angular/namespaces/controllers.js      |  8 ++++----
 .../explore/class.hierarchy.spec.js           |  1 +
 test-cypress/steps/class-views-steps.js       | 19 ++++++++++++++-----
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/js/angular/namespaces/controllers.js b/src/js/angular/namespaces/controllers.js
index ae158acd01..2916702989 100644
--- a/src/js/angular/namespaces/controllers.js
+++ b/src/js/angular/namespaces/controllers.js
@@ -41,6 +41,10 @@ namespaces.controller('NamespacesCtrl', ['$scope', '$http', '$repositories', 'to
         $scope.pageSize = $scope.pageSizeOptions[0];
         $scope.displayedNamespaces = [];
 
+        $scope.isLicenseValid = function() {
+            return $licenseService.isLicenseValid();
+        }
+
         $scope.getNamespaces = function () {
             if (!$repositories.getActiveRepository()) {
                 return;
@@ -86,10 +90,6 @@ namespaces.controller('NamespacesCtrl', ['$scope', '$http', '$repositories', 'to
                 });
         };
 
-        $scope.isLicenseValid = function() {
-            return $licenseService.isLicenseValid();
-        }
-
         $scope.changePagination = function () {
             if (angular.isDefined($scope.namespaces)) {
                 $scope.displayedNamespaces = $scope.namespaces.slice($scope.pageSize * ($scope.page - 1), $scope.pageSize * $scope.page);
diff --git a/test-cypress/integration/explore/class.hierarchy.spec.js b/test-cypress/integration/explore/class.hierarchy.spec.js
index 974688b990..bf4108f02e 100644
--- a/test-cypress/integration/explore/class.hierarchy.spec.js
+++ b/test-cypress/integration/explore/class.hierarchy.spec.js
@@ -183,6 +183,7 @@ describe('Class hierarchy screen validation', () => {
         ClassViewsSteps.confirmReloadWarningAppear(CLASS_HIERARCHY);
         ClassViewsSteps.confirmReload();
         cy.visit('/hierarchy#1');
+        cy.window();
         verifyCounterValue(INITIAL_CLASS_COUNT + CLASS_COUNT_OF_NEWS_GRAPH);
         ClassViewsSteps.clickGraphBtn();
         ClassViewsSteps.selectGraphFromDropDown(NEWS_GRAPH);
diff --git a/test-cypress/steps/class-views-steps.js b/test-cypress/steps/class-views-steps.js
index a6313fa1ed..6e9f978a5a 100644
--- a/test-cypress/steps/class-views-steps.js
+++ b/test-cypress/steps/class-views-steps.js
@@ -7,15 +7,21 @@ const ALL_GRAPHS = 'All graphs';
 const NEWS_GRAPH = 'http://example.org/news';
 
 Object.defineProperty(global, 'GRAPH_FILE', {
-    get: () => {return GRAPH_FILE;}
+    get: () => {
+        return GRAPH_FILE;
+    }
 });
 
 Object.defineProperty(global, 'ALL_GRAPHS', {
-    get: () => {return ALL_GRAPHS;}
+    get: () => {
+        return ALL_GRAPHS;
+    }
 });
 
 Object.defineProperty(global, 'NEWS_GRAPH', {
-    get: () => {return NEWS_GRAPH;}
+    get: () => {
+        return NEWS_GRAPH;
+    }
 });
 
 class ClassViewsSteps {
@@ -52,8 +58,11 @@ class ClassViewsSteps {
     }
 
     static confirmReload() {
-        cy.get('.modal-footer .confirm-btn').click();
-        cy.get('.modal').should('not.exist');
+        cy.get('.modal-footer .confirm-btn')
+            .click()
+            .then(() => {
+                cy.get('.modal').should('not.exist');
+            });
     }
 
     static reloadDiagram() {

From 219de91679d5760fa6c398ec4c42594b296dcd7a Mon Sep 17 00:00:00 2001
From: Desislava Borisova <desislava.borisova@ontotext.com>
Date: Mon, 23 May 2022 16:46:14 +0300
Subject: [PATCH 15/23] GDB-6329 - correct tests due to CI build fail.

---
 test-cypress/integration/explore/class.hierarchy.spec.js | 2 ++
 test-cypress/steps/class-views-steps.js                  | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/test-cypress/integration/explore/class.hierarchy.spec.js b/test-cypress/integration/explore/class.hierarchy.spec.js
index bf4108f02e..21b747f863 100644
--- a/test-cypress/integration/explore/class.hierarchy.spec.js
+++ b/test-cypress/integration/explore/class.hierarchy.spec.js
@@ -182,6 +182,8 @@ describe('Class hierarchy screen validation', () => {
 
         ClassViewsSteps.confirmReloadWarningAppear(CLASS_HIERARCHY);
         ClassViewsSteps.confirmReload();
+        // No active loader
+        cy.get('.ot-loader-new-content').should('not.exist');
         cy.visit('/hierarchy#1');
         cy.window();
         verifyCounterValue(INITIAL_CLASS_COUNT + CLASS_COUNT_OF_NEWS_GRAPH);
diff --git a/test-cypress/steps/class-views-steps.js b/test-cypress/steps/class-views-steps.js
index 6e9f978a5a..e725502cdd 100644
--- a/test-cypress/steps/class-views-steps.js
+++ b/test-cypress/steps/class-views-steps.js
@@ -41,7 +41,9 @@ class ClassViewsSteps {
     }
 
     static clickGraphBtn() {
-        cy.get('#graphsBtnGroup').click();
+        cy.waitUntil(() =>
+            cy.get('#graphsBtnGroup')
+                .then(graphsBtn => graphsBtn && Cypress.dom.isAttached(graphsBtn) && graphsBtn.trigger('click')));
     }
 
 

From d10fdd003bb3215186dccdaab6de7281c2b5ce96 Mon Sep 17 00:00:00 2001
From: "sava.savov" <sava.savov@ontotext.com>
Date: Mon, 23 May 2022 17:33:24 +0300
Subject: [PATCH 16/23] GDB-6329 Removed unnecessary cy.visit in "Test
 class-hierarchy for given graph"

---
 test-cypress/integration/explore/class.hierarchy.spec.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test-cypress/integration/explore/class.hierarchy.spec.js b/test-cypress/integration/explore/class.hierarchy.spec.js
index 21b747f863..e47c883a53 100644
--- a/test-cypress/integration/explore/class.hierarchy.spec.js
+++ b/test-cypress/integration/explore/class.hierarchy.spec.js
@@ -184,8 +184,6 @@ describe('Class hierarchy screen validation', () => {
         ClassViewsSteps.confirmReload();
         // No active loader
         cy.get('.ot-loader-new-content').should('not.exist');
-        cy.visit('/hierarchy#1');
-        cy.window();
         verifyCounterValue(INITIAL_CLASS_COUNT + CLASS_COUNT_OF_NEWS_GRAPH);
         ClassViewsSteps.clickGraphBtn();
         ClassViewsSteps.selectGraphFromDropDown(NEWS_GRAPH);

From dc93da6334c6f458499969ae52c90b69da2d55b2 Mon Sep 17 00:00:00 2001
From: "sava.savov" <sava.savov@ontotext.com>
Date: Mon, 23 May 2022 20:06:27 +0300
Subject: [PATCH 17/23] GDB-6329 Added retry of getting delete btn in
 namespaces.spec

---
 test-cypress/integration/setup/namespaces.spec.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/test-cypress/integration/setup/namespaces.spec.js b/test-cypress/integration/setup/namespaces.spec.js
index 4b0e82a205..e4ba6d784a 100644
--- a/test-cypress/integration/setup/namespaces.spec.js
+++ b/test-cypress/integration/setup/namespaces.spec.js
@@ -208,7 +208,7 @@ describe('Namespaces', () => {
 
         selectNamespace('rdf');
         selectNamespace('rdfs');
-        getDeleteNamespacesButton().click();
+        clickDeleteNamespacesButton();
         confirmModal();
 
         updatedCount = updatedCount - 2;
@@ -218,7 +218,7 @@ describe('Namespaces', () => {
             .should('contain', `Showing 1 - ${updatedCount} of ${updatedCount} results`);
 
         getSelectAllNamespacesCheckbox().click();
-        getDeleteNamespacesButton().click();
+        clickDeleteNamespacesButton();
         confirmModal();
 
         getNamespacesTable().should('not.be.visible');
@@ -316,8 +316,10 @@ describe('Namespaces', () => {
         return getNamespacesTable().find('.select-all-namespaces');
     }
 
-    function getDeleteNamespacesButton() {
-        return getNamespacesTable().find('.delete-namespaces-btn');
+    function clickDeleteNamespacesButton() {
+        cy.waitUntil(() =>
+            cy.get('.delete-namespaces-btn')
+                .then(deleteBtn => deleteBtn && Cypress.dom.isAttached(deleteBtn) && deleteBtn.trigger('click')));
     }
 
     function getNamespaces() {

From fdafc31278f39b09694595a48c147290a6079a15 Mon Sep 17 00:00:00 2001
From: "sava.savov" <sava.savov@ontotext.com>
Date: Mon, 23 May 2022 20:51:51 +0300
Subject: [PATCH 18/23] GDB-6329 Added retry of blocker when confirm btn is
 clicked

---
 .../explore/class.hierarchy.spec.js           | 18 ++++----
 .../integration/setup/namespaces.spec.js      | 46 +++++++++++--------
 test-cypress/steps/class-views-steps.js       |  4 +-
 3 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/test-cypress/integration/explore/class.hierarchy.spec.js b/test-cypress/integration/explore/class.hierarchy.spec.js
index e47c883a53..0eee2c6582 100644
--- a/test-cypress/integration/explore/class.hierarchy.spec.js
+++ b/test-cypress/integration/explore/class.hierarchy.spec.js
@@ -181,14 +181,16 @@ describe('Class hierarchy screen validation', () => {
         ClassViewsSteps.reloadDiagram();
 
         ClassViewsSteps.confirmReloadWarningAppear(CLASS_HIERARCHY);
-        ClassViewsSteps.confirmReload();
-        // No active loader
-        cy.get('.ot-loader-new-content').should('not.exist');
-        verifyCounterValue(INITIAL_CLASS_COUNT + CLASS_COUNT_OF_NEWS_GRAPH);
-        ClassViewsSteps.clickGraphBtn();
-        ClassViewsSteps.selectGraphFromDropDown(NEWS_GRAPH);
-        ClassViewsSteps.verifyGraphIsDisplayed(NEWS_GRAPH);
-        verifyCounterValue(CLASS_COUNT_OF_NEWS_GRAPH);
+        ClassViewsSteps.confirmReload()
+            .then(() => {
+                // No active loader
+                cy.get('.ot-loader-new-content').should('not.exist');
+                verifyCounterValue(INITIAL_CLASS_COUNT + CLASS_COUNT_OF_NEWS_GRAPH);
+                ClassViewsSteps.clickGraphBtn();
+                ClassViewsSteps.selectGraphFromDropDown(NEWS_GRAPH);
+                ClassViewsSteps.verifyGraphIsDisplayed(NEWS_GRAPH);
+                verifyCounterValue(CLASS_COUNT_OF_NEWS_GRAPH);
+            });
     });
 
     function getDomainRangeGraphButton() {
diff --git a/test-cypress/integration/setup/namespaces.spec.js b/test-cypress/integration/setup/namespaces.spec.js
index e4ba6d784a..ae44fc58fd 100644
--- a/test-cypress/integration/setup/namespaces.spec.js
+++ b/test-cypress/integration/setup/namespaces.spec.js
@@ -52,12 +52,14 @@ describe('Namespaces', () => {
             // Should show all namespaces by default (they are only 6 so they can be visualized all at once)
             cy.get('.dropdown-toggle')
                 .should('contain', 'All')
-                .click();
-            cy.get('.page-size-option')
-                .should('have.length', 1)
-                .and('contain', 'All');
-            // Close the menu to avoid overlapping other elements
-            cy.get('.dropdown-toggle').click();
+                .click()
+                .then(() => {
+                    cy.get('.page-size-option')
+                        .should('have.length', 1)
+                        .and('contain', 'All');
+                    // Close the menu to avoid overlapping other elements
+                    cy.get('.dropdown-toggle').click();
+                });
         });
 
         // Should show summary of results
@@ -121,20 +123,24 @@ describe('Namespaces', () => {
     it('should filter existing namespaces', () => {
         getNamespacesFilterField()
             .should('have.value', '')
-            .type('owl')
-            .should('have.value', 'owl');
-        getNamespaces()
-            .should('have.length', 1)
-            .and('contain', DEFAULT_NAMESPACES['owl']);
-        getNamespacesHeaderPaginationInfo()
-            .should('be.visible')
-            .and('contain', 'Showing 1 - 1 of 1 results');
-
-        getNamespacesFilterField()
-            .clear()
-            .type('missing_prefix');
-        getNamespacesTable().should('not.be.visible');
-        getNoNamespacesMatchAlert().should('be.visible');
+            .then((el) => {
+                cy.wrap(el).type('owl');
+            }).then(() => {
+                getNamespacesFilterField()
+                    .should('have.value', 'owl');
+                getNamespaces()
+                    .should('have.length', 1)
+                    .and('contain', DEFAULT_NAMESPACES['owl']);
+                getNamespacesHeaderPaginationInfo()
+                    .should('be.visible')
+                    .and('contain', 'Showing 1 - 1 of 1 results');
+
+                getNamespacesFilterField()
+                    .clear()
+                    .type('missing_prefix');
+                getNamespacesTable().should('not.be.visible');
+                getNoNamespacesMatchAlert().should('be.visible');
+        });
     });
 
     it('should allow to add new namespace', () => {
diff --git a/test-cypress/steps/class-views-steps.js b/test-cypress/steps/class-views-steps.js
index e725502cdd..6b6095c92e 100644
--- a/test-cypress/steps/class-views-steps.js
+++ b/test-cypress/steps/class-views-steps.js
@@ -60,10 +60,10 @@ class ClassViewsSteps {
     }
 
     static confirmReload() {
-        cy.get('.modal-footer .confirm-btn')
+        return cy.get('.modal-footer .confirm-btn')
             .click()
             .then(() => {
-                cy.get('.modal').should('not.exist');
+                return cy.get('.modal').should('not.exist');
             });
     }
 

From 5c007dc3e578a2c0f30656b642947b383eae743b Mon Sep 17 00:00:00 2001
From: "sava.savov" <sava.savov@ontotext.com>
Date: Mon, 23 May 2022 21:40:31 +0300
Subject: [PATCH 19/23] GDB-6329 Fixed cypress test in class.hierarchy.spec

---
 .../rdf-class-hierarchy.controller.js         |  7 ++---
 .../explore/class.hierarchy.spec.js           | 26 ++++++++++---------
 test-cypress/steps/class-views-steps.js       |  9 ++++---
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/js/angular/graphexplore/controllers/rdf-class-hierarchy.controller.js b/src/js/angular/graphexplore/controllers/rdf-class-hierarchy.controller.js
index 8dcec64422..d28a8bf9bf 100644
--- a/src/js/angular/graphexplore/controllers/rdf-class-hierarchy.controller.js
+++ b/src/js/angular/graphexplore/controllers/rdf-class-hierarchy.controller.js
@@ -58,11 +58,8 @@ function RdfClassHierarchyCtlr($scope, $rootScope, $location, $repositories, $li
     };
 
     const initView = function () {
-        if (!$scope.getActiveRepository()) {
-            return;
-        }
-
-        if (!$licenseService.isLicenseValid()) {
+        if (!$scope.getActiveRepository() ||
+                !$licenseService.isLicenseValid()) {
             return;
         }
         return RDF4JRepositoriesRestService.resolveGraphs()
diff --git a/test-cypress/integration/explore/class.hierarchy.spec.js b/test-cypress/integration/explore/class.hierarchy.spec.js
index 0eee2c6582..cb5bb4f3a8 100644
--- a/test-cypress/integration/explore/class.hierarchy.spec.js
+++ b/test-cypress/integration/explore/class.hierarchy.spec.js
@@ -16,7 +16,10 @@ describe('Class hierarchy screen validation', () => {
         cy.presetRepository(repositoryId);
 
         cy.importServerFile(repositoryId, FILE_TO_IMPORT);
+        waitUntilPageIsLoaded();
+    });
 
+    function waitUntilPageIsLoaded() {
         cy.visit('/hierarchy');
         cy.window();
         // Wait for the chart and diagram to be visible, also check if a class is displayed.
@@ -25,7 +28,7 @@ describe('Class hierarchy screen validation', () => {
             findClassByName('food:Grape');
             cy.get('@classInHierarchy').scrollIntoView().should('be.visible');
         });
-    });
+    }
 
     afterEach(() => {
         cy.deleteRepository(repositoryId);
@@ -172,7 +175,7 @@ describe('Class hierarchy screen validation', () => {
     it('Test class-hierarchy for given graph', () => {
         cy.importServerFile(repositoryId, GRAPH_FILE, {"context": NEWS_GRAPH});
         // Should re-enter page to display Graph dropdown
-        cy.visit('/hierarchy');
+        waitUntilPageIsLoaded();
         ClassViewsSteps.verifyDataChangedWarning();
         verifyCounterValue(INITIAL_CLASS_COUNT);
         ClassViewsSteps.verifyGraphIsDisplayed(ALL_GRAPHS);
@@ -181,16 +184,15 @@ describe('Class hierarchy screen validation', () => {
         ClassViewsSteps.reloadDiagram();
 
         ClassViewsSteps.confirmReloadWarningAppear(CLASS_HIERARCHY);
-        ClassViewsSteps.confirmReload()
-            .then(() => {
-                // No active loader
-                cy.get('.ot-loader-new-content').should('not.exist');
-                verifyCounterValue(INITIAL_CLASS_COUNT + CLASS_COUNT_OF_NEWS_GRAPH);
-                ClassViewsSteps.clickGraphBtn();
-                ClassViewsSteps.selectGraphFromDropDown(NEWS_GRAPH);
-                ClassViewsSteps.verifyGraphIsDisplayed(NEWS_GRAPH);
-                verifyCounterValue(CLASS_COUNT_OF_NEWS_GRAPH);
-            });
+        ClassViewsSteps.confirmReload();
+        cy.visit('/hierarchy#1');
+        waitUntilPageIsLoaded();
+        ClassViewsSteps.verifyGraphIsDisplayed(ALL_GRAPHS);
+        verifyCounterValue(INITIAL_CLASS_COUNT + CLASS_COUNT_OF_NEWS_GRAPH);
+        ClassViewsSteps.clickGraphBtn();
+        ClassViewsSteps.selectGraphFromDropDown(NEWS_GRAPH);
+        ClassViewsSteps.verifyGraphIsDisplayed(NEWS_GRAPH);
+        verifyCounterValue(CLASS_COUNT_OF_NEWS_GRAPH);
     });
 
     function getDomainRangeGraphButton() {
diff --git a/test-cypress/steps/class-views-steps.js b/test-cypress/steps/class-views-steps.js
index 6b6095c92e..c017970d91 100644
--- a/test-cypress/steps/class-views-steps.js
+++ b/test-cypress/steps/class-views-steps.js
@@ -36,8 +36,9 @@ class ClassViewsSteps {
     }
 
     static verifyGraphIsDisplayed(graph) {
-        cy.get('#selectGraphDropdown').should('be.visible')
-            .and('contain', graph);
+        cy.waitUntil(() =>
+            cy.get('#selectGraphDropdown')
+                .then(dropDown => dropDown && Cypress.dom.isAttached(dropDown) && dropDown.text().indexOf(graph) !== -1));
     }
 
     static clickGraphBtn() {
@@ -60,10 +61,10 @@ class ClassViewsSteps {
     }
 
     static confirmReload() {
-        return cy.get('.modal-footer .confirm-btn')
+        cy.get('.modal-footer .confirm-btn')
             .click()
             .then(() => {
-                return cy.get('.modal').should('not.exist');
+                cy.get('.modal').should('not.exist');
             });
     }
 

From 09a52389ef2a77117064beb257b39eb6ef8f1521 Mon Sep 17 00:00:00 2001
From: "sava.savov" <sava.savov@ontotext.com>
Date: Mon, 23 May 2022 22:00:04 +0300
Subject: [PATCH 20/23] GDB-6329 Removed repository creation before each test

---
 .../explore/class.hierarchy.spec.js           | 23 +++++++++++--------
 test-cypress/steps/class-views-steps.js       |  2 +-
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/test-cypress/integration/explore/class.hierarchy.spec.js b/test-cypress/integration/explore/class.hierarchy.spec.js
index cb5bb4f3a8..7fefa6d163 100644
--- a/test-cypress/integration/explore/class.hierarchy.spec.js
+++ b/test-cypress/integration/explore/class.hierarchy.spec.js
@@ -10,16 +10,18 @@ const CLASS_HIERARCHY = 'class hierarchy';
 describe('Class hierarchy screen validation', () => {
     let repositoryId;
 
-    beforeEach(() => {
+    before(() => {
         repositoryId = 'repo' + Date.now();
         cy.createRepository({id: repositoryId});
-        cy.presetRepository(repositoryId);
-
         cy.importServerFile(repositoryId, FILE_TO_IMPORT);
-        waitUntilPageIsLoaded();
     });
 
+    beforeEach(() => {
+        waitUntilPageIsLoaded();
+    })
+
     function waitUntilPageIsLoaded() {
+        cy.presetRepository(repositoryId);
         cy.visit('/hierarchy');
         cy.window();
         // Wait for the chart and diagram to be visible, also check if a class is displayed.
@@ -30,7 +32,7 @@ describe('Class hierarchy screen validation', () => {
         });
     }
 
-    afterEach(() => {
+    after(() => {
         cy.deleteRepository(repositoryId);
     });
 
@@ -186,13 +188,14 @@ describe('Class hierarchy screen validation', () => {
         ClassViewsSteps.confirmReloadWarningAppear(CLASS_HIERARCHY);
         ClassViewsSteps.confirmReload();
         cy.visit('/hierarchy#1');
-        waitUntilPageIsLoaded();
         ClassViewsSteps.verifyGraphIsDisplayed(ALL_GRAPHS);
         verifyCounterValue(INITIAL_CLASS_COUNT + CLASS_COUNT_OF_NEWS_GRAPH);
-        ClassViewsSteps.clickGraphBtn();
-        ClassViewsSteps.selectGraphFromDropDown(NEWS_GRAPH);
-        ClassViewsSteps.verifyGraphIsDisplayed(NEWS_GRAPH);
-        verifyCounterValue(CLASS_COUNT_OF_NEWS_GRAPH);
+        ClassViewsSteps.clickGraphBtn()
+            .then(() => {
+                ClassViewsSteps.selectGraphFromDropDown(NEWS_GRAPH);
+                ClassViewsSteps.verifyGraphIsDisplayed(NEWS_GRAPH);
+                verifyCounterValue(CLASS_COUNT_OF_NEWS_GRAPH);
+            });
     });
 
     function getDomainRangeGraphButton() {
diff --git a/test-cypress/steps/class-views-steps.js b/test-cypress/steps/class-views-steps.js
index c017970d91..a93280baab 100644
--- a/test-cypress/steps/class-views-steps.js
+++ b/test-cypress/steps/class-views-steps.js
@@ -42,7 +42,7 @@ class ClassViewsSteps {
     }
 
     static clickGraphBtn() {
-        cy.waitUntil(() =>
+        return cy.waitUntil(() =>
             cy.get('#graphsBtnGroup')
                 .then(graphsBtn => graphsBtn && Cypress.dom.isAttached(graphsBtn) && graphsBtn.trigger('click')));
     }

From c484fdec4a4631cbb6c3f039500462ca3b1b7e51 Mon Sep 17 00:00:00 2001
From: "sava.savov" <sava.savov@ontotext.com>
Date: Mon, 23 May 2022 22:22:37 +0300
Subject: [PATCH 21/23] GDB-6329 Removed repository creation before each test

---
 test-cypress/integration/explore/class.hierarchy.spec.js     | 2 +-
 test-cypress/integration/explore/class.relationships.spec.js | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/test-cypress/integration/explore/class.hierarchy.spec.js b/test-cypress/integration/explore/class.hierarchy.spec.js
index 7fefa6d163..aca3f55ef1 100644
--- a/test-cypress/integration/explore/class.hierarchy.spec.js
+++ b/test-cypress/integration/explore/class.hierarchy.spec.js
@@ -187,7 +187,7 @@ describe('Class hierarchy screen validation', () => {
 
         ClassViewsSteps.confirmReloadWarningAppear(CLASS_HIERARCHY);
         ClassViewsSteps.confirmReload();
-        cy.visit('/hierarchy#1');
+        cy.url().should('contain', `${Cypress.config('baseUrl')}/hierarchy#1`);
         ClassViewsSteps.verifyGraphIsDisplayed(ALL_GRAPHS);
         verifyCounterValue(INITIAL_CLASS_COUNT + CLASS_COUNT_OF_NEWS_GRAPH);
         ClassViewsSteps.clickGraphBtn()
diff --git a/test-cypress/integration/explore/class.relationships.spec.js b/test-cypress/integration/explore/class.relationships.spec.js
index 6ccdd6e9b6..755fdb2ad1 100644
--- a/test-cypress/integration/explore/class.relationships.spec.js
+++ b/test-cypress/integration/explore/class.relationships.spec.js
@@ -6,7 +6,7 @@ describe('Class relations screen validation', () => {
 
     let repositoryId;
 
-    beforeEach(() => {
+    before(() => {
         repositoryId = 'class-relations-repo' + Date.now();
         cy.createRepository({id: repositoryId});
         cy.presetRepository(repositoryId);
@@ -20,7 +20,7 @@ describe('Class relations screen validation', () => {
         cy.get('#wb-dependencies-classInClasses').should('be.visible');
     });
 
-    afterEach(() => {
+    after(() => {
         cy.deleteRepository(repositoryId);
     });
 
@@ -65,6 +65,7 @@ describe('Class relations screen validation', () => {
 
     it('Test class relationships for given graph', () => {
         cy.importServerFile(repositoryId, GRAPH_FILE, {"context": NEWS_GRAPH});
+        cy.presetRepository(repositoryId);
         // Should re-enter page to display Graph dropdown
         cy.visit('/relationships');
         ClassViewsSteps.verifyDataChangedWarning();

From 7fb0f7f4a10165aa1357a163338ff6e66efa1c08 Mon Sep 17 00:00:00 2001
From: "sava.savov" <sava.savov@ontotext.com>
Date: Mon, 23 May 2022 22:53:28 +0300
Subject: [PATCH 22/23] GDB-6329 Added on direction listener

---
 .../controllers/rdf-class-hierarchy.controller.js           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/js/angular/graphexplore/controllers/rdf-class-hierarchy.controller.js b/src/js/angular/graphexplore/controllers/rdf-class-hierarchy.controller.js
index d28a8bf9bf..d4dd2ad933 100644
--- a/src/js/angular/graphexplore/controllers/rdf-class-hierarchy.controller.js
+++ b/src/js/angular/graphexplore/controllers/rdf-class-hierarchy.controller.js
@@ -492,9 +492,9 @@ function RdfClassHierarchyCtlr($scope, $rootScope, $location, $repositories, $li
         return $scope.getSelGraphValue() === 'all.graphs.label'
     }
 
-    window.addEventListener('load', initView);
+    initView();
 
-    $scope.$on('$destroy', function (event) {
-        window.removeEventListener('load', initView);
+    $scope.$watch('direction', function () {
+        initView();
     });
 }

From fc9e8233f4aad148f764a43334813be6244123fb Mon Sep 17 00:00:00 2001
From: "sava.savov" <sava.savov@ontotext.com>
Date: Tue, 24 May 2022 00:01:16 +0300
Subject: [PATCH 23/23] GDB-6329 Added on direction listener

---
 src/js/angular/core/services/repositories.service.js      | 7 +++++++
 .../controllers/rdf-class-hierarchy.controller.js         | 8 +++++---
 test-cypress/steps/class-views-steps.js                   | 3 ++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/js/angular/core/services/repositories.service.js b/src/js/angular/core/services/repositories.service.js
index 011bdd4076..c948e117a5 100644
--- a/src/js/angular/core/services/repositories.service.js
+++ b/src/js/angular/core/services/repositories.service.js
@@ -419,4 +419,11 @@ repositories.service('$repositories', ['$http', 'toastr', '$rootScope', '$timeou
                 that.init();
             }
         });
+
+        window.addEventListener('load', function () {
+            that.repository = {
+                id: localStorage.getItem(that.repositoryStorageName) || '',
+                location: localStorage.getItem(that.repositoryStorageLocationName) || ''
+            };
+        });
     }]);
diff --git a/src/js/angular/graphexplore/controllers/rdf-class-hierarchy.controller.js b/src/js/angular/graphexplore/controllers/rdf-class-hierarchy.controller.js
index d4dd2ad933..36c5182cbb 100644
--- a/src/js/angular/graphexplore/controllers/rdf-class-hierarchy.controller.js
+++ b/src/js/angular/graphexplore/controllers/rdf-class-hierarchy.controller.js
@@ -72,6 +72,8 @@ function RdfClassHierarchyCtlr($scope, $rootScope, $location, $repositories, $li
             });
     };
 
+    initView();
+
     const setSelectedGraphFromCache = function () {
         const selGraphFromCache = LocalStorageAdapter.get(`classHierarchy-selectedGraph-${$repositories.getActiveRepository()}`);
         if (selGraphFromCache !== null && $scope.graphsInRepo.some(graph => graph.contextID.uri === selGraphFromCache.contextID.uri)) {
@@ -492,9 +494,9 @@ function RdfClassHierarchyCtlr($scope, $rootScope, $location, $repositories, $li
         return $scope.getSelGraphValue() === 'all.graphs.label'
     }
 
-    initView();
+    window.addEventListener('load', initView);
 
-    $scope.$watch('direction', function () {
-        initView();
+    $scope.$on('$destroy', function (event) {
+        window.removeEventListener('load', initView);
     });
 }
diff --git a/test-cypress/steps/class-views-steps.js b/test-cypress/steps/class-views-steps.js
index a93280baab..5efb5cca10 100644
--- a/test-cypress/steps/class-views-steps.js
+++ b/test-cypress/steps/class-views-steps.js
@@ -27,7 +27,8 @@ Object.defineProperty(global, 'NEWS_GRAPH', {
 class ClassViewsSteps {
 
     static selectGraphFromDropDown(graph) {
-        cy.get('#selectGraphDropdown .dropdown-item')
+        cy.get('#selectGraphDropdown')
+            .find('.dropdown-item')
             .each(($el, index, $list) => {
                 if ($el.text().trim() === graph) {
                     cy.wrap($el).click();