From be678e084e64a613558c6d195a0dd2e9b23eb198 Mon Sep 17 00:00:00 2001
From: Shiran Pasternak <shiran.pasternak@microsoft.com>
Date: Wed, 31 Aug 2022 17:26:58 -0400
Subject: [PATCH 01/72] Bumps Batch Explorer to v2.16.0

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

diff --git a/package.json b/package.json
index 3ff40a5f49..84274ec351 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "name": "Microsoft Corporation",
     "email": "batchexplorer@microsoft.com"
   },
-  "version": "2.15.0",
+  "version": "2.16.0",
   "main": "build/client/main.prod.js",
   "scripts": {
     "ts": "ts-node --project tsconfig.node.json --files",

From a50bfa55c8790fbfa9cb91fc5f76d74b6f1d9724 Mon Sep 17 00:00:00 2001
From: Shiran Pasternak <shiran.pasternak@microsoft.com>
Date: Thu, 1 Sep 2022 17:13:21 -0400
Subject: [PATCH 02/72] FIXES AB#445: Adds "application" role to monitor charts

---
 .../account-monitoring-section/account-monitoring-section.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app/components/account/details/account-monitoring-section/account-monitoring-section.html b/src/app/components/account/details/account-monitoring-section/account-monitoring-section.html
index 885acf81e9..7286385b4b 100644
--- a/src/app/components/account/details/account-monitoring-section/account-monitoring-section.html
+++ b/src/app/components/account/details/account-monitoring-section/account-monitoring-section.html
@@ -18,7 +18,8 @@ <h1 class="section-title">{{'account-details.monitoring' | i18n }}</h1>
 <div class="monitor-charts" *ngIf="isArmAccount">
     <a class="monitor-chart"
         [title]="'account-monitoring.expandLabel' | i18n"
-        [routerLink]="['/accounts', account.id, 'monitor']" *ngFor="let metricType of chartTypes;trackBy: trackMetric">
+        [routerLink]="['/accounts', account.id, 'monitor']" *ngFor="let metricType of chartTypes;trackBy: trackMetric"
+        role="application">
         <bl-monitor-chart [metrics]="metricType" [timeRange]="currentRange" [chartType]="chartType"></bl-monitor-chart>
     </a>
     <div class="monitor-chart current-node-counts">

From cc27b879186fcd8f07f3c495004ae839978b4d59 Mon Sep 17 00:00:00 2001
From: Shiran Pasternak <shiran.pasternak@microsoft.com>
Date: Fri, 2 Sep 2022 10:35:40 -0400
Subject: [PATCH 03/72] Fixes AB#466: OS offer select version tooltips

---
 .../action/add/os-picker/os-offer-tile/os-offer-tile.html   | 6 +++++-
 .../add/os-picker/os-offer-tile/os-offer-tile.i18n.yml      | 3 +++
 .../pool/action/add/os-picker/pool-os-picker.module.ts      | 2 ++
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 src/app/components/pool/action/add/os-picker/os-offer-tile/os-offer-tile.i18n.yml

diff --git a/src/app/components/pool/action/add/os-picker/os-offer-tile/os-offer-tile.html b/src/app/components/pool/action/add/os-picker/os-offer-tile/os-offer-tile.html
index 21736b72c3..997d143cdf 100644
--- a/src/app/components/pool/action/add/os-picker/os-offer-tile/os-offer-tile.html
+++ b/src/app/components/pool/action/add/os-picker/os-offer-tile/os-offer-tile.html
@@ -12,7 +12,11 @@
         </div>
     </div>
 </div>
-<button class="select-version" [matMenuTriggerFor]="menu" title="Select version">
+<button
+    class="select-version"
+    [matMenuTriggerFor]="menu"
+    matTooltip="{{'os-offer-tile.select-version-button.tooltip' | i18n}}"
+    title="{{'os-offer-tile.select-version-button.tooltip' | i18n}}">
     <i class="fa fa-cog"></i>
 </button>
 <mat-menu #menu="matMenu">
diff --git a/src/app/components/pool/action/add/os-picker/os-offer-tile/os-offer-tile.i18n.yml b/src/app/components/pool/action/add/os-picker/os-offer-tile/os-offer-tile.i18n.yml
new file mode 100644
index 0000000000..2470e95fa6
--- /dev/null
+++ b/src/app/components/pool/action/add/os-picker/os-offer-tile/os-offer-tile.i18n.yml
@@ -0,0 +1,3 @@
+os-offer-tile:
+  select-version-button:
+    tooltip: Select version
diff --git a/src/app/components/pool/action/add/os-picker/pool-os-picker.module.ts b/src/app/components/pool/action/add/os-picker/pool-os-picker.module.ts
index 9f68d30264..95e9566c77 100644
--- a/src/app/components/pool/action/add/os-picker/pool-os-picker.module.ts
+++ b/src/app/components/pool/action/add/os-picker/pool-os-picker.module.ts
@@ -3,6 +3,7 @@ import { NgModule } from "@angular/core";
 import { FormsModule, ReactiveFormsModule } from "@angular/forms";
 import { MatMenuModule } from "@angular/material/menu";
 import { MatTabsModule } from "@angular/material/tabs";
+import { MatTooltipModule } from "@angular/material/tooltip";
 import { BaseModule, FormModule, I18nUIModule, SelectModule } from "@batch-flask/ui";
 import { DataDiskPickerComponent, OsOfferTileComponent, PoolOsPickerComponent, SigImagePickerComponent } from ".";
 import { ContainerConfigurationPickerModule } from "../container-configuration-picker";
@@ -29,6 +30,7 @@ const privateComponents = [
         FormModule,
         BaseModule,
         MatMenuModule,
+        MatTooltipModule,
         MatTabsModule,
     ],
     declarations: [...publicComponents, ...privateComponents],

From e6def01e226492ab404701d0135903c4c69246a3 Mon Sep 17 00:00:00 2001
From: Shiran Pasternak <shiran.pasternak@microsoft.com>
Date: Fri, 2 Sep 2022 10:53:10 -0400
Subject: [PATCH 04/72] Fixes AB#469: Sidebar border for high-contrast mode

---
 .../ui/sidebar/sidebar-content/sidebar-content.scss       | 8 ++++++++
 src/app/styles/vendor/material-theme.scss                 | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/src/@batch-flask/ui/sidebar/sidebar-content/sidebar-content.scss b/src/@batch-flask/ui/sidebar/sidebar-content/sidebar-content.scss
index 35998d49df..7d54e88140 100644
--- a/src/@batch-flask/ui/sidebar/sidebar-content/sidebar-content.scss
+++ b/src/@batch-flask/ui/sidebar/sidebar-content/sidebar-content.scss
@@ -5,3 +5,11 @@ bl-sidebar-content {
         background-color: $card-background;
     }
 }
+
+@media (forced-colors: active) {
+    bl-sidebar-content {
+        .right-sidebar-content {
+            border-left: 1px solid currentColor;
+        }
+    }
+}
diff --git a/src/app/styles/vendor/material-theme.scss b/src/app/styles/vendor/material-theme.scss
index bb3f609470..2b93e9f92c 100644
--- a/src/app/styles/vendor/material-theme.scss
+++ b/src/app/styles/vendor/material-theme.scss
@@ -185,3 +185,7 @@ mat-button-toggle-group {
         border: 1px solid $outline-color;
     }
 }
+
+.cdk-high-contrast-active .mat-drawer.mat-drawer-end {
+    border-left: none;
+}

From 3d013ec85f2aca40b5eb3e3ebcfabe405860469f Mon Sep 17 00:00:00 2001
From: Shiran Pasternak <shiran.pasternak@microsoft.com>
Date: Fri, 2 Sep 2022 12:04:20 -0400
Subject: [PATCH 05/72] Fixes for high-contrast mode

Fixes AB#662, AB#941
---
 src/@batch-flask/ui/buttons/button.scss              | 6 ++++++
 src/@batch-flask/ui/buttons/clickable/clickable.scss | 6 ++++++
 src/app/styles/vendor/material-theme.scss            | 6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/src/@batch-flask/ui/buttons/button.scss b/src/@batch-flask/ui/buttons/button.scss
index 3526f7220c..b290dba47c 100644
--- a/src/@batch-flask/ui/buttons/button.scss
+++ b/src/@batch-flask/ui/buttons/button.scss
@@ -160,3 +160,9 @@ bl-button {
         }
     }
 }
+
+@media (forced-colors: active) {
+    bl-button {
+        border: 1px solid currentColor;
+    }
+}
diff --git a/src/@batch-flask/ui/buttons/clickable/clickable.scss b/src/@batch-flask/ui/buttons/clickable/clickable.scss
index a282f17c57..5f08cb3019 100644
--- a/src/@batch-flask/ui/buttons/clickable/clickable.scss
+++ b/src/@batch-flask/ui/buttons/clickable/clickable.scss
@@ -1,3 +1,9 @@
 bl-clickable {
     cursor: pointer;
 }
+
+@media (forced-colors: active) {
+    bl-clickable {
+        border: 1px solid currentColor;
+    }
+}
diff --git a/src/app/styles/vendor/material-theme.scss b/src/app/styles/vendor/material-theme.scss
index 2b93e9f92c..11a23b9d2d 100644
--- a/src/app/styles/vendor/material-theme.scss
+++ b/src/app/styles/vendor/material-theme.scss
@@ -189,3 +189,9 @@ mat-button-toggle-group {
 .cdk-high-contrast-active .mat-drawer.mat-drawer-end {
     border-left: none;
 }
+
+@media (forced-colors: active) {
+    mat-dialog-container {
+        border: 1px solid currentColor;
+    }
+}

From 71a1e08048a3199d8069370da0c9b509bec34881 Mon Sep 17 00:00:00 2001
From: Shiran Pasternak <shiran.pasternak@microsoft.com>
Date: Fri, 2 Sep 2022 12:15:43 -0400
Subject: [PATCH 06/72] Fixes AB#724: Notification highlight in HCM

---
 src/@batch-flask/ui/notifications/toast/toast.scss | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/@batch-flask/ui/notifications/toast/toast.scss b/src/@batch-flask/ui/notifications/toast/toast.scss
index 1ba1066799..5d33b8bb14 100644
--- a/src/@batch-flask/ui/notifications/toast/toast.scss
+++ b/src/@batch-flask/ui/notifications/toast/toast.scss
@@ -83,3 +83,11 @@ bl-toast {
         }
     }
 }
+
+@media (forced-colors: active) {
+    bl-toast {
+        &.success, &.info, &.warn, &.error {
+            border: 1px solid Highlight;
+        }
+    }
+}

From 3fecbf5d428a9500d87b56b5c871cccf12341eaf Mon Sep 17 00:00:00 2001
From: Rena <cRui861@users.noreply.github.com>
Date: Wed, 14 Sep 2022 15:01:47 -0700
Subject: [PATCH 07/72] Add deprecation warning for Windows container images
 (#2573)

---
 .../pool/action/add/pool-create-basic-dialog.html          | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/app/components/pool/action/add/pool-create-basic-dialog.html b/src/app/components/pool/action/add/pool-create-basic-dialog.html
index 0c798e04fc..774a2403ed 100644
--- a/src/app/components/pool/action/add/pool-create-basic-dialog.html
+++ b/src/app/components/pool/action/add/pool-create-basic-dialog.html
@@ -29,6 +29,13 @@
         </bl-form-section>
 
         <bl-form-section title="Select an operating system configuration" subtitle="Choose the operating system to be installed on all the nodes in the pool">
+            <bl-banner class="cloud-services-deprecation-warning" type="warning">
+                <div message>
+                    The Windows container images below will be removed from marketplace starting on September 22, 2022. After this date, new pools using it may not be created from the Azure Batch Explorer.
+                    <a (click)="openLink('https://github.com/Azure/Batch/issues/136')" href="javascript:void(0)">Click here </a>
+                    for more information.
+                </div>
+            </bl-banner>
             <ng-container *ngIf="cloudServiceConfiguration">
                 <bl-banner class="cloud-services-deprecation-warning" type="warning">
                     <div message>

From adb31be898404f7e9589fd99efead9228cc10af0 Mon Sep 17 00:00:00 2001
From: hoppe <hoppewang@microsoft.com>
Date: Mon, 26 Sep 2022 15:26:32 +0800
Subject: [PATCH 08/72] fix: adjust luminosity contrast ratio in theme color

---
 src/app/components/misc/theme-colors/theme-colors.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/components/misc/theme-colors/theme-colors.component.ts b/src/app/components/misc/theme-colors/theme-colors.component.ts
index 52e1b00d74..3ec4c14e58 100644
--- a/src/app/components/misc/theme-colors/theme-colors.component.ts
+++ b/src/app/components/misc/theme-colors/theme-colors.component.ts
@@ -32,7 +32,7 @@ export class ThemeColorsComponent implements OnDestroy {
                 return {
                     key,
                     value: actualColor,
-                    text: tinycolor.mostReadable(actualColor, [color, contrast]).toHexString(),
+                    text: tinycolor.mostReadable(actualColor, [color, contrast, "#000", "#fff"]).toHexString(),
                 };
             });
             this.changeDetector.markForCheck();

From d9571ff0ce054a6fab4b4c6c70d7ce30fefbd65c Mon Sep 17 00:00:00 2001
From: hoppe <hoppewang@microsoft.com>
Date: Mon, 26 Sep 2022 15:30:02 +0800
Subject: [PATCH 09/72] fix: addpool os select-verison adjust title

---
 .../pool/action/add/os-picker/os-offer-tile/os-offer-tile.html  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/components/pool/action/add/os-picker/os-offer-tile/os-offer-tile.html b/src/app/components/pool/action/add/os-picker/os-offer-tile/os-offer-tile.html
index 997d143cdf..d081623a4d 100644
--- a/src/app/components/pool/action/add/os-picker/os-offer-tile/os-offer-tile.html
+++ b/src/app/components/pool/action/add/os-picker/os-offer-tile/os-offer-tile.html
@@ -16,7 +16,7 @@
     class="select-version"
     [matMenuTriggerFor]="menu"
     matTooltip="{{'os-offer-tile.select-version-button.tooltip' | i18n}}"
-    title="{{'os-offer-tile.select-version-button.tooltip' | i18n}}">
+    title="{{'os-offer-tile.select-version-button.tooltip' | i18n}} {{name}}">
     <i class="fa fa-cog"></i>
 </button>
 <mat-menu #menu="matMenu">

From 977287e7854ac73ea823183a610e674827929d1d Mon Sep 17 00:00:00 2001
From: hoppe <hoppewang@microsoft.com>
Date: Mon, 26 Sep 2022 15:31:14 +0800
Subject: [PATCH 10/72] fix: setting page disable title focusable

---
 src/app/components/settings/settings.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/components/settings/settings.html b/src/app/components/settings/settings.html
index 14ddc682d3..7ed749e7a7 100644
--- a/src/app/components/settings/settings.html
+++ b/src/app/components/settings/settings.html
@@ -1,5 +1,5 @@
 <div class="settings-header">
-    <h1 tabindex="0" autofocus>{{'settings.title' | i18n}}</h1>
+    <h1>{{'settings.title' | i18n}}</h1>
     <div class="saved" *ngIf="saved" attr.aria-live="assertive">
         {{'settings.saved' | i18n}}
     </div>

From 33c5989728147acbe8d5a118a63c9f3d2df77ef5 Mon Sep 17 00:00:00 2001
From: hoppe <hoppewang@microsoft.com>
Date: Mon, 26 Sep 2022 15:32:21 +0800
Subject: [PATCH 11/72] feat: ajdust debugger

---
 .vscode/launch.json | 2 +-
 package-lock.json   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 0b256a5732..6f5a8e84fb 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -43,7 +43,7 @@
       "request": "attach",
       "port": 9222,
       "sourceMaps": true,
-      "webRoot": "${workspaceRoot}/build",
+      "webRoot": "${workspaceRoot}",
       "timeout": 30000,
       "presentation": {
         "hidden": false,
diff --git a/package-lock.json b/package-lock.json
index bb20a42df9..aeb9f12788 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "batch-explorer",
-  "version": "2.15.0",
+  "version": "2.16.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "batch-explorer",
-      "version": "2.15.0",
+      "version": "2.16.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {

From 2b8d7c7c4270919f8f194d46418feea2d4e560d9 Mon Sep 17 00:00:00 2001
From: hoppe wang <wanghp000@gmail.com>
Date: Mon, 26 Sep 2022 16:48:27 +0800
Subject: [PATCH 12/72] fix: add aria-require to the add storage container
 prompt

---
 src/@batch-flask/ui/dialogs/prompt/prompt-dialog.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/@batch-flask/ui/dialogs/prompt/prompt-dialog.html b/src/@batch-flask/ui/dialogs/prompt/prompt-dialog.html
index b134884608..3a378e0467 100644
--- a/src/@batch-flask/ui/dialogs/prompt/prompt-dialog.html
+++ b/src/@batch-flask/ui/dialogs/prompt/prompt-dialog.html
@@ -14,7 +14,7 @@
         </div>
 
         <bl-form-field class="form-element">
-            <input blInput [formControl]="promptControl" [attr.aria-label]="title">
+            <input blInput [formControl]="promptControl" [attr.aria-label]="title" aria-required="true">
         </bl-form-field>
         <bl-error controlName="prompt" [code]="entry.code" *ngFor="let entry of validatorMessages;trackBy: trackByFn">{{entry.message}}</bl-error>
     </ng-container>

From b10a3946133e1a08e99cc709940a6656c19aff28 Mon Sep 17 00:00:00 2001
From: hoppe wang <wanghp000@gmail.com>
Date: Fri, 30 Sep 2022 11:41:08 +0800
Subject: [PATCH 13/72] fix: resolve comments

---
 .../pool/action/add/os-picker/os-offer-tile/os-offer-tile.html  | 2 +-
 src/app/components/settings/auth-settings/auth-settings.html    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/components/pool/action/add/os-picker/os-offer-tile/os-offer-tile.html b/src/app/components/pool/action/add/os-picker/os-offer-tile/os-offer-tile.html
index d081623a4d..0039298586 100644
--- a/src/app/components/pool/action/add/os-picker/os-offer-tile/os-offer-tile.html
+++ b/src/app/components/pool/action/add/os-picker/os-offer-tile/os-offer-tile.html
@@ -16,7 +16,7 @@
     class="select-version"
     [matMenuTriggerFor]="menu"
     matTooltip="{{'os-offer-tile.select-version-button.tooltip' | i18n}}"
-    title="{{'os-offer-tile.select-version-button.tooltip' | i18n}} {{name}}">
+    title="{{'os-offer-tile.select-version-button.tooltip' | i18n}} ({{prettyName}})">
     <i class="fa fa-cog"></i>
 </button>
 <mat-menu #menu="matMenu">
diff --git a/src/app/components/settings/auth-settings/auth-settings.html b/src/app/components/settings/auth-settings/auth-settings.html
index 94ee96fbf1..d7466f6071 100644
--- a/src/app/components/settings/auth-settings/auth-settings.html
+++ b/src/app/components/settings/auth-settings/auth-settings.html
@@ -1,5 +1,5 @@
 <div class="auth-settings-header">
-    <h1 tabindex="0" autofocus>{{'auth-settings.title' | i18n}}</h1>
+    <h1>{{'auth-settings.title' | i18n}}</h1>
     <div class="saved" *ngIf="saved" attr.aria-live="assertive">
         {{'auth-settings.saved' | i18n}}
     </div>

From ab5bf756d8910def47bffa9d9a3b719023288116 Mon Sep 17 00:00:00 2001
From: Sanjana Kapur <sanjanakapur@microsoft.com>
Date: Thu, 13 Oct 2022 12:34:45 -0700
Subject: [PATCH 14/72] Add September Accessibility Bug Fixes (#2578)

* Fix AB#686: Add suggestion for Configure Proxy box

* Fix AB#790: Make callout accessible via keyboard

* Fix AB#883: Make graph parts keyboard accessible

* Fix AB#999: Add keyboard focus for Job Status pane

* Fix AB#917: Add asterisk to ID in Create Pool form
---
 src/@batch-flask/ui/callout/callout.directive.ts     | 12 ++++++++++++
 src/@batch-flask/ui/callout/callout.html             |  2 +-
 .../components/account/details/account-details.html  |  2 +-
 .../account-monitoring-section.html                  |  6 +++---
 .../monitoring/monitor-chart/monitor-chart.html      | 10 +++++-----
 .../pool/action/add/pool-create-basic-dialog.html    |  2 +-
 .../pool/action/add/pool-create-basic-dialog.scss    |  5 +++++
 .../manual-proxy-configuration-window.html           |  6 +++---
 8 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/src/@batch-flask/ui/callout/callout.directive.ts b/src/@batch-flask/ui/callout/callout.directive.ts
index baa9111077..0cba29710b 100644
--- a/src/@batch-flask/ui/callout/callout.directive.ts
+++ b/src/@batch-flask/ui/callout/callout.directive.ts
@@ -3,6 +3,7 @@ import { TemplatePortal } from "@angular/cdk/portal";
 import { Directive, ElementRef,  HostListener, Input, ViewContainerRef } from "@angular/core";
 import { Subscription } from "rxjs";
 import { CalloutComponent } from "./callout.component";
+import { ENTER, SPACE } from "@batch-flask/core/keys";
 
 @Directive({
     selector: "[blCallout]",
@@ -25,6 +26,17 @@ export class CalloutDirective {
         }
     }
 
+    @HostListener("keydown", ["$event"])
+    public onkeydown(event: KeyboardEvent) {
+        if (event.key === SPACE || event.key === ENTER) {
+            if (this._overlayRef) {
+                this.close();
+            } else {
+                this.open();
+            }
+        }
+    }
+
     public open() {
         this._overlayRef = this.overlay.create(this._getOverlayConfig());
         this._backDropClickSub = this._overlayRef.backdropClick().subscribe(() => {
diff --git a/src/@batch-flask/ui/callout/callout.html b/src/@batch-flask/ui/callout/callout.html
index 0c084b3f5f..f23afbbec7 100644
--- a/src/@batch-flask/ui/callout/callout.html
+++ b/src/@batch-flask/ui/callout/callout.html
@@ -1,5 +1,5 @@
 <ng-template>
-    <div class="bl-callout">
+    <div class="bl-callout" tabindex="0">
         <ng-content></ng-content>
     </div>
 </ng-template>
diff --git a/src/app/components/account/details/account-details.html b/src/app/components/account/details/account-details.html
index 0b506d9d13..afcaf53945 100644
--- a/src/app/components/account/details/account-details.html
+++ b/src/app/components/account/details/account-details.html
@@ -9,7 +9,7 @@
         <bl-account-cost-card></bl-account-cost-card>
         <h1 class="section-title">{{'account-details.resources' | i18n }}</h1>
         <div class="account-cards">
-            <bl-card class="account-card">
+            <bl-card class="account-card" routerLink="/jobs" (click)="selectAccount(account.id)">
                 <div class="title">
                     <h2>Job status</h2>
                 </div>
diff --git a/src/app/components/account/details/account-monitoring-section/account-monitoring-section.html b/src/app/components/account/details/account-monitoring-section/account-monitoring-section.html
index 7286385b4b..5918a832ae 100644
--- a/src/app/components/account/details/account-monitoring-section/account-monitoring-section.html
+++ b/src/app/components/account/details/account-monitoring-section/account-monitoring-section.html
@@ -22,9 +22,9 @@ <h1 class="section-title">{{'account-details.monitoring' | i18n }}</h1>
         role="application">
         <bl-monitor-chart [metrics]="metricType" [timeRange]="currentRange" [chartType]="chartType"></bl-monitor-chart>
     </a>
-    <div class="monitor-chart current-node-counts">
-        <h2>{{'account-monitoring.currentNodeStates' | i18n }}</h2>
-        <bl-pool-state-graph></bl-pool-state-graph>
+    <div class="monitor-chart current-node-counts" tabindex="0">
+        <h2 tabindex="0">{{'account-monitoring.currentNodeStates' | i18n }}</h2>
+        <bl-pool-state-graph tabindex="0" aria-label="graph"></bl-pool-state-graph>
     </div>
 </div>
 <div  *ngIf="!isArmAccount">
diff --git a/src/app/components/account/monitoring/monitor-chart/monitor-chart.html b/src/app/components/account/monitoring/monitor-chart/monitor-chart.html
index abfbb10e97..64d32815b7 100644
--- a/src/app/components/account/monitoring/monitor-chart/monitor-chart.html
+++ b/src/app/components/account/monitoring/monitor-chart/monitor-chart.html
@@ -1,20 +1,20 @@
 <ng-container *ngIf="!preview">
     <div class="header">
-        <h2>
+        <h2 tabindex="0">
             {{ 'account-monitoring.' + metrics | i18n }}
         </h2>
 
 
-        <div class="aggregation" *ngIf="aggregation">
+        <div class="aggregation" *ngIf="aggregation" tabindex="0">
             {{aggregation}}
         </div>
     </div>
     <ng-container *ngIf="isChartReady">
-        <div class="chart-container">
+        <div class="chart-container" tabindex="0" aria-label="graph">
             <canvas blChart [datasets]="datasets" [options]="options" [chartType]="chartType" [colors]="colors"></canvas>
         </div>
         <div class="legend">
-            <div class="legend-item" *ngFor="let dataset of datasets;trackBy: trackDataSet;let index=index">
+            <div class="legend-item" *ngFor="let dataset of datasets;trackBy: trackDataSet;let index=index" tabindex="0">
                 <div class="value">
                     {{total[index]}}
                 </div>
@@ -23,7 +23,7 @@ <h2>
                 </div>
             </div>
         </div>
-        <div class="interval-label" *ngIf="interval">
+        <div class="interval-label" *ngIf="interval" tabindex="0">
             {{'account-monitoring.aggregatedOver' | i18n: {interval: interval} }}
         </div>
     </ng-container>
diff --git a/src/app/components/pool/action/add/pool-create-basic-dialog.html b/src/app/components/pool/action/add/pool-create-basic-dialog.html
index 774a2403ed..b5dbd05224 100644
--- a/src/app/components/pool/action/add/pool-create-basic-dialog.html
+++ b/src/app/components/pool/action/add/pool-create-basic-dialog.html
@@ -3,7 +3,7 @@
         <bl-form-section title="Pool details" subtitle="Basic information about the pool">
             <div class="grow">
                 <div class="gcol">
-                    <bl-form-field class="form-element">
+                    <bl-form-field class="form-element required">
                         <input blInput #idInput formControlName="id" placeholder="ID" maxlength="64">
 
                         <bl-hint align="end" attr.aria-label="{{idInput.value.length}} characters out of 64">{{idInput.value.length}} / 64</bl-hint>
diff --git a/src/app/components/pool/action/add/pool-create-basic-dialog.scss b/src/app/components/pool/action/add/pool-create-basic-dialog.scss
index a23d49e0da..07420468a6 100644
--- a/src/app/components/pool/action/add/pool-create-basic-dialog.scss
+++ b/src/app/components/pool/action/add/pool-create-basic-dialog.scss
@@ -26,3 +26,8 @@ bl-pool-create-basic-dialog {
         color: #1d54af;
     }
 }
+
+.required label:after {
+    content: "*";
+    color: $validation-error-color;
+}
diff --git a/src/client/proxy/manual-proxy-configuration-window/manual-proxy-configuration-window.html b/src/client/proxy/manual-proxy-configuration-window/manual-proxy-configuration-window.html
index e7cb8f0383..fdd01be6ee 100644
--- a/src/client/proxy/manual-proxy-configuration-window/manual-proxy-configuration-window.html
+++ b/src/client/proxy/manual-proxy-configuration-window/manual-proxy-configuration-window.html
@@ -52,15 +52,15 @@ <h1>Enter proxy configuration for BatchExplorer</h1>
     </div>
     <div class="form-element">
         <label for="port">Port</label>
-        <input id="port">
+        <input id="port" placeholder="ex: 80">
     </div>
     <div class="form-element">
         <label for="username">Username</label>
-        <input id="username">
+        <input id="username" placeholder="ex: sample_username">
     </div>
     <div class="form-element">
         <label for="password">Password</label>
-        <input id="password" type="password">
+        <input id="password" type="password" placeholder="ex: samplepassword">
     </div>
     <br>
     <button class="save-button" onclick="submit()">Save</button>

From 47c2a3549ca2c54007d66010056091d8bdf194b7 Mon Sep 17 00:00:00 2001
From: Haopeng Wang <wanghp000@gmail.com>
Date: Tue, 25 Oct 2022 11:28:19 +0800
Subject: [PATCH 15/72] fix: Create button for storage container under data
 menu is broken (#2579)

#AB1011

Co-authored-by: Shiran Pasternak <shiran.pasternak@microsoft.com>
---
 .../ui/buttons/clickable/clickable.component.ts             | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/@batch-flask/ui/buttons/clickable/clickable.component.ts b/src/@batch-flask/ui/buttons/clickable/clickable.component.ts
index 5151904195..b7cdc2214b 100644
--- a/src/@batch-flask/ui/buttons/clickable/clickable.component.ts
+++ b/src/@batch-flask/ui/buttons/clickable/clickable.component.ts
@@ -12,7 +12,6 @@ import {
     Self,
     SimpleChanges,
 } from "@angular/core";
-import { MatMenuTrigger } from "@angular/material/menu";
 import { RouterLink } from "@angular/router";
 import { ENTER, SPACE } from "@batch-flask/core/keys";
 import { Permission, PermissionService } from "@batch-flask/ui/permission";
@@ -60,7 +59,6 @@ export class ClickableComponent implements OnChanges, OnDestroy {
     public subtitle = "";
 
     private permissionService: PermissionService | null;
-    private _matMenuTrigger: MatMenuTrigger | null;
     // Router link directive if any
     private _routerLink?: RouterLink;
     private _sub: Subscription;
@@ -69,7 +67,6 @@ export class ClickableComponent implements OnChanges, OnDestroy {
 
     constructor(injector: Injector, @Self() @Optional() routerLink: RouterLink) {
         this._routerLink = routerLink;
-        this._matMenuTrigger = injector.get<MatMenuTrigger | null>(MatMenuTrigger, null, 2);
         this.permissionService = injector.get<PermissionService | null>(PermissionService, null);
     }
 
@@ -121,9 +118,6 @@ export class ClickableComponent implements OnChanges, OnDestroy {
         if (this._routerLink) {
             this._routerLink.onClick();
         }
-        if (this._matMenuTrigger) {
-            this._matMenuTrigger.openMenu();
-        }
     }
 
     private _clearSubscription() {

From a89a38637013c842a3a35eb8c86135d8e776c495 Mon Sep 17 00:00:00 2001
From: Rena <cRui861@users.noreply.github.com>
Date: Thu, 27 Oct 2022 11:52:33 -0700
Subject: [PATCH 16/72] Add Italy accessibility link (#2582)

---
 src/client/menu/help-menu.ts       | 8 ++++++++
 src/client/menu/main-menu.i18n.yml | 1 +
 src/common/constants/constants.ts  | 1 +
 3 files changed, 10 insertions(+)

diff --git a/src/client/menu/help-menu.ts b/src/client/menu/help-menu.ts
index e6ef1bfe49..f48e2611d7 100644
--- a/src/client/menu/help-menu.ts
+++ b/src/client/menu/help-menu.ts
@@ -20,6 +20,10 @@ export class HelpMenu {
                     label: this.i18n.translate("main-menu.help.privacyStatement"),
                     click: () => this.openPrivacyStatement(),
                 },
+                {
+                    label: this.i18n.translate("main-menu.help.italyAccessibility"),
+                    click: () => this.openItalyAccessibility(),
+                },
                 { type: "separator" },
                 {
                     label: this.i18n.translate("main-menu.help.reportIssue"),
@@ -37,6 +41,10 @@ export class HelpMenu {
         shell.openExternal(Constants.ExternalLinks.privacyStatement);
     }
 
+    public openItalyAccessibility() {
+        shell.openExternal(Constants.ExternalLinks.italyAccessibility);
+    }
+
     public submitIssue() {
         shell.openExternal(Constants.ExternalLinks.submitIssue);
     }
diff --git a/src/client/menu/main-menu.i18n.yml b/src/client/menu/main-menu.i18n.yml
index cb1cd03601..a5e85827dc 100644
--- a/src/client/menu/main-menu.i18n.yml
+++ b/src/client/menu/main-menu.i18n.yml
@@ -3,4 +3,5 @@ main-menu:
     label: Help
     viewLicense: View license
     privacyStatement: Privacy statement
+    italyAccessibility: Italy Accessibility Declarations
     reportIssue: Report issue
diff --git a/src/common/constants/constants.ts b/src/common/constants/constants.ts
index 310c7485f1..c26f6d97d7 100644
--- a/src/common/constants/constants.ts
+++ b/src/common/constants/constants.ts
@@ -138,6 +138,7 @@ export const ExternalLinks = {
     setupStorageAccount: "https://portal.azure.com/#resource{0}/storageAccount",
     license: "https://azure.github.io/BatchExplorer/EULA.html",
     privacyStatement: "https://privacy.microsoft.com/en-us/privacystatement",
+    italyAccessibility: "https://www.microsoft.com/it-it/accessibility/accessibilita/dichiarazioni",
     submitIssue: "https://github.com/Azure/BatchExplorer/issues",
     subscriptionUrl: "https://portal.azure.com/#resource/subscriptions/{0}/overview",
     costManagementUrl: "https://ms.portal.azure.com/#resource/subscriptions/{0}/costByResource",

From c510c305cf6495652a0db28a775732c9cb350ea6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Nov 2022 15:06:12 -0800
Subject: [PATCH 17/72] Bump loader-utils from 1.4.0 to 1.4.1 (#2588)

Bumps [loader-utils](https://github.com/webpack/loader-utils) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/webpack/loader-utils/releases)
- [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.1/CHANGELOG.md)
- [Commits](https://github.com/webpack/loader-utils/compare/v1.4.0...v1.4.1)

---
updated-dependencies:
- dependency-name: loader-utils
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 14 +++++++-------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index aeb9f12788..3a217b7bda 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -121,7 +121,7 @@
         "karma-mocha-reporter": "^2.2.5",
         "karma-sourcemap-loader": "^0.3.8",
         "karma-webpack": "^4.0.2",
-        "loader-utils": "^1.4.0",
+        "loader-utils": "^1.4.1",
         "markdownlint": "^0.23.1",
         "markdownlint-cli2": "^0.0.14",
         "merge2": "^1.4.1",
@@ -12905,9 +12905,9 @@
       }
     },
     "node_modules/loader-utils": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.1.tgz",
+      "integrity": "sha512-1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q==",
       "dev": true,
       "dependencies": {
         "big.js": "^5.2.2",
@@ -32630,9 +32630,9 @@
       "dev": true
     },
     "loader-utils": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.1.tgz",
+      "integrity": "sha512-1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q==",
       "dev": true,
       "requires": {
         "big.js": "^5.2.2",
diff --git a/package.json b/package.json
index 84274ec351..3f07625ffb 100644
--- a/package.json
+++ b/package.json
@@ -130,7 +130,7 @@
     "karma-mocha-reporter": "^2.2.5",
     "karma-sourcemap-loader": "^0.3.8",
     "karma-webpack": "^4.0.2",
-    "loader-utils": "^1.4.0",
+    "loader-utils": "^1.4.1",
     "markdownlint": "^0.23.1",
     "markdownlint-cli2": "^0.0.14",
     "merge2": "^1.4.1",

From 95e7c38af6051cb2ff97ed89c312165209fa0f36 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Nov 2022 15:55:20 -0800
Subject: [PATCH 18/72] Bump socket.io-parser from 4.0.4 to 4.0.5 (#2589)

Bumps [socket.io-parser](https://github.com/socketio/socket.io-parser) from 4.0.4 to 4.0.5.
- [Release notes](https://github.com/socketio/socket.io-parser/releases)
- [Changelog](https://github.com/socketio/socket.io-parser/blob/main/CHANGELOG.md)
- [Commits](https://github.com/socketio/socket.io-parser/compare/4.0.4...4.0.5)

---
updated-dependencies:
- dependency-name: socket.io-parser
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3a217b7bda..012ebee74b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17908,9 +17908,9 @@
       "dev": true
     },
     "node_modules/socket.io-parser": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.4.tgz",
-      "integrity": "sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.5.tgz",
+      "integrity": "sha512-sNjbT9dX63nqUFIOv95tTVm6elyIU4RvB1m8dOeZt+IgWwcWklFDOdmGcfo3zSiRsnR/3pJkjY5lfoGqEe4Eig==",
       "dev": true,
       "dependencies": {
         "@types/component-emitter": "^1.2.10",
@@ -36608,9 +36608,9 @@
       "dev": true
     },
     "socket.io-parser": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.4.tgz",
-      "integrity": "sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.5.tgz",
+      "integrity": "sha512-sNjbT9dX63nqUFIOv95tTVm6elyIU4RvB1m8dOeZt+IgWwcWklFDOdmGcfo3zSiRsnR/3pJkjY5lfoGqEe4Eig==",
       "dev": true,
       "requires": {
         "@types/component-emitter": "^1.2.10",

From 7ab8668205d38adffcb5d8d4219da410ef220fed Mon Sep 17 00:00:00 2001
From: Haopeng Wang <wanghp000@gmail.com>
Date: Sun, 13 Nov 2022 18:13:52 -0800
Subject: [PATCH 19/72] =?UTF-8?q?fix:=20announce=20=E2=80=98no=20match?=
 =?UTF-8?q?=E2=80=99=20information=20on=20subscription=20filter=20(#2584)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix: announce ‘no match’ information on subscription filter AB#758
---
 .../select-dropdown.component.ts              | 24 ++++++++++++++++---
 .../select-dropdown/select-dropdown.html      |  7 ++----
 .../select-dropdown/select-dropdown.i18n.yml  |  4 ++++
 .../ui/select/select.component.spec.ts        |  3 ++-
 .../ui/select/select.component.ts             |  1 +
 5 files changed, 30 insertions(+), 9 deletions(-)
 create mode 100644 src/@batch-flask/ui/select/select-dropdown/select-dropdown.i18n.yml

diff --git a/src/@batch-flask/ui/select/select-dropdown/select-dropdown.component.ts b/src/@batch-flask/ui/select/select-dropdown/select-dropdown.component.ts
index 22098a1467..135fd7fa80 100644
--- a/src/@batch-flask/ui/select/select-dropdown/select-dropdown.component.ts
+++ b/src/@batch-flask/ui/select/select-dropdown/select-dropdown.component.ts
@@ -1,8 +1,9 @@
+import { LiveAnnouncer } from "@angular/cdk/a11y";
 import {
     ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef,
-    HostBinding, Inject, forwardRef,
+    HostBinding, Inject, forwardRef
 } from "@angular/core";
-import { ListKeyNavigator } from "@batch-flask/core";
+import { ListKeyNavigator, I18nService } from "@batch-flask/core";
 import { SelectOptionComponent } from "@batch-flask/ui/select/option";
 import { SelectComponent } from "../select.component";
 
@@ -30,6 +31,7 @@ export class SelectDropdownComponent {
     public set displayedOptions(options: SelectOptionComponent[]) {
         this._displayedOptions = options;
         this._computeOptions();
+        this._announceItems();
         this.changeDetector.markForCheck();
     }
 
@@ -66,6 +68,7 @@ export class SelectDropdownComponent {
 
     public rows: any;
     public keyNavigator: ListKeyNavigator<SelectOptionComponent>;
+    public noMatchText = '';
 
     private _displayedOptions: SelectOptionComponent[] = [];
     private _focusedOption: any;
@@ -75,7 +78,9 @@ export class SelectDropdownComponent {
     constructor(
         @Inject(forwardRef(() => SelectComponent)) public select: any,
         private elementRef: ElementRef,
-        private changeDetector: ChangeDetectorRef) {
+        private changeDetector: ChangeDetectorRef,
+        private liveAnnouncer: LiveAnnouncer,
+        private i18n: I18nService) {
     }
     /**
      * Scroll to the option at the given index
@@ -124,4 +129,17 @@ export class SelectDropdownComponent {
         this.keyNavigator.items = this.rows;
         this.changeDetector.markForCheck();
     }
+
+    private _announceItems() {
+        if (!this.displayedOptions.length) {
+            this.noMatchText = this.select.filter
+                ? this.i18n.t('select-dropdown.noMatch')
+                : this.i18n.t('select-dropdown.noOptions');
+            this.liveAnnouncer.announce(this.noMatchText);
+        } else {
+            this.liveAnnouncer.announce(
+                this.i18n.t('select-dropdown.showItems', {num: this.displayedOptions.length})
+            );
+        }
+    }
 }
diff --git a/src/@batch-flask/ui/select/select-dropdown/select-dropdown.html b/src/@batch-flask/ui/select/select-dropdown/select-dropdown.html
index 605101216a..f69c50fadc 100644
--- a/src/@batch-flask/ui/select/select-dropdown/select-dropdown.html
+++ b/src/@batch-flask/ui/select/select-dropdown/select-dropdown.html
@@ -20,9 +20,6 @@
         </ng-container>
     </div>
 </div>
-<div class="no-option" *ngIf="displayedOptions.length === 0 && select.filter">
-    No match
-</div>
-<div class="no-option" *ngIf="displayedOptions.length === 0 && !select.filter">
-    No options available
+<div class="no-option" *ngIf="displayedOptions.length === 0">
+    {{noMatchText}}
 </div>
diff --git a/src/@batch-flask/ui/select/select-dropdown/select-dropdown.i18n.yml b/src/@batch-flask/ui/select/select-dropdown/select-dropdown.i18n.yml
new file mode 100644
index 0000000000..5b6200fe0d
--- /dev/null
+++ b/src/@batch-flask/ui/select/select-dropdown/select-dropdown.i18n.yml
@@ -0,0 +1,4 @@
+select-dropdown:
+  noMatch: No match
+  noOptions: No options available
+  showItems: Showing {num} items
diff --git a/src/@batch-flask/ui/select/select.component.spec.ts b/src/@batch-flask/ui/select/select.component.spec.ts
index 37f2a8356d..0b7255b55c 100644
--- a/src/@batch-flask/ui/select/select.component.spec.ts
+++ b/src/@batch-flask/ui/select/select.component.spec.ts
@@ -6,6 +6,7 @@ import { By } from "@angular/platform-browser";
 import { BrowserDynamicTestingModule } from "@angular/platform-browser-dynamic/testing";
 import { ClickableComponent } from "@batch-flask/ui/buttons/clickable";
 import { PermissionService } from "@batch-flask/ui/permission";
+import { I18nTestingModule } from "@batch-flask/core/testing";
 import { click, mousedown, updateInput } from "test/utils/helpers";
 import { SelectOptionComponent } from "./option";
 import { OptionTemplateDirective } from "./option-template.directive";
@@ -79,7 +80,7 @@ describe("SelectComponent", () => {
 
     function setup(component) {
         TestBed.configureTestingModule({
-            imports: [FormsModule, ReactiveFormsModule, OverlayModule],
+            imports: [FormsModule, ReactiveFormsModule, OverlayModule, I18nTestingModule],
             declarations: [SelectComponent,
                 SelectOptionComponent, SelectDropdownComponent,
                 OptionTemplateDirective,
diff --git a/src/@batch-flask/ui/select/select.component.ts b/src/@batch-flask/ui/select/select.component.ts
index 07b007a887..869e664a8f 100644
--- a/src/@batch-flask/ui/select/select.component.ts
+++ b/src/@batch-flask/ui/select/select.component.ts
@@ -176,6 +176,7 @@ export class SelectComponent<TValue = any> implements FormFieldControl<any>, Opt
     private _propagateChange: (value: any) => void;
     private _touchedFn: () => void;
     private _optionsMap: Map<any, SelectOptionComponent> = new Map();
+
     public get dropdownId() {
         return this.id + "-dropdown";
     }

From 616298d2a82e3d3cb5a339d0da3605ca38ba7657 Mon Sep 17 00:00:00 2001
From: Shiran Pasternak <shiran.pasternak@microsoft.com>
Date: Tue, 15 Nov 2022 10:19:11 -0500
Subject: [PATCH 20/72] Upgrades Batch PIP modules

Fixes AB#1013
---
 python/requirements.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/python/requirements.txt b/python/requirements.txt
index 85946acdb3..4df0ba0946 100644
--- a/python/requirements.txt
+++ b/python/requirements.txt
@@ -1,5 +1,5 @@
 websockets==10.1
 pylint==2.3.0
-azure-batch-extensions==7.0.0
+azure-batch-extensions==9.0.0
 pyinstaller==4.9
-azure-batch==8.0.0
+azure-batch==12.0.0

From 54b37f10f2a3588d3f8d487230f733e821ce20ea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Nov 2022 08:45:38 +0000
Subject: [PATCH 21/72] Bump loader-utils from 1.4.1 to 1.4.2

Bumps [loader-utils](https://github.com/webpack/loader-utils) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/webpack/loader-utils/releases)
- [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.2/CHANGELOG.md)
- [Commits](https://github.com/webpack/loader-utils/compare/v1.4.1...v1.4.2)

---
updated-dependencies:
- dependency-name: loader-utils
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 14 +++++++-------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 012ebee74b..3e7723a351 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -121,7 +121,7 @@
         "karma-mocha-reporter": "^2.2.5",
         "karma-sourcemap-loader": "^0.3.8",
         "karma-webpack": "^4.0.2",
-        "loader-utils": "^1.4.1",
+        "loader-utils": "^1.4.2",
         "markdownlint": "^0.23.1",
         "markdownlint-cli2": "^0.0.14",
         "merge2": "^1.4.1",
@@ -12905,9 +12905,9 @@
       }
     },
     "node_modules/loader-utils": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.1.tgz",
-      "integrity": "sha512-1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q==",
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+      "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
       "dev": true,
       "dependencies": {
         "big.js": "^5.2.2",
@@ -32630,9 +32630,9 @@
       "dev": true
     },
     "loader-utils": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.1.tgz",
-      "integrity": "sha512-1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q==",
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+      "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
       "dev": true,
       "requires": {
         "big.js": "^5.2.2",
diff --git a/package.json b/package.json
index 3f07625ffb..861ea67885 100644
--- a/package.json
+++ b/package.json
@@ -130,7 +130,7 @@
     "karma-mocha-reporter": "^2.2.5",
     "karma-sourcemap-loader": "^0.3.8",
     "karma-webpack": "^4.0.2",
-    "loader-utils": "^1.4.1",
+    "loader-utils": "^1.4.2",
     "markdownlint": "^0.23.1",
     "markdownlint-cli2": "^0.0.14",
     "merge2": "^1.4.1",

From 8268cc0019b8f572e72e4553823cdab11d51436a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Dec 2022 22:55:31 +0000
Subject: [PATCH 22/72] Bump qs from 6.5.2 to 6.5.3

Bumps [qs](https://github.com/ljharb/qs) from 6.5.2 to 6.5.3.
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.5.2...v6.5.3)

---
updated-dependencies:
- dependency-name: qs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3e7723a351..dcc7e0d007 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16748,9 +16748,9 @@
       }
     },
     "node_modules/request/node_modules/qs": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
+      "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
       "engines": {
         "node": ">=0.6"
       }
@@ -35688,9 +35688,9 @@
           }
         },
         "qs": {
-          "version": "6.5.2",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
+          "version": "6.5.3",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
+          "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA=="
         },
         "tough-cookie": {
           "version": "2.5.0",

From accfabf0e0d0ef46cb06910a45ee85843fd72d22 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Nov 2022 03:30:28 +0000
Subject: [PATCH 23/72] Bump engine.io and socket.io

Bumps [engine.io](https://github.com/socketio/engine.io) and [socket.io](https://github.com/socketio/socket.io). These dependencies needed to be updated together.

Updates `engine.io` from 6.1.2 to 6.2.1
- [Release notes](https://github.com/socketio/engine.io/releases)
- [Changelog](https://github.com/socketio/engine.io/blob/main/CHANGELOG.md)
- [Commits](https://github.com/socketio/engine.io/compare/6.1.2...6.2.1)

Updates `socket.io` from 4.4.1 to 4.5.3
- [Release notes](https://github.com/socketio/socket.io/releases)
- [Changelog](https://github.com/socketio/socket.io/blob/main/CHANGELOG.md)
- [Commits](https://github.com/socketio/socket.io/compare/4.4.1...4.5.3)

---
updated-dependencies:
- dependency-name: engine.io
  dependency-type: indirect
- dependency-name: socket.io
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 123 +++++++++++++++++++---------------------------
 1 file changed, 50 insertions(+), 73 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index dcc7e0d007..82fe1d482d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1484,14 +1484,11 @@
         "node": ">=4"
       }
     },
-    "node_modules/@socket.io/base64-arraybuffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@socket.io/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
-      "integrity": "sha512-dOlCBKnDw4iShaIsH/bxujKTM18+2TOAsYz+KSc11Am38H4q5Xw8Bbz97ZYdrVNM+um3p7w86Bvvmcn9q+5+eQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6.0"
-      }
+    "node_modules/@socket.io/component-emitter": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",
+      "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==",
+      "dev": true
     },
     "node_modules/@stylelint/postcss-css-in-js": {
       "version": "0.37.2",
@@ -1536,12 +1533,6 @@
         "moment": "^2.10.2"
       }
     },
-    "node_modules/@types/component-emitter": {
-      "version": "1.2.11",
-      "resolved": "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.11.tgz",
-      "integrity": "sha512-SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ==",
-      "dev": true
-    },
     "node_modules/@types/cookie": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz",
@@ -7624,9 +7615,9 @@
       }
     },
     "node_modules/engine.io": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.1.2.tgz",
-      "integrity": "sha512-v/7eGHxPvO2AWsksyx2PUsQvBafuvqs0jJJQ0FdmJG1b9qIvgSbqDRGwNhfk2XHaTTbTXiC4quRE8Q9nRjsrQQ==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.1.tgz",
+      "integrity": "sha512-ECceEFcAaNRybd3lsGQKas3ZlMVjN3cyWwMP25D2i0zWfyiytVbTpRPa34qrr+FHddtpBVOmq4H/DCv1O0lZRA==",
       "dev": true,
       "dependencies": {
         "@types/cookie": "^0.4.1",
@@ -7637,7 +7628,7 @@
         "cookie": "~0.4.1",
         "cors": "~2.8.5",
         "debug": "~4.3.1",
-        "engine.io-parser": "~5.0.0",
+        "engine.io-parser": "~5.0.3",
         "ws": "~8.2.3"
       },
       "engines": {
@@ -7645,13 +7636,10 @@
       }
     },
     "node_modules/engine.io-parser": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.3.tgz",
-      "integrity": "sha512-BtQxwF27XUNnSafQLvDi0dQ8s3i6VgzSoQMJacpIcGNrlUdfHSKbgm3jmjCVvQluGzqwujQMPAoMai3oYSTurg==",
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.4.tgz",
+      "integrity": "sha512-+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg==",
       "dev": true,
-      "dependencies": {
-        "@socket.io/base64-arraybuffer": "~1.0.2"
-      },
       "engines": {
         "node": ">=10.0.0"
       }
@@ -17885,36 +17873,35 @@
       }
     },
     "node_modules/socket.io": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.4.1.tgz",
-      "integrity": "sha512-s04vrBswdQBUmuWJuuNTmXUVJhP0cVky8bBDhdkf8y0Ptsu7fKU2LuLbts9g+pdmAdyMMn8F/9Mf1/wbtUN0fg==",
+      "version": "4.5.3",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.3.tgz",
+      "integrity": "sha512-zdpnnKU+H6mOp7nYRXH4GNv1ux6HL6+lHL8g7Ds7Lj8CkdK1jJK/dlwsKDculbyOHifcJ0Pr/yeXnZQ5GeFrcg==",
       "dev": true,
       "dependencies": {
         "accepts": "~1.3.4",
         "base64id": "~2.0.0",
         "debug": "~4.3.2",
-        "engine.io": "~6.1.0",
-        "socket.io-adapter": "~2.3.3",
-        "socket.io-parser": "~4.0.4"
+        "engine.io": "~6.2.0",
+        "socket.io-adapter": "~2.4.0",
+        "socket.io-parser": "~4.2.0"
       },
       "engines": {
         "node": ">=10.0.0"
       }
     },
     "node_modules/socket.io-adapter": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.3.3.tgz",
-      "integrity": "sha512-Qd/iwn3VskrpNO60BeRyCyr8ZWw9CPZyitW4AQwmRZ8zCiyDiL+znRnWX6tDHXnWn1sJrM1+b6Mn6wEDJJ4aYQ==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz",
+      "integrity": "sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg==",
       "dev": true
     },
     "node_modules/socket.io-parser": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.5.tgz",
-      "integrity": "sha512-sNjbT9dX63nqUFIOv95tTVm6elyIU4RvB1m8dOeZt+IgWwcWklFDOdmGcfo3zSiRsnR/3pJkjY5lfoGqEe4Eig==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.1.tgz",
+      "integrity": "sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g==",
       "dev": true,
       "dependencies": {
-        "@types/component-emitter": "^1.2.10",
-        "component-emitter": "~1.3.0",
+        "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.3.1"
       },
       "engines": {
@@ -23403,10 +23390,10 @@
       "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz",
       "integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow=="
     },
-    "@socket.io/base64-arraybuffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@socket.io/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
-      "integrity": "sha512-dOlCBKnDw4iShaIsH/bxujKTM18+2TOAsYz+KSc11Am38H4q5Xw8Bbz97ZYdrVNM+um3p7w86Bvvmcn9q+5+eQ==",
+    "@socket.io/component-emitter": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",
+      "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==",
       "dev": true
     },
     "@stylelint/postcss-css-in-js": {
@@ -23442,12 +23429,6 @@
         "moment": "^2.10.2"
       }
     },
-    "@types/component-emitter": {
-      "version": "1.2.11",
-      "resolved": "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.11.tgz",
-      "integrity": "sha512-SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ==",
-      "dev": true
-    },
     "@types/cookie": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz",
@@ -28520,9 +28501,9 @@
       }
     },
     "engine.io": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.1.2.tgz",
-      "integrity": "sha512-v/7eGHxPvO2AWsksyx2PUsQvBafuvqs0jJJQ0FdmJG1b9qIvgSbqDRGwNhfk2XHaTTbTXiC4quRE8Q9nRjsrQQ==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.1.tgz",
+      "integrity": "sha512-ECceEFcAaNRybd3lsGQKas3ZlMVjN3cyWwMP25D2i0zWfyiytVbTpRPa34qrr+FHddtpBVOmq4H/DCv1O0lZRA==",
       "dev": true,
       "requires": {
         "@types/cookie": "^0.4.1",
@@ -28533,18 +28514,15 @@
         "cookie": "~0.4.1",
         "cors": "~2.8.5",
         "debug": "~4.3.1",
-        "engine.io-parser": "~5.0.0",
+        "engine.io-parser": "~5.0.3",
         "ws": "~8.2.3"
       }
     },
     "engine.io-parser": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.3.tgz",
-      "integrity": "sha512-BtQxwF27XUNnSafQLvDi0dQ8s3i6VgzSoQMJacpIcGNrlUdfHSKbgm3jmjCVvQluGzqwujQMPAoMai3oYSTurg==",
-      "dev": true,
-      "requires": {
-        "@socket.io/base64-arraybuffer": "~1.0.2"
-      }
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.4.tgz",
+      "integrity": "sha512-+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg==",
+      "dev": true
     },
     "enhanced-resolve": {
       "version": "4.3.0",
@@ -36588,33 +36566,32 @@
       }
     },
     "socket.io": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.4.1.tgz",
-      "integrity": "sha512-s04vrBswdQBUmuWJuuNTmXUVJhP0cVky8bBDhdkf8y0Ptsu7fKU2LuLbts9g+pdmAdyMMn8F/9Mf1/wbtUN0fg==",
+      "version": "4.5.3",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.3.tgz",
+      "integrity": "sha512-zdpnnKU+H6mOp7nYRXH4GNv1ux6HL6+lHL8g7Ds7Lj8CkdK1jJK/dlwsKDculbyOHifcJ0Pr/yeXnZQ5GeFrcg==",
       "dev": true,
       "requires": {
         "accepts": "~1.3.4",
         "base64id": "~2.0.0",
         "debug": "~4.3.2",
-        "engine.io": "~6.1.0",
-        "socket.io-adapter": "~2.3.3",
-        "socket.io-parser": "~4.0.4"
+        "engine.io": "~6.2.0",
+        "socket.io-adapter": "~2.4.0",
+        "socket.io-parser": "~4.2.0"
       }
     },
     "socket.io-adapter": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.3.3.tgz",
-      "integrity": "sha512-Qd/iwn3VskrpNO60BeRyCyr8ZWw9CPZyitW4AQwmRZ8zCiyDiL+znRnWX6tDHXnWn1sJrM1+b6Mn6wEDJJ4aYQ==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz",
+      "integrity": "sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg==",
       "dev": true
     },
     "socket.io-parser": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.5.tgz",
-      "integrity": "sha512-sNjbT9dX63nqUFIOv95tTVm6elyIU4RvB1m8dOeZt+IgWwcWklFDOdmGcfo3zSiRsnR/3pJkjY5lfoGqEe4Eig==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.1.tgz",
+      "integrity": "sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g==",
       "dev": true,
       "requires": {
-        "@types/component-emitter": "^1.2.10",
-        "component-emitter": "~1.3.0",
+        "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.3.1"
       }
     },

From 2baeb75379b8bc926173260e9f881ba8fa4abfaf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Dec 2022 18:27:16 +0000
Subject: [PATCH 24/72] Bump decode-uri-component from 0.2.0 to 0.2.1

Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.1.
- [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases)
- [Commits](https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.0...v0.2.1)

---
updated-dependencies:
- dependency-name: decode-uri-component
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 14 +++++++-------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 82fe1d482d..31ec59b2be 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -29,7 +29,7 @@
         "chokidar": "^3.4.3",
         "commander": "^8.0.0",
         "d3": "^5.16.0",
-        "decode-uri-component": "^0.2.0",
+        "decode-uri-component": "^0.2.1",
         "download": "^8.0.0",
         "electron-updater": "^4.3.4",
         "element-resize-detector": "^1.2.1",
@@ -6208,9 +6208,9 @@
       }
     },
     "node_modules/decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.1.tgz",
+      "integrity": "sha512-XZHyaFJ6QMWhYmlz+UcmtaLeecNiXwkTGzCqG5WByt+1P1HnU6Siwf0TeP3OsZmlnGqQRSEMIxue0LLCaGY3dw==",
       "engines": {
         "node": ">=0.10"
       }
@@ -27359,9 +27359,9 @@
       }
     },
     "decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.1.tgz",
+      "integrity": "sha512-XZHyaFJ6QMWhYmlz+UcmtaLeecNiXwkTGzCqG5WByt+1P1HnU6Siwf0TeP3OsZmlnGqQRSEMIxue0LLCaGY3dw=="
     },
     "decompress": {
       "version": "4.2.1",
diff --git a/package.json b/package.json
index 861ea67885..d37c208502 100644
--- a/package.json
+++ b/package.json
@@ -181,7 +181,7 @@
     "chokidar": "^3.4.3",
     "commander": "^8.0.0",
     "d3": "^5.16.0",
-    "decode-uri-component": "^0.2.0",
+    "decode-uri-component": "^0.2.1",
     "download": "^8.0.0",
     "electron-updater": "^4.3.4",
     "element-resize-detector": "^1.2.1",

From b2860cb9de913dcfff16ef420bee7df29f68c0bc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Dec 2022 19:11:48 +0000
Subject: [PATCH 25/72] Bump express from 4.17.1 to 4.18.2

Bumps [express](https://github.com/expressjs/express) from 4.17.1 to 4.18.2.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.17.1...4.18.2)

---
updated-dependencies:
- dependency-name: express
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 724 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 505 insertions(+), 219 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 31ec59b2be..33dda0157f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2434,13 +2434,13 @@
       }
     },
     "node_modules/accepts": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
-      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
       "dev": true,
       "dependencies": {
-        "mime-types": "~2.1.24",
-        "negotiator": "0.6.2"
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
       },
       "engines": {
         "node": ">= 0.6"
@@ -3697,24 +3697,27 @@
       "dev": true
     },
     "node_modules/body-parser": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
-      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
       "dev": true,
       "dependencies": {
-        "bytes": "3.1.0",
+        "bytes": "3.1.2",
         "content-type": "~1.0.4",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.7.2",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.7.0",
-        "raw-body": "2.4.0",
-        "type-is": "~1.6.17"
+        "on-finished": "2.4.1",
+        "qs": "6.11.0",
+        "raw-body": "2.5.1",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
       }
     },
     "node_modules/body-parser/node_modules/debug": {
@@ -3726,12 +3729,33 @@
         "ms": "2.0.0"
       }
     },
+    "node_modules/body-parser/node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/body-parser/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
       "dev": true
     },
+    "node_modules/body-parser/node_modules/on-finished": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+      "dev": true,
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/bonjour": {
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
@@ -4408,9 +4432,9 @@
       "dev": true
     },
     "node_modules/bytes": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
       "dev": true,
       "engines": {
         "node": ">= 0.8"
@@ -5481,16 +5505,35 @@
       }
     },
     "node_modules/content-disposition": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
-      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
       "dependencies": {
-        "safe-buffer": "5.1.2"
+        "safe-buffer": "5.2.1"
       },
       "engines": {
         "node": ">= 0.6"
       }
     },
+    "node_modules/content-disposition/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
     "node_modules/content-type": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
@@ -6580,10 +6623,14 @@
       }
     },
     "node_modules/destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
-      "dev": true
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
     },
     "node_modules/detect-file": {
       "version": "1.0.0",
@@ -8664,7 +8711,7 @@
     "node_modules/etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
       "dev": true,
       "engines": {
         "node": ">= 0.6"
@@ -8908,38 +8955,39 @@
       }
     },
     "node_modules/express": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
-      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
+      "version": "4.18.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
       "dev": true,
       "dependencies": {
-        "accepts": "~1.3.7",
+        "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.19.0",
-        "content-disposition": "0.5.3",
+        "body-parser": "1.20.1",
+        "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.4.0",
+        "cookie": "0.5.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
+        "depd": "2.0.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
+        "finalhandler": "1.2.0",
         "fresh": "0.5.2",
+        "http-errors": "2.0.0",
         "merge-descriptors": "1.0.1",
         "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.5",
-        "qs": "6.7.0",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.11.0",
         "range-parser": "~1.2.1",
-        "safe-buffer": "5.1.2",
-        "send": "0.17.1",
-        "serve-static": "1.14.1",
-        "setprototypeof": "1.1.1",
-        "statuses": "~1.5.0",
+        "safe-buffer": "5.2.1",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
         "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
@@ -8955,9 +9003,9 @@
       "dev": true
     },
     "node_modules/express/node_modules/cookie": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
-      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
       "dev": true,
       "engines": {
         "node": ">= 0.6"
@@ -8972,12 +9020,80 @@
         "ms": "2.0.0"
       }
     },
+    "node_modules/express/node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/express/node_modules/finalhandler": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+      "dev": true,
+      "dependencies": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "statuses": "2.0.1",
+        "unpipe": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/express/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
       "dev": true
     },
+    "node_modules/express/node_modules/on-finished": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+      "dev": true,
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/express/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/express/node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/ext-list": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz",
@@ -9857,9 +9973,9 @@
       }
     },
     "node_modules/forwarded": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
       "dev": true,
       "engines": {
         "node": ">= 0.6"
@@ -9880,7 +9996,7 @@
     "node_modules/fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
       "dev": true,
       "engines": {
         "node": ">= 0.6"
@@ -10878,26 +10994,38 @@
       "dev": true
     },
     "node_modules/http-errors": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
-      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
       "dev": true,
       "dependencies": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.1",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.0"
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/http-errors/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-      "dev": true
+    "node_modules/http-errors/node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/http-errors/node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
     "node_modules/http-parser-js": {
       "version": "0.5.3",
@@ -13596,19 +13724,19 @@
       }
     },
     "node_modules/mime-db": {
-      "version": "1.46.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.46.0.tgz",
-      "integrity": "sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ==",
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/mime-types": {
-      "version": "2.1.29",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.29.tgz",
-      "integrity": "sha512-Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ==",
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "dependencies": {
-        "mime-db": "1.46.0"
+        "mime-db": "1.52.0"
       },
       "engines": {
         "node": ">= 0.6"
@@ -13957,9 +14085,9 @@
       "dev": true
     },
     "node_modules/negotiator": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
-      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
       "dev": true,
       "engines": {
         "node": ">= 0.6"
@@ -15791,12 +15919,12 @@
       "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk="
     },
     "node_modules/proxy-addr": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
-      "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
       "dev": true,
       "dependencies": {
-        "forwarded": "~0.1.2",
+        "forwarded": "0.2.0",
         "ipaddr.js": "1.9.1"
       },
       "engines": {
@@ -15911,12 +16039,18 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
       "dev": true,
+      "dependencies": {
+        "side-channel": "^1.0.4"
+      },
       "engines": {
         "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/query-string": {
@@ -16015,13 +16149,13 @@
       }
     },
     "node_modules/raw-body": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
-      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
       "dev": true,
       "dependencies": {
-        "bytes": "3.1.0",
-        "http-errors": "1.7.2",
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "unpipe": "1.0.0"
       },
@@ -17247,24 +17381,24 @@
       }
     },
     "node_modules/send": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
-      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "dev": true,
       "dependencies": {
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "~1.7.2",
+        "http-errors": "2.0.0",
         "mime": "1.6.0",
-        "ms": "2.1.1",
-        "on-finished": "~2.3.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
         "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
+        "statuses": "2.0.1"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -17282,9 +17416,18 @@
     "node_modules/send/node_modules/debug/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
+    "node_modules/send/node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/send/node_modules/mime": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
@@ -17298,11 +17441,32 @@
       }
     },
     "node_modules/send/node_modules/ms": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-      "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "dev": true
     },
+    "node_modules/send/node_modules/on-finished": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+      "dev": true,
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/send/node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/serialize-error": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz",
@@ -17402,15 +17566,15 @@
       "dev": true
     },
     "node_modules/serve-static": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
-      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
       "dev": true,
       "dependencies": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.17.1"
+        "send": "0.18.0"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -17464,9 +17628,9 @@
       "dev": true
     },
     "node_modules/setprototypeof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
       "dev": true
     },
     "node_modules/sha.js": {
@@ -17520,6 +17684,20 @@
       "resolved": "https://registry.npmjs.org/shimmer/-/shimmer-1.2.1.tgz",
       "integrity": "sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw=="
     },
+    "node_modules/side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/signal-exit": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
@@ -19894,9 +20072,9 @@
       }
     },
     "node_modules/toidentifier": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
       "dev": true,
       "engines": {
         "node": ">=0.6"
@@ -24243,13 +24421,13 @@
       }
     },
     "accepts": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
-      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
       "dev": true,
       "requires": {
-        "mime-types": "~2.1.24",
-        "negotiator": "0.6.2"
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
       }
     },
     "acorn": {
@@ -25287,21 +25465,23 @@
       "dev": true
     },
     "body-parser": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
-      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
       "dev": true,
       "requires": {
-        "bytes": "3.1.0",
+        "bytes": "3.1.2",
         "content-type": "~1.0.4",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.7.2",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.7.0",
-        "raw-body": "2.4.0",
-        "type-is": "~1.6.17"
+        "on-finished": "2.4.1",
+        "qs": "6.11.0",
+        "raw-body": "2.5.1",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
       },
       "dependencies": {
         "debug": {
@@ -25313,11 +25493,26 @@
             "ms": "2.0.0"
           }
         },
+        "depd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+          "dev": true
+        },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
           "dev": true
+        },
+        "on-finished": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+          "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+          "dev": true,
+          "requires": {
+            "ee-first": "1.1.1"
+          }
         }
       }
     },
@@ -25843,9 +26038,9 @@
       "dev": true
     },
     "bytes": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
       "dev": true
     },
     "cacache": {
@@ -26736,11 +26931,18 @@
       "dev": true
     },
     "content-disposition": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
-      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
       "requires": {
-        "safe-buffer": "5.1.2"
+        "safe-buffer": "5.2.1"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+        }
       }
     },
     "content-type": {
@@ -27654,9 +27856,9 @@
       }
     },
     "destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
       "dev": true
     },
     "detect-file": {
@@ -29303,7 +29505,7 @@
     "etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
       "dev": true
     },
     "event-target-shim": {
@@ -29499,38 +29701,39 @@
       }
     },
     "express": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
-      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
+      "version": "4.18.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
       "dev": true,
       "requires": {
-        "accepts": "~1.3.7",
+        "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.19.0",
-        "content-disposition": "0.5.3",
+        "body-parser": "1.20.1",
+        "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.4.0",
+        "cookie": "0.5.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
+        "depd": "2.0.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
+        "finalhandler": "1.2.0",
         "fresh": "0.5.2",
+        "http-errors": "2.0.0",
         "merge-descriptors": "1.0.1",
         "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.5",
-        "qs": "6.7.0",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.11.0",
         "range-parser": "~1.2.1",
-        "safe-buffer": "5.1.2",
-        "send": "0.17.1",
-        "serve-static": "1.14.1",
-        "setprototypeof": "1.1.1",
-        "statuses": "~1.5.0",
+        "safe-buffer": "5.2.1",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
         "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
@@ -29543,9 +29746,9 @@
           "dev": true
         },
         "cookie": {
-          "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
-          "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+          "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
           "dev": true
         },
         "debug": {
@@ -29557,11 +29760,53 @@
             "ms": "2.0.0"
           }
         },
+        "depd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+          "dev": true
+        },
+        "finalhandler": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+          "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+          "dev": true,
+          "requires": {
+            "debug": "2.6.9",
+            "encodeurl": "~1.0.2",
+            "escape-html": "~1.0.3",
+            "on-finished": "2.4.1",
+            "parseurl": "~1.3.3",
+            "statuses": "2.0.1",
+            "unpipe": "~1.0.0"
+          }
+        },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
           "dev": true
+        },
+        "on-finished": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+          "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+          "dev": true,
+          "requires": {
+            "ee-first": "1.1.1"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "dev": true
+        },
+        "statuses": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+          "dev": true
         }
       }
     },
@@ -30274,9 +30519,9 @@
       }
     },
     "forwarded": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
       "dev": true
     },
     "fragment-cache": {
@@ -30291,7 +30536,7 @@
     "fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
       "dev": true
     },
     "from2": {
@@ -31069,22 +31314,28 @@
       "dev": true
     },
     "http-errors": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
-      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
       "dev": true,
       "requires": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.1",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.0"
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
       },
       "dependencies": {
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+        "depd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+          "dev": true
+        },
+        "statuses": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
           "dev": true
         }
       }
@@ -33172,16 +33423,16 @@
       "dev": true
     },
     "mime-db": {
-      "version": "1.46.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.46.0.tgz",
-      "integrity": "sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ=="
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
     },
     "mime-types": {
-      "version": "2.1.29",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.29.tgz",
-      "integrity": "sha512-Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ==",
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "requires": {
-        "mime-db": "1.46.0"
+        "mime-db": "1.52.0"
       }
     },
     "mimic-response": {
@@ -33467,9 +33718,9 @@
       "dev": true
     },
     "negotiator": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
-      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
       "dev": true
     },
     "neo-async": {
@@ -34923,12 +35174,12 @@
       "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk="
     },
     "proxy-addr": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
-      "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
       "dev": true,
       "requires": {
-        "forwarded": "~0.1.2",
+        "forwarded": "0.2.0",
         "ipaddr.js": "1.9.1"
       }
     },
@@ -35035,10 +35286,13 @@
       "dev": true
     },
     "qs": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
-      "dev": true
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "dev": true,
+      "requires": {
+        "side-channel": "^1.0.4"
+      }
     },
     "query-string": {
       "version": "5.1.1",
@@ -35106,13 +35360,13 @@
       "dev": true
     },
     "raw-body": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
-      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
       "dev": true,
       "requires": {
-        "bytes": "3.1.0",
-        "http-errors": "1.7.2",
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "unpipe": "1.0.0"
       }
@@ -36055,24 +36309,24 @@
       }
     },
     "send": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
-      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "dev": true,
       "requires": {
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "~1.7.2",
+        "http-errors": "2.0.0",
         "mime": "1.6.0",
-        "ms": "2.1.1",
-        "on-finished": "~2.3.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
         "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
+        "statuses": "2.0.1"
       },
       "dependencies": {
         "debug": {
@@ -36087,11 +36341,17 @@
             "ms": {
               "version": "2.0.0",
               "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+              "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
               "dev": true
             }
           }
         },
+        "depd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+          "dev": true
+        },
         "mime": {
           "version": "1.6.0",
           "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
@@ -36099,9 +36359,24 @@
           "dev": true
         },
         "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+          "dev": true
+        },
+        "on-finished": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+          "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+          "dev": true,
+          "requires": {
+            "ee-first": "1.1.1"
+          }
+        },
+        "statuses": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
           "dev": true
         }
       }
@@ -36191,15 +36466,15 @@
       }
     },
     "serve-static": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
-      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
       "dev": true,
       "requires": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.17.1"
+        "send": "0.18.0"
       }
     },
     "set-blocking": {
@@ -36243,9 +36518,9 @@
       "dev": true
     },
     "setprototypeof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
       "dev": true
     },
     "sha.js": {
@@ -36287,6 +36562,17 @@
       "resolved": "https://registry.npmjs.org/shimmer/-/shimmer-1.2.1.tgz",
       "integrity": "sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw=="
     },
+    "side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      }
+    },
     "signal-exit": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
@@ -38225,9 +38511,9 @@
       }
     },
     "toidentifier": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
       "dev": true
     },
     "toposort": {

From aa70a6dcdaa7f841c633c451867645b4eec3ad7f Mon Sep 17 00:00:00 2001
From: Rena Chen <rena.chen@microsoft.com>
Date: Mon, 12 Apr 2021 18:23:31 -0700
Subject: [PATCH 26/72] Fixes AB#446: Name property not defined for monitor
 charts

---
 .../monitor-chart/monitor-chart.component.ts         |  7 +++++--
 .../monitoring/monitor-chart/monitor-chart.html      | 12 ++++++++----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/app/components/account/monitoring/monitor-chart/monitor-chart.component.ts b/src/app/components/account/monitoring/monitor-chart/monitor-chart.component.ts
index 445088e672..c1680032e1 100644
--- a/src/app/components/account/monitoring/monitor-chart/monitor-chart.component.ts
+++ b/src/app/components/account/monitoring/monitor-chart/monitor-chart.component.ts
@@ -24,12 +24,15 @@ const aggregationAttributes = {
     [MonitorChartAggregation.Avg]: "average",
     [MonitorChartAggregation.Sum]: "total",
 };
+
+let idCounter = 0;
 @Component({
     selector: "bl-monitor-chart",
     templateUrl: "monitor-chart.html",
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MonitorChartComponent implements OnChanges, OnDestroy {
+    @Input() public headerId = `monitor-chart-header-id-${idCounter++}`;
     @Input() public chartType: ChartType = ChartType.Line;
     @Input() public metrics: MonitorChartType;
     @Input() public preview: boolean = false;
@@ -77,11 +80,11 @@ export class MonitorChartComponent implements OnChanges, OnDestroy {
             }),
         );
 
-        const metrics = combineLatest(
+        const metrics = combineLatest([
             this._metrics.pipe(filter(isNotNullOrUndefined)),
             this._timeRange.pipe(filter(isNotNullOrUndefined)),
             this.accountService.currentAccountId,
-        ).pipe(
+        ]).pipe(
             takeUntil(this._destroy),
             tap(() => {
                 this.chartError = null;
diff --git a/src/app/components/account/monitoring/monitor-chart/monitor-chart.html b/src/app/components/account/monitoring/monitor-chart/monitor-chart.html
index 64d32815b7..4a5b5921ef 100644
--- a/src/app/components/account/monitoring/monitor-chart/monitor-chart.html
+++ b/src/app/components/account/monitoring/monitor-chart/monitor-chart.html
@@ -1,17 +1,21 @@
 <ng-container *ngIf="!preview">
     <div class="header">
-        <h2 tabindex="0">
+        <h2 tabindex="0" id="{{headerId}}">
             {{ 'account-monitoring.' + metrics | i18n }}
         </h2>
-
-
         <div class="aggregation" *ngIf="aggregation" tabindex="0">
             {{aggregation}}
         </div>
     </div>
     <ng-container *ngIf="isChartReady">
         <div class="chart-container" tabindex="0" aria-label="graph">
-            <canvas blChart [datasets]="datasets" [options]="options" [chartType]="chartType" [colors]="colors"></canvas>
+            <canvas blChart
+                [datasets]="datasets"
+                [options]="options"
+                [chartType]="chartType"
+                [colors]="colors"
+                [attr.aria-labelledby]="headerId">
+            </canvas>
         </div>
         <div class="legend">
             <div class="legend-item" *ngFor="let dataset of datasets;trackBy: trackDataSet;let index=index" tabindex="0">

From fc2c12e3542dcb73ca3176cbb82f33765920cfe9 Mon Sep 17 00:00:00 2001
From: rechen <rechen@microsoft.com>
Date: Mon, 26 Apr 2021 16:05:17 -0700
Subject: [PATCH 27/72] Update fix for AB#451

---
 .../pool/action/add/os-picker/os-offer-tile/os-offer-tile.html  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/components/pool/action/add/os-picker/os-offer-tile/os-offer-tile.html b/src/app/components/pool/action/add/os-picker/os-offer-tile/os-offer-tile.html
index 0039298586..39a7632092 100644
--- a/src/app/components/pool/action/add/os-picker/os-offer-tile/os-offer-tile.html
+++ b/src/app/components/pool/action/add/os-picker/os-offer-tile/os-offer-tile.html
@@ -17,7 +17,7 @@
     [matMenuTriggerFor]="menu"
     matTooltip="{{'os-offer-tile.select-version-button.tooltip' | i18n}}"
     title="{{'os-offer-tile.select-version-button.tooltip' | i18n}} ({{prettyName}})">
-    <i class="fa fa-cog"></i>
+    <i class="fa fa-cog" aria-hidden="true"></i>
 </button>
 <mat-menu #menu="matMenu">
     <button mat-menu-item *ngFor="let sku of skus;trackBy: trackSku" (click)="onClickSku(sku)">{{sku.name}}</button>

From 376331c46917b54e6755b85b6db13e7d4498040c Mon Sep 17 00:00:00 2001
From: rechen <rechen@microsoft.com>
Date: Mon, 26 Apr 2021 19:57:29 -0700
Subject: [PATCH 28/72] Fix AB#452: Required Asterisk is not defined to the
 required ID require field.

---
 src/@batch-flask/ui/form/form-field/form-field.html          | 3 +++
 src/@batch-flask/ui/form/form-field/form-field.scss          | 5 +++++
 .../components/pool/action/add/pool-create-basic-dialog.html | 4 ++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/@batch-flask/ui/form/form-field/form-field.html b/src/@batch-flask/ui/form/form-field/form-field.html
index 564957580e..b203038a2e 100644
--- a/src/@batch-flask/ui/form/form-field/form-field.html
+++ b/src/@batch-flask/ui/form/form-field/form-field.html
@@ -5,6 +5,9 @@
         [attr.for]="control.id"
         [attr.aria-owns]="control.id">
         {{control.placeholder}}
+        <sup *ngIf="control.required">
+            <i class="fa fa-asterisk" aria-hidden="true"></i>
+        </sup>
     </label>
 </div>
 <div class="input-container">
diff --git a/src/@batch-flask/ui/form/form-field/form-field.scss b/src/@batch-flask/ui/form/form-field/form-field.scss
index cf6dbd35ed..a768dd9ab2 100644
--- a/src/@batch-flask/ui/form/form-field/form-field.scss
+++ b/src/@batch-flask/ui/form/form-field/form-field.scss
@@ -28,6 +28,11 @@ bl-form-field {
         // Having this opacity make contrast ratio too loos
         // opacity: 0.5;
     }
+
+    .fa-asterisk {
+        color: var(--color-danger);
+        font-size: 8px;
+    }
 }
 
 bl-form-field {
diff --git a/src/app/components/pool/action/add/pool-create-basic-dialog.html b/src/app/components/pool/action/add/pool-create-basic-dialog.html
index b5dbd05224..3148c81c3c 100644
--- a/src/app/components/pool/action/add/pool-create-basic-dialog.html
+++ b/src/app/components/pool/action/add/pool-create-basic-dialog.html
@@ -3,8 +3,8 @@
         <bl-form-section title="Pool details" subtitle="Basic information about the pool">
             <div class="grow">
                 <div class="gcol">
-                    <bl-form-field class="form-element required">
-                        <input blInput #idInput formControlName="id" placeholder="ID" maxlength="64">
+                    <bl-form-field class="form-element">
+                        <input blInput #idInput formControlName="id" placeholder="ID" maxlength="64" required>
 
                         <bl-hint align="end" attr.aria-label="{{idInput.value.length}} characters out of 64">{{idInput.value.length}} / 64</bl-hint>
 

From 9875c16e620a5b4d278fdb1e4d6f5271eb3c6053 Mon Sep 17 00:00:00 2001
From: rechen <rechen@microsoft.com>
Date: Mon, 26 Apr 2021 20:40:11 -0700
Subject: [PATCH 29/72] Fix AB#453: On the Create job schedule blade,
 aria-required=true and asterisk mark are not defined for the Id control.

---
 .../action/add/job-schedule-create-basic-dialog.html            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/components/job-schedule/action/add/job-schedule-create-basic-dialog.html b/src/app/components/job-schedule/action/add/job-schedule-create-basic-dialog.html
index cd8949fd13..00833c8f81 100644
--- a/src/app/components/job-schedule/action/add/job-schedule-create-basic-dialog.html
+++ b/src/app/components/job-schedule/action/add/job-schedule-create-basic-dialog.html
@@ -3,7 +3,7 @@
         <bl-form-section title="General info" subtitle="Basic information about the job schedule">
             <div class="form-element">
                 <bl-form-field>
-                    <input blInput formControlName="id" placeholder="ID">
+                    <input blInput formControlName="id" placeholder="ID" required>
                 </bl-form-field>
                 <bl-error controlName="id" code="required">ID is a required field</bl-error>
                 <bl-error controlName="id" code="maxlength">ID has a maximum length of 64 characters</bl-error>

From d25f0f9c943b26c02acfd835a1c5d2ee52e7b4ca Mon Sep 17 00:00:00 2001
From: Shiran Pasternak <shiran.pasternak@microsoft.com>
Date: Wed, 14 Sep 2022 13:18:38 -0400
Subject: [PATCH 30/72] Fixes focus trap for callouts

Related to AB#996.
---
 .../core/html-util/focus-helper.spec.ts       | 74 +++++++++++++++++++
 .../core/html-util/focus-helper.ts            | 50 +++++++++++++
 src/@batch-flask/core/html-util/index.ts      |  1 +
 src/@batch-flask/core/index.ts                |  1 +
 .../clickable/clickable.component.spec.ts     | 10 ++-
 .../ui/callout/callout.directive.spec.ts      | 66 +++++++++++++++++
 .../ui/callout/callout.directive.ts           | 26 ++++---
 src/@batch-flask/ui/callout/callout.html      |  2 +-
 .../ui/datetime-picker/datetime-picker.html   |  5 +-
 9 files changed, 222 insertions(+), 13 deletions(-)
 create mode 100644 src/@batch-flask/core/html-util/focus-helper.spec.ts
 create mode 100644 src/@batch-flask/core/html-util/focus-helper.ts
 create mode 100644 src/@batch-flask/core/html-util/index.ts
 create mode 100644 src/@batch-flask/ui/callout/callout.directive.spec.ts

diff --git a/src/@batch-flask/core/html-util/focus-helper.spec.ts b/src/@batch-flask/core/html-util/focus-helper.spec.ts
new file mode 100644
index 0000000000..7255c2fe62
--- /dev/null
+++ b/src/@batch-flask/core/html-util/focus-helper.spec.ts
@@ -0,0 +1,74 @@
+import { Component } from "@angular/core";
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { By } from "@angular/platform-browser";
+import { focusWithin } from "./focus-helper";
+
+@Component({
+    template: `
+<div id="container">
+    <span></span>
+    <input/>
+    <div></div>
+</div>
+    `
+}) class TestComponent { }
+
+describe("focus-helper", () => {
+    describe("focusWithin", () => {
+        let fixture: ComponentFixture<TestComponent>;
+        let container, children;
+
+        const expectContainerFocus = el => {
+            focusWithin(container);
+            expect(document.activeElement).toEqual(el);
+        };
+
+        beforeEach(() => {
+            TestBed.configureTestingModule({
+                declarations: [TestComponent]
+            });
+
+            fixture = TestBed.createComponent(TestComponent);
+            fixture.detectChanges();
+
+            container = fixture.debugElement.query(By.css("#container"))
+                .nativeElement;
+            children = container.childNodes;
+        });
+        it("focuses on the first interactive element", () => {
+            expect(document.activeElement).toEqual(document.body);
+
+            expectContainerFocus(children[1]);
+        });
+        it("focuses on an element whose tabindex is 0", () => {
+            children[0].tabIndex = 0;
+            expectContainerFocus(children[0]);
+        });
+
+        it("skips invisible elements", () => {
+            children[2].tabIndex = 0;
+            expectContainerFocus(children[1]);
+
+            children[1].style.display = "none";
+            expectContainerFocus(children[2]);
+
+            children[1].style.display = null;
+            children[1].style.visibility = "hidden";
+            expectContainerFocus(children[2]);
+
+            children[1].style.visibility = "visible";
+            children[1].style.opacity = 0;
+            expectContainerFocus(children[2]);
+
+            children[1].style.opacity = 1;
+            expectContainerFocus(children[1]);
+        });
+
+        it("skips disabled elements", () => {
+            expectContainerFocus(children[1]);
+            children[1].setAttribute("disabled", true);
+            children[2].tabIndex = 0;
+            expectContainerFocus(children[2]);
+        })
+    });
+});
diff --git a/src/@batch-flask/core/html-util/focus-helper.ts b/src/@batch-flask/core/html-util/focus-helper.ts
new file mode 100644
index 0000000000..ffa2e2338d
--- /dev/null
+++ b/src/@batch-flask/core/html-util/focus-helper.ts
@@ -0,0 +1,50 @@
+/**
+ * Finds the first interactive element within an element tree and focuses it.
+ *
+ * @param element an HTML element tree to focus in
+ * @returns Whether an interactive was found and focused
+ */
+export function focusWithin(element: HTMLElement): boolean {
+    if (!element) {
+        return false;
+    }
+
+    if (isInteractive(element)) {
+        element.focus();
+        return true;
+    }
+
+    for (const child of element.childNodes) {
+        if (child instanceof HTMLElement && focusWithin(child)) {
+            return true;
+        }
+    }
+    return false;
+}
+
+/**
+ * Determines if an HTML element is interactive.
+ *
+ * @param element An HTML element to query
+ * @returns whether the element is interactive
+ */
+export function isInteractive(element: HTMLElement): boolean {
+
+    // The display style will have the computed visibility of the elment,
+    // except if its opacity is 0, which should be tested explicitly.
+    const style = window.getComputedStyle(element);
+
+    if (style.display === "none" ||
+        style.opacity === "0" ||
+        element.getAttribute("disabled") === "true") {
+        return false;
+    }
+
+    if (element.tabIndex >= 0 ||
+        element.tagName === "INPUT" ||
+        element.tagName === "BUTTON") {
+        return true;
+    }
+
+    return false;
+}
diff --git a/src/@batch-flask/core/html-util/index.ts b/src/@batch-flask/core/html-util/index.ts
new file mode 100644
index 0000000000..14b0f09519
--- /dev/null
+++ b/src/@batch-flask/core/html-util/index.ts
@@ -0,0 +1 @@
+export * from "./focus-helper";
diff --git a/src/@batch-flask/core/index.ts b/src/@batch-flask/core/index.ts
index 409fb232b3..8947749701 100644
--- a/src/@batch-flask/core/index.ts
+++ b/src/@batch-flask/core/index.ts
@@ -20,3 +20,4 @@ export * from "./telemetry";
 export * from "./timezone";
 export * from "./tenant-settings";
 export * from "./user-configuration";
+export * from "./html-util";
diff --git a/src/@batch-flask/ui/buttons/clickable/clickable.component.spec.ts b/src/@batch-flask/ui/buttons/clickable/clickable.component.spec.ts
index 4777733b22..d768c15532 100644
--- a/src/@batch-flask/ui/buttons/clickable/clickable.component.spec.ts
+++ b/src/@batch-flask/ui/buttons/clickable/clickable.component.spec.ts
@@ -3,7 +3,8 @@ import { ComponentFixture, TestBed, fakeAsync, getTestBed, tick } from "@angular
 import { BrowserModule, By } from "@angular/platform-browser";
 import { Router } from "@angular/router";
 import { RouterTestingModule } from "@angular/router/testing";
-import { click } from "test/utils/helpers";
+import { KeyCode } from "@batch-flask/core/keys";
+import { click, keydown } from "test/utils/helpers";
 import { ClickableComponent } from "./clickable.component";
 
 /* eslint-disable @angular-eslint/component-class-suffix */
@@ -54,6 +55,13 @@ describe("ClickableComponent", () => {
         click(de);
         expect(testComponent.trigger).not.toHaveBeenCalled();
     });
+
+    it("triggers through 'Enter' key", fakeAsync(() => {
+        setup(ClickableWithRouterLinkOnSelf);
+        keydown(de, KeyCode.Enter);
+        tick();
+        expect(testComponent.trigger).toHaveBeenCalledOnce();
+    }));
 });
 
 class TestComponent {
diff --git a/src/@batch-flask/ui/callout/callout.directive.spec.ts b/src/@batch-flask/ui/callout/callout.directive.spec.ts
new file mode 100644
index 0000000000..7fd6a0dadc
--- /dev/null
+++ b/src/@batch-flask/ui/callout/callout.directive.spec.ts
@@ -0,0 +1,66 @@
+import { Overlay } from "@angular/cdk/overlay";
+import { Component, ViewChild } from "@angular/core";
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { By } from "@angular/platform-browser";
+import { CalloutDirective } from "..";
+
+@Component({
+    template: `<input [blCallout] />`
+})
+class HostComponent {
+    @ViewChild(CalloutDirective) theDirective;
+}
+
+describe("CalloutDirective", () => {
+    let fixture: ComponentFixture<HostComponent>;
+    let input: HTMLButtonElement;
+    let testComponent: HostComponent;
+
+    beforeEach(async () => {
+        await TestBed.configureTestingModule({
+            declarations: [CalloutDirective, HostComponent],
+            providers: [{
+                provide: Overlay, useValue: {
+                    position: () => ({
+                        connectedTo: () => ({
+                            withPositions: () => null
+                        })
+                    }),
+                    scrollStrategies: { block: () => null }
+                }
+            }]
+        }).compileComponents();
+        fixture = TestBed.createComponent(HostComponent);
+
+        const target = fixture.debugElement.query(By.css("input"));
+        testComponent = target.componentInstance;
+        input = target.nativeElement;
+
+        fixture.detectChanges();
+    });
+
+    function testToggleKeyStroke(key: string) {
+        const directive = testComponent.theDirective;
+        const openSpy = spyOn(directive, "open");
+        const closeSpy = spyOn(directive, "close");
+
+        input.dispatchEvent(new KeyboardEvent("keydown", { key }));
+        expect(openSpy).toHaveBeenCalledOnce();
+        expect(closeSpy).not.toHaveBeenCalled();
+
+        openSpy.calls.reset();
+        directive._overlayRef = {}; // simulate an open callout
+
+        input.dispatchEvent(new KeyboardEvent("keydown", { key }));
+        expect(openSpy).not.toHaveBeenCalled();
+        expect(closeSpy).toHaveBeenCalledOnce();
+    }
+
+    it("can be toggled with the 'Enter' key", () => {
+        testToggleKeyStroke("Enter");
+    });
+
+    it("can be toggled with the 'Space' key", () => {
+        testToggleKeyStroke("Space");
+    });
+});
diff --git a/src/@batch-flask/ui/callout/callout.directive.ts b/src/@batch-flask/ui/callout/callout.directive.ts
index 0cba29710b..77bfb2974e 100644
--- a/src/@batch-flask/ui/callout/callout.directive.ts
+++ b/src/@batch-flask/ui/callout/callout.directive.ts
@@ -1,9 +1,10 @@
 import { ConnectionPositionPair, Overlay, OverlayConfig, OverlayRef } from "@angular/cdk/overlay";
 import { TemplatePortal } from "@angular/cdk/portal";
-import { Directive, ElementRef,  HostListener, Input, ViewContainerRef } from "@angular/core";
+import { Directive, ElementRef, HostListener, Input, ViewContainerRef } from "@angular/core";
+import { focusWithin } from "@batch-flask/core";
+import { KeyCode } from "@batch-flask/core/keys";
 import { Subscription } from "rxjs";
 import { CalloutComponent } from "./callout.component";
-import { ENTER, SPACE } from "@batch-flask/core/keys";
 
 @Directive({
     selector: "[blCallout]",
@@ -18,7 +19,9 @@ export class CalloutDirective {
 
     }
 
-    @HostListener("click") public handleClick() {
+    @HostListener("click", ["$event"])
+    public handleClick(event: Event) {
+        event.preventDefault();
         if (this._overlayRef) {
             this.close();
         } else {
@@ -27,13 +30,9 @@ export class CalloutDirective {
     }
 
     @HostListener("keydown", ["$event"])
-    public onkeydown(event: KeyboardEvent) {
-        if (event.key === SPACE || event.key === ENTER) {
-            if (this._overlayRef) {
-                this.close();
-            } else {
-                this.open();
-            }
+    public onKeyDown(event: KeyboardEvent) {
+        if (event.key === KeyCode.Enter || event.key === KeyCode.Space) {
+            this.handleClick(event);
         }
     }
 
@@ -45,6 +44,13 @@ export class CalloutDirective {
 
         const portal = new TemplatePortal(this.component.template, this.viewContainerRef);
         this._overlayRef.attach(portal);
+        this._overlayRef.overlayElement.onkeydown = (event: KeyboardEvent) => {
+            if (event.key === KeyCode.Escape) {
+                this.close();
+                this.elementRef.nativeElement.focus();
+            }
+        }
+        focusWithin(this._overlayRef.overlayElement);
     }
 
     public close() {
diff --git a/src/@batch-flask/ui/callout/callout.html b/src/@batch-flask/ui/callout/callout.html
index f23afbbec7..0c084b3f5f 100644
--- a/src/@batch-flask/ui/callout/callout.html
+++ b/src/@batch-flask/ui/callout/callout.html
@@ -1,5 +1,5 @@
 <ng-template>
-    <div class="bl-callout" tabindex="0">
+    <div class="bl-callout">
         <ng-content></ng-content>
     </div>
 </ng-template>
diff --git a/src/@batch-flask/ui/datetime-picker/datetime-picker.html b/src/@batch-flask/ui/datetime-picker/datetime-picker.html
index 2d85eb75dd..4199bfa0f3 100644
--- a/src/@batch-flask/ui/datetime-picker/datetime-picker.html
+++ b/src/@batch-flask/ui/datetime-picker/datetime-picker.html
@@ -6,10 +6,13 @@
         <input blInput [matDatepicker]="datePicker"
             [placeholder]="'datetime-picker.pickDate' | i18n"
             formControlName="date"
+            title="{{label}} {{'datetime-picker.time' | i18n}}"
             attr.aria-label="{{label}} {{'datetime-picker.date' | i18n}}">
         <mat-datepicker-toggle blFormFieldSuffix [for]="datePicker"></mat-datepicker-toggle>
         <mat-datepicker #datePicker></mat-datepicker>
-        <input *ngIf="timePicker" blInput formControlName="time" type="time" attr.aria-label="{{label}} {{'datetime-picker.time' | i18n}}">
+        <input *ngIf="timePicker" blInput formControlName="time" type="time"
+            title="{{label}}  {{'datetime-picker.time' | i18n}}"
+            attr.aria-label="{{label}} {{'datetime-picker.time' | i18n}}">
         <span class="timezone" [title]="'datetime-picker.currentTimeZone' | i18n">{{currentTimeZone?.offsetNameShort}}</span>
     </div>
 </ng-container>

From 4c5f3a5ff9cbdc39c8ac124ec57585fee51b6ead Mon Sep 17 00:00:00 2001
From: David Watrous <509299+dpwatrous@users.noreply.github.com>
Date: Fri, 16 Dec 2022 13:29:43 -0500
Subject: [PATCH 31/72] Fixed Windows code signing (#2606)

.NET 2.x doesn't seem to be on our CI image anymore
---
 .vsts/win/sign.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.vsts/win/sign.yml b/.vsts/win/sign.yml
index 9b849e848e..98734a7db2 100644
--- a/.vsts/win/sign.yml
+++ b/.vsts/win/sign.yml
@@ -5,6 +5,12 @@ parameters:
   pattern: ''
 
 steps:
+  - task: UseDotNet@2
+    displayName: 'Use .NET Core sdk'
+    inputs:
+      packageType: sdk
+      version: 2.1.x
+
   - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
     displayName: ${{ parameters.name }}
     inputs:

From 82e4a3bff6ac3d82d85fdcffe4d3025b68a108db Mon Sep 17 00:00:00 2001
From: Rena <cRui861@users.noreply.github.com>
Date: Tue, 3 Jan 2023 12:58:41 -0800
Subject: [PATCH 32/72] Add batchSupportEndOfLife to show image deprecation
 warnings (#2574)

* Add deprecation warning for windowsserver container images

* Minor: remove plural images

* Fix wording of deprecation message

* Fix broken link for pool details
* fix find and replace all error for Cores
* remove console log statement

* Address PR comments

* Add batchSupportedEndOfLife to determine whether deprecation warning will appear

* Add date to deprecation warning message
* Fix unit test

* Fix unit tests

* Change deprecation warning link to only show if image has associated learn more info

* Remove fit

* Change wording for pool details

* Address PR suggestions

* Add different
EOL messages for how far away each date is
---
 .../add/pool-picker/pool-picker.component.ts  |  4 +-
 .../os-image-picker.component.spec.ts         |  3 +-
 .../os-image-picker.component.ts              |  8 +-
 .../add/pool-create-basic-dialog.component.ts | 53 +++++++++++++
 .../action/add/pool-create-basic-dialog.html  | 26 ++++---
 .../add/pool-create-basic-dialog.i18n.yml     |  4 +
 .../action/add/pool-create-basic-dialog.scss  |  4 +-
 .../pool/details/pool-details.component.ts    | 76 ++++++++++++++++++-
 .../components/pool/details/pool-details.html | 19 +++++
 .../pool/details/pool-details.i18n.yml        |  4 +
 .../components/pool/details/pool-details.scss | 25 ++++++
 src/app/models/pool-os-skus.ts                |  2 +
 src/app/utils/pool-utils.ts                   | 34 +++++++++
 13 files changed, 243 insertions(+), 19 deletions(-)
 create mode 100644 src/app/components/pool/action/add/pool-create-basic-dialog.i18n.yml

diff --git a/src/app/components/job/action/add/pool-picker/pool-picker.component.ts b/src/app/components/job/action/add/pool-picker/pool-picker.component.ts
index e3b59ee70e..162a3f7412 100644
--- a/src/app/components/job/action/add/pool-picker/pool-picker.component.ts
+++ b/src/app/components/job/action/add/pool-picker/pool-picker.component.ts
@@ -95,10 +95,10 @@ export class PoolPickerComponent implements ControlValueAccessor, OnChanges, OnD
             this.changeDetector.markForCheck();
         });
 
-        combineLatest(
+        combineLatest([
             this.poolOsService.offers,
             ciFilteredPools,
-        ).pipe(
+        ]).pipe(
             takeUntil(this._destroy),
         ).subscribe(([offers, pools]) => {
             this._updateOffers(offers.allOffers, pools);
diff --git a/src/app/components/pool/action/add/os-picker/os-image-picker/os-image-picker.component.spec.ts b/src/app/components/pool/action/add/os-picker/os-image-picker/os-image-picker.component.spec.ts
index 6cc5c3e76c..500e5fa47c 100644
--- a/src/app/components/pool/action/add/os-picker/os-image-picker/os-image-picker.component.spec.ts
+++ b/src/app/components/pool/action/add/os-picker/os-image-picker/os-image-picker.component.spec.ts
@@ -264,7 +264,7 @@ describe("OSImagePickerComponent", () => {
         });
     });
 
-    it("picks the latest virtual machine sku of given offer when cliking on the tile", () => {
+    it("picks the latest virtual machine sku of given offer when clicking on the tile", () => {
         const tiles = getTiles(0);
 
         click(tiles[1].query(By.css(".main")));
@@ -282,6 +282,7 @@ describe("OSImagePickerComponent", () => {
                     sku: "7.1",
                 },
                 nodeAgentSKUId: "batch.node.centos 7",
+                batchSupportEndOfLife: null,
             },
         });
     });
diff --git a/src/app/components/pool/action/add/os-picker/os-image-picker/os-image-picker.component.ts b/src/app/components/pool/action/add/os-picker/os-image-picker/os-image-picker.component.ts
index 11b8e43b69..0621c58ad2 100644
--- a/src/app/components/pool/action/add/os-picker/os-image-picker/os-image-picker.component.ts
+++ b/src/app/components/pool/action/add/os-picker/os-image-picker/os-image-picker.component.ts
@@ -17,6 +17,7 @@ export interface OSImageSelection {
             virtualMachineImageId?: string;
         },
         nodeAgentSKUId?: string;
+        batchSupportEndOfLife?: Date;
     };
     cloudServiceConfiguration?: {
         osFamily: string,
@@ -59,6 +60,7 @@ export class OSImagePickerComponent implements OnChanges, OnDestroy {
     public selectedOffer: string;
     public selectedSku: string;
     public selectedNodeAgentId: string;
+    public selectedbatchSupportEndOfLife: Date;
 
     // Cloud service
     public selectedFamilyName: string;
@@ -104,12 +106,14 @@ export class OSImagePickerComponent implements OnChanges, OnDestroy {
                 this.selectedOffer = null;
                 this.selectedSku = null;
                 this.selectedFamilyName = null;
+                this.selectedbatchSupportEndOfLife = null;
 
                 if (vmConfig) {
                     const ref = vmConfig.imageReference;
                     this.selectedOffer = ref && ref.offer;
                     this.selectedSku = ref && ref.sku;
                     this.selectedNodeAgentId = vmConfig && vmConfig.nodeAgentSKUId;
+                    this.selectedbatchSupportEndOfLife = vmConfig.batchSupportEndOfLife;
                 } else if (value.cloudServiceConfiguration) {
                     const familyId = value.cloudServiceConfiguration.osFamily;
                     const item = cloudServiceOsFamilies.filter(x => x.id === familyId).first();
@@ -144,12 +148,14 @@ export class OSImagePickerComponent implements OnChanges, OnDestroy {
         // preventing user clicking pick same sku multiple times
         if (this.selectedOffer === offer.name &&
             this.selectedSku === sku.name &&
-            this.selectedNodeAgentId === sku.nodeAgentId) {
+            this.selectedNodeAgentId === sku.nodeAgentId &&
+            this.selectedbatchSupportEndOfLife === sku.batchSupportEndOfLife) {
             return;
         }
         this.formGroup.patchValue({
             virtualMachineConfiguration: {
                 nodeAgentSKUId: sku.nodeAgentId,
+                batchSupportEndOfLife: sku.batchSupportEndOfLife,
                 imageReference: {
                     publisher: offer.publisher,
                     offer: offer.name,
diff --git a/src/app/components/pool/action/add/pool-create-basic-dialog.component.ts b/src/app/components/pool/action/add/pool-create-basic-dialog.component.ts
index 346ff6dbe2..e61837305e 100644
--- a/src/app/components/pool/action/add/pool-create-basic-dialog.component.ts
+++ b/src/app/components/pool/action/add/pool-create-basic-dialog.component.ts
@@ -13,9 +13,17 @@ import { NumberUtils } from "app/utils";
 import { Constants } from "common";
 import { Observable, Subscription, of } from "rxjs";
 import { map } from "rxjs/operators";
+import { PoolUtils } from "app/utils";
 
 import "./pool-create-basic-dialog.scss";
 
+export enum ImageEOLState {
+    None,
+    PassedEndOfLife,
+    NearingEndOfLife,
+    FarAwayFromEndOfLife,
+}
+
 @Component({
     selector: "bl-pool-create-basic-dialog",
     templateUrl: "pool-create-basic-dialog.html",
@@ -38,6 +46,26 @@ export class PoolCreateBasicDialogComponent extends DynamicForm<Pool, PoolCreate
         return this._osControl.value && this._osControl.value.cloudServiceConfiguration;
     }
 
+    public get selectedDeprecatedImageEndOfLife() {
+        return this.virtualMachineConfiguration && this.virtualMachineConfiguration.batchSupportEndOfLife;
+    }
+
+    public get selectedImageWillDeprecate() {
+        return this.endOfLifeProximity != ImageEOLState.PassedEndOfLife && this.endOfLifeProximity != ImageEOLState.None;
+    }
+
+    public get hasDeprecationLink() {
+        return this.selectedImageWillDeprecate && PoolUtils.getEndOfLifeHyperlinkforPoolCreate(this.selectedVirtualMachineImageName);
+    }
+
+    public get selectedVirtualMachineImageName(): string {
+        return this._osControl.value.virtualMachineConfiguration.imageReference.sku;
+    }
+
+    public get selectedVirtualMachineImageEndOfLifeDate(): string {
+        return this.selectedDeprecatedImageEndOfLife.toDateString();
+    }
+
     public osSource: PoolOsSources = PoolOsSources.IaaS;
     public osType: "linux" | "windows" = "linux";
     public NodeFillType = NodeFillType;
@@ -48,6 +76,9 @@ export class PoolCreateBasicDialogComponent extends DynamicForm<Pool, PoolCreate
     public armNetworkOnly = true;
     public title = "Add pool";
 
+    public imageEOLState = ImageEOLState;
+    public endOfLifeProximity: ImageEOLState = ImageEOLState.None;
+
     private _osControl: FormControl;
     private _renderingSkuSelected: boolean = false;
     private _subs: Subscription[] = [];
@@ -146,6 +177,7 @@ export class PoolCreateBasicDialogComponent extends DynamicForm<Pool, PoolCreate
                 || value.vmSize !== this._lastFormValue.vmSize
                 || this._lastFormValue.scale !== value.scale) {
                 this._updateEstimatedPrice();
+                this._updateImageEOLState();
             }
             this._lastFormValue = value;
         });
@@ -225,7 +257,28 @@ export class PoolCreateBasicDialogComponent extends DynamicForm<Pool, PoolCreate
         };
     }
 
+    public openDeprecationLink() {
+        const link = PoolUtils.getEndOfLifeHyperlinkforPoolCreate(this.selectedVirtualMachineImageName);
+        this.electronShell.openExternal(link, {activate: true});
+    }
+
     public openLink(link: string) {
         this.electronShell.openExternal(link, {activate: true});
     }
+
+    private _updateImageEOLState() {
+        if (!this.selectedDeprecatedImageEndOfLife) {
+            this.endOfLifeProximity = ImageEOLState.None;
+            return;
+        }
+        const diff = this.selectedDeprecatedImageEndOfLife.getTime() - Date.now();
+        const days = diff / (1000 * 3600 * 24);
+        if (days >= 0 && days <= 365) {
+            this.endOfLifeProximity = ImageEOLState.NearingEndOfLife;
+        } else if (days > 365) {
+            this.endOfLifeProximity = ImageEOLState.FarAwayFromEndOfLife;
+        } else {
+            this.endOfLifeProximity = ImageEOLState.PassedEndOfLife;
+        }
+    }
 }
diff --git a/src/app/components/pool/action/add/pool-create-basic-dialog.html b/src/app/components/pool/action/add/pool-create-basic-dialog.html
index 3148c81c3c..d54e72e552 100644
--- a/src/app/components/pool/action/add/pool-create-basic-dialog.html
+++ b/src/app/components/pool/action/add/pool-create-basic-dialog.html
@@ -29,18 +29,26 @@
         </bl-form-section>
 
         <bl-form-section title="Select an operating system configuration" subtitle="Choose the operating system to be installed on all the nodes in the pool">
-            <bl-banner class="cloud-services-deprecation-warning" type="warning">
-                <div message>
-                    The Windows container images below will be removed from marketplace starting on September 22, 2022. After this date, new pools using it may not be created from the Azure Batch Explorer.
-                    <a (click)="openLink('https://github.com/Azure/Batch/issues/136')" href="javascript:void(0)">Click here </a>
-                    for more information.
-                </div>
-            </bl-banner>
+            <ng-container *ngIf="selectedImageWillDeprecate">
+                <bl-banner class="create-pool-deprecation-warning" type="warning">
+                    <div message>
+                        <span [ngSwitch]="endOfLifeProximity">
+                            <bl-i18n *ngSwitchCase="imageEOLState.FarAwayFromEndOfLife" key="pool-create-basic-dialog.deprecationWarning.imageFarFromEndOfLife">
+                                <b *i18nParam="'imageEndOfLifeDate'">{{selectedVirtualMachineImageEndOfLifeDate}}</b>
+                            </bl-i18n>
+                            <bl-i18n *ngSwitchCase="imageEOLState.NearingEndOfLife" key="pool-create-basic-dialog.deprecationWarning.imageNearingEndOfLife">
+                                <b *i18nParam="'imageEndOfLifeDate'">{{selectedVirtualMachineImageEndOfLifeDate}}</b>
+                            </bl-i18n>
+                        </span>
+                        <a class="create-pool-warning-alternative-link" *ngIf="hasDeprecationLink" (click)="openDeprecationLink()" href="javascript:void(0)">Learn more </a>
+                    </div>
+                </bl-banner>
+            </ng-container>
             <ng-container *ngIf="cloudServiceConfiguration">
-                <bl-banner class="cloud-services-deprecation-warning" type="warning">
+                <bl-banner class="create-pool-deprecation-warning" type="warning">
                     <div message>
                         Cloud Services pools are deprecated and will be retired on 29 February 2024. Existing ‘CloudServiceConfiguration’ pools will need to be deleted and new
-                        <a class="cloud-services-warning-alternative-link" (click)="openLink('https://docs.microsoft.com/en-us/azure/batch/batch-pool-cloud-service-to-virtual-machine-configuration?WT.mc_id=Portal-Microsoft_Azure_Batch')" href="javascript:void(0)">‘VirtualMachineConfiguration’ pools created. </a>
+                        <a class="create-pool-warning-alternative-link" (click)="openLink('https://docs.microsoft.com/azure/batch/batch-pool-cloud-service-to-virtual-machine-configuration?WT.mc_id=Portal-Microsoft_Azure_Batch')" href="javascript:void(0)">‘VirtualMachineConfiguration’ pools created. </a>
                         For new pools, select either a different ‘Distributions‘ or ‘Custom Image’ option.
                     </div>
                 </bl-banner>
diff --git a/src/app/components/pool/action/add/pool-create-basic-dialog.i18n.yml b/src/app/components/pool/action/add/pool-create-basic-dialog.i18n.yml
new file mode 100644
index 0000000000..ca33fc9918
--- /dev/null
+++ b/src/app/components/pool/action/add/pool-create-basic-dialog.i18n.yml
@@ -0,0 +1,4 @@
+pool-create-basic-dialog:
+  deprecationWarning:
+    imageFarFromEndOfLife: The selected image has an end-of-life date of {imageEndOfLifeDate}. After this date, it will not appear as an option when creating new pools. API calls using the image may continue to function for up to 60 days afterwards.
+    imageNearingEndOfLife: The selected image is nearing its end of life date of {imageEndOfLifeDate}. After this date, it will not appear as an option when creating new pools. API calls using the image may continue to function for up to 60 days afterwards.
diff --git a/src/app/components/pool/action/add/pool-create-basic-dialog.scss b/src/app/components/pool/action/add/pool-create-basic-dialog.scss
index 07420468a6..8a2b29b71c 100644
--- a/src/app/components/pool/action/add/pool-create-basic-dialog.scss
+++ b/src/app/components/pool/action/add/pool-create-basic-dialog.scss
@@ -2,7 +2,7 @@
 
 bl-pool-create-basic-dialog {
     // static colors for deprecation warnings
-    .cloud-services-deprecation-warning {
+    .create-pool-deprecation-warning {
         > .warning {
             background-color: var(--color-warn-50);
             // using the color from var(--color-text-primary)
@@ -21,7 +21,7 @@ bl-pool-create-basic-dialog {
         }
     }
 
-    .cloud-services-warning-alternative-link {
+    .create-pool-warning-alternative-link {
         // using the color from var(--color-primary-800);
         color: #1d54af;
     }
diff --git a/src/app/components/pool/details/pool-details.component.ts b/src/app/components/pool/details/pool-details.component.ts
index fa753abc00..3148e4bc40 100644
--- a/src/app/components/pool/details/pool-details.component.ts
+++ b/src/app/components/pool/details/pool-details.component.ts
@@ -2,16 +2,23 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnIni
 import { ActivatedRoute, Router } from "@angular/router";
 import { EntityView, autobind } from "@batch-flask/core";
 import { PoolDecorator } from "app/decorators";
-import { Pool } from "app/models";
-import { BatchExplorerService, PoolParams, PoolService, PricingService } from "app/services";
-import { NumberUtils } from "app/utils";
+import { ImageInformation, Pool } from "app/models";
+import { BatchExplorerService, PoolOsService, PoolParams, PoolService, PricingService } from "app/services";
+import { NumberUtils, PoolUtils } from "app/utils";
 import { List } from "immutable";
 import { Subscription, from } from "rxjs";
 import { flatMap } from "rxjs/operators";
 import { PoolCommands } from "../action";
+import { ElectronShell } from "@batch-flask/electron";
 
 import "./pool-details.scss";
 
+export enum ImageEOLState {
+    PassedEndOfLife,
+    NearingEndOfLife,
+    FarAwayFromEndOfLife,
+};
+
 @Component({
     selector: "bl-pool-details",
     templateUrl: "pool-details.html",
@@ -35,26 +42,45 @@ export class PoolDetailsComponent implements OnInit, OnDestroy {
         this.poolDecorator = pool && new PoolDecorator(pool);
     }
     public get pool() { return this._pool; }
+    public get isImageDeprecated() {
+        return this._isImageDeprecated;
+    }
+    public get hasDeprecationLink() {
+        return this.isImageDeprecated && PoolUtils.getEndOfLifeHyperlinkforPoolDetails(this.poolDecorator.poolOs);
+    }
+    public get selectedImageEndOfLifeDate() {
+        return this._selectedImageEndOfLifeDate.toDateString();
+    }
+
     public data: EntityView<Pool, PoolParams>;
     public estimatedCost = "-";
 
+    public imageEOLState = ImageEOLState;
+    public endOfLifeProximity: ImageEOLState;
+
     private _paramsSubscriber: Subscription;
     private _pool: Pool;
+    private _isImageDeprecated: boolean;
+    private _supportedImages: ImageInformation[];
+    private _selectedImageEndOfLifeDate: Date;
 
     constructor(
         public commands: PoolCommands,
         private changeDetector: ChangeDetectorRef,
         private router: Router,
         private activatedRoute: ActivatedRoute,
+        private poolOsService: PoolOsService,
         private batchExplorer: BatchExplorerService,
         private pricingService: PricingService,
-        private poolService: PoolService) {
+        private poolService: PoolService,
+        private electronShell: ElectronShell) {
 
         this.data = this.poolService.view();
         this.data.item.subscribe((pool) => {
             this.pool = pool;
             this.changeDetector.markForCheck();
             this._updatePrice();
+            this._updatePoolDeprecationWarning();
         });
 
         this.data.deleted.subscribe((key) => {
@@ -70,6 +96,10 @@ export class PoolDetailsComponent implements OnInit, OnDestroy {
             this.data.params = { id: this.poolId };
             this.data.fetch();
         });
+        this.poolOsService.supportedImages.subscribe(val => {
+            this._supportedImages = val.toArray();
+            this._updatePoolDeprecationWarning();
+        });
     }
 
     public ngOnDestroy() {
@@ -101,6 +131,15 @@ export class PoolDetailsComponent implements OnInit, OnDestroy {
         return from(window.appReady);
     }
 
+    public openDeprecationLink() {
+        const link = PoolUtils.getEndOfLifeHyperlinkforPoolDetails(this.poolDecorator.poolOs);
+        this.electronShell.openExternal(link, {activate: true});
+    }
+
+    public openLink(link: string) {
+        this.electronShell.openExternal(link, {activate: true});
+    }
+
     private _updatePrice() {
         if (!this.pool) {
             this.estimatedCost = "-";
@@ -116,4 +155,33 @@ export class PoolDetailsComponent implements OnInit, OnDestroy {
             this.changeDetector.markForCheck();
         });
     }
+
+    private _updatePoolDeprecationWarning() {
+        this._isImageDeprecated = false;
+        if (!this._supportedImages) {
+            return;
+        }
+        for (let i = 0; i < this._supportedImages.length; i++) {
+            const selectedImage = this._supportedImages[i];
+            if (this.poolDecorator
+                && this.poolDecorator.poolOs.includes(selectedImage.imageReference.sku)
+                && selectedImage.batchSupportEndOfLife) {
+                this._isImageDeprecated = true;
+                this._selectedImageEndOfLifeDate = selectedImage.batchSupportEndOfLife;
+                this._updateImageEOLState();
+            }
+        }
+    }
+
+    private _updateImageEOLState() {
+        const diff = this._selectedImageEndOfLifeDate.getTime() - Date.now();
+        const days = diff / (1000 * 3600 * 24);
+        if (days < 0) {
+            this.endOfLifeProximity = ImageEOLState.PassedEndOfLife;
+        } else if (days >= 0 && days <= 365) {
+            this.endOfLifeProximity = ImageEOLState.NearingEndOfLife;
+        } else {
+            this.endOfLifeProximity = ImageEOLState.FarAwayFromEndOfLife;
+        }
+    }
 }
diff --git a/src/app/components/pool/details/pool-details.html b/src/app/components/pool/details/pool-details.html
index 41f5a408fa..59ff8811c7 100644
--- a/src/app/components/pool/details/pool-details.html
+++ b/src/app/components/pool/details/pool-details.html
@@ -27,6 +27,25 @@
             </div>
         </bl-summary-card>
 
+        <ng-container *ngIf="isImageDeprecated">
+            <bl-banner class="pool-details-summary-deprecation-warning" type="warning">
+                <div message>
+                    <span [ngSwitch]="endOfLifeProximity">
+                        <bl-i18n *ngSwitchCase="imageEOLState.NearingEndOfLife" key="pool-details.deprecationWarning.imageNearingEndOfLife">
+                            <b *i18nParam="'imageEndOfLifeDate'">{{selectedImageEndOfLifeDate}}</b>
+                        </bl-i18n>
+                        <bl-i18n *ngSwitchCase="imageEOLState.FarAwayFromEndOfLife" key="pool-details.deprecationWarning.imageFarAwayFromEndOfLife">
+                            <b *i18nParam="'imageEndOfLifeDate'">{{selectedImageEndOfLifeDate}}</b>
+                        </bl-i18n>
+                        <bl-i18n *ngSwitchCase="imageEOLState.PassedEndOfLife" key="pool-details.deprecationWarning.imagePassedEndOfLife">
+                            <b *i18nParam="'imageEndOfLifeDate'">{{selectedImageEndOfLifeDate}}</b>
+                        </bl-i18n>
+                    </span>
+                    <a class="pool-details-summary-warning-alternative-link" *ngIf="hasDeprecationLink" (click)="openDeprecationLink()" href="javascript:void(0)">Learn more </a>
+                </div>
+            </bl-banner>
+        </ng-container>
+
         <bl-pool-error-display [pool]="pool"></bl-pool-error-display>
         <bl-card class="details">
             <bl-tab-group>
diff --git a/src/app/components/pool/details/pool-details.i18n.yml b/src/app/components/pool/details/pool-details.i18n.yml
index 7e841b25f2..bca08ad621 100644
--- a/src/app/components/pool/details/pool-details.i18n.yml
+++ b/src/app/components/pool/details/pool-details.i18n.yml
@@ -2,3 +2,7 @@ pool-details:
   graphs: Graphs
   openInNewWindow: Open in a new window
   estimatedCost: Estimated cost of this pool at this current state
+  deprecationWarning:
+    imageNearingEndOfLife: This pool's image is nearing its end-of-life date of {imageEndOfLifeDate}. After this date, it will not appear as an option when creating new pools. API calls to create or scale pools using the image may continue to function for up to 60 days afterwards.
+    imageFarAwayFromEndOfLife: This pool's image has an end-of-life date of {imageEndOfLifeDate}. After this date, it will not appear as an option when creating new pools. API calls to create or scale pools using the image may continue to function for up to 60 days afterwards.
+    imagePassedEndOfLife: This pool's image is past its end-of-life date of {imageEndOfLifeDate}. Please recreate this pool using a different image afterwards.
diff --git a/src/app/components/pool/details/pool-details.scss b/src/app/components/pool/details/pool-details.scss
index 557461786b..58a0542c4f 100644
--- a/src/app/components/pool/details/pool-details.scss
+++ b/src/app/components/pool/details/pool-details.scss
@@ -21,4 +21,29 @@ bl-pool-details {
     div[summaryTile] > bl-pool-cost-card {
         padding: 5px;
     }
+
+    // static colors for deprecation warnings
+    .pool-details-summary-deprecation-warning {
+        > .warning {
+            background-color: var(--color-warn-50);
+            // using the color from var(--color-text-primary)
+            color: #333333;
+
+            > .summary-container {
+
+                &.standard {
+                    height: unset;
+                }
+
+                > .message {
+                    white-space: normal;
+                }
+            }
+        }
+    }
+
+    .pool-details-summary-alternative-link {
+        // using the color from var(--color-primary-800);
+        color: #1d54af;
+    }
 }
diff --git a/src/app/models/pool-os-skus.ts b/src/app/models/pool-os-skus.ts
index 0d523c8ef9..6f1b088c00 100644
--- a/src/app/models/pool-os-skus.ts
+++ b/src/app/models/pool-os-skus.ts
@@ -43,6 +43,7 @@ export interface Sku {
     name: string;
     nodeAgentId: string;
     osType: string;
+    batchSupportEndOfLife?: Date;
 }
 
 export interface Offer {
@@ -88,6 +89,7 @@ export class PoolOsSkus {
                 name: imageReference.sku,
                 nodeAgentId: image.nodeAgentSKUId,
                 osType: image.osType,
+                batchSupportEndOfLife: image.batchSupportEndOfLife,
             });
         });
 
diff --git a/src/app/utils/pool-utils.ts b/src/app/utils/pool-utils.ts
index 562ddcc0de..7f486a31df 100644
--- a/src/app/utils/pool-utils.ts
+++ b/src/app/utils/pool-utils.ts
@@ -19,6 +19,24 @@ export interface PoolPriceOptions {
     target?: boolean;
 }
 
+const deprecatedContainerImages = [
+    "2016-datacenter-with-containers",
+    "2016-datacenter-with-containers-g2",
+    "2016-datacenter-with-containers-gs",
+    "2019-datacenter-containers-with-containers",
+    "2019-datacenter-core-with-containers-g2",
+    "2019-datacenter-containers-with-containers-smalldisk",
+    "2019-datacenter-core-with-containers-smalldisk-g2",
+    "2019-datacenter-with-containers",
+    "2019-datacenter-with-containers-g2",
+    "2019-datacenter-with-containers-gs",
+    "2019-datacenter-with-containers-smalldisk",
+    "2019-datacenter-with-containers-smalldisk-g2",
+    "datacenter-core-20h2-with-containers-smalldisk",
+    "datacenter-core-20h2-with-containers-smalldisk-gs",
+    "datacenter-core-20h2-with-containers-smalldisk-g2",
+]
+
 const iconMapping = {
     "ubuntuserver": Icons.ubuntu,
     "ubuntu-server-container": Icons.ubuntu,
@@ -174,6 +192,22 @@ export class PoolUtils {
         return "cloud";
     }
 
+    // Pool Details gives OS name and image name so we have to split to just get the matching image name
+    public static getEndOfLifeHyperlinkforPoolDetails(imageName: string): string | null {
+        const imageDetails = imageName.split(" ");
+        if (deprecatedContainerImages.includes(imageDetails[1].toLowerCase())) {
+            return 'https://github.com/Azure/Batch/issues/136';
+        }
+        return null;
+    }
+
+    public static getEndOfLifeHyperlinkforPoolCreate(imageName: string): string | null {
+        if (deprecatedContainerImages.includes(imageName.toLowerCase())) {
+            return 'https://github.com/Azure/Batch/issues/136';
+        }
+        return null;
+    }
+
     /**
      * Display the status of the pool nodes nicely.
      * @param pool Pool

From 19ae786a098d114502066b7d42bfd25d64b804a1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Jan 2023 05:48:26 +0000
Subject: [PATCH 33/72] Bump jsonwebtoken and @azure/msal-node

Bumps [jsonwebtoken](https://github.com/auth0/node-jsonwebtoken) to 9.0.0 and updates ancestor dependency [@azure/msal-node](https://github.com/AzureAD/microsoft-authentication-library-for-js). These dependencies need to be updated together.


Updates `jsonwebtoken` from 8.5.1 to 9.0.0
- [Release notes](https://github.com/auth0/node-jsonwebtoken/releases)
- [Changelog](https://github.com/auth0/node-jsonwebtoken/blob/master/CHANGELOG.md)
- [Commits](https://github.com/auth0/node-jsonwebtoken/compare/v8.5.1...v9.0.0)

Updates `@azure/msal-node` from 1.10.0 to 1.14.6
- [Release notes](https://github.com/AzureAD/microsoft-authentication-library-for-js/releases)
- [Commits](https://github.com/AzureAD/microsoft-authentication-library-for-js/compare/msal-node-v1.10.0...msal-node-v1.14.6)

---
updated-dependencies:
- dependency-name: jsonwebtoken
  dependency-type: indirect
- dependency-name: "@azure/msal-node"
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 167 +++++++++++++---------------------------------
 package.json      |   2 +-
 2 files changed, 48 insertions(+), 121 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 33dda0157f..89ab4df735 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,7 +21,7 @@
         "@angular/platform-browser-dynamic": "^11.0.0",
         "@angular/platform-server": "^11.0.0",
         "@angular/router": "^11.0.0",
-        "@azure/msal-node": "^1.10.0",
+        "@azure/msal-node": "^1.14.6",
         "@azure/storage-blob": "^10.5.0",
         "applicationinsights": "^1.8.5",
         "azure-storage": "^2.10.7",
@@ -495,20 +495,20 @@
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
     },
     "node_modules/@azure/msal-common": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-7.0.0.tgz",
-      "integrity": "sha512-EkaHGjv0kw1RljhboeffM91b+v9d5VtmyG+0a/gvdqjbLu3kDzEfoaS5BNM9QqMzbxgZylsjAjQDtxdHLX/ziA==",
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.0.2.tgz",
+      "integrity": "sha512-qzwxuF8kZAp+rNUactMCgJh8fblq9D4lSqrrIxMDzLjgSZtjN32ix7r/HBe8QdOr76II9SVVPcMkX4sPzPfQ7w==",
       "engines": {
         "node": ">=0.8.0"
       }
     },
     "node_modules/@azure/msal-node": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.10.0.tgz",
-      "integrity": "sha512-oSv9mg199FpRTe+fZ3o9NDYpKShOHqeceaNcCHJcKUaAaCojAbfbxD1Cvsti8BEsLKE6x0HcnjilnM1MKmZekA==",
+      "version": "1.14.6",
+      "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.14.6.tgz",
+      "integrity": "sha512-em/qqFL5tLMxMPl9vormAs13OgZpmQoJbiQ/GlWr+BA77eCLoL+Ehr5xRHowYo+LFe5b+p+PJVkRvT+mLvOkwA==",
       "dependencies": {
-        "@azure/msal-common": "^7.0.0",
-        "jsonwebtoken": "^8.5.1",
+        "@azure/msal-common": "^9.0.2",
+        "jsonwebtoken": "^9.0.0",
         "uuid": "^8.3.0"
       },
       "engines": {
@@ -4120,7 +4120,7 @@
     "node_modules/buffer-equal-constant-time": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
-      "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk="
+      "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA=="
     },
     "node_modules/buffer-fill": {
       "version": "1.0.0",
@@ -12446,32 +12446,32 @@
       ]
     },
     "node_modules/jsonwebtoken": {
-      "version": "8.5.1",
-      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz",
-      "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz",
+      "integrity": "sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==",
       "dependencies": {
         "jws": "^3.2.2",
-        "lodash.includes": "^4.3.0",
-        "lodash.isboolean": "^3.0.3",
-        "lodash.isinteger": "^4.0.4",
-        "lodash.isnumber": "^3.0.3",
-        "lodash.isplainobject": "^4.0.6",
-        "lodash.isstring": "^4.0.1",
-        "lodash.once": "^4.0.0",
+        "lodash": "^4.17.21",
         "ms": "^2.1.1",
-        "semver": "^5.6.0"
+        "semver": "^7.3.8"
       },
       "engines": {
-        "node": ">=4",
-        "npm": ">=1.4.28"
+        "node": ">=12",
+        "npm": ">=6"
       }
     },
     "node_modules/jsonwebtoken/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
       "bin": {
-        "semver": "bin/semver"
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
     "node_modules/jsprim": {
@@ -13076,41 +13076,11 @@
       "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=",
       "dev": true
     },
-    "node_modules/lodash.includes": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
-      "integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8="
-    },
-    "node_modules/lodash.isboolean": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
-      "integrity": "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY="
-    },
     "node_modules/lodash.isequal": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
       "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA="
     },
-    "node_modules/lodash.isinteger": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
-      "integrity": "sha1-YZwK89A/iwTDH1iChAt3sRzWg0M="
-    },
-    "node_modules/lodash.isnumber": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz",
-      "integrity": "sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w="
-    },
-    "node_modules/lodash.isplainobject": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs="
-    },
-    "node_modules/lodash.isstring": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
-      "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE="
-    },
     "node_modules/lodash.memoize": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz",
@@ -13123,11 +13093,6 @@
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
-    "node_modules/lodash.once": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
-      "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w="
-    },
     "node_modules/lodash.truncate": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
@@ -22804,17 +22769,17 @@
       }
     },
     "@azure/msal-common": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-7.0.0.tgz",
-      "integrity": "sha512-EkaHGjv0kw1RljhboeffM91b+v9d5VtmyG+0a/gvdqjbLu3kDzEfoaS5BNM9QqMzbxgZylsjAjQDtxdHLX/ziA=="
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.0.2.tgz",
+      "integrity": "sha512-qzwxuF8kZAp+rNUactMCgJh8fblq9D4lSqrrIxMDzLjgSZtjN32ix7r/HBe8QdOr76II9SVVPcMkX4sPzPfQ7w=="
     },
     "@azure/msal-node": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.10.0.tgz",
-      "integrity": "sha512-oSv9mg199FpRTe+fZ3o9NDYpKShOHqeceaNcCHJcKUaAaCojAbfbxD1Cvsti8BEsLKE6x0HcnjilnM1MKmZekA==",
+      "version": "1.14.6",
+      "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.14.6.tgz",
+      "integrity": "sha512-em/qqFL5tLMxMPl9vormAs13OgZpmQoJbiQ/GlWr+BA77eCLoL+Ehr5xRHowYo+LFe5b+p+PJVkRvT+mLvOkwA==",
       "requires": {
-        "@azure/msal-common": "^7.0.0",
-        "jsonwebtoken": "^8.5.1",
+        "@azure/msal-common": "^9.0.2",
+        "jsonwebtoken": "^9.0.0",
         "uuid": "^8.3.0"
       },
       "dependencies": {
@@ -25795,7 +25760,7 @@
     "buffer-equal-constant-time": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
-      "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk="
+      "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA=="
     },
     "buffer-fill": {
       "version": "1.0.0",
@@ -32389,26 +32354,23 @@
       "integrity": "sha1-XAxWhRBxYOcv50ib3eoLRMK8Z70="
     },
     "jsonwebtoken": {
-      "version": "8.5.1",
-      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz",
-      "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz",
+      "integrity": "sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==",
       "requires": {
         "jws": "^3.2.2",
-        "lodash.includes": "^4.3.0",
-        "lodash.isboolean": "^3.0.3",
-        "lodash.isinteger": "^4.0.4",
-        "lodash.isnumber": "^3.0.3",
-        "lodash.isplainobject": "^4.0.6",
-        "lodash.isstring": "^4.0.1",
-        "lodash.once": "^4.0.0",
+        "lodash": "^4.17.21",
         "ms": "^2.1.1",
-        "semver": "^5.6.0"
+        "semver": "^7.3.8"
       },
       "dependencies": {
         "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+          "version": "7.3.8",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
         }
       }
     },
@@ -32907,41 +32869,11 @@
       "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=",
       "dev": true
     },
-    "lodash.includes": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
-      "integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8="
-    },
-    "lodash.isboolean": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
-      "integrity": "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY="
-    },
     "lodash.isequal": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
       "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA="
     },
-    "lodash.isinteger": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
-      "integrity": "sha1-YZwK89A/iwTDH1iChAt3sRzWg0M="
-    },
-    "lodash.isnumber": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz",
-      "integrity": "sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w="
-    },
-    "lodash.isplainobject": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs="
-    },
-    "lodash.isstring": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
-      "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE="
-    },
     "lodash.memoize": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz",
@@ -32954,11 +32886,6 @@
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
-    "lodash.once": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
-      "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w="
-    },
     "lodash.truncate": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
diff --git a/package.json b/package.json
index d37c208502..a22e9a531a 100644
--- a/package.json
+++ b/package.json
@@ -173,7 +173,7 @@
     "@angular/platform-browser-dynamic": "^11.0.0",
     "@angular/platform-server": "^11.0.0",
     "@angular/router": "^11.0.0",
-    "@azure/msal-node": "^1.10.0",
+    "@azure/msal-node": "^1.14.6",
     "@azure/storage-blob": "^10.5.0",
     "applicationinsights": "^1.8.5",
     "azure-storage": "^2.10.7",

From 2801d211e7f7f1413fbf961c11159f9f98d01edf Mon Sep 17 00:00:00 2001
From: Shiran Pasternak <shiran.pasternak@microsoft.com>
Date: Tue, 29 Nov 2022 12:57:16 -0500
Subject: [PATCH 34/72] Poll rate wasn't used correctly by EntityView

---
 .../core/data/entity-view/entity-view.spec.ts | 56 +++++++++++++------
 .../core/data/entity-view/entity-view.ts      |  2 +-
 2 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/src/@batch-flask/core/data/entity-view/entity-view.spec.ts b/src/@batch-flask/core/data/entity-view/entity-view.spec.ts
index 6a47737f2a..4cdc90a42d 100644
--- a/src/@batch-flask/core/data/entity-view/entity-view.spec.ts
+++ b/src/@batch-flask/core/data/entity-view/entity-view.spec.ts
@@ -47,7 +47,7 @@ describe("EntityView", () => {
         view.fetch();
         tick();
         expect(dataSpy).toHaveBeenCalledTimes(1);
-        expect(item!.toJS()).toEqual(fake1);
+        expect(item.toJS()).toEqual(fake1);
         expect(dataSpy).toHaveBeenCalledWith({ parentId: "parent-1", id: "1" });
     }));
 
@@ -57,35 +57,59 @@ describe("EntityView", () => {
         view.item.subscribe(x => item = x);
         view.fetch();
         expect(item).not.toBeFalsy();
-        expect(item!.toJS()).toEqual({ id: "1", parentId: "parent-1", state: "creating", name: "Fake1" });
+        expect(item.toJS()).toEqual({ id: "1", parentId: "parent-1", state: "creating", name: "Fake1" });
 
         tick(); // This should be the return from the fetched data
-        expect(item!.toJS()).toEqual(fake1);
+        expect(item.toJS()).toEqual(fake1);
     }));
 
     it("Update the data when refreshing", fakeAsync(() => {
         view.item.subscribe(x => item = x);
         view.fetch();
         tick();
-        expect(item!.toJS()).toEqual(fake1);
+        expect(item.toJS()).toEqual(fake1);
 
         view.refresh();
         tick();
-        expect(item!.toJS()).toEqual(fake2);
+        expect(item.toJS()).toEqual(fake2);
 
         view.refresh();
         tick();
-        expect(item!.toJS()).toEqual(fake3);
+        expect(item.toJS()).toEqual(fake3);
         expect(dataSpy).toHaveBeenCalledTimes(3);
     }));
 
-    it("Update the params", fakeAsync(() => {
+    it("updates at the poll rate", fakeAsync(() => {
+        const cache2 = new DataCache<FakeModel>();
+        const dataSpy2 = jasmine.createSpy("supplyDataSpy")
+            .and.returnValues(...data.map(x => from(Promise.resolve(x))));
+        const getter2 = new BasicEntityGetter(FakeModel, {
+            cache: () => cache2,
+            supplyData: dataSpy2,
+        });
+
+        const view2 = new EntityView({
+            cache: () => cache2,
+            getter: getter2,
+            poll: 1000
+        });
+        view2.params = { parentId: "parent-1", id: "2" };
+
+        let item2: FakeModel;
+
         view.item.subscribe(x => item = x);
-        view.params = { parentId: "parent-1", id: "2" };
+        view2.item.subscribe(x => item2 = x);
         view.fetch();
+        view2.fetch();
         tick();
-        expect(item!.toJS()).toEqual(fake1);
-        expect(dataSpy).toHaveBeenCalledWith({ parentId: "parent-1", id: "2" });
+        expect(item.toJS()).toEqual(fake1);
+        expect(item2.toJS()).toEqual(fake1);
+
+        tick(1000);
+        expect(item.toJS()).toEqual(fake1);
+        expect(item2.toJS()).toEqual(fake2);
+
+        view2.dispose();
     }));
 
     it("Update the params", fakeAsync(() => {
@@ -93,21 +117,21 @@ describe("EntityView", () => {
         view.params = { parentId: "parent-1", id: "2" };
         view.fetch();
         tick();
-        expect(item!.toJS()).toEqual(fake1);
-        expect(dataSpy).toHaveBeenCalledWith({parentId: "parent-1",  id: "2" });
+        expect(item.toJS()).toEqual(fake1);
+        expect(dataSpy).toHaveBeenCalledWith({ parentId: "parent-1", id: "2" });
     }));
 
     it("Update the cache should update the item", fakeAsync(() => {
         view.item.subscribe(x => item = x);
         view.fetch();
         tick();
-        expect(item!.toJS()).toEqual(fake1);
+        expect(item.toJS()).toEqual(fake1);
         expect(dataSpy).toHaveBeenCalledTimes(1);
-        expect(dataSpy).toHaveBeenCalledWith({parentId: "parent-1",  id: "1" });
+        expect(dataSpy).toHaveBeenCalledWith({ parentId: "parent-1", id: "1" });
 
-        cache.addItem(new FakeModel({...data[2], parentId: "parent-1"}));
+        cache.addItem(new FakeModel({ ...data[2], parentId: "parent-1" }));
         tick();
-        expect(item!.toJS()).toEqual(fake3);
+        expect(item.toJS()).toEqual(fake3);
     }));
 
     describe("When it return a 404 error", () => {
diff --git a/src/@batch-flask/core/data/entity-view/entity-view.ts b/src/@batch-flask/core/data/entity-view/entity-view.ts
index f51a162cc6..b9cd15ced6 100644
--- a/src/@batch-flask/core/data/entity-view/entity-view.ts
+++ b/src/@batch-flask/core/data/entity-view/entity-view.ts
@@ -47,7 +47,7 @@ export class EntityView<TEntity extends Record<any>, TParams> extends GenericVie
         );
 
         if (config.poll) {
-            this._pollTracker = this.startPoll(5000);
+            this._pollTracker = this.startPoll(config.poll);
         }
     }
 

From 5f5bc7e8cdc4d8b05e44eeccb0929482eefecc8d Mon Sep 17 00:00:00 2001
From: Shiran Pasternak <shiran.pasternak@microsoft.com>
Date: Tue, 11 Oct 2022 18:31:11 -0400
Subject: [PATCH 35/72] Migrates to new Azure Storage API

---
 karma.conf.js                                 |    1 -
 package-lock.json                             | 1984 ++++++-----------
 package.json                                  |    3 +-
 scripts/azpipelines/update-latest.ts          |   94 +-
 scripts/azpipelines/upload-to-storage.ts      |   69 +-
 scripts/azpipelines/utils.ts                  |   80 +-
 .../application-create-dialog.component.ts    |    5 +-
 .../blob-container-picker.component.ts        |    3 +-
 ...cefile-cloud-file-dialog.component.spec.ts |   23 +-
 ...esourcefile-cloud-file-dialog.component.ts |    7 +-
 .../resourcefile-picker.component.ts          |    3 +-
 .../browse/data-container-list.component.ts   |    6 +-
 .../file-group-sas.component.ts               |    5 +-
 .../decorators/container-lease-decorator.ts   |   18 +-
 src/app/models/blob-container.ts              |   11 +
 src/app/models/container-lease.ts             |   16 +-
 .../services/core/data/storage-list-getter.ts |   28 +-
 .../storage/blob-storage-client-proxy.ts      |  444 ++--
 .../storage/models/blob-storage-result.ts     |    4 -
 src/app/services/storage/models/index.ts      |    3 +-
 .../storage/models/shared-access-policy.ts    |    5 +-
 .../services/storage/models/storage-blob.ts   |  137 ++
 .../storage/models/storage-request-options.ts |    2 -
 .../services/storage/storage-blob.service.ts  |  100 +-
 .../storage/storage-client-proxy-factory.ts   |   20 +-
 .../storage/storage-client.service.ts         |   29 +-
 .../storage/storage-container.service.ts      |   10 +-
 src/client/client.module.ts                   |    2 +
 src/client/core/batch-explorer-application.ts |    7 +-
 src/client/core/index.ts                      |    1 +
 src/client/core/storage/index.ts              |    1 +
 .../core/storage/storage-blob-adapter.spec.ts |  224 ++
 .../core/storage/storage-blob-adapter.ts      |  269 +++
 src/common/constants/constants.ts             |   16 +-
 34 files changed, 1756 insertions(+), 1874 deletions(-)
 delete mode 100644 src/app/services/storage/models/blob-storage-result.ts
 create mode 100644 src/app/services/storage/models/storage-blob.ts
 delete mode 100644 src/app/services/storage/models/storage-request-options.ts
 create mode 100644 src/client/core/storage/index.ts
 create mode 100644 src/client/core/storage/storage-blob-adapter.spec.ts
 create mode 100644 src/client/core/storage/storage-blob-adapter.ts

diff --git a/karma.conf.js b/karma.conf.js
index 8c4ea346f7..0f959abb3d 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -95,7 +95,6 @@ module.exports = function(config) {
                 { type: "cobertura", subdir: ".", file: "cobertura.xml" },
             ]
         },
-        // Can't enable yet has a conflict in dependency with azure-storage
         junitReporter: {
             outputDir: "./coverage"
         }
diff --git a/package-lock.json b/package-lock.json
index 89ab4df735..e02b14bad1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,9 +22,8 @@
         "@angular/platform-server": "^11.0.0",
         "@angular/router": "^11.0.0",
         "@azure/msal-node": "^1.14.6",
-        "@azure/storage-blob": "^10.5.0",
+        "@azure/storage-blob": "^12.11.0",
         "applicationinsights": "^1.8.5",
-        "azure-storage": "^2.10.7",
         "chart.js": "^2.9.3",
         "chokidar": "^3.4.3",
         "commander": "^8.0.0",
@@ -449,50 +448,119 @@
       }
     },
     "node_modules/@azure/abort-controller": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-1.0.4.tgz",
-      "integrity": "sha512-lNUmDRVGpanCsiUN3NWxFTdwmdFI53xwhkTFfHDGTYk46ca7Ind3nanJc+U6Zj9Tv+9nTCWRBscWEW1DyKOpTw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-1.1.0.tgz",
+      "integrity": "sha512-TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw==",
       "dependencies": {
-        "tslib": "^2.0.0"
+        "tslib": "^2.2.0"
       },
       "engines": {
-        "node": ">=8.0.0"
+        "node": ">=12.0.0"
       }
     },
     "node_modules/@azure/core-auth": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.2.0.tgz",
-      "integrity": "sha512-KUl+Nwn/Sm6Lw5d3U90m1jZfNSL087SPcqHLxwn2T6PupNKmcgsEbDjHB25gDvHO4h7pBsTlrdJAY7dz+Qk8GA==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.4.0.tgz",
+      "integrity": "sha512-HFrcTgmuSuukRf/EdPmqBrc5l6Q5Uu+2TbuhaKbgaCpP2TfAeiNaQPAadxO+CYBRHGUzIDteMAjFspFLDLnKVQ==",
       "dependencies": {
         "@azure/abort-controller": "^1.0.0",
-        "tslib": "^2.0.0"
+        "tslib": "^2.2.0"
       },
       "engines": {
-        "node": ">=8.0.0"
+        "node": ">=12.0.0"
       }
     },
-    "node_modules/@azure/ms-rest-js": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.2.3.tgz",
-      "integrity": "sha512-sXOhOu/37Tr8428f32Jwuwga975Xw64pYg1UeUwOBMhkNgtn5vUuNRa3fhmem+I6f8EKoi6hOsYDFlaHeZ52jA==",
-      "dependencies": {
-        "@azure/core-auth": "^1.1.4",
-        "@types/node-fetch": "^2.3.7",
-        "@types/tunnel": "0.0.1",
-        "abort-controller": "^3.0.0",
-        "form-data": "^2.5.0",
-        "node-fetch": "^2.6.0",
-        "tough-cookie": "^3.0.1",
-        "tslib": "^1.10.0",
-        "tunnel": "0.0.6",
-        "uuid": "^3.3.2",
+    "node_modules/@azure/core-http": {
+      "version": "2.2.7",
+      "resolved": "https://registry.npmjs.org/@azure/core-http/-/core-http-2.2.7.tgz",
+      "integrity": "sha512-TyGMeDm90mkRS8XzSQbSMD+TqnWL1XKGCh0x0QVGMD8COH2yU0q5SaHm/IBEBkzcq0u73NhS/p57T3KVSgUFqQ==",
+      "dependencies": {
+        "@azure/abort-controller": "^1.0.0",
+        "@azure/core-auth": "^1.3.0",
+        "@azure/core-tracing": "1.0.0-preview.13",
+        "@azure/core-util": "^1.1.0",
+        "@azure/logger": "^1.0.0",
+        "@types/node-fetch": "^2.5.0",
+        "@types/tunnel": "^0.0.3",
+        "form-data": "^4.0.0",
+        "node-fetch": "^2.6.7",
+        "process": "^0.11.10",
+        "tough-cookie": "^4.0.0",
+        "tslib": "^2.2.0",
+        "tunnel": "^0.0.6",
+        "uuid": "^8.3.0",
         "xml2js": "^0.4.19"
+      },
+      "engines": {
+        "node": ">=12.0.0"
       }
     },
-    "node_modules/@azure/ms-rest-js/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+    "node_modules/@azure/core-http/node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/@azure/core-lro": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.4.0.tgz",
+      "integrity": "sha512-F65+rYkll1dpw3RGm8/SSiSj+/QkMeYDanzS/QKlM1dmuneVyXbO46C88V1MRHluLGdMP6qfD3vDRYALn0z0tQ==",
+      "dependencies": {
+        "@azure/abort-controller": "^1.0.0",
+        "@azure/logger": "^1.0.0",
+        "tslib": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@azure/core-paging": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@azure/core-paging/-/core-paging-1.3.0.tgz",
+      "integrity": "sha512-H6Tg9eBm0brHqLy0OSAGzxIh1t4UL8eZVrSUMJ60Ra9cwq2pOskFqVpz2pYoHDsBY1jZ4V/P8LRGb5D5pmC6rg==",
+      "dependencies": {
+        "tslib": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@azure/core-tracing": {
+      "version": "1.0.0-preview.13",
+      "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.0.0-preview.13.tgz",
+      "integrity": "sha512-KxDlhXyMlh2Jhj2ykX6vNEU0Vou4nHr025KoSEiz7cS3BNiHNaZcdECk/DmLkEB0as5T7b/TpRcehJ5yV6NeXQ==",
+      "dependencies": {
+        "@opentelemetry/api": "^1.0.1",
+        "tslib": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@azure/core-util": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@azure/core-util/-/core-util-1.1.1.tgz",
+      "integrity": "sha512-A4TBYVQCtHOigFb2ETiiKFDocBoI1Zk2Ui1KpI42aJSIDexF7DHQFpnjonltXAIU/ceH+1fsZAWWgvX6/AKzog==",
+      "dependencies": {
+        "@azure/abort-controller": "^1.0.0",
+        "tslib": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@azure/logger": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@azure/logger/-/logger-1.0.3.tgz",
+      "integrity": "sha512-aK4s3Xxjrx3daZr3VylxejK3vG5ExXck5WOHDJ8in/k9AqlfIyFMMT1uG7u8mNjX+QRILTIn0/Xgschfh/dQ9g==",
+      "dependencies": {
+        "tslib": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
     },
     "node_modules/@azure/msal-common": {
       "version": "9.0.2",
@@ -524,20 +592,23 @@
       }
     },
     "node_modules/@azure/storage-blob": {
-      "version": "10.5.0",
-      "resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-10.5.0.tgz",
-      "integrity": "sha512-67+0EP7STy9BQgzvN1RgmSvXhxRd044eDgepX7zBp7XslBxz8YGo2cSLm9w5o5Qf1FLCRlwuziRMikaPCLMpVw==",
+      "version": "12.11.0",
+      "resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.11.0.tgz",
+      "integrity": "sha512-na+FisoARuaOWaHWpmdtk3FeuTWf2VWamdJ9/TJJzj5ZdXPLC3juoDgFs6XVuJIoK30yuBpyFBEDXVRK4pB7Tg==",
       "dependencies": {
-        "@azure/ms-rest-js": "^2.0.0",
+        "@azure/abort-controller": "^1.0.0",
+        "@azure/core-http": "^2.0.0",
+        "@azure/core-lro": "^2.2.0",
+        "@azure/core-paging": "^1.1.1",
+        "@azure/core-tracing": "1.0.0-preview.13",
+        "@azure/logger": "^1.0.0",
         "events": "^3.0.0",
-        "tslib": "^1.9.3"
+        "tslib": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
       }
     },
-    "node_modules/@azure/storage-blob/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-    },
     "node_modules/@babel/code-frame": {
       "version": "7.12.11",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
@@ -1460,6 +1531,14 @@
         "node": ">=10"
       }
     },
+    "node_modules/@opentelemetry/api": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.2.0.tgz",
+      "integrity": "sha512-0nBr+VZNKm9tvNDZFstI3Pq1fCTEDK5OZTnVKNvBNAKgd0yIvmwsP4m61rEv7ZP+tOUjWJhROpxK5MsnlF911g==",
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
     "node_modules/@playwright/test": {
       "version": "1.24.2",
       "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.24.2.tgz",
@@ -1484,11 +1563,14 @@
         "node": ">=4"
       }
     },
-    "node_modules/@socket.io/component-emitter": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",
-      "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==",
-      "dev": true
+    "node_modules/@socket.io/base64-arraybuffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@socket.io/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
+      "integrity": "sha512-dOlCBKnDw4iShaIsH/bxujKTM18+2TOAsYz+KSc11Am38H4q5Xw8Bbz97ZYdrVNM+um3p7w86Bvvmcn9q+5+eQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6.0"
+      }
     },
     "node_modules/@stylelint/postcss-css-in-js": {
       "version": "0.37.2",
@@ -1533,6 +1615,12 @@
         "moment": "^2.10.2"
       }
     },
+    "node_modules/@types/component-emitter": {
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.11.tgz",
+      "integrity": "sha512-SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ==",
+      "dev": true
+    },
     "node_modules/@types/cookie": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz",
@@ -1998,9 +2086,9 @@
       "dev": true
     },
     "node_modules/@types/tunnel": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/@types/tunnel/-/tunnel-0.0.1.tgz",
-      "integrity": "sha512-AOqu6bQu5MSWwYvehMXLukFHnupHrpZ8nvgae5Ggie9UwzDR1CCwoXgSSWNZJuyOlCdfdsWMA5F2LlmvyoTv8A==",
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/@types/tunnel/-/tunnel-0.0.3.tgz",
+      "integrity": "sha512-sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA==",
       "dependencies": {
         "@types/node": "*"
       }
@@ -2422,25 +2510,14 @@
       "integrity": "sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ==",
       "dev": true
     },
-    "node_modules/abort-controller": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
-      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
-      "dependencies": {
-        "event-target-shim": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=6.5"
-      }
-    },
     "node_modules/accepts": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
-      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
+      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
       "dev": true,
       "dependencies": {
-        "mime-types": "~2.1.34",
-        "negotiator": "0.6.3"
+        "mime-types": "~2.1.24",
+        "negotiator": "0.6.2"
       },
       "engines": {
         "node": ">= 0.6"
@@ -2495,6 +2572,7 @@
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -2735,20 +2813,6 @@
       "integrity": "sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw==",
       "dev": true
     },
-    "node_modules/app-builder-lib/node_modules/form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-      "dev": true,
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/app-builder-lib/node_modules/fs-extra": {
       "version": "10.0.0",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
@@ -3055,14 +3119,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/asn1": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-      "dependencies": {
-        "safer-buffer": "~2.1.0"
-      }
-    },
     "node_modules/asn1.js": {
       "version": "5.4.1",
       "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
@@ -3095,6 +3151,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
       "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+      "dev": true,
+      "optional": true,
       "engines": {
         "node": ">=0.8"
       }
@@ -3242,61 +3300,12 @@
       "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
       "dev": true
     },
-    "node_modules/aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/aws4": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
-      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
-    },
     "node_modules/axobject-query": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
       "integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==",
       "dev": true
     },
-    "node_modules/azure-storage": {
-      "version": "2.10.7",
-      "resolved": "https://registry.npmjs.org/azure-storage/-/azure-storage-2.10.7.tgz",
-      "integrity": "sha512-4oeFGtn3Ziw/fGs/zkoIpKKtygnCVIcZwzJ7UQzKTxhkGQqVCByOFbYqMGYR3L+wOsunX9lNfD0jc51SQuKSSA==",
-      "deprecated": "Please note: newer packages @azure/storage-blob, @azure/storage-queue and @azure/storage-file are available as of November 2019 and @azure/data-tables is available as of June 2021. While the legacy azure-storage package will continue to receive critical bug fixes, we strongly encourage you to upgrade. Migration guide can be found: https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/storage/MigrationGuide.md",
-      "dependencies": {
-        "browserify-mime": "^1.2.9",
-        "extend": "^3.0.2",
-        "json-edm-parser": "~0.1.2",
-        "json-schema": "~0.4.0",
-        "md5.js": "^1.3.4",
-        "readable-stream": "^2.0.0",
-        "request": "^2.86.0",
-        "underscore": "^1.12.1",
-        "uuid": "^3.0.0",
-        "validator": "^13.7.0",
-        "xml2js": "~0.2.8",
-        "xmlbuilder": "^9.0.7"
-      },
-      "engines": {
-        "node": ">= 0.8.26"
-      }
-    },
-    "node_modules/azure-storage/node_modules/sax": {
-      "version": "0.5.8",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz",
-      "integrity": "sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE="
-    },
-    "node_modules/azure-storage/node_modules/xml2js": {
-      "version": "0.2.8",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz",
-      "integrity": "sha1-m4FpCTFjH/CdGVdUn69U9PmAs8I=",
-      "dependencies": {
-        "sax": "0.5.x"
-      }
-    },
     "node_modules/babel-code-frame": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
@@ -3604,14 +3613,6 @@
       "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
       "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
     },
-    "node_modules/bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-      "dependencies": {
-        "tweetnacl": "^0.14.3"
-      }
-    },
     "node_modules/big.js": {
       "version": "5.2.2",
       "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
@@ -3697,27 +3698,24 @@
       "dev": true
     },
     "node_modules/body-parser": {
-      "version": "1.20.1",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
-      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
+      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
       "dev": true,
       "dependencies": {
-        "bytes": "3.1.2",
+        "bytes": "3.1.0",
         "content-type": "~1.0.4",
         "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "http-errors": "2.0.0",
+        "depd": "~1.1.2",
+        "http-errors": "1.7.2",
         "iconv-lite": "0.4.24",
-        "on-finished": "2.4.1",
-        "qs": "6.11.0",
-        "raw-body": "2.5.1",
-        "type-is": "~1.6.18",
-        "unpipe": "1.0.0"
+        "on-finished": "~2.3.0",
+        "qs": "6.7.0",
+        "raw-body": "2.4.0",
+        "type-is": "~1.6.17"
       },
       "engines": {
-        "node": ">= 0.8",
-        "npm": "1.2.8000 || >= 1.4.16"
+        "node": ">= 0.8"
       }
     },
     "node_modules/body-parser/node_modules/debug": {
@@ -3729,33 +3727,12 @@
         "ms": "2.0.0"
       }
     },
-    "node_modules/body-parser/node_modules/depd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/body-parser/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
       "dev": true
     },
-    "node_modules/body-parser/node_modules/on-finished": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-      "dev": true,
-      "dependencies": {
-        "ee-first": "1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/bonjour": {
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
@@ -3956,11 +3933,6 @@
         "safe-buffer": "^5.1.2"
       }
     },
-    "node_modules/browserify-mime": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/browserify-mime/-/browserify-mime-1.2.9.tgz",
-      "integrity": "sha1-rrGvKN5sDXpqLOQK22j/GEIq8x8="
-    },
     "node_modules/browserify-rsa": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
@@ -4432,9 +4404,9 @@
       "dev": true
     },
     "node_modules/bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
       "dev": true,
       "engines": {
         "node": ">= 0.8"
@@ -4602,14 +4574,20 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001309",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001309.tgz",
-      "integrity": "sha512-Pl8vfigmBXXq+/yUz1jUwULeq9xhMJznzdc/xwl4WclDAuebcTHVefpz8lE/bMI+UN7TOkSSe7B7RnZd6+dzjA==",
+      "version": "1.0.30001442",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001442.tgz",
+      "integrity": "sha512-239m03Pqy0hwxYPYR5JwOIxRJfLTWtle9FV8zosfV5pHg+/51uD4nxcUlM8+mWWGfwKtt8lJNHnD3cWw9VZ6ow==",
       "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/browserslist"
-      }
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        }
+      ]
     },
     "node_modules/canonical-path": {
       "version": "1.0.0",
@@ -4617,11 +4595,6 @@
       "integrity": "sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg==",
       "dev": true
     },
-    "node_modules/caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
-    },
     "node_modules/chalk": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -5505,35 +5478,16 @@
       }
     },
     "node_modules/content-disposition": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
-      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
+      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
       "dependencies": {
-        "safe-buffer": "5.2.1"
+        "safe-buffer": "5.1.2"
       },
       "engines": {
         "node": ">= 0.6"
       }
     },
-    "node_modules/content-disposition/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
     "node_modules/content-type": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
@@ -6179,17 +6133,6 @@
         "d3-transition": "1"
       }
     },
-    "node_modules/dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "dependencies": {
-        "assert-plus": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
     "node_modules/date-fns": {
       "version": "2.19.0",
       "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.19.0.tgz",
@@ -6251,9 +6194,9 @@
       }
     },
     "node_modules/decode-uri-component": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.1.tgz",
-      "integrity": "sha512-XZHyaFJ6QMWhYmlz+UcmtaLeecNiXwkTGzCqG5WByt+1P1HnU6Siwf0TeP3OsZmlnGqQRSEMIxue0LLCaGY3dw==",
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
+      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
       "engines": {
         "node": ">=0.10"
       }
@@ -6623,14 +6566,10 @@
       }
     },
     "node_modules/destroy": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
-      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8",
-        "npm": "1.2.8000 || >= 1.4.16"
-      }
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
+      "dev": true
     },
     "node_modules/detect-file": {
       "version": "1.0.0",
@@ -7080,15 +7019,6 @@
         "stream-shift": "^1.0.0"
       }
     },
-    "node_modules/ecc-jsbn": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-      "dependencies": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
     "node_modules/ecdsa-sig-formatter": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
@@ -7662,9 +7592,9 @@
       }
     },
     "node_modules/engine.io": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.1.tgz",
-      "integrity": "sha512-ECceEFcAaNRybd3lsGQKas3ZlMVjN3cyWwMP25D2i0zWfyiytVbTpRPa34qrr+FHddtpBVOmq4H/DCv1O0lZRA==",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.1.2.tgz",
+      "integrity": "sha512-v/7eGHxPvO2AWsksyx2PUsQvBafuvqs0jJJQ0FdmJG1b9qIvgSbqDRGwNhfk2XHaTTbTXiC4quRE8Q9nRjsrQQ==",
       "dev": true,
       "dependencies": {
         "@types/cookie": "^0.4.1",
@@ -7675,7 +7605,7 @@
         "cookie": "~0.4.1",
         "cors": "~2.8.5",
         "debug": "~4.3.1",
-        "engine.io-parser": "~5.0.3",
+        "engine.io-parser": "~5.0.0",
         "ws": "~8.2.3"
       },
       "engines": {
@@ -7683,10 +7613,13 @@
       }
     },
     "node_modules/engine.io-parser": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.4.tgz",
-      "integrity": "sha512-+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg==",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.3.tgz",
+      "integrity": "sha512-BtQxwF27XUNnSafQLvDi0dQ8s3i6VgzSoQMJacpIcGNrlUdfHSKbgm3jmjCVvQluGzqwujQMPAoMai3oYSTurg==",
       "dev": true,
+      "dependencies": {
+        "@socket.io/base64-arraybuffer": "~1.0.2"
+      },
       "engines": {
         "node": ">=10.0.0"
       }
@@ -8711,20 +8644,12 @@
     "node_modules/etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
       "dev": true,
       "engines": {
         "node": ">= 0.6"
       }
     },
-    "node_modules/event-target-shim": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
-      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/eventemitter3": {
       "version": "4.0.7",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
@@ -8955,39 +8880,38 @@
       }
     },
     "node_modules/express": {
-      "version": "4.18.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
-      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+      "version": "4.17.1",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
+      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
       "dev": true,
       "dependencies": {
-        "accepts": "~1.3.8",
+        "accepts": "~1.3.7",
         "array-flatten": "1.1.1",
-        "body-parser": "1.20.1",
-        "content-disposition": "0.5.4",
+        "body-parser": "1.19.0",
+        "content-disposition": "0.5.3",
         "content-type": "~1.0.4",
-        "cookie": "0.5.0",
+        "cookie": "0.4.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
-        "depd": "2.0.0",
+        "depd": "~1.1.2",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "1.2.0",
+        "finalhandler": "~1.1.2",
         "fresh": "0.5.2",
-        "http-errors": "2.0.0",
         "merge-descriptors": "1.0.1",
         "methods": "~1.1.2",
-        "on-finished": "2.4.1",
+        "on-finished": "~2.3.0",
         "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.7",
-        "qs": "6.11.0",
+        "proxy-addr": "~2.0.5",
+        "qs": "6.7.0",
         "range-parser": "~1.2.1",
-        "safe-buffer": "5.2.1",
-        "send": "0.18.0",
-        "serve-static": "1.15.0",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
+        "safe-buffer": "5.1.2",
+        "send": "0.17.1",
+        "serve-static": "1.14.1",
+        "setprototypeof": "1.1.1",
+        "statuses": "~1.5.0",
         "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
@@ -9003,9 +8927,9 @@
       "dev": true
     },
     "node_modules/express/node_modules/cookie": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
+      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
       "dev": true,
       "engines": {
         "node": ">= 0.6"
@@ -9020,80 +8944,12 @@
         "ms": "2.0.0"
       }
     },
-    "node_modules/express/node_modules/depd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/express/node_modules/finalhandler": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
-      "dev": true,
-      "dependencies": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "statuses": "2.0.1",
-        "unpipe": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/express/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
       "dev": true
     },
-    "node_modules/express/node_modules/on-finished": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-      "dev": true,
-      "dependencies": {
-        "ee-first": "1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/express/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/express/node_modules/statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/ext-list": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz",
@@ -9120,7 +8976,8 @@
     "node_modules/extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+      "dev": true
     },
     "node_modules/extend-shallow": {
       "version": "3.0.2",
@@ -9218,14 +9075,17 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
       "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+      "dev": true,
       "engines": [
         "node >=0.6.0"
-      ]
+      ],
+      "optional": true
     },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
     },
     "node_modules/fast-diff": {
       "version": "1.2.0",
@@ -9266,7 +9126,8 @@
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
     },
     "node_modules/fast-levenshtein": {
       "version": "2.0.6",
@@ -9795,14 +9656,6 @@
       "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
       "dev": true
     },
-    "node_modules/forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/fork-ts-checker-webpack-plugin": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.2.1.tgz",
@@ -9960,22 +9813,22 @@
       }
     },
     "node_modules/form-data": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
-      "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
       "dependencies": {
         "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
+        "combined-stream": "^1.0.8",
         "mime-types": "^2.1.12"
       },
       "engines": {
-        "node": ">= 0.12"
+        "node": ">= 6"
       }
     },
     "node_modules/forwarded": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
+      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
       "dev": true,
       "engines": {
         "node": ">= 0.6"
@@ -9996,7 +9849,7 @@
     "node_modules/fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
+      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
       "dev": true,
       "engines": {
         "node": ">= 0.6"
@@ -10205,14 +10058,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "dependencies": {
-        "assert-plus": "^1.0.0"
-      }
-    },
     "node_modules/github-from-package": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
@@ -10509,27 +10354,6 @@
       "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
       "dev": true
     },
-    "node_modules/har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/har-validator": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
-      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
-      "deprecated": "this library is no longer supported",
-      "dependencies": {
-        "ajv": "^6.12.3",
-        "har-schema": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/hard-rejection": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
@@ -10683,6 +10507,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
       "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+      "dev": true,
       "dependencies": {
         "inherits": "^2.0.4",
         "readable-stream": "^3.6.0",
@@ -10696,6 +10521,7 @@
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
       "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -10709,6 +10535,7 @@
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
       "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -10728,6 +10555,7 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
       "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
       "dependencies": {
         "safe-buffer": "~5.2.0"
       }
@@ -10994,38 +10822,26 @@
       "dev": true
     },
     "node_modules/http-errors": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
-      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
+      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
       "dev": true,
       "dependencies": {
-        "depd": "2.0.0",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "toidentifier": "1.0.1"
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.1",
+        "statuses": ">= 1.5.0 < 2",
+        "toidentifier": "1.0.0"
       },
       "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/http-errors/node_modules/depd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/http-errors/node_modules/statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
+    "node_modules/http-errors/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "dev": true
     },
     "node_modules/http-parser-js": {
       "version": "0.5.3",
@@ -11088,20 +10904,6 @@
         "node": ">=4.0.0"
       }
     },
-    "node_modules/http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "dependencies": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
-      },
-      "engines": {
-        "node": ">=0.8",
-        "npm": ">=1.3.7"
-      }
-    },
     "node_modules/https-browserify": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
@@ -11408,6 +11210,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
       "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
+      "dev": true,
       "engines": {
         "node": ">=4"
       }
@@ -11939,7 +11742,8 @@
     "node_modules/is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+      "dev": true
     },
     "node_modules/is-windows": {
       "version": "1.0.2",
@@ -11988,11 +11792,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
-    },
     "node_modules/istanbul-instrumenter-loader": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-3.0.1.tgz",
@@ -12325,11 +12124,6 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
-    },
     "node_modules/jschardet": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-2.3.0.tgz",
@@ -12367,14 +12161,6 @@
       "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
       "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg="
     },
-    "node_modules/json-edm-parser": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/json-edm-parser/-/json-edm-parser-0.1.2.tgz",
-      "integrity": "sha1-HmCw/vG8CvZ7wNFG393lSGzWFbQ=",
-      "dependencies": {
-        "jsonparse": "~1.2.0"
-      }
-    },
     "node_modules/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",
@@ -12386,15 +12172,11 @@
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
       "dev": true
     },
-    "node_modules/json-schema": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
-      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="
-    },
     "node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
     },
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
@@ -12405,7 +12187,9 @@
     "node_modules/json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+      "dev": true,
+      "optional": true
     },
     "node_modules/json3": {
       "version": "3.3.3",
@@ -12437,14 +12221,6 @@
         "graceful-fs": "^4.1.6"
       }
     },
-    "node_modules/jsonparse": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.2.0.tgz",
-      "integrity": "sha1-XAxWhRBxYOcv50ib3eoLRMK8Z70=",
-      "engines": [
-        "node >= 0.2.0"
-      ]
-    },
     "node_modules/jsonwebtoken": {
       "version": "9.0.0",
       "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz",
@@ -12474,20 +12250,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/jsprim": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
-      "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
-      "dependencies": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.4.0",
-        "verror": "1.10.0"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
     "node_modules/jwa": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz",
@@ -13408,6 +13170,7 @@
       "version": "1.3.4",
       "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz",
       "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=",
+      "dev": true,
       "dependencies": {
         "hash-base": "^3.0.0",
         "inherits": "^2.0.1"
@@ -13689,19 +13452,19 @@
       }
     },
     "node_modules/mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "version": "1.46.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.46.0.tgz",
+      "integrity": "sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ==",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "version": "2.1.29",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.29.tgz",
+      "integrity": "sha512-Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ==",
       "dependencies": {
-        "mime-db": "1.52.0"
+        "mime-db": "1.46.0"
       },
       "engines": {
         "node": ">= 0.6"
@@ -14050,9 +13813,9 @@
       "dev": true
     },
     "node_modules/negotiator": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
+      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
       "dev": true,
       "engines": {
         "node": ">= 0.6"
@@ -14559,14 +14322,6 @@
         "yargs-parser": "^13.1.2"
       }
     },
-    "node_modules/oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -15382,11 +15137,6 @@
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
       "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA="
     },
-    "node_modules/performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
-    },
     "node_modules/picocolors": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
@@ -15853,7 +15603,6 @@
       "version": "0.11.10",
       "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
       "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-      "dev": true,
       "engines": {
         "node": ">= 0.6.0"
       }
@@ -15884,12 +15633,12 @@
       "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk="
     },
     "node_modules/proxy-addr": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
+      "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==",
       "dev": true,
       "dependencies": {
-        "forwarded": "0.2.0",
+        "forwarded": "~0.1.2",
         "ipaddr.js": "1.9.1"
       },
       "engines": {
@@ -15920,9 +15669,9 @@
       "dev": true
     },
     "node_modules/psl": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
+      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="
     },
     "node_modules/public-encrypt": {
       "version": "4.0.3",
@@ -16004,18 +15753,12 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
       "dev": true,
-      "dependencies": {
-        "side-channel": "^1.0.4"
-      },
       "engines": {
         "node": ">=0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/query-string": {
@@ -16053,8 +15796,7 @@
     "node_modules/querystringify": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
-      "dev": true
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
     },
     "node_modules/queue-microtask": {
       "version": "1.2.2",
@@ -16114,13 +15856,13 @@
       }
     },
     "node_modules/raw-body": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
+      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
       "dev": true,
       "dependencies": {
-        "bytes": "3.1.2",
-        "http-errors": "2.0.0",
+        "bytes": "3.1.0",
+        "http-errors": "1.7.2",
         "iconv-lite": "0.4.24",
         "unpipe": "1.0.0"
       },
@@ -16790,70 +16532,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/request": {
-      "version": "2.88.2",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
-      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
-      "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
-      "dependencies": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.3",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.5.0",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/request/node_modules/form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 0.12"
-      }
-    },
-    "node_modules/request/node_modules/qs": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
-      "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/request/node_modules/tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-      "dependencies": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
     "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -16890,8 +16568,7 @@
     "node_modules/requires-port": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
-      "dev": true
+      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
     },
     "node_modules/reserved-words": {
       "version": "0.1.2",
@@ -17346,24 +17023,24 @@
       }
     },
     "node_modules/send": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+      "version": "0.17.1",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
+      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
       "dev": true,
       "dependencies": {
         "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
+        "depd": "~1.1.2",
+        "destroy": "~1.0.4",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "2.0.0",
+        "http-errors": "~1.7.2",
         "mime": "1.6.0",
-        "ms": "2.1.3",
-        "on-finished": "2.4.1",
+        "ms": "2.1.1",
+        "on-finished": "~2.3.0",
         "range-parser": "~1.2.1",
-        "statuses": "2.0.1"
+        "statuses": "~1.5.0"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -17381,18 +17058,9 @@
     "node_modules/send/node_modules/debug/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
       "dev": true
     },
-    "node_modules/send/node_modules/depd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/send/node_modules/mime": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
@@ -17406,32 +17074,11 @@
       }
     },
     "node_modules/send/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+      "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
       "dev": true
     },
-    "node_modules/send/node_modules/on-finished": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-      "dev": true,
-      "dependencies": {
-        "ee-first": "1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/send/node_modules/statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/serialize-error": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz",
@@ -17531,15 +17178,15 @@
       "dev": true
     },
     "node_modules/serve-static": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
+      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
       "dev": true,
       "dependencies": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.18.0"
+        "send": "0.17.1"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -17593,9 +17240,9 @@
       "dev": true
     },
     "node_modules/setprototypeof": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
+      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
       "dev": true
     },
     "node_modules/sha.js": {
@@ -17649,20 +17296,6 @@
       "resolved": "https://registry.npmjs.org/shimmer/-/shimmer-1.2.1.tgz",
       "integrity": "sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw=="
     },
-    "node_modules/side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/signal-exit": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
@@ -18016,35 +17649,36 @@
       }
     },
     "node_modules/socket.io": {
-      "version": "4.5.3",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.3.tgz",
-      "integrity": "sha512-zdpnnKU+H6mOp7nYRXH4GNv1ux6HL6+lHL8g7Ds7Lj8CkdK1jJK/dlwsKDculbyOHifcJ0Pr/yeXnZQ5GeFrcg==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.4.1.tgz",
+      "integrity": "sha512-s04vrBswdQBUmuWJuuNTmXUVJhP0cVky8bBDhdkf8y0Ptsu7fKU2LuLbts9g+pdmAdyMMn8F/9Mf1/wbtUN0fg==",
       "dev": true,
       "dependencies": {
         "accepts": "~1.3.4",
         "base64id": "~2.0.0",
         "debug": "~4.3.2",
-        "engine.io": "~6.2.0",
-        "socket.io-adapter": "~2.4.0",
-        "socket.io-parser": "~4.2.0"
+        "engine.io": "~6.1.0",
+        "socket.io-adapter": "~2.3.3",
+        "socket.io-parser": "~4.0.4"
       },
       "engines": {
         "node": ">=10.0.0"
       }
     },
     "node_modules/socket.io-adapter": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz",
-      "integrity": "sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.3.3.tgz",
+      "integrity": "sha512-Qd/iwn3VskrpNO60BeRyCyr8ZWw9CPZyitW4AQwmRZ8zCiyDiL+znRnWX6tDHXnWn1sJrM1+b6Mn6wEDJJ4aYQ==",
       "dev": true
     },
     "node_modules/socket.io-parser": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.1.tgz",
-      "integrity": "sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.5.tgz",
+      "integrity": "sha512-sNjbT9dX63nqUFIOv95tTVm6elyIU4RvB1m8dOeZt+IgWwcWklFDOdmGcfo3zSiRsnR/3pJkjY5lfoGqEe4Eig==",
       "dev": true,
       "dependencies": {
-        "@socket.io/component-emitter": "~3.1.0",
+        "@types/component-emitter": "^1.2.10",
+        "component-emitter": "~1.3.0",
         "debug": "~4.3.1"
       },
       "engines": {
@@ -18321,30 +17955,6 @@
       "dev": true,
       "optional": true
     },
-    "node_modules/sshpk": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
-      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
-      "dependencies": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
-      },
-      "bin": {
-        "sshpk-conv": "bin/sshpk-conv",
-        "sshpk-sign": "bin/sshpk-sign",
-        "sshpk-verify": "bin/sshpk-verify"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/ssri": {
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
@@ -20037,9 +19647,9 @@
       }
     },
     "node_modules/toidentifier": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
+      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
       "dev": true,
       "engines": {
         "node": ">=0.6"
@@ -20052,18 +19662,27 @@
       "dev": true
     },
     "node_modules/tough-cookie": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
-      "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz",
+      "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==",
       "dependencies": {
-        "ip-regex": "^2.1.0",
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.2.0",
+        "url-parse": "^1.5.3"
       },
       "engines": {
         "node": ">=6"
       }
     },
+    "node_modules/tough-cookie/node_modules/universalify": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
     "node_modules/tr46": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
@@ -20259,11 +19878,6 @@
         "node": "*"
       }
     },
-    "node_modules/tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
-    },
     "node_modules/type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -20393,11 +20007,6 @@
         "through": "^2.3.8"
       }
     },
-    "node_modules/underscore": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
-      "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g=="
-    },
     "node_modules/unified": {
       "version": "9.2.1",
       "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.1.tgz",
@@ -20732,6 +20341,7 @@
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
       "dependencies": {
         "punycode": "^2.1.0"
       }
@@ -20788,7 +20398,6 @@
       "version": "1.5.10",
       "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
       "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
-      "dev": true,
       "dependencies": {
         "querystringify": "^2.1.1",
         "requires-port": "^1.0.0"
@@ -20884,6 +20493,7 @@
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
       "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
       "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "dev": true,
       "bin": {
         "uuid": "bin/uuid"
       }
@@ -20904,14 +20514,6 @@
         "spdx-expression-parse": "^3.0.0"
       }
     },
-    "node_modules/validator": {
-      "version": "13.7.0",
-      "resolved": "https://registry.npmjs.org/validator/-/validator-13.7.0.tgz",
-      "integrity": "sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw==",
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
     "node_modules/vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
@@ -20925,9 +20527,11 @@
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
       "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "dev": true,
       "engines": [
         "node >=0.6.0"
       ],
+      "optional": true,
       "dependencies": {
         "assert-plus": "^1.0.0",
         "core-util-is": "1.0.2",
@@ -22410,6 +22014,7 @@
       "version": "9.0.7",
       "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
       "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=",
+      "dev": true,
       "engines": {
         "node": ">=4.0"
       }
@@ -22727,47 +22332,95 @@
       }
     },
     "@azure/abort-controller": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-1.0.4.tgz",
-      "integrity": "sha512-lNUmDRVGpanCsiUN3NWxFTdwmdFI53xwhkTFfHDGTYk46ca7Ind3nanJc+U6Zj9Tv+9nTCWRBscWEW1DyKOpTw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-1.1.0.tgz",
+      "integrity": "sha512-TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw==",
       "requires": {
-        "tslib": "^2.0.0"
+        "tslib": "^2.2.0"
       }
     },
     "@azure/core-auth": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.2.0.tgz",
-      "integrity": "sha512-KUl+Nwn/Sm6Lw5d3U90m1jZfNSL087SPcqHLxwn2T6PupNKmcgsEbDjHB25gDvHO4h7pBsTlrdJAY7dz+Qk8GA==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.4.0.tgz",
+      "integrity": "sha512-HFrcTgmuSuukRf/EdPmqBrc5l6Q5Uu+2TbuhaKbgaCpP2TfAeiNaQPAadxO+CYBRHGUzIDteMAjFspFLDLnKVQ==",
       "requires": {
         "@azure/abort-controller": "^1.0.0",
-        "tslib": "^2.0.0"
+        "tslib": "^2.2.0"
       }
     },
-    "@azure/ms-rest-js": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.2.3.tgz",
-      "integrity": "sha512-sXOhOu/37Tr8428f32Jwuwga975Xw64pYg1UeUwOBMhkNgtn5vUuNRa3fhmem+I6f8EKoi6hOsYDFlaHeZ52jA==",
-      "requires": {
-        "@azure/core-auth": "^1.1.4",
-        "@types/node-fetch": "^2.3.7",
-        "@types/tunnel": "0.0.1",
-        "abort-controller": "^3.0.0",
-        "form-data": "^2.5.0",
-        "node-fetch": "^2.6.0",
-        "tough-cookie": "^3.0.1",
-        "tslib": "^1.10.0",
-        "tunnel": "0.0.6",
-        "uuid": "^3.3.2",
+    "@azure/core-http": {
+      "version": "2.2.7",
+      "resolved": "https://registry.npmjs.org/@azure/core-http/-/core-http-2.2.7.tgz",
+      "integrity": "sha512-TyGMeDm90mkRS8XzSQbSMD+TqnWL1XKGCh0x0QVGMD8COH2yU0q5SaHm/IBEBkzcq0u73NhS/p57T3KVSgUFqQ==",
+      "requires": {
+        "@azure/abort-controller": "^1.0.0",
+        "@azure/core-auth": "^1.3.0",
+        "@azure/core-tracing": "1.0.0-preview.13",
+        "@azure/core-util": "^1.1.0",
+        "@azure/logger": "^1.0.0",
+        "@types/node-fetch": "^2.5.0",
+        "@types/tunnel": "^0.0.3",
+        "form-data": "^4.0.0",
+        "node-fetch": "^2.6.7",
+        "process": "^0.11.10",
+        "tough-cookie": "^4.0.0",
+        "tslib": "^2.2.0",
+        "tunnel": "^0.0.6",
+        "uuid": "^8.3.0",
         "xml2js": "^0.4.19"
       },
       "dependencies": {
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        "uuid": {
+          "version": "8.3.2",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+          "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
         }
       }
     },
+    "@azure/core-lro": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.4.0.tgz",
+      "integrity": "sha512-F65+rYkll1dpw3RGm8/SSiSj+/QkMeYDanzS/QKlM1dmuneVyXbO46C88V1MRHluLGdMP6qfD3vDRYALn0z0tQ==",
+      "requires": {
+        "@azure/abort-controller": "^1.0.0",
+        "@azure/logger": "^1.0.0",
+        "tslib": "^2.2.0"
+      }
+    },
+    "@azure/core-paging": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@azure/core-paging/-/core-paging-1.3.0.tgz",
+      "integrity": "sha512-H6Tg9eBm0brHqLy0OSAGzxIh1t4UL8eZVrSUMJ60Ra9cwq2pOskFqVpz2pYoHDsBY1jZ4V/P8LRGb5D5pmC6rg==",
+      "requires": {
+        "tslib": "^2.2.0"
+      }
+    },
+    "@azure/core-tracing": {
+      "version": "1.0.0-preview.13",
+      "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.0.0-preview.13.tgz",
+      "integrity": "sha512-KxDlhXyMlh2Jhj2ykX6vNEU0Vou4nHr025KoSEiz7cS3BNiHNaZcdECk/DmLkEB0as5T7b/TpRcehJ5yV6NeXQ==",
+      "requires": {
+        "@opentelemetry/api": "^1.0.1",
+        "tslib": "^2.2.0"
+      }
+    },
+    "@azure/core-util": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@azure/core-util/-/core-util-1.1.1.tgz",
+      "integrity": "sha512-A4TBYVQCtHOigFb2ETiiKFDocBoI1Zk2Ui1KpI42aJSIDexF7DHQFpnjonltXAIU/ceH+1fsZAWWgvX6/AKzog==",
+      "requires": {
+        "@azure/abort-controller": "^1.0.0",
+        "tslib": "^2.2.0"
+      }
+    },
+    "@azure/logger": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@azure/logger/-/logger-1.0.3.tgz",
+      "integrity": "sha512-aK4s3Xxjrx3daZr3VylxejK3vG5ExXck5WOHDJ8in/k9AqlfIyFMMT1uG7u8mNjX+QRILTIn0/Xgschfh/dQ9g==",
+      "requires": {
+        "tslib": "^2.2.0"
+      }
+    },
     "@azure/msal-common": {
       "version": "9.0.2",
       "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.0.2.tgz",
@@ -22791,20 +22444,18 @@
       }
     },
     "@azure/storage-blob": {
-      "version": "10.5.0",
-      "resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-10.5.0.tgz",
-      "integrity": "sha512-67+0EP7STy9BQgzvN1RgmSvXhxRd044eDgepX7zBp7XslBxz8YGo2cSLm9w5o5Qf1FLCRlwuziRMikaPCLMpVw==",
+      "version": "12.11.0",
+      "resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.11.0.tgz",
+      "integrity": "sha512-na+FisoARuaOWaHWpmdtk3FeuTWf2VWamdJ9/TJJzj5ZdXPLC3juoDgFs6XVuJIoK30yuBpyFBEDXVRK4pB7Tg==",
       "requires": {
-        "@azure/ms-rest-js": "^2.0.0",
+        "@azure/abort-controller": "^1.0.0",
+        "@azure/core-http": "^2.0.0",
+        "@azure/core-lro": "^2.2.0",
+        "@azure/core-paging": "^1.1.1",
+        "@azure/core-tracing": "1.0.0-preview.13",
+        "@azure/logger": "^1.0.0",
         "events": "^3.0.0",
-        "tslib": "^1.9.3"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-        }
+        "tslib": "^2.2.0"
       }
     },
     "@babel/code-frame": {
@@ -23518,6 +23169,11 @@
         }
       }
     },
+    "@opentelemetry/api": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.2.0.tgz",
+      "integrity": "sha512-0nBr+VZNKm9tvNDZFstI3Pq1fCTEDK5OZTnVKNvBNAKgd0yIvmwsP4m61rEv7ZP+tOUjWJhROpxK5MsnlF911g=="
+    },
     "@playwright/test": {
       "version": "1.24.2",
       "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.24.2.tgz",
@@ -23533,10 +23189,10 @@
       "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz",
       "integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow=="
     },
-    "@socket.io/component-emitter": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",
-      "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==",
+    "@socket.io/base64-arraybuffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@socket.io/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
+      "integrity": "sha512-dOlCBKnDw4iShaIsH/bxujKTM18+2TOAsYz+KSc11Am38H4q5Xw8Bbz97ZYdrVNM+um3p7w86Bvvmcn9q+5+eQ==",
       "dev": true
     },
     "@stylelint/postcss-css-in-js": {
@@ -23572,6 +23228,12 @@
         "moment": "^2.10.2"
       }
     },
+    "@types/component-emitter": {
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.11.tgz",
+      "integrity": "sha512-SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ==",
+      "dev": true
+    },
     "@types/cookie": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz",
@@ -24035,9 +23697,9 @@
       "dev": true
     },
     "@types/tunnel": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/@types/tunnel/-/tunnel-0.0.1.tgz",
-      "integrity": "sha512-AOqu6bQu5MSWwYvehMXLukFHnupHrpZ8nvgae5Ggie9UwzDR1CCwoXgSSWNZJuyOlCdfdsWMA5F2LlmvyoTv8A==",
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/@types/tunnel/-/tunnel-0.0.3.tgz",
+      "integrity": "sha512-sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA==",
       "requires": {
         "@types/node": "*"
       }
@@ -24377,22 +24039,14 @@
       "integrity": "sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ==",
       "dev": true
     },
-    "abort-controller": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
-      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
-      "requires": {
-        "event-target-shim": "^5.0.0"
-      }
-    },
     "accepts": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
-      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
+      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
       "dev": true,
       "requires": {
-        "mime-types": "~2.1.34",
-        "negotiator": "0.6.3"
+        "mime-types": "~2.1.24",
+        "negotiator": "0.6.2"
       }
     },
     "acorn": {
@@ -24430,6 +24084,7 @@
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
       "requires": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -24624,17 +24279,6 @@
           "integrity": "sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw==",
           "dev": true
         },
-        "form-data": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-          "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-          "dev": true,
-          "requires": {
-            "asynckit": "^0.4.0",
-            "combined-stream": "^1.0.8",
-            "mime-types": "^2.1.12"
-          }
-        },
         "fs-extra": {
           "version": "10.0.0",
           "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
@@ -24873,14 +24517,6 @@
         }
       }
     },
-    "asn1": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-      "requires": {
-        "safer-buffer": "~2.1.0"
-      }
-    },
     "asn1.js": {
       "version": "5.4.1",
       "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
@@ -24931,7 +24567,9 @@
     "assert-plus": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+      "dev": true,
+      "optional": true
     },
     "assign-symbols": {
       "version": "1.0.0",
@@ -25031,56 +24669,12 @@
         }
       }
     },
-    "aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
-    },
-    "aws4": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
-      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
-    },
     "axobject-query": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
       "integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==",
       "dev": true
     },
-    "azure-storage": {
-      "version": "2.10.7",
-      "resolved": "https://registry.npmjs.org/azure-storage/-/azure-storage-2.10.7.tgz",
-      "integrity": "sha512-4oeFGtn3Ziw/fGs/zkoIpKKtygnCVIcZwzJ7UQzKTxhkGQqVCByOFbYqMGYR3L+wOsunX9lNfD0jc51SQuKSSA==",
-      "requires": {
-        "browserify-mime": "^1.2.9",
-        "extend": "^3.0.2",
-        "json-edm-parser": "~0.1.2",
-        "json-schema": "~0.4.0",
-        "md5.js": "^1.3.4",
-        "readable-stream": "^2.0.0",
-        "request": "^2.86.0",
-        "underscore": "^1.12.1",
-        "uuid": "^3.0.0",
-        "validator": "^13.7.0",
-        "xml2js": "~0.2.8",
-        "xmlbuilder": "^9.0.7"
-      },
-      "dependencies": {
-        "sax": {
-          "version": "0.5.8",
-          "resolved": "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz",
-          "integrity": "sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE="
-        },
-        "xml2js": {
-          "version": "0.2.8",
-          "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz",
-          "integrity": "sha1-m4FpCTFjH/CdGVdUn69U9PmAs8I=",
-          "requires": {
-            "sax": "0.5.x"
-          }
-        }
-      }
-    },
     "babel-code-frame": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
@@ -25341,14 +24935,6 @@
       "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
       "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
     },
-    "bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-      "requires": {
-        "tweetnacl": "^0.14.3"
-      }
-    },
     "big.js": {
       "version": "5.2.2",
       "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
@@ -25430,23 +25016,21 @@
       "dev": true
     },
     "body-parser": {
-      "version": "1.20.1",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
-      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
+      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
       "dev": true,
       "requires": {
-        "bytes": "3.1.2",
+        "bytes": "3.1.0",
         "content-type": "~1.0.4",
         "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "http-errors": "2.0.0",
+        "depd": "~1.1.2",
+        "http-errors": "1.7.2",
         "iconv-lite": "0.4.24",
-        "on-finished": "2.4.1",
-        "qs": "6.11.0",
-        "raw-body": "2.5.1",
-        "type-is": "~1.6.18",
-        "unpipe": "1.0.0"
+        "on-finished": "~2.3.0",
+        "qs": "6.7.0",
+        "raw-body": "2.4.0",
+        "type-is": "~1.6.17"
       },
       "dependencies": {
         "debug": {
@@ -25458,26 +25042,11 @@
             "ms": "2.0.0"
           }
         },
-        "depd": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-          "dev": true
-        },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
           "dev": true
-        },
-        "on-finished": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-          "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-          "dev": true,
-          "requires": {
-            "ee-first": "1.1.1"
-          }
         }
       }
     },
@@ -25641,11 +25210,6 @@
         "safe-buffer": "^5.1.2"
       }
     },
-    "browserify-mime": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/browserify-mime/-/browserify-mime-1.2.9.tgz",
-      "integrity": "sha1-rrGvKN5sDXpqLOQK22j/GEIq8x8="
-    },
     "browserify-rsa": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
@@ -26003,9 +25567,9 @@
       "dev": true
     },
     "bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
       "dev": true
     },
     "cacache": {
@@ -26138,9 +25702,9 @@
       "dev": true
     },
     "caniuse-lite": {
-      "version": "1.0.30001309",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001309.tgz",
-      "integrity": "sha512-Pl8vfigmBXXq+/yUz1jUwULeq9xhMJznzdc/xwl4WclDAuebcTHVefpz8lE/bMI+UN7TOkSSe7B7RnZd6+dzjA==",
+      "version": "1.0.30001442",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001442.tgz",
+      "integrity": "sha512-239m03Pqy0hwxYPYR5JwOIxRJfLTWtle9FV8zosfV5pHg+/51uD4nxcUlM8+mWWGfwKtt8lJNHnD3cWw9VZ6ow==",
       "dev": true
     },
     "canonical-path": {
@@ -26149,11 +25713,6 @@
       "integrity": "sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg==",
       "dev": true
     },
-    "caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
-    },
     "chalk": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -26896,18 +26455,11 @@
       "dev": true
     },
     "content-disposition": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
-      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
+      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
       "requires": {
-        "safe-buffer": "5.2.1"
-      },
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-        }
+        "safe-buffer": "5.1.2"
       }
     },
     "content-type": {
@@ -27481,14 +27033,6 @@
         "d3-transition": "1"
       }
     },
-    "dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
     "date-fns": {
       "version": "2.19.0",
       "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.19.0.tgz",
@@ -27526,9 +27070,9 @@
       }
     },
     "decode-uri-component": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.1.tgz",
-      "integrity": "sha512-XZHyaFJ6QMWhYmlz+UcmtaLeecNiXwkTGzCqG5WByt+1P1HnU6Siwf0TeP3OsZmlnGqQRSEMIxue0LLCaGY3dw=="
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
+      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ=="
     },
     "decompress": {
       "version": "4.2.1",
@@ -27821,9 +27365,9 @@
       }
     },
     "destroy": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
-      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
       "dev": true
     },
     "detect-file": {
@@ -28202,15 +27746,6 @@
         "stream-shift": "^1.0.0"
       }
     },
-    "ecc-jsbn": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-      "requires": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
     "ecdsa-sig-formatter": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
@@ -28668,9 +28203,9 @@
       }
     },
     "engine.io": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.1.tgz",
-      "integrity": "sha512-ECceEFcAaNRybd3lsGQKas3ZlMVjN3cyWwMP25D2i0zWfyiytVbTpRPa34qrr+FHddtpBVOmq4H/DCv1O0lZRA==",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.1.2.tgz",
+      "integrity": "sha512-v/7eGHxPvO2AWsksyx2PUsQvBafuvqs0jJJQ0FdmJG1b9qIvgSbqDRGwNhfk2XHaTTbTXiC4quRE8Q9nRjsrQQ==",
       "dev": true,
       "requires": {
         "@types/cookie": "^0.4.1",
@@ -28681,15 +28216,18 @@
         "cookie": "~0.4.1",
         "cors": "~2.8.5",
         "debug": "~4.3.1",
-        "engine.io-parser": "~5.0.3",
+        "engine.io-parser": "~5.0.0",
         "ws": "~8.2.3"
       }
     },
     "engine.io-parser": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.4.tgz",
-      "integrity": "sha512-+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg==",
-      "dev": true
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.3.tgz",
+      "integrity": "sha512-BtQxwF27XUNnSafQLvDi0dQ8s3i6VgzSoQMJacpIcGNrlUdfHSKbgm3jmjCVvQluGzqwujQMPAoMai3oYSTurg==",
+      "dev": true,
+      "requires": {
+        "@socket.io/base64-arraybuffer": "~1.0.2"
+      }
     },
     "enhanced-resolve": {
       "version": "4.3.0",
@@ -29470,14 +29008,9 @@
     "etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
       "dev": true
     },
-    "event-target-shim": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
-      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="
-    },
     "eventemitter3": {
       "version": "4.0.7",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
@@ -29666,39 +29199,38 @@
       }
     },
     "express": {
-      "version": "4.18.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
-      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+      "version": "4.17.1",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
+      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
       "dev": true,
       "requires": {
-        "accepts": "~1.3.8",
+        "accepts": "~1.3.7",
         "array-flatten": "1.1.1",
-        "body-parser": "1.20.1",
-        "content-disposition": "0.5.4",
+        "body-parser": "1.19.0",
+        "content-disposition": "0.5.3",
         "content-type": "~1.0.4",
-        "cookie": "0.5.0",
+        "cookie": "0.4.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
-        "depd": "2.0.0",
+        "depd": "~1.1.2",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "1.2.0",
+        "finalhandler": "~1.1.2",
         "fresh": "0.5.2",
-        "http-errors": "2.0.0",
         "merge-descriptors": "1.0.1",
         "methods": "~1.1.2",
-        "on-finished": "2.4.1",
+        "on-finished": "~2.3.0",
         "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.7",
-        "qs": "6.11.0",
+        "proxy-addr": "~2.0.5",
+        "qs": "6.7.0",
         "range-parser": "~1.2.1",
-        "safe-buffer": "5.2.1",
-        "send": "0.18.0",
-        "serve-static": "1.15.0",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
+        "safe-buffer": "5.1.2",
+        "send": "0.17.1",
+        "serve-static": "1.14.1",
+        "setprototypeof": "1.1.1",
+        "statuses": "~1.5.0",
         "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
@@ -29711,9 +29243,9 @@
           "dev": true
         },
         "cookie": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-          "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
+          "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
           "dev": true
         },
         "debug": {
@@ -29725,53 +29257,11 @@
             "ms": "2.0.0"
           }
         },
-        "depd": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-          "dev": true
-        },
-        "finalhandler": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-          "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
-          "dev": true,
-          "requires": {
-            "debug": "2.6.9",
-            "encodeurl": "~1.0.2",
-            "escape-html": "~1.0.3",
-            "on-finished": "2.4.1",
-            "parseurl": "~1.3.3",
-            "statuses": "2.0.1",
-            "unpipe": "~1.0.0"
-          }
-        },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
           "dev": true
-        },
-        "on-finished": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-          "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-          "dev": true,
-          "requires": {
-            "ee-first": "1.1.1"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-          "dev": true
-        },
-        "statuses": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-          "dev": true
         }
       }
     },
@@ -29795,7 +29285,8 @@
     "extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+      "dev": true
     },
     "extend-shallow": {
       "version": "3.0.2",
@@ -29878,12 +29369,15 @@
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+      "dev": true,
+      "optional": true
     },
     "fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
     },
     "fast-diff": {
       "version": "1.2.0",
@@ -29920,7 +29414,8 @@
     "fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
     },
     "fast-levenshtein": {
       "version": "2.0.6",
@@ -30356,11 +29851,6 @@
         }
       }
     },
-    "forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
-    },
     "fork-ts-checker-webpack-plugin": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.2.1.tgz",
@@ -30474,19 +29964,19 @@
       }
     },
     "form-data": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
-      "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
       "requires": {
         "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
+        "combined-stream": "^1.0.8",
         "mime-types": "^2.1.12"
       }
     },
     "forwarded": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
+      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
       "dev": true
     },
     "fragment-cache": {
@@ -30501,7 +29991,7 @@
     "fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
+      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
       "dev": true
     },
     "from2": {
@@ -30672,14 +30162,6 @@
       "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
       "dev": true
     },
-    "getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
     "github-from-package": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
@@ -30905,20 +30387,6 @@
       "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
       "dev": true
     },
-    "har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
-    },
-    "har-validator": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
-      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
-      "requires": {
-        "ajv": "^6.12.3",
-        "har-schema": "^2.0.0"
-      }
-    },
     "hard-rejection": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
@@ -31034,6 +30502,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
       "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+      "dev": true,
       "requires": {
         "inherits": "^2.0.4",
         "readable-stream": "^3.6.0",
@@ -31044,6 +30513,7 @@
           "version": "3.6.0",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
           "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "dev": true,
           "requires": {
             "inherits": "^2.0.3",
             "string_decoder": "^1.1.1",
@@ -31053,12 +30523,14 @@
         "safe-buffer": {
           "version": "5.2.1",
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "dev": true
         },
         "string_decoder": {
           "version": "1.3.0",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
           "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+          "dev": true,
           "requires": {
             "safe-buffer": "~5.2.0"
           }
@@ -31279,28 +30751,22 @@
       "dev": true
     },
     "http-errors": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
-      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
+      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
       "dev": true,
       "requires": {
-        "depd": "2.0.0",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "toidentifier": "1.0.1"
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.1",
+        "statuses": ">= 1.5.0 < 2",
+        "toidentifier": "1.0.0"
       },
       "dependencies": {
-        "depd": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-          "dev": true
-        },
-        "statuses": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
           "dev": true
         }
       }
@@ -31356,16 +30822,6 @@
         "micromatch": "^3.1.10"
       }
     },
-    "http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
-      }
-    },
     "https-browserify": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
@@ -31597,7 +31053,8 @@
     "ip-regex": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
-      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk="
+      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
+      "dev": true
     },
     "ipaddr.js": {
       "version": "1.9.1",
@@ -31944,7 +31401,8 @@
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+      "dev": true
     },
     "is-windows": {
       "version": "1.0.2",
@@ -31981,11 +31439,6 @@
       "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
       "dev": true
     },
-    "isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
-    },
     "istanbul-instrumenter-loader": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-3.0.1.tgz",
@@ -32257,11 +31710,6 @@
         "esprima": "^4.0.0"
       }
     },
-    "jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
-    },
     "jschardet": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-2.3.0.tgz",
@@ -32284,14 +31732,6 @@
       "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
       "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg="
     },
-    "json-edm-parser": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/json-edm-parser/-/json-edm-parser-0.1.2.tgz",
-      "integrity": "sha1-HmCw/vG8CvZ7wNFG393lSGzWFbQ=",
-      "requires": {
-        "jsonparse": "~1.2.0"
-      }
-    },
     "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",
@@ -32303,15 +31743,11 @@
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
       "dev": true
     },
-    "json-schema": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
-      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="
-    },
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
     },
     "json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
@@ -32322,7 +31758,9 @@
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+      "dev": true,
+      "optional": true
     },
     "json3": {
       "version": "3.3.3",
@@ -32348,11 +31786,6 @@
         "graceful-fs": "^4.1.6"
       }
     },
-    "jsonparse": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.2.0.tgz",
-      "integrity": "sha1-XAxWhRBxYOcv50ib3eoLRMK8Z70="
-    },
     "jsonwebtoken": {
       "version": "9.0.0",
       "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz",
@@ -32374,17 +31807,6 @@
         }
       }
     },
-    "jsprim": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
-      "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
-      "requires": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.4.0",
-        "verror": "1.10.0"
-      }
-    },
     "jwa": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz",
@@ -33128,6 +32550,7 @@
       "version": "1.3.4",
       "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz",
       "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=",
+      "dev": true,
       "requires": {
         "hash-base": "^3.0.0",
         "inherits": "^2.0.1"
@@ -33350,16 +32773,16 @@
       "dev": true
     },
     "mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
+      "version": "1.46.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.46.0.tgz",
+      "integrity": "sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ=="
     },
     "mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "version": "2.1.29",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.29.tgz",
+      "integrity": "sha512-Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ==",
       "requires": {
-        "mime-db": "1.52.0"
+        "mime-db": "1.46.0"
       }
     },
     "mimic-response": {
@@ -33645,9 +33068,9 @@
       "dev": true
     },
     "negotiator": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
+      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
       "dev": true
     },
     "neo-async": {
@@ -34071,11 +33494,6 @@
         }
       }
     },
-    "oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
-    },
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -34715,11 +34133,6 @@
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
       "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA="
     },
-    "performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
-    },
     "picocolors": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
@@ -35075,8 +34488,7 @@
     "process": {
       "version": "0.11.10",
       "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-      "dev": true
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
     },
     "process-nextick-args": {
       "version": "1.0.7",
@@ -35101,12 +34513,12 @@
       "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk="
     },
     "proxy-addr": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
+      "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==",
       "dev": true,
       "requires": {
-        "forwarded": "0.2.0",
+        "forwarded": "~0.1.2",
         "ipaddr.js": "1.9.1"
       }
     },
@@ -35134,9 +34546,9 @@
       "dev": true
     },
     "psl": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
+      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="
     },
     "public-encrypt": {
       "version": "4.0.3",
@@ -35213,13 +34625,10 @@
       "dev": true
     },
     "qs": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
-      "dev": true,
-      "requires": {
-        "side-channel": "^1.0.4"
-      }
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
+      "dev": true
     },
     "query-string": {
       "version": "5.1.1",
@@ -35246,8 +34655,7 @@
     "querystringify": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
-      "dev": true
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
     },
     "queue-microtask": {
       "version": "1.2.2",
@@ -35287,13 +34695,13 @@
       "dev": true
     },
     "raw-body": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
+      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
       "dev": true,
       "requires": {
-        "bytes": "3.1.2",
-        "http-errors": "2.0.0",
+        "bytes": "3.1.0",
+        "http-errors": "1.7.2",
         "iconv-lite": "0.4.24",
         "unpipe": "1.0.0"
       }
@@ -35809,59 +35217,6 @@
         "is-finite": "^1.0.0"
       }
     },
-    "request": {
-      "version": "2.88.2",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
-      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
-      "requires": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.3",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.5.0",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
-      },
-      "dependencies": {
-        "form-data": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-          "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-          "requires": {
-            "asynckit": "^0.4.0",
-            "combined-stream": "^1.0.6",
-            "mime-types": "^2.1.12"
-          }
-        },
-        "qs": {
-          "version": "6.5.3",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
-          "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA=="
-        },
-        "tough-cookie": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-          "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-          "requires": {
-            "psl": "^1.1.28",
-            "punycode": "^2.1.1"
-          }
-        }
-      }
-    },
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -35889,8 +35244,7 @@
     "requires-port": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
-      "dev": true
+      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
     },
     "reserved-words": {
       "version": "0.1.2",
@@ -36236,24 +35590,24 @@
       }
     },
     "send": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+      "version": "0.17.1",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
+      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
       "dev": true,
       "requires": {
         "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
+        "depd": "~1.1.2",
+        "destroy": "~1.0.4",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "2.0.0",
+        "http-errors": "~1.7.2",
         "mime": "1.6.0",
-        "ms": "2.1.3",
-        "on-finished": "2.4.1",
+        "ms": "2.1.1",
+        "on-finished": "~2.3.0",
         "range-parser": "~1.2.1",
-        "statuses": "2.0.1"
+        "statuses": "~1.5.0"
       },
       "dependencies": {
         "debug": {
@@ -36268,17 +35622,11 @@
             "ms": {
               "version": "2.0.0",
               "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-              "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
               "dev": true
             }
           }
         },
-        "depd": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-          "dev": true
-        },
         "mime": {
           "version": "1.6.0",
           "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
@@ -36286,24 +35634,9 @@
           "dev": true
         },
         "ms": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-          "dev": true
-        },
-        "on-finished": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-          "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-          "dev": true,
-          "requires": {
-            "ee-first": "1.1.1"
-          }
-        },
-        "statuses": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
           "dev": true
         }
       }
@@ -36393,15 +35726,15 @@
       }
     },
     "serve-static": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
+      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
       "dev": true,
       "requires": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.18.0"
+        "send": "0.17.1"
       }
     },
     "set-blocking": {
@@ -36445,9 +35778,9 @@
       "dev": true
     },
     "setprototypeof": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
+      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
       "dev": true
     },
     "sha.js": {
@@ -36489,17 +35822,6 @@
       "resolved": "https://registry.npmjs.org/shimmer/-/shimmer-1.2.1.tgz",
       "integrity": "sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw=="
     },
-    "side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
-      }
-    },
     "signal-exit": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
@@ -36779,32 +36101,33 @@
       }
     },
     "socket.io": {
-      "version": "4.5.3",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.3.tgz",
-      "integrity": "sha512-zdpnnKU+H6mOp7nYRXH4GNv1ux6HL6+lHL8g7Ds7Lj8CkdK1jJK/dlwsKDculbyOHifcJ0Pr/yeXnZQ5GeFrcg==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.4.1.tgz",
+      "integrity": "sha512-s04vrBswdQBUmuWJuuNTmXUVJhP0cVky8bBDhdkf8y0Ptsu7fKU2LuLbts9g+pdmAdyMMn8F/9Mf1/wbtUN0fg==",
       "dev": true,
       "requires": {
         "accepts": "~1.3.4",
         "base64id": "~2.0.0",
         "debug": "~4.3.2",
-        "engine.io": "~6.2.0",
-        "socket.io-adapter": "~2.4.0",
-        "socket.io-parser": "~4.2.0"
+        "engine.io": "~6.1.0",
+        "socket.io-adapter": "~2.3.3",
+        "socket.io-parser": "~4.0.4"
       }
     },
     "socket.io-adapter": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz",
-      "integrity": "sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.3.3.tgz",
+      "integrity": "sha512-Qd/iwn3VskrpNO60BeRyCyr8ZWw9CPZyitW4AQwmRZ8zCiyDiL+znRnWX6tDHXnWn1sJrM1+b6Mn6wEDJJ4aYQ==",
       "dev": true
     },
     "socket.io-parser": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.1.tgz",
-      "integrity": "sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.5.tgz",
+      "integrity": "sha512-sNjbT9dX63nqUFIOv95tTVm6elyIU4RvB1m8dOeZt+IgWwcWklFDOdmGcfo3zSiRsnR/3pJkjY5lfoGqEe4Eig==",
       "dev": true,
       "requires": {
-        "@socket.io/component-emitter": "~3.1.0",
+        "@types/component-emitter": "^1.2.10",
+        "component-emitter": "~1.3.0",
         "debug": "~4.3.1"
       }
     },
@@ -37046,22 +36369,6 @@
       "dev": true,
       "optional": true
     },
-    "sshpk": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
-      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
-      "requires": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
-      }
-    },
     "ssri": {
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
@@ -38438,9 +37745,9 @@
       }
     },
     "toidentifier": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
+      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
       "dev": true
     },
     "toposort": {
@@ -38450,13 +37757,21 @@
       "dev": true
     },
     "tough-cookie": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
-      "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz",
+      "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==",
       "requires": {
-        "ip-regex": "^2.1.0",
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.2.0",
+        "url-parse": "^1.5.3"
+      },
+      "dependencies": {
+        "universalify": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+          "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg=="
+        }
       }
     },
     "tr46": {
@@ -38608,11 +37923,6 @@
         "safe-buffer": "^5.0.1"
       }
     },
-    "tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
-    },
     "type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -38709,11 +38019,6 @@
         "through": "^2.3.8"
       }
     },
-    "underscore": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
-      "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g=="
-    },
     "unified": {
       "version": "9.2.1",
       "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.1.tgz",
@@ -38969,6 +38274,7 @@
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
       "requires": {
         "punycode": "^2.1.0"
       }
@@ -39025,7 +38331,6 @@
       "version": "1.5.10",
       "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
       "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
-      "dev": true,
       "requires": {
         "querystringify": "^2.1.1",
         "requires-port": "^1.0.0"
@@ -39103,7 +38408,8 @@
     "uuid": {
       "version": "3.4.0",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "dev": true
     },
     "v8-compile-cache": {
       "version": "2.3.0",
@@ -39121,11 +38427,6 @@
         "spdx-expression-parse": "^3.0.0"
       }
     },
-    "validator": {
-      "version": "13.7.0",
-      "resolved": "https://registry.npmjs.org/validator/-/validator-13.7.0.tgz",
-      "integrity": "sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw=="
-    },
     "vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
@@ -39136,6 +38437,8 @@
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
       "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "dev": true,
+      "optional": true,
       "requires": {
         "assert-plus": "^1.0.0",
         "core-util-is": "1.0.2",
@@ -40337,7 +39640,8 @@
     "xmlbuilder": {
       "version": "9.0.7",
       "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
-      "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0="
+      "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=",
+      "dev": true
     },
     "xtend": {
       "version": "4.0.2",
diff --git a/package.json b/package.json
index a22e9a531a..78e80ce522 100644
--- a/package.json
+++ b/package.json
@@ -174,9 +174,8 @@
     "@angular/platform-server": "^11.0.0",
     "@angular/router": "^11.0.0",
     "@azure/msal-node": "^1.14.6",
-    "@azure/storage-blob": "^10.5.0",
+    "@azure/storage-blob": "^12.11.0",
     "applicationinsights": "^1.8.5",
-    "azure-storage": "^2.10.7",
     "chart.js": "^2.9.3",
     "chokidar": "^3.4.3",
     "commander": "^8.0.0",
diff --git a/scripts/azpipelines/update-latest.ts b/scripts/azpipelines/update-latest.ts
index ddac194475..2c64265bc8 100644
--- a/scripts/azpipelines/update-latest.ts
+++ b/scripts/azpipelines/update-latest.ts
@@ -1,14 +1,19 @@
 // eslint-disable no-console
-import * as azureStorage from "azure-storage";
 import makeDir from "make-dir";
 import * as path from "path";
 import * as fs from "fs";
-import { getManifest, getContainerName } from "./utils";
+import { getManifest, getContainerName, BlobStorageClient } from "./utils";
 import { promisify } from "util";
 
 const copyFile = promisify(fs.copyFile);
 
-const stagingDir = path.join(process.env.AGENT_TEMPDIRECTORY, "batchexplorer-github");
+if (!process.env.AGENT_TEMPDIRECTORY) {
+    throw new Error(
+        "Required AGENT_TEMPDIRECTORY environment variable is empty"
+    );
+}
+const stagingDir = path.join(process.env.AGENT_TEMPDIRECTORY,
+    "batchexplorer-github");
 console.log("Env", process.env);
 const storageAccountName = process.env.AZURE_STORAGE_ACCOUNT;
 const storageAccountKey = process.argv[2];
@@ -16,60 +21,37 @@ const storageAccountKey = process.argv[2];
 console.log("Artifact staging directory is", stagingDir);
 console.log(`##vso[task.setvariable variable=BE_GITHUB_ARTIFACTS_DIR]${stagingDir}`)
 
+if (!storageAccountName) {
+    console.error(`No storage account name found in AZURE_STORAGE_ACCOUNT`);
+    process.exit(-1)
+}
+
 if (!storageAccountKey) {
     console.error("No storage account key passed");
     process.exit(-1);
 }
 
 console.log("Uploading to storage account:", storageAccountName);
-const blobService = azureStorage.createBlobService(storageAccountName, storageAccountKey);
-
-function sleep(ms) {
-    return new Promise(resolve => setTimeout(resolve, ms));
-}
 
-async function getProperties(container, blob): Promise<azureStorage.BlobService.BlobResult> {
-    return new Promise((resolve, reject) => {
-        blobService.getBlobProperties(container, blob, (error, result) => {
-            if (error) { return reject(error); }
-            resolve(result);
-        });
-    });
-}
+const storageClient = new BlobStorageClient(storageAccountName,
+    storageAccountKey);
 
-async function waitCopy(container, blob) {
-    while (true) {
-        const properties = await getProperties(container, blob);
-        const copyStatus = properties.copy && properties.copy.status;
-        switch (copyStatus) {
-            case "success":
-                return true;
-            case "aborted":
-                throw new Error("Copy was aborted");
-            case "failed":
-                throw new Error("Copy has failed");
-            case "pending":
-                console.log(`Copy "${blob}"is pending`);
+async function copyBlob(source, container, blob) {
+    const poller = await storageClient.beginCopyBlob(source, container, blob);
+    try {
+        return await poller.pollUntilDone();
+    } catch (error) {
+        switch (error.name) {
+            case "PollerCancelledError":
+                throw new Error(`Copy was cancelled: ${error.message}`);
+            case "PollerStoppedError":
+                throw new Error(`Copy was stopped: ${error.message}`);
+            default:
+                throw new Error(`Copy failed: ${error.message}`);
         }
-        sleep(5000);
     }
 }
 
-async function startCopyBlob(source, container, blob) {
-    return new Promise((resolve, reject) => {
-        blobService.startCopyBlob(source, container, blob, (error, result) => {
-            if (error) { return reject(error); }
-
-            resolve(result);
-        });
-    });
-}
-
-async function copyBlob(source, container, blob) {
-    await startCopyBlob(source, container, blob);
-    return waitCopy(container, blob);
-}
-
 function getLatestFile(os) {
     switch (os) {
         case "darwin":
@@ -83,9 +65,16 @@ function getLatestFile(os) {
 
 async function copyFilesToArtifactStaging(os) {
     const manifest = getManifest(os);
-    console.log(`Copy ${manifest.files.length} files for os: ${os}`);
-    for (const file of manifest.files) {
-        await copyFile(path.join(os, file.path), path.join(stagingDir, file.path))
+    if (manifest.files) {
+        console.log(`Copy ${manifest.files.length} files for os: ${os}`);
+        for (const file of manifest.files) {
+            if (file.path) {
+                await copyFile(
+                    path.join(os, file.path),
+                    path.join(stagingDir, file.path)
+                );
+            }
+        }
     }
 }
 
@@ -101,10 +90,15 @@ async function updateLatest(os) {
     const manifest = getManifest(os);
     console.log(`##vso[task.setvariable variable=BE_RELEASE_VERSION]${manifest.version}`)
     console.log(`Updating latest for os: ${os}`);
+    if (!manifest.buildType) {
+        throw new Error(
+            "Manifest does not contain required value for buildType"
+        );
+    }
     const container = getContainerName(manifest.buildType);
     const latestFile = getLatestFile(os);
-    const orgiginalBlob = `${manifest.version}/${latestFile}`;
-    const sourceUrl = blobService.getUrl(container, orgiginalBlob);
+    const originalBlob = `${manifest.version}/${latestFile}`;
+    const sourceUrl = storageClient.getUrl(container, originalBlob);
     console.log("Copying", sourceUrl, container, latestFile);
     return copyBlob(sourceUrl, container, latestFile);
 }
diff --git a/scripts/azpipelines/upload-to-storage.ts b/scripts/azpipelines/upload-to-storage.ts
index c540236d75..6f0ab5a3d3 100644
--- a/scripts/azpipelines/upload-to-storage.ts
+++ b/scripts/azpipelines/upload-to-storage.ts
@@ -1,8 +1,7 @@
 // eslint-disable no-console
 import * as fs from "fs";
 import * as path from "path";
-import * as AzureStorage from "azure-storage";
-import { getManifest, getContainerName } from "./utils";
+import { getManifest, getContainerName, BlobStorageClient } from "./utils";
 import * as crypto from "crypto";
 
 const storageAccountName = process.env.AZURE_STORAGE_ACCOUNT;
@@ -11,50 +10,32 @@ const attemptNumber = Number(process.env.Release_AttemptNumber);
 
 console.log(`This is the ${attemptNumber} try to release`);
 
+if (!storageAccountName) {
+    console.error(`No storage account name found in AZURE_STORAGE_ACCOUNT`);
+    process.exit(-1);
+}
+
 if (!storageAccountKey) {
     console.error("No storage account key passed");
     process.exit(-1);
 }
 
 console.log("Uploading to storage account:", storageAccountName);
-const blobService = AzureStorage.createBlobService(storageAccountName, storageAccountKey);
 
 function computeFileMd5(filename) {
     const data = fs.readFileSync(filename);
     return crypto.createHash("md5").update(data).digest("base64");
 }
 
-async function getBlob(container, blobName): Promise<AzureStorage.BlobService.BlobResult> {
-    return new Promise((resolve, reject) => {
-        blobService.getBlobProperties(container, blobName, (error, result) => {
-            if (error) {
-                return reject(error);
-            }
-
-            resolve(result);
-        });
-    });
-}
+const storageClient = new BlobStorageClient(storageAccountName,
+    storageAccountKey);
 
 async function createBlobFromLocalFile(container, filename, blobName, override = false) {
-    const options: AzureStorage.BlobService.CreateBlockBlobRequestOptions = {};
-    if (!override) {
-        options.accessConditions = AzureStorage.AccessCondition.generateIfNotExistsCondition();
-    }
-
-    return new Promise((resolve, reject) => {
-        blobService.createBlockBlobFromLocalFile(container, blobName, filename, options,
-            (error, result, response) => {
-
-                if (error) {
-                    reject(error);
-                    return;
-                }
+    const response = await storageClient.createBlob(container, blobName,
+        filename, override);
 
-                console.log("Uploaded", result, response);
-                resolve(result);
-            });
-    });
+    console.log("Uploaded", response);
+    return response;
 }
 
 async function uploadToBlob(container, filename, blobName, override = false) {
@@ -62,10 +43,10 @@ async function uploadToBlob(container, filename, blobName, override = false) {
     try {
         return await createBlobFromLocalFile(container, filename, blobName, override);
     } catch (error) {
-        if (error.code === "BlobAlreadyExists") {
-            const blob = await getBlob(container, blobName);
+        if (error.details.errorCode === "BlobAlreadyExists") {
+            const blob = await storageClient.getBlob(container, blobName);
             const md5 = computeFileMd5(filename);
-            const blobMd5 = blob.contentSettings && blob.contentSettings.contentMD5;
+            const blobMd5 = blob.blobContentMD5?.toString();
             if (md5 === blobMd5) {
                 console.log(`Already uploaded ${filename} skipping(Md5 hash matched)`);
             } else {
@@ -79,10 +60,22 @@ async function uploadToBlob(container, filename, blobName, override = false) {
 
 async function uploadFiles(os) {
     const manifest = getManifest(os);
-    console.log(`Uploading ${manifest.files.length} files for os: ${os}`);
-    const container = getContainerName(manifest.buildType);
-    for (const file of manifest.files) {
-        await uploadToBlob(container, path.join(os, file.path), file.remotePath);
+    if (manifest.files) {
+        console.log(`Uploading ${manifest.files?.length} files for os: ${os}`);
+        if (!manifest.buildType) {
+            throw new Error(
+                "Manifest does not contain required value for buildType"
+            );
+        }
+        const container = getContainerName(manifest.buildType);
+        for (const file of manifest.files) {
+            if (file.path) {
+                await uploadToBlob(container, path.join(os, file.path),
+                    file.remotePath);
+            }
+        }
+    } else {
+        console.error(`Cannot get manifest for ${os}`);
     }
 }
 
diff --git a/scripts/azpipelines/utils.ts b/scripts/azpipelines/utils.ts
index 3bc48dd822..d1d0a3b0d6 100644
--- a/scripts/azpipelines/utils.ts
+++ b/scripts/azpipelines/utils.ts
@@ -1,3 +1,4 @@
+import { BlobBeginCopyFromURLResponse, BlobDownloadResponseParsed, BlobGetPropertiesResponse, BlobUploadCommonResponse, BlockBlobClient, PollerLike, PollOperationState, StorageSharedKeyCredential } from "@azure/storage-blob";
 import * as fs from "fs";
 import * as path from "path";
 
@@ -13,7 +14,11 @@ interface Manifest {
 }
 
 export function getManifest(os: string): Manifest {
-    return JSON.parse(fs.readFileSync(path.join(os, "manifest.json")).toString());
+    const filePath = path.join(os, "manifest.json");
+    if (!fs.existsSync(filePath)) {
+        throw new Error(`Manifest path ${filePath} does not exist`);
+    }
+    return JSON.parse(fs.readFileSync(filePath).toString()) || {};
 }
 
 export function getContainerName(buildType: string): string {
@@ -26,3 +31,76 @@ export function getContainerName(buildType: string): string {
             return "test";
     }
 }
+
+
+export function storageURL(
+    account: string,
+    container?: string,
+    blob?: string
+): string {
+    let url = `https://${account}.blob.core.windows.net`;
+    if (container) {
+        url = `${url}/${container}`;
+        if (blob) {
+            url = `${url}/${blob}`;
+        }
+    }
+    return url;
+}
+
+export type CopyPoller = PollerLike<
+    PollOperationState<BlobBeginCopyFromURLResponse>,
+    BlobBeginCopyFromURLResponse
+>;
+export class BlobStorageClient {
+    private credential: StorageSharedKeyCredential;
+    constructor(private accountName: string, accountKey: string) {
+        this.credential = new StorageSharedKeyCredential(accountName,
+            accountKey);
+    }
+
+    private getBlobClient(container: string, blob: string) {
+        return new BlockBlobClient(
+            storageURL(this.accountName, container, blob),
+            this.credential
+        )
+    }
+
+    public getUrl(container: string, blob: string): string {
+        return storageURL(this.accountName, container, blob);
+    }
+
+    public async createBlob(
+        container: string,
+        blob: string,
+        filename: string,
+        override = true
+    ):
+        Promise<BlobUploadCommonResponse> {
+        const blobClient = this.getBlobClient(container, blob);
+        const conditions = override ? {} : { ifNoneMatch: "*" };
+        const response = await blobClient.uploadFile(filename, { conditions });
+        return response;
+    }
+
+    public async getBlob(container: string, blob: string):
+        Promise<BlobDownloadResponseParsed> {
+        return this.getBlobClient(container, blob).download(0);
+    }
+
+    public async getBlobProperties(container: string, blob: string):
+        Promise<BlobGetPropertiesResponse> {
+        return this.getBlobClient(container, blob).getProperties();
+    }
+
+    public async beginCopyBlob(source: string, container: string, blob: string):
+        Promise<CopyPoller> {
+        const client = this.getBlobClient(container, blob);
+        return client.beginCopyFromURL(source, {
+            intervalInMs: 5000,
+            onProgress(state) {
+                console.log(`Copy "${blob}" is pending ${state.copyProgress}`);
+            },
+        })
+    }
+}
diff --git a/src/app/components/application/action/create/application-create-dialog.component.ts b/src/app/components/application/action/create/application-create-dialog.component.ts
index cfba66eb86..1b6660aa6b 100644
--- a/src/app/components/application/action/create/application-create-dialog.component.ts
+++ b/src/app/components/application/action/create/application-create-dialog.component.ts
@@ -8,7 +8,7 @@ import { BatchApplication, BatchApplicationPackage } from "app/models";
 import { applicationToCreateFormModel } from "app/models/forms";
 import { BatchApplicationPackageService, BatchApplicationService } from "app/services";
 import { StorageBlobService } from "app/services/storage";
-import * as storage from "azure-storage";
+import { UploadFileResult } from "app/services/storage/models/storage-blob";
 import { Constants } from "common";
 import { Observable, of, throwError } from "rxjs";
 import { catchError, share, switchMap, tap } from "rxjs/operators";
@@ -103,7 +103,8 @@ export class ApplicationCreateDialogComponent {
         );
     }
 
-    private _uploadAppPackage(file: File, sasUrl: string): Observable<storage.BlobService.BlobResult> {
+    private _uploadAppPackage(file: File, sasUrl: string):
+        Observable<UploadFileResult> {
         if (!this.hasValidFile()) {
             return throwError("Valid file not selected");
         }
diff --git a/src/app/components/common/blob-container-picker/blob-container-picker.component.ts b/src/app/components/common/blob-container-picker/blob-container-picker.component.ts
index 144e39ac02..032fd3d35d 100644
--- a/src/app/components/common/blob-container-picker/blob-container-picker.component.ts
+++ b/src/app/components/common/blob-container-picker/blob-container-picker.component.ts
@@ -10,6 +10,7 @@ import { BlobContainer } from "app/models";
 import {
     AutoStorageService, ListContainerParams, StorageContainerService,
 } from "app/services/storage";
+import { PermissionType } from "app/services/storage/models";
 import { List } from "immutable";
 import { DateTime } from "luxon";
 import { BehaviorSubject, Observable, Subject, combineLatest } from "rxjs";
@@ -47,7 +48,7 @@ export class BlobContainerPickerComponent implements ControlValueAccessor, OnCha
     /**
      * Permission for the sas url if having output as sas url
      */
-    @Input() public sasPermissions: string = "rl";
+    @Input() public sasPermissions: PermissionType[] = ["r"];
 
     public containers: List<BlobContainer>;
     public container = new FormControl();
diff --git a/src/app/components/common/resourcefile-picker/resourcefile-cloud-file-dialog/resourcefile-cloud-file-dialog.component.spec.ts b/src/app/components/common/resourcefile-picker/resourcefile-cloud-file-dialog/resourcefile-cloud-file-dialog.component.spec.ts
index 665fee1b46..5953c86527 100644
--- a/src/app/components/common/resourcefile-picker/resourcefile-cloud-file-dialog/resourcefile-cloud-file-dialog.component.spec.ts
+++ b/src/app/components/common/resourcefile-picker/resourcefile-cloud-file-dialog/resourcefile-cloud-file-dialog.component.spec.ts
@@ -11,7 +11,6 @@ import { File, FileExplorerConfig, FormModule } from "@batch-flask/ui";
 import { ArmBatchAccount, ArmSubscription, StorageAccount } from "app/models";
 import { BatchAccountService, StorageAccountService } from "app/services";
 import { AutoStorageService, StorageBlobService, StorageContainerService } from "app/services/storage";
-import { BlobUtilities } from "azure-storage";
 import { List } from "immutable";
 import { of } from "rxjs";
 import { ResourceFileCloudFileDialogComponent } from "./resourcefile-cloud-file-dialog.component";
@@ -219,7 +218,7 @@ describe("ResourceFileCloudFileDialogComponent", () => {
                 expect(blobServiceSpy.list).toHaveBeenCalledOnce();
                 expect(blobServiceSpy.list).toHaveBeenCalledWith("auto-storage-id", "foobar", {
                     folder: "path/to/folder",
-                    limit: 1,
+                    maxPages: 1,
                 }, true);
 
                 expect(containerServiceSpy.generateSharedAccessUrl).not.toHaveBeenCalledOnce();
@@ -255,15 +254,15 @@ describe("ResourceFileCloudFileDialogComponent", () => {
                 expect(blobServiceSpy.list).toHaveBeenCalledOnce();
                 expect(blobServiceSpy.list).toHaveBeenCalledWith("auto-storage-id", "foobar", {
                     folder: "path/to/file.sh",
-                    limit: 1,
+                    maxPages: 1,
                 }, true);
                 expect(blobServiceSpy.generateSharedAccessBlobUrl).toHaveBeenCalledOnce();
                 expect(blobServiceSpy.generateSharedAccessBlobUrl).toHaveBeenCalledWith(
                     "auto-storage-id", "foobar", "path/to/file.sh", {
-                        AccessPolicy: jasmine.objectContaining({
-                            Permissions: BlobUtilities.SharedAccessPermissions.READ,
-                        }),
-                    });
+                    AccessPolicy: jasmine.objectContaining({
+                        Permissions: ["r"],
+                    }),
+                });
             });
 
             it("updated the current selection", () => {
@@ -304,16 +303,16 @@ describe("ResourceFileCloudFileDialogComponent", () => {
                 expect(blobServiceSpy.list).toHaveBeenCalledOnce();
                 expect(blobServiceSpy.list).toHaveBeenCalledWith("new-storage-acc-1", "foobar", {
                     folder: "path/to/folder",
-                    limit: 1,
+                    maxPages: 1,
                 }, true);
 
                 expect(containerServiceSpy.generateSharedAccessUrl).toHaveBeenCalled();
                 expect(containerServiceSpy.generateSharedAccessUrl).toHaveBeenCalledWith(
                     "new-storage-acc-1", "foobar", {
-                        AccessPolicy: jasmine.objectContaining({
-                            Permissions: BlobUtilities.SharedAccessPermissions.READ,
-                        }),
-                    });
+                    AccessPolicy: jasmine.objectContaining({
+                        Permissions: ["r"],
+                    }),
+                });
             });
 
             it("updated the current selection", () => {
diff --git a/src/app/components/common/resourcefile-picker/resourcefile-cloud-file-dialog/resourcefile-cloud-file-dialog.component.ts b/src/app/components/common/resourcefile-picker/resourcefile-cloud-file-dialog/resourcefile-cloud-file-dialog.component.ts
index 8445ef989c..7bfb80a8cd 100644
--- a/src/app/components/common/resourcefile-picker/resourcefile-cloud-file-dialog/resourcefile-cloud-file-dialog.component.ts
+++ b/src/app/components/common/resourcefile-picker/resourcefile-cloud-file-dialog/resourcefile-cloud-file-dialog.component.ts
@@ -8,7 +8,6 @@ import { BatchAccountService, StorageAccountService } from "app/services";
 import { AutoStorageService, StorageBlobService, StorageContainerService } from "app/services/storage";
 import { SharedAccessPolicy } from "app/services/storage/models";
 import { ArmResourceUtils, StorageUtils } from "app/utils";
-import { BlobUtilities } from "azure-storage";
 import { DateTime } from "luxon";
 import { BehaviorSubject, Observable, Subject, of } from "rxjs";
 import {
@@ -178,7 +177,7 @@ export class ResourceFileCloudFileDialogComponent implements OnInit, OnDestroy {
         return this.blobService.list(storageAccountId, containerName,
             {
                 folder: path,
-                limit: 1,
+                maxPages: 1,
             },
             true,
         ).pipe(
@@ -203,7 +202,7 @@ export class ResourceFileCloudFileDialogComponent implements OnInit, OnDestroy {
 
         const sas: SharedAccessPolicy = {
             AccessPolicy: {
-                Permissions: BlobUtilities.SharedAccessPermissions.READ,
+                Permissions: ["r"],
                 Start: new Date(),
                 Expiry: DateTime.local().plus({ weeks: 1 }).toJSDate(),
             },
@@ -226,7 +225,7 @@ export class ResourceFileCloudFileDialogComponent implements OnInit, OnDestroy {
 
         const sas: SharedAccessPolicy = {
             AccessPolicy: {
-                Permissions: BlobUtilities.SharedAccessPermissions.READ,
+                Permissions: ["r"],
                 Start: new Date(),
                 Expiry: DateTime.local().plus({ weeks: 1 }).toJSDate(),
             },
diff --git a/src/app/components/common/resourcefile-picker/resourcefile-picker.component.ts b/src/app/components/common/resourcefile-picker/resourcefile-picker.component.ts
index 5fb378490d..336959d23b 100644
--- a/src/app/components/common/resourcefile-picker/resourcefile-picker.component.ts
+++ b/src/app/components/common/resourcefile-picker/resourcefile-picker.component.ts
@@ -11,7 +11,6 @@ import { CloudPathUtils, DragUtils, SecureUtils, UrlUtils } from "@batch-flask/u
 import { ResourceFileAttributes } from "app/models";
 import { AutoStorageService, StorageBlobService, StorageContainerService } from "app/services/storage";
 import { SharedAccessPolicy } from "app/services/storage/models";
-import { BlobUtilities } from "azure-storage";
 import { BEUserConfiguration } from "common";
 import { DateTime } from "luxon";
 import * as path from "path";
@@ -202,7 +201,7 @@ export class ResourcefilePickerComponent implements ControlValueAccessor, OnDest
                         this.changeDetector.detectChanges();
                         const sas: SharedAccessPolicy = {
                             AccessPolicy: {
-                                Permissions: BlobUtilities.SharedAccessPermissions.READ,
+                                Permissions: ["r"],
                                 Start: new Date(),
                                 Expiry: DateTime.local().plus({ weeks: 1 }).toJSDate(),
                             },
diff --git a/src/app/components/data/browse/data-container-list.component.ts b/src/app/components/data/browse/data-container-list.component.ts
index 3dc6d6b0a7..d7794028f9 100644
--- a/src/app/components/data/browse/data-container-list.component.ts
+++ b/src/app/components/data/browse/data-container-list.component.ts
@@ -5,7 +5,7 @@ import {
 import { ActivatedRoute } from "@angular/router";
 import { Filter, ListSelection, ListView, autobind } from "@batch-flask/core";
 import { ListBaseComponent, LoadingStatus, QuickListItemStatus } from "@batch-flask/ui";
-import { BlobContainer, LeaseStatus } from "app/models";
+import { BlobContainer } from "app/models";
 import { ListContainerParams, StorageContainerService } from "app/services/storage";
 import { ComponentUtils } from "app/utils";
 import { Constants } from "common";
@@ -114,8 +114,8 @@ export class DataContainerListComponent extends ListBaseComponent implements OnI
     }
 
     public containerStatus(container: BlobContainer): QuickListItemStatus {
-        switch (container.lease && container.lease.status) {
-            case LeaseStatus.locked:
+        switch (container.lease?.status) {
+            case "locked":
                 return QuickListItemStatus.warning;
             default:
                 return QuickListItemStatus.normal;
diff --git a/src/app/components/data/shared/file-group-sas/file-group-sas.component.ts b/src/app/components/data/shared/file-group-sas/file-group-sas.component.ts
index 5caf2a14fd..92f74b12d3 100644
--- a/src/app/components/data/shared/file-group-sas/file-group-sas.component.ts
+++ b/src/app/components/data/shared/file-group-sas/file-group-sas.component.ts
@@ -5,6 +5,7 @@ import {
 import { ListView, autobind } from "@batch-flask/core";
 import { BlobContainer } from "app/models";
 import { AutoStorageService, ListContainerParams, StorageContainerService } from "app/services/storage";
+import { SharedAccessPolicy } from "app/services/storage/models";
 import { Constants } from "common";
 import { List } from "immutable";
 import { DateTime } from "luxon";
@@ -113,9 +114,9 @@ export class FileGroupSasComponent implements ControlValueAccessor, OnChanges, O
          * Blob Container read/write/list access policy that is valid for 7 days, The maximum
          * lifetime of a task in Batch.
          */
-        const accessPolicy = {
+        const accessPolicy: SharedAccessPolicy = {
             AccessPolicy: {
-                Permissions: this.allowWrite ? "rwl" : "rl",
+                Permissions: (this.allowWrite ? ["r", "w", "l"] : ["r", "l"]),
                 ResourceTypes: "CONTAINER",
                 Services: "BLOB",
                 Start: DateTime.utc().minus({ minutes: 15 }).toJSDate(),
diff --git a/src/app/decorators/container-lease-decorator.ts b/src/app/decorators/container-lease-decorator.ts
index 0c540675f3..65a8260051 100644
--- a/src/app/decorators/container-lease-decorator.ts
+++ b/src/app/decorators/container-lease-decorator.ts
@@ -16,12 +16,10 @@ export class ContainerLeaseDecorator extends DecoratorBase<ContainerLease> {
 
     private _leaseStatusField(status: LeaseStatus): string {
         switch (status) {
-            case LeaseStatus.locked:
+            case "locked":
                 return "Locked";
-            case LeaseStatus.unlocked:
+            case "unlocked":
                 return "Unlocked";
-            case LeaseStatus.unspecified:
-                return "Unspecified";
 
             default:
                 return this.stringField(status);
@@ -30,18 +28,16 @@ export class ContainerLeaseDecorator extends DecoratorBase<ContainerLease> {
 
     private _leaseStateField(state: LeaseState): string {
         switch (state) {
-            case LeaseState.available:
+            case "available":
                 return "Available";
-            case LeaseState.breaking:
+            case "breaking":
                 return "Breaking";
-            case LeaseState.broken:
+            case "broken":
                 return "Broken";
-            case LeaseState.expired:
+            case "expired":
                 return "Expired";
-            case LeaseState.leased:
+            case "leased":
                 return "Leased";
-            case LeaseState.unspecified:
-                return "Unspecified";
 
             default:
                 return this.stringField(state);
diff --git a/src/app/models/blob-container.ts b/src/app/models/blob-container.ts
index bbece5bb26..341270c73d 100644
--- a/src/app/models/blob-container.ts
+++ b/src/app/models/blob-container.ts
@@ -1,4 +1,5 @@
 import { Model, NavigableRecord, Prop, Record } from "@batch-flask/core";
+import { StorageContainerProperties } from "app/services/storage";
 import { Constants } from "common";
 import { ContainerLease, ContainerLeaseAttributes } from "./container-lease";
 
@@ -28,6 +29,16 @@ export class BlobContainer extends Record<BlobContainerAttributes> implements Na
     @Prop() public lease: ContainerLease;
     @Prop() public storageAccountId: string;
 
+    constructor(container: StorageContainerProperties) {
+        super(container);
+        this.lease = new ContainerLease({
+            state: container.leaseState,
+            status: container.leaseStatus,
+            duration: container.leaseDuration
+        });
+        this.publicAccessLevel = container.publicAccess;
+    }
+
     public get routerLink(): string[] {
         if (this.isFileGroup) {
             return ["/data/file-groups/containers", this.id];
diff --git a/src/app/models/container-lease.ts b/src/app/models/container-lease.ts
index 98b09e5f6f..ca81b90b73 100644
--- a/src/app/models/container-lease.ts
+++ b/src/app/models/container-lease.ts
@@ -1,3 +1,4 @@
+import { LeaseStateType, LeaseStatusType } from "@azure/storage-blob";
 import { Model, Prop, Record } from "@batch-flask/core";
 
 export interface ContainerLeaseAttributes {
@@ -16,17 +17,6 @@ export class ContainerLease extends Record<ContainerLeaseAttributes> {
     @Prop() public duration: string;
 }
 
-export enum LeaseStatus {
-    locked = "locked",
-    unlocked = "unlocked",
-    unspecified = "unspecified",
-}
+export type LeaseStatus = LeaseStatusType;
 
-export enum LeaseState {
-    available = "available",
-    breaking = "breaking",
-    broken = "broken",
-    expired = "expired",
-    leased = "leased",
-    unspecified = "unspecified",
-}
+export type LeaseState = LeaseStateType;
diff --git a/src/app/services/core/data/storage-list-getter.ts b/src/app/services/core/data/storage-list-getter.ts
index 3fdcc4ca4f..268797cd4a 100644
--- a/src/app/services/core/data/storage-list-getter.ts
+++ b/src/app/services/core/data/storage-list-getter.ts
@@ -1,28 +1,24 @@
 import { Type } from "@angular/core";
 import { ContinuationToken, ListGetter, ListGetterConfig, Record, ServerError } from "@batch-flask/core";
+import { StorageBlobResult } from "app/services/storage/models";
 import { StorageClientService } from "app/services/storage/storage-client.service";
 import { Observable, from, throwError } from "rxjs";
-import { catchError, flatMap, map, share } from "rxjs/operators";
+import { catchError, map, share, switchMap } from "rxjs/operators";
 
 export interface StorageBaseParams {
     storageAccountId: string;
 }
 
-export interface StorageListResponse {
-    data: any[];
-    continuationToken?: string;
-}
-
 export interface StorageListConfig<TEntity extends Record<any>, TParams extends StorageBaseParams>
     extends ListGetterConfig<TEntity, TParams> {
 
-    getData: (client: any, params: TParams, options: any, token: any) => Promise<StorageListResponse>;
+    getData: (client: any, params: TParams, options: any, token: any) => Promise<StorageBlobResult<TEntity[]>>;
 }
 
 export class StorageListGetter<TEntity extends Record<any>, TParams extends StorageBaseParams>
     extends ListGetter<TEntity, TParams> {
 
-    private _getData: (client: any, params: TParams, options: any, token: any) => Promise<StorageListResponse>;
+    private _getData: (client: any, params: TParams, options: any, token: any) => Promise<StorageBlobResult<TEntity[]>>;
 
     constructor(
         type: Type<TEntity>,
@@ -36,26 +32,18 @@ export class StorageListGetter<TEntity extends Record<any>, TParams extends Stor
 
     protected list(params: TParams, options: any): Observable<any> {
         return this._clientProxy(params, options, null).pipe(
-            flatMap((client) => {
-                return from(client);
-            }),
+            switchMap(client => from(client)),
             map(response => this._processStorageResponse(response)),
-            catchError((error) => {
-                return throwError(ServerError.fromStorage(error));
-            }),
+            catchError(error => throwError(ServerError.fromStorage(error))),
             share(),
         );
     }
 
     protected listNext(token: ContinuationToken): Observable<any> {
         return this._clientProxy(token.params, token.options, token.nextLink).pipe(
-            flatMap((client) => {
-                return from(client);
-            }),
+            switchMap(client => from(client)),
             map(response => this._processStorageResponse(response)),
-            catchError((error) => {
-                return throwError(ServerError.fromStorage(error));
-            }),
+            catchError(error => throwError(ServerError.fromStorage(error))),
             share(),
         );
     }
diff --git a/src/app/services/storage/blob-storage-client-proxy.ts b/src/app/services/storage/blob-storage-client-proxy.ts
index 48017d444b..3ae96a6013 100644
--- a/src/app/services/storage/blob-storage-client-proxy.ts
+++ b/src/app/services/storage/blob-storage-client-proxy.ts
@@ -1,20 +1,11 @@
-import { EncodingUtils } from "@batch-flask/utils";
-import { BlobService } from "azure-storage";
-import { BlobStorageResult, SharedAccessPolicy, StorageRequestOptions } from "./models";
+import { BlobUploadCommonResponse } from "@azure/storage-blob";
+import { ElectronRemote } from "@batch-flask/electron";
+import { IpcEvent } from "common/constants";
+import { SharedAccessPolicy } from "./models";
+import * as blob from "./models/storage-blob";
+import { BlobContentResult } from "./storage-blob.service";
 
-export interface ListBlobOptions {
-    /**
-     * Filter for the path.(Relative to the prefix if given)
-     */
-    folder?: string;
-
-    /**
-     * If it should list all files or 1 directory deep.
-     */
-    recursive?: boolean;
-
-    limit?: number;
-}
+const storageIpc = IpcEvent.storageBlob;
 
 export interface ListBlobResponse {
     body: {
@@ -28,370 +19,239 @@ export interface ListBlobResponse {
 }
 
 export class BlobStorageClientProxy {
-    public client: BlobService;
 
-    constructor(blobService: BlobService) {
-        this.client = blobService;
+    private storageInfo: { url: string; account: string, key: string };
+
+    constructor(
+        private remote: ElectronRemote,
+        account: string,
+        key: string,
+        blobEndpoint: string
+    ) {
+        const url = `https://${account}.${blobEndpoint}`;
+        this.storageInfo = { url, account, key };
     }
 
     /**
-     * Lists blobs from the container that match the prefix. In our case the prefix will be the
-     * taskId and the OutputKind of the task output.
-     * http://azure.github.io/azure-storage-node/BlobService.html#listBlobsSegmentedWithPrefix__anchor
+     * Lists blobs from the container that match the prefix. In our case the
+     * prefix will be the taskId and the OutputKind of the task output.
      *
      * @param {string} container - Name of the storage container
      * @param {string} blobPrefix - The prefix of the blob name. In our case it is the taskId prefix:
      *  "${taskId}/$TaskOutput|$TaskLog/${namePrefixFilter}"
-     * @param {string} filter - Optional text for filtering further than the blob prefix
      * @param {string} continuationToken - Token that was returned from the last call, if any
-     * @param {StorageRequestOptions} options - Optional request parameters
+     * @param {blob.RequestOptions} options - Optional request parameters
      */
-    public listBlobs(
-        container: string,
-        options: ListBlobOptions = {},
-        continuationToken?: any): Promise<BlobStorageResult> {
-
-        // we want to keep the filter and prefix separate for mapping files in the response.
-        const prefix = options.folder;
-        const storageOptions: StorageRequestOptions = {
-            delimiter: options.recursive ? null : "/",
-            maxResults: options.limit,
-        };
-        return new Promise((resolve, reject) => {
-            this.client.listBlobsSegmentedWithPrefix(container, prefix, continuationToken, storageOptions,
-                (error, result, response: any) => {
-                    if (error) { return reject(error); }
-
-                    const folders = this._getFolderNames(response).map((name) => {
-                        return {
-                            name: name,
-                            url: `${container}/${name}`,
-                            isDirectory: true,
-                        };
-                    });
-
-                    resolve({
-                        data: folders.concat(result.entries.map((blob) => {
-                            return {
-                                name: blob.name,
-                                url: `${container}/${blob.name}`,
-                                isDirectory: false,
-                                properties: {
-                                    contentLength: parseInt(blob.contentLength, 10),
-                                    contentType: blob.contentSettings.contentType,
-                                    creationTime: null,
-                                    lastModified: blob.lastModified,
-                                },
-                            };
-                        })),
-                        continuationToken: result.continuationToken,
-                    });
-                });
-        });
+    public async listBlobs(
+        containerName: string,
+        options: blob.ListBlobOptions,
+        continuationToken?: string
+    ): Promise<blob.ListBlobsResult> {
+        return this.remote.send(storageIpc.listBlobs,
+            { ...this.storageInfo, containerName, options, continuationToken });
     }
 
     /**
      * Returns all user-defined metadata, standard HTTP properties, and system
      * properties for the blob.
-     * http://azure.github.io/azure-storage-node/BlobService.html#getBlobProperties__anchor
      *
-     * @param {string} container - Name of the storage container
+     * @param {string} containerName - Name of the storage container
      * @param {string} blobName - Name of the blob file: "myblob.txt"
      * @param {string} blobPrefix - Optional prefix to the blob from the container root: "1001/$TaskOutput/"
-     * @param {StorageRequestOptions} options - Optional request parameters
+     * @param {blob.RequestOptions} options - Optional request parameters
      */
-    public getBlobProperties(
-        container: string,
+    public async getBlobProperties(
+        containerName: string,
         blobName: string,
-        blobPrefix?: string,
-        options?: StorageRequestOptions): Promise<BlobStorageResult> {
-
-        const blobPath = `${blobPrefix || ""}${blobName}`;
-        return new Promise((resolve, reject) => {
-            this.client.getBlobProperties(container, blobPath, options, (error, result, response) => {
-                if (error) {
-                    reject(error);
-                } else {
-                    resolve({
-                        data: {
-                            name: blobName,
-                            url: `${container}/${blobPath}`,
-                            isDirectory: false,
-                            properties: {
-                                contentLength: parseInt(result.contentLength, 10),
-                                contentType: result.contentSettings.contentType,
-                                creationTime: null,
-                                lastModified: result.lastModified,
-                            },
-                        },
-                    });
-                }
-            });
-        });
+        blobPrefix = "",
+        options?: blob.RequestOptions
+    ): Promise<blob.GetBlobPropertiesResult> {
+
+        return this.remote.send(storageIpc.getBlobProperties,
+            {
+                ...this.storageInfo,
+                containerName,
+                blobName,
+                blobPrefix,
+                options
+            }
+        );
     }
 
     /**
      * Downloads a blob into a text string.
-     * http://azure.github.io/azure-storage-node/BlobService.html#getBlobToText__anchor
+     *
      * @param {string} container - Name of the storage container
      * @param {string} blob - Fully prefixed blob path: "1001/$TaskOutput/myblob.txt"
-     * @param {StorageRequestOptions} options - Optional request parameters
+     * @param {blob.RequestOptions} options - Optional request parameters
      */
-    public async getBlobContent(container: string, blob: string, options?: StorageRequestOptions) {
-        const buffer = await this._getBlobAsBuffer(container, blob, options);
-        const {encoding} = await EncodingUtils.detectEncodingFromBuffer({ buffer, bytesRead: buffer.length });
-        let content;
-        if (encoding) {
-            content = new TextDecoder(encoding).decode(buffer);
-        } else {
-            content = buffer.toString();
-        }
-
-        return { content };
+    public async getBlobContent(
+        containerName: string,
+        blobName: string,
+        options?: blob.GetBlobContentOptions
+    ): Promise<BlobContentResult> {
+        return this.remote.send(storageIpc.getBlobContent,
+            { ...this.storageInfo, containerName, blobName, options });
     }
 
     /**
      * Downloads a blob into a file.
-     * http://azure.github.io/azure-storage-node/BlobService.html#getBlobToLocalFile__anchor
-     * Note: this returns a SpeedSummary object that can list the percent complete. Can't see any
-     * implementation of this in the docs. Might be useful at some point.
+     *
      * @param {string} container - Name of the storage container
      * @param {string} blob - Fully prefixed blob path: "1001/$TaskOutput/myblob.txt"
      * @param {string} localFileName - The local path to the file to be downloaded.
-     * @param {StorageRequestOptions} options - Optional request parameters
+     * @param {blob.RequestOptions} options - Optional request parameters
      */
-    public getBlobToLocalFile(container: string, blob: string, localFileName: string, options?: StorageRequestOptions) {
-        return new Promise((resolve, reject) => {
-            this.client.getBlobToLocalFile(container, blob, localFileName, options, (error, result, response) => {
-                if (error) {
-                    reject(error);
-                } else {
-                    // resolve with no content
-                    resolve({});
-                }
-            });
-        });
+    public async getBlobToLocalFile(
+        containerName: string,
+        blobName: string,
+        localFileName: string,
+        options?: blob.RequestOptions
+    ): Promise<void> {
+        await this.remote.send(storageIpc.downloadBlob,
+            {
+                ...this.storageInfo,
+                containerName,
+                blobName,
+                localFileName,
+                options
+            }
+        );
+        return;
     }
 
     /**
-     * Marks the specified blob or snapshot for deletion if it exists. The blob is later deleted during
-     * garbage collection. If a blob has snapshots, you must delete them when deleting the blob by setting
-     * the deleteSnapshots option.
-     * http://azure.github.io/azure-storage-node/BlobService.html#deleteBlobIfExists__anchor
+     * Marks the specified blob or snapshot for deletion if it exists. The blob
+     * is later deleted during garbage collection. If a blob has snapshots, you
+     * must delete them when deleting the blob by setting the deleteSnapshots
+     * option.
      *
      * @param {string} container - ID of the storage container
      * @param {string} blob - Fully prefixed blob path: "1001/$TaskOutput/myblob.txt"
-     * @param {StorageRequestOptions} options - Optional request parameters
+     * @param {blob.RequestOptions} options - Optional request parameters
      */
-    public deleteBlobIfExists(container: string, blob: string, options?: StorageRequestOptions)
-        : Promise<boolean> {
-
-        return new Promise((resolve, reject) => {
-            this.client.deleteBlobIfExists(container, blob, options, (error, response) => {
-                if (error) {
-                    reject(error);
-                } else {
-                    resolve(response);
-                }
-            });
-        });
+    public async deleteBlobIfExists(
+        containerName: string,
+        blobName: string,
+        options?: blob.RequestOptions
+    ): Promise<boolean> {
+        return this.remote.send(storageIpc.deleteBlob,
+            { ...this.storageInfo, containerName, blobName, options });
     }
 
     /**
-     * Lists a segment containing a collection of container items whose names begin with the specified
-     * prefix under the specified account. By default the prefix will generally be "grp-" as this is the
-     * NCJ prefix for file group containers, but can aso be anything we like in order to get any
-     * arbritrary container.
-     * http://azure.github.io/azure-storage-node/BlobService.html#listContainersSegmentedWithPrefix__anchor
+     * Lists a segment containing a collection of container items whose names
+     * begin with the specified prefix under the specified account. By default
+     * the prefix will generally be "grp-" as this is the NCJ prefix for file
+     * group containers, but can aso be anything we like in order to get any
+     * arbitrary container.
      *
      * @param {string} prefix - Container name prefix including filter, or null.
-     * @param {string} filter - Filter in addition to name prefix.
      * @param {string} continuationToken - Token that was returned from the last call, if any
-     * @param {StorageRequestOptions} options - Optional request parameters
+     * @param {blob.RequestOptions} options - Optional request parameters
      */
-    public listContainersWithPrefix(
-        startswith: string,
-        continuationToken?: any,
-        options?: StorageRequestOptions): Promise<BlobStorageResult> {
-
-        return new Promise((resolve, reject) => {
-            this.client.listContainersSegmentedWithPrefix(startswith, continuationToken, options,
-                (error, result, response) => {
-                    if (error) {
-                        reject(error);
-                    } else {
-                        resolve({
-                            data: result.entries.map((container) => {
-                                return {
-                                    ...container,
-                                    id: container.name,
-                                };
-                            }),
-                            continuationToken: result.continuationToken,
-                        });
-                    }
-                });
-        });
+    public async listContainersWithPrefix(
+        prefix: string,
+        continuationToken?: string,
+        options?: blob.RequestOptions
+    ): Promise<blob.ListContainersResult> {
+        return this.remote.send(storageIpc.listContainers,
+            { ...this.storageInfo, continuationToken, prefix, options }
+        );
     }
 
     /**
-     * Returns all user-defined metadata and system properties for the specified container.
-     * The data returned does not include the container's list of blobs.
-     * http://azure.github.io/azure-storage-node/BlobService.html#getContainerProperties__anchor
+     * Returns all user-defined metadata and system properties for the
+     * specified container. The data returned does not include the container's
+     * list of blobs.
      *
      * @param {string} container - Name of the storage container
-     * @param {string} prefix - Container name prefix to be remove from the display name.
-     * @param {StorageRequestOptions} options - Optional request parameters
+     * @param {blob.RequestOptions} options - Optional request parameters
      */
-    public getContainerProperties(container: string, prefix: string, options?: StorageRequestOptions)
-        : Promise<BlobStorageResult> {
-
-        return new Promise((resolve, reject) => {
-            this.client.getContainerProperties(container, options, (error, result, response) => {
-                if (error) {
-                    reject(error);
-                } else {
-                    resolve({
-                        data: {
-                            ...result,
-                            id: result.name,
-                        },
-                    });
-                }
-            });
-        });
+    public async getContainerProperties(
+        containerName: string,
+        options?: blob.RequestOptions
+    ): Promise<blob.GetContainerPropertiesResult> {
+        return this.remote.send(storageIpc.getContainerProperties,
+            { ...this.storageInfo, containerName, options });
     }
 
     /**
-     * Marks the specified container for deletion. The container and any blobs contained within
-     * it are later deleted during garbage collection.
-     * http://azure.github.io/azure-storage-node/BlobService.html#deleteContainer__anchor
+     * Marks the specified container for deletion. The container and any blobs
+     * contained within it are later deleted during garbage collection.
      *
      * @param {string} container - Name of the storage container
-     * @param {StorageRequestOptions} options - Optional request parameters
+     * @param {blob.RequestOptions} options - Optional request parameters
      */
-    public deleteContainer(container: string, options?: StorageRequestOptions)
-        : Promise<void> {
-
-        return new Promise((resolve, reject) => {
-            this.client.deleteContainer(container, options, (error, response) => {
-                if (error) {
-                    reject(error);
-                } else {
-                    resolve();
-                }
-            });
-        });
+    public async deleteContainer(
+        containerName: string,
+        options?: blob.RequestOptions
+    ): Promise<void> {
+        return this.remote.send(storageIpc.deleteContainer,
+            { ...this.storageInfo, containerName, options });
     }
 
     /**
      * Creates a new container under the specified account.
      * If a container with the same name already exists, the operation fails.
-     * http://azure.github.io/azure-storage-node/BlobService.html#createContainer__anchor
      *
      * @param {string} container - Name of the storage container
      */
-    public createContainer(containerName: string)
-        : Promise<void> {
-
-        return new Promise((resolve, reject) => {
-            this.client.createContainer(containerName, (error, response) => {
-                if (error) {
-                    reject(error);
-                } else {
-                    resolve();
-                }
-            });
-        });
+    public async createContainer(containerName: string): Promise<void> {
+        return this.remote.send(storageIpc.createContainer,
+            { ...this.storageInfo, containerName });
     }
 
     /**
-     * Creates a new container under the specified account if it doesn't exsits.
+     * Creates a new container under the specified account if it doesn't exists.
      *
      * @param {string} container - Name of the storage container
+     * @returns {boolean} whether a new container was created
      */
-    public createContainerIfNotExists(containerName: string)
-        : Promise<void> {
-
-        return new Promise((resolve, reject) => {
-            this.client.createContainerIfNotExists(containerName, (error, response) => {
-                if (error) {
-                    reject(error);
-                } else {
-                    resolve();
-                }
-            });
-        });
+    public async createContainerIfNotExists(
+        containerName: string,
+        options?: blob.RequestOptions
+    ): Promise<boolean> {
+        return this.remote.send(storageIpc.createContainer,
+            {
+                ...this.storageInfo,
+                containerName,
+                options,
+                unlessExists: true
+            }
+        );
     }
 
-    /**
-     * Retrieves a shared access signature token.
-     * http://azure.github.io/azure-storage-node/BlobService.html#generateSharedAccessSignature__anchor
-     *
-     * @param {string} container - Name of the storage container
-     * @param {string} sharedAccessPolicy - The shared access policy
-     */
-    public generateSharedAccessSignature(
-        container: string, blob: string, sharedAccessPolicy: SharedAccessPolicy): string {
-        return this.client.generateSharedAccessSignature(container, blob, sharedAccessPolicy, null);
+    public async generateSasUrl(
+        containerName: string,
+        blobName?: string,
+        accessPolicy?: SharedAccessPolicy
+    ): Promise<string> {
+        return this.remote.send(storageIpc.generateSasUrl,
+            { ...this.storageInfo, containerName, blobName, accessPolicy });
     }
 
     /**
      * Retrieves a blob or container URL.
-     * http://azure.github.io/azure-storage-node/BlobService.html#getUrl__anchor
      *
      * @param {string} container - Name of the storage container
      * @param {string} blob - Optional blob name.
      * @param {string} sasToken - The Shared Access Signature token.
      */
     public getUrl(container: string, blob?: string, sasToken?: string): string {
-        return this.client.getUrl(container, blob, sasToken);
-    }
-
-    public async uploadFile(container: string, file: string, remotePath: string): Promise<BlobService.BlobResult> {
-        return new Promise<BlobService.BlobResult>((resolve, reject) => {
-            this.client.createBlockBlobFromLocalFile(container, remotePath, file,
-                (error: any, result: BlobService.BlobResult) => {
-                    if (error) { return reject(error); }
-                    resolve(result);
-                });
-        });
+        return [
+            this.storageInfo.url,
+            container,
+            blob ? `/${blob}${sasToken}` : sasToken
+        ].join("/");
     }
 
-    /**
-     * Return the list of folder names return by listing blobs with a delimiter
-     * @param response
-     */
-    private _getFolderNames(response: ListBlobResponse) {
-        const results = response.body["EnumerationResults"]["Blobs"];
-        const blobPrefix = results["BlobPrefix"];
-        if (!blobPrefix) {
-            return [];
-        }
-        const data = Array.isArray(blobPrefix) ? blobPrefix : [blobPrefix];
-        return data.map(x => x["Name"].slice(0, -1));
-    }
-
-    private _getBlobAsBuffer(container: string, blob: string, options: StorageRequestOptions): Promise<Buffer> {
-        return new Promise((resolve, reject) => {
-            const chunks = [];
-            const stream = this.client.createReadStream(container, blob, options, (error, text, response) => {
-                if (error) {
-                    reject(error);
-                }
-            });
-            stream.on("data", (chunk) => {
-                chunks.push(chunk);
-            });
-
-            stream.on("end", () => {
-                const buffer = Buffer.concat(chunks);
-                resolve(buffer);
-            });
-
-            stream.on("error", (error) => {
-                reject(error);
-            });
-        });
+    public async uploadFile(
+        containerName: string,
+        fileName: string,
+        blobName: string
+    ): Promise<BlobUploadCommonResponse> {
+        return this.remote.send(storageIpc.uploadFile,
+            { ...this.storageInfo, containerName, fileName, blobName });
     }
 }
diff --git a/src/app/services/storage/models/blob-storage-result.ts b/src/app/services/storage/models/blob-storage-result.ts
deleted file mode 100644
index 1676c76e53..0000000000
--- a/src/app/services/storage/models/blob-storage-result.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface BlobStorageResult {
-    continuationToken?: any;
-    data: any;
-}
diff --git a/src/app/services/storage/models/index.ts b/src/app/services/storage/models/index.ts
index b55e6458d9..000b6f45b3 100644
--- a/src/app/services/storage/models/index.ts
+++ b/src/app/services/storage/models/index.ts
@@ -1,3 +1,2 @@
-export * from "./blob-storage-result";
+export * from "./storage-blob";
 export * from "./shared-access-policy";
-export * from "./storage-request-options";
diff --git a/src/app/services/storage/models/shared-access-policy.ts b/src/app/services/storage/models/shared-access-policy.ts
index f2e06b796e..09d1d8dfac 100644
--- a/src/app/services/storage/models/shared-access-policy.ts
+++ b/src/app/services/storage/models/shared-access-policy.ts
@@ -15,11 +15,14 @@ export interface SharedAccessPolicy {
     AccessPolicy: AccessPolicy;
 }
 
+export type PermissionType = "r" | "a" | "c" | "w" | "d" | "x" | "t" | "m" |
+    "e" | "i" | "y" | "l";
+
 export interface AccessPolicy {
     /**
      * The permission type
      */
-    Permissions: string;
+    Permissions: PermissionType[];
 
     /**
      * The time at which the Shared Access Signature becomes valid (The UTC value will be used).
diff --git a/src/app/services/storage/models/storage-blob.ts b/src/app/services/storage/models/storage-blob.ts
new file mode 100644
index 0000000000..7cf2cf58f7
--- /dev/null
+++ b/src/app/services/storage/models/storage-blob.ts
@@ -0,0 +1,137 @@
+import { ContainerItem, BlobUploadCommonResponse, ContainerGetPropertiesResponse, CommonOptions } from "@azure/storage-blob";
+import { Model, Prop, Record } from "@batch-flask/core";
+import { SharedAccessPolicy } from "./shared-access-policy";
+
+// Placeholder; we don't use any options to storage-blob API requests
+export type RequestOptions = Partial<CommonOptions>;
+
+export interface BaseParams {
+    url: string;
+    account: string;
+    key: string;
+}
+
+export interface ContainerParams extends BaseParams {
+    containerName: string;
+}
+
+export interface BlobParams extends ContainerParams {
+    blobName: string;
+}
+
+export interface ListContainersParams extends BaseParams {
+    prefix?: string;
+    continuationToken?: string;
+    options?: RequestOptions & {
+        maxPages?: number;
+        maxPageSize?: number;
+    };
+}
+
+export interface GetBlobPropertiesParams extends BlobParams {
+    blobPrefix?: string,
+    options?: RequestOptions
+}
+
+export interface GetContainerPropertiesParams extends ContainerParams {
+    options?: RequestOptions;
+}
+
+export interface ListBlobsParams extends ContainerParams {
+    continuationToken?: string;
+    options?: ListBlobOptions;
+}
+
+export interface GetBlobContentParams extends BlobParams {
+    options?: GetBlobContentOptions;
+}
+
+export interface GetBlobContentOptions extends RequestOptions {
+    rangeStart?: number;
+    rangeEnd?: number;
+}
+
+export interface DeleteContainerParams extends ContainerParams {
+    options?: RequestOptions;
+}
+
+export interface CreateContainerParams extends ContainerParams {
+    unlessExists?: boolean;
+    options?: RequestOptions;
+}
+
+export interface GenerateSasUrlParams extends ContainerParams {
+    blobName?: string;
+    accessPolicy?: SharedAccessPolicy;
+}
+
+export interface DownloadBlobParams extends BlobParams {
+    localFileName: string;
+    options?: RequestOptions;
+}
+
+export interface UploadFileParams extends BlobParams {
+    fileName: string;
+}
+
+export interface DeleteBlobParams extends BlobParams {
+    options?: RequestOptions;
+}
+
+export interface StorageBlobResult<T> {
+    data: T;
+    continuationToken?: string;
+}
+
+export type ListContainersResult = StorageBlobResult<ContainerItem[]>;
+export type GetBlobPropertiesResult = StorageBlobResult<BlobProperties>;
+export type ListBlobsResult = StorageBlobResult<BlobItem[]>;
+export type GetContainerPropertiesResult =
+    StorageBlobResult<ContainerProperties>;
+export type UploadFileResult = BlobUploadCommonResponse;
+
+export interface GetBlobContentResult {
+    content: string;
+}
+
+export interface BlobProperties {
+    name: string;
+    url: string;
+    isDirectory: boolean;
+    properties: {
+        contentLength: number;
+        contentType: string;
+        creationTime: Date | string;
+        lastModified: Date | string;
+    };
+}
+
+@Model()
+export class BlobItem extends Record<BlobProperties> {
+    @Prop() name: string;
+    @Prop() url: string;
+    @Prop() isDirectory: boolean;
+    @Prop() properties: {
+        contentLength: number;
+        contentType: string;
+        creationTime: Date | string;
+        lastModified: Date | string;
+    }
+}
+
+export type ContainerProperties = ContainerGetPropertiesResponse;
+
+export interface ListBlobOptions {
+    /**
+     * Filter for the path.(Relative to the prefix if given)
+     */
+    folder?: string;
+
+    /**
+     * If it should list all files or 1 directory deep.
+     */
+    recursive?: boolean;
+
+    maxPageSize?: number;
+    maxPages?: number;
+}
diff --git a/src/app/services/storage/models/storage-request-options.ts b/src/app/services/storage/models/storage-request-options.ts
deleted file mode 100644
index 03245aa93e..0000000000
--- a/src/app/services/storage/models/storage-request-options.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export interface StorageRequestOptions {
-}
diff --git a/src/app/services/storage/storage-blob.service.ts b/src/app/services/storage/storage-blob.service.ts
index 628d6a33a4..336eb1cd69 100644
--- a/src/app/services/storage/storage-blob.service.ts
+++ b/src/app/services/storage/storage-blob.service.ts
@@ -1,4 +1,5 @@
 import { Injectable, NgZone } from "@angular/core";
+import { ContainerClient, ContainerProperties } from "@azure/storage-blob";
 import {
     DataCache,
     EntityView,
@@ -10,15 +11,14 @@ import {
     enterZone,
 } from "@batch-flask/core";
 import { FileSystemService } from "@batch-flask/electron";
-import { File, FileLoadOptions, FileLoader, FileNavigator } from "@batch-flask/ui";
+import { File, FileLoadOptions, FileLoader, FileNavigator, FileLoadResult } from "@batch-flask/ui";
 import { CloudPathUtils, log } from "@batch-flask/utils";
 import { StorageEntityGetter, StorageListGetter } from "app/services/core";
-import { SharedAccessPolicy } from "app/services/storage/models";
-import { BlobService, createBlobServiceWithSas } from "azure-storage";
+import { ListBlobOptions, SharedAccessPolicy, StorageBlobResult, UploadFileResult } from "app/services/storage/models";
 import { Constants } from "common";
 import { AsyncSubject, Observable, from, of, throwError } from "rxjs";
-import { catchError, concat, concatMap, flatMap, map, share, take } from "rxjs/operators";
-import { BlobStorageClientProxy, ListBlobOptions } from "./blob-storage-client-proxy";
+import { catchError, concat, concatMap, map, share, switchMap, take } from "rxjs/operators";
+import { BlobStorageClientProxy } from "./blob-storage-client-proxy";
 import { StorageClientService } from "./storage-client.service";
 
 export interface ListBlobParams {
@@ -27,15 +27,23 @@ export interface ListBlobParams {
 }
 
 export interface BlobFileParams extends ListBlobParams {
-    storageAccountId: string;
     blobPrefix?: string;
     blobName?: string;
 }
 
+export interface CreateBlobParams {
+    accountUrl: string;
+    container: string;
+    blob: string;
+    sasToken: string;
+}
+
 export interface BlobContentResult {
     content: string;
 }
 
+export type StorageContainerProperties = ContainerProperties;
+
 export interface NavigateBlobsOptions {
     /**
      * Optional callback that gets called when an error is returned listing files.
@@ -78,10 +86,18 @@ export class InvalidSasUrlError extends Error {
 // Regex to extract the host, container and blob from a sasUrl
 const storageBlobUrlRegex = /^(https:\/\/[\w\._\-]+)\/([\w\-_]+)\/([\w\-_.]+)\?(.*)$/i;
 
+function createBlobClient(params: CreateBlobParams) {
+    const containerClient = new ContainerClient(
+        params.accountUrl + params.sasToken,
+        params.container
+    );
+    return containerClient.getBlockBlobClient(params.blob);
+}
+
 @Injectable({ providedIn: "root" })
 export class StorageBlobService {
-    public maxBlobPageSize: number = 100; // 500 slows down the UI too much.
-    public maxContainerPageSize: number = 50;
+    public maxBlobPageSize: number = 200; // 500 slows down the UI too much.
+    public maxContainerPageSize: number = 100;
 
     private _blobListCache = new TargetedDataCache<ListBlobParams, File>({
         key: ({ storageAccountId, container }) => `${storageAccountId}/${container}`,
@@ -104,12 +120,21 @@ export class StorageBlobService {
 
         this._blobListGetter = new StorageListGetter(File, this.storageClient, {
             cache: (params) => this.getBlobFileCache(params),
-            getData: (client, params, options, continuationToken) => {
+            getData: (client: BlobStorageClientProxy,
+                params, options, continuationToken) => {
+                const blobOptions: ListBlobOptions = {
+                    folder: options.original.folder,
+                    recursive: options.original.recursive,
+                    maxPages: options.original.limit,
+                    maxPageSize: this.maxBlobPageSize
+                };
+
+                // N.B. `BlobItem` and `File` are nearly identical
                 return client.listBlobs(
                     params.container,
-                    options.original,
+                    blobOptions,
                     continuationToken,
-                );
+                ) as Promise<StorageBlobResult<File[]>>;
             },
             logIgnoreError: storageIgnoredErrors,
         });
@@ -199,12 +224,12 @@ export class StorageBlobService {
             properties: () => {
                 return this.get(storageAccountId, container, blobName, blobPrefix);
             },
-            content: (options: FileLoadOptions) => {
-                return this._callStorageClient(storageAccountId, (client) => {
+            content: (options: FileLoadOptions): Observable<FileLoadResult> =>
+                this._callStorageClient(storageAccountId, (client) => {
                     const pathToBlob = `${blobPrefix || ""}${blobName}`;
-                    return client.getBlobContent(container, pathToBlob, options);
-                });
-            },
+                    return client.getBlobContent(container, pathToBlob,
+                        options);
+                }),
             download: (dest: string) => {
                 return this._callStorageClient(storageAccountId, (client) => {
                     const pathToBlob = `${blobPrefix || ""}${blobName}`;
@@ -263,8 +288,7 @@ export class StorageBlobService {
         sharedAccessPolicy: SharedAccessPolicy): Observable<string> {
 
         return this._callStorageClient(storageAccountId, (client) => {
-            const sasToken = client.generateSharedAccessSignature(container, blob, sharedAccessPolicy);
-            return Promise.resolve(client.getUrl(container, blob, sasToken));
+            return client.generateSasUrl(container, blob, sharedAccessPolicy);
         }, (error) => {
             // TODO-Andrew: test that errors are caught
             log.error(`Error generating container SAS: ${container}`, { ...error });
@@ -272,22 +296,17 @@ export class StorageBlobService {
     }
 
     public uploadToSasUrl(sasUrl: string, filePath: string): Observable<any> {
-        const subject = new AsyncSubject<BlobService.BlobResult>();
-
-        const { accountUrl, sasToken, container, blob } = this._parseSasUrl(sasUrl);
-        const service = createBlobServiceWithSas(accountUrl, sasToken);
-        service.createBlockBlobFromLocalFile(container, blob, filePath,
-            (error: any, result: BlobService.BlobResult) => {
-                this.zone.run(() => {
-
-                    if (error) {
-                        subject.error(ServerError.fromStorage(error));
-                        subject.complete();
-                    }
+        const subject = new AsyncSubject<UploadFileResult>();
+
+        const blobParams = this._parseSasUrl(sasUrl);
+        const blobClient = createBlobClient(blobParams);
+        this.zone.run(() => {
+            blobClient.uploadFile(filePath)
+                .then(result => {
                     subject.next(result);
-                    subject.complete();
-                });
-            });
+                }).catch(error => subject.error(ServerError.fromStorage(error))
+                ).finally(() => subject.complete());
+        });
 
         return subject.asObservable();
     }
@@ -296,16 +315,17 @@ export class StorageBlobService {
      * Upload a single file to storage.
      * @param container Container Id
      * @param file Absolute path to the local file
-     * @param remotePath Blob name
+     * @param blobName Blob name
      */
     public uploadFile(
         storageAccountId: string,
         container: string,
         file: string,
-        remotePath: string): Observable<BlobService.BlobResult> {
+        blobName: string
+    ): Observable<UploadFileResult> {
 
         return this._callStorageClient(storageAccountId,
-            (client) => client.uploadFile(container, file, remotePath), (error) => {
+            (client) => client.uploadFile(container, file, blobName), (error) => {
                 log.error(`Error upload file ${file} to container ${container}`, error);
             });
     }
@@ -338,7 +358,7 @@ export class StorageBlobService {
                 };
                 const blob = remotePath ? CloudPathUtils.join(remotePath, file.remotePath) : file.remotePath;
                 const uploadObs = this.uploadFile(storageAccountId, container, file.localPath, blob).pipe(
-                    map(x => ({
+                    map(() => ({
                         uploaded: index + 1,
                         total,
                         current: file,
@@ -384,9 +404,7 @@ export class StorageBlobService {
 
         return this.storageClient.getFor(storageAccountId).pipe(
             take(1),
-            flatMap((client) => {
-                return from<Promise<T>>(promise(client));
-            }),
+            switchMap(client => from<Promise<T>>(promise(client))),
             catchError((err) => {
                 const serverError = ServerError.fromStorage(err);
                 if (errorCallback) {
@@ -400,7 +418,7 @@ export class StorageBlobService {
         );
     }
 
-    private _parseSasUrl(sasUrl: string) {
+    private _parseSasUrl(sasUrl: string): CreateBlobParams {
         const match = storageBlobUrlRegex.exec(sasUrl);
 
         if (match.length < 5) {
diff --git a/src/app/services/storage/storage-client-proxy-factory.ts b/src/app/services/storage/storage-client-proxy-factory.ts
index 8fd365c86c..8a45621a91 100644
--- a/src/app/services/storage/storage-client-proxy-factory.ts
+++ b/src/app/services/storage/storage-client-proxy-factory.ts
@@ -1,4 +1,4 @@
-import * as storage from "azure-storage";
+import { ElectronRemote } from "@batch-flask/electron";
 import { BlobStorageClientProxy } from "./blob-storage-client-proxy";
 
 export interface StorageAccountSharedKeyOptions {
@@ -16,19 +16,17 @@ export class StorageClientProxyFactory {
     private _sharedKeyOptions: StorageAccountSharedKeyOptions = {} as any;
     private _blobSharedKeyClient: BlobStorageClientProxy = null;
 
-    public getBlobServiceForSharedKey(options: StorageAccountSharedKeyOptions) {
+    constructor(private remote: ElectronRemote) { }
+
+    public async getBlobServiceForSharedKey(options: StorageAccountSharedKeyOptions) {
         if (!this._compareSharedKeyOptions(options)) {
             this._sharedKeyOptions = options;
-            const connectionString = [
-                `DefaultEndpointsProtocol=https;`,
-                `AccountName=${options.account};`,
-                `AccountKey=${options.key};`,
-                `EndpointSuffix=${options.endpoint};`,
-            ].join("");
-            const blobService = storage.createBlobService(connectionString)
-                .withFilter(new storage.ExponentialRetryPolicyFilter());
 
-            this._blobSharedKeyClient = new BlobStorageClientProxy(blobService);
+            this._blobSharedKeyClient = new BlobStorageClientProxy(
+                this.remote,
+                options.account, options.key,
+                `blob.${options.endpoint}`
+            );
         }
 
         return this._blobSharedKeyClient;
diff --git a/src/app/services/storage/storage-client.service.ts b/src/app/services/storage/storage-client.service.ts
index 79866fc4ba..f879dd6c3c 100644
--- a/src/app/services/storage/storage-client.service.ts
+++ b/src/app/services/storage/storage-client.service.ts
@@ -1,10 +1,11 @@
 import { Injectable } from "@angular/core";
 import { ServerError } from "@batch-flask/core";
+import { ElectronRemote } from "@batch-flask/electron";
 import { StorageKeys } from "app/models";
 import { BatchExplorerService } from "app/services/batch-explorer.service";
 import { ArmResourceUtils } from "app/utils";
 import { Observable, throwError } from "rxjs";
-import { first, flatMap, map, share } from "rxjs/operators";
+import { first, flatMap, map, share, switchMap } from "rxjs/operators";
 import { BatchAccountService } from "../batch-account";
 import { BlobStorageClientProxy } from "./blob-storage-client-proxy";
 import { StorageAccountKeysService } from "./storage-account-keys.service";
@@ -22,7 +23,7 @@ export interface StorageKeyCachedItem {
     keys: StorageKeys;
 }
 
-@Injectable({providedIn: "root"})
+@Injectable({ providedIn: "root" })
 export class StorageClientService {
     public hasAutoStorage: Observable<boolean>;
     public hasArmAutoStorage: Observable<boolean>;
@@ -33,9 +34,11 @@ export class StorageClientService {
     constructor(
         private batchExplorer: BatchExplorerService,
         private accountService: BatchAccountService,
-        private storageKeysService: StorageAccountKeysService) {
+        private storageKeysService: StorageAccountKeysService,
+        remote: ElectronRemote
+    ) {
 
-        this._storageClientFactory = new StorageClientProxyFactory();
+        this._storageClientFactory = new StorageClientProxyFactory(remote);
 
         this.hasAutoStorage = this.accountService.currentAccount.pipe(map((account) => {
             return Boolean(account.autoStorage);
@@ -65,13 +68,17 @@ export class StorageClientService {
     }
 
     public getFor(storageAccountId: string): Observable<BlobStorageClientProxy> {
-        return this.storageKeysService.getFor(storageAccountId).pipe(map((keys) => {
-            return this._storageClientFactory.getBlobServiceForSharedKey({
-                account: ArmResourceUtils.getAccountNameFromResourceId(storageAccountId),
-                key: keys.primaryKey,
-                endpoint: this.batchExplorer.azureEnvironment.storageEndpoint,
-            });
-        }));
+        return this.storageKeysService.getFor(storageAccountId).pipe(
+            switchMap((keys) =>
+                this._storageClientFactory.getBlobServiceForSharedKey({
+                    account: ArmResourceUtils
+                        .getAccountNameFromResourceId(storageAccountId),
+                    key: keys.primaryKey,
+                    endpoint:
+                        this.batchExplorer.azureEnvironment.storageEndpoint,
+                })
+            )
+        );
     }
 
     public clearCurrentStorageKeys() {
diff --git a/src/app/services/storage/storage-container.service.ts b/src/app/services/storage/storage-container.service.ts
index 49ffdd14de..a08887577c 100644
--- a/src/app/services/storage/storage-container.service.ts
+++ b/src/app/services/storage/storage-container.service.ts
@@ -11,7 +11,6 @@ import { log } from "@batch-flask/utils";
 import { BlobContainer } from "app/models";
 import { StorageEntityGetter, StorageListGetter } from "app/services/core";
 import { SharedAccessPolicy } from "app/services/storage/models";
-import { Constants } from "common";
 import { Observable, Subject, from, throwError } from "rxjs";
 import { catchError, flatMap, share } from "rxjs/operators";
 import { BlobStorageClientProxy } from "./blob-storage-client-proxy";
@@ -32,7 +31,9 @@ const storageIgnoredErrors = [
     HttpCode.Conflict,
 ];
 
-@Injectable({providedIn: "root"})
+const storageAccountPollRate = 30_000;
+
+@Injectable({ providedIn: "root" })
 export class StorageContainerService {
     /**
      * Triggered only when a file group is added through this app.
@@ -112,7 +113,7 @@ export class StorageContainerService {
         return new EntityView({
             cache: params => this._containerCache.getCache(params),
             getter: this._containerGetter,
-            poll: Constants.PollRate.entity,
+            poll: storageAccountPollRate,
         });
     }
 
@@ -121,8 +122,7 @@ export class StorageContainerService {
         container: string,
         sharedAccessPolicy: SharedAccessPolicy): Observable<string> {
         return this._callStorageClient(storageAccountId, (client) => {
-            const sasToken = client.generateSharedAccessSignature(container, null, sharedAccessPolicy);
-            return Promise.resolve(client.getUrl(container, null, sasToken));
+            return client.generateSasUrl(container, null, sharedAccessPolicy);
         }, (error) => {
             log.error(`Error generating container SAS: ${container}`, { ...error });
         });
diff --git a/src/client/client.module.ts b/src/client/client.module.ts
index a233923a80..5575bb31f8 100644
--- a/src/client/client.module.ts
+++ b/src/client/client.module.ts
@@ -19,6 +19,7 @@ import { BatchExplorerApplication } from "./core/batch-explorer-application";
 import { BatchExplorerInitializer } from "./core/batch-explorer-initializer";
 import { BatchExplorerProcess } from "./core/batch-explorer-process";
 import { BlIpcMain } from "./core/bl-ipc-main";
+import { StorageBlobAdapter } from "./core/storage";
 import { LocalDataStore } from "./core/local-data-store";
 import { BatchExplorerProperties } from "./core/properties";
 import { ClientTelemetryModule } from "./core/telemetry";
@@ -68,6 +69,7 @@ export function initializeServices(injector) {
         BatchExplorerProperties,
         AADService,
         BlIpcMain,
+        StorageBlobAdapter,
         AzureEnvironmentService,
         ...servicesToInitialize,
     ],
diff --git a/src/client/core/batch-explorer-application.ts b/src/client/core/batch-explorer-application.ts
index 8bfc37088e..c855c7dd9d 100644
--- a/src/client/core/batch-explorer-application.ts
+++ b/src/client/core/batch-explorer-application.ts
@@ -24,6 +24,7 @@ import { RecoverWindow } from "../recover-window";
 import { AADService, AuthenticationState, AuthenticationWindow, LogoutError } from "./aad";
 import { BatchExplorerInitializer } from "./batch-explorer-initializer";
 import { MainWindowManager } from "./main-window-manager";
+import { StorageBlobAdapter } from "./storage";
 
 const osName = `${os.platform()}-${os.arch()}/${os.release()}`;
 const isDev = ClientConstants.isDev ? "-dev" : "";
@@ -56,7 +57,8 @@ export class BatchExplorerApplication {
         public properties: BatchExplorerProperties,
         private telemetryService: TelemetryService,
         private telemetryManager: TelemetryManager,
-        private ipcMain: BlIpcMain) {
+        private ipcMain: BlIpcMain,
+        private storageBlobAdapter: StorageBlobAdapter) {
         this.windows = new MainWindowManager(this, this.telemetryManager);
         this.state = this._state.asObservable();
 
@@ -81,6 +83,7 @@ export class BatchExplorerApplication {
         this._setupProcessEvents();
         this._registerFileProtocol();
         await this.proxySettings.init();
+        this.storageBlobAdapter.init();
     }
 
     /**
@@ -331,7 +334,7 @@ export class BatchExplorerApplication {
     }
 
     private _registerFileProtocol() {
-        protocol.registerFileProtocol("file", (request,  callback) => {
+        protocol.registerFileProtocol("file", (request, callback) => {
             const pathName = decodeURI(request.url.replace("file:///", ""));
             callback(pathName);
         });
diff --git a/src/client/core/index.ts b/src/client/core/index.ts
index 7c4f05a793..290cd38c26 100644
--- a/src/client/core/index.ts
+++ b/src/client/core/index.ts
@@ -4,3 +4,4 @@ export * from "./subprocess";
 export * from "./batch-explorer-application";
 export * from "./smart-card-certificate";
 export * from "./client-locale.service";
+export * from "./storage";
diff --git a/src/client/core/storage/index.ts b/src/client/core/storage/index.ts
new file mode 100644
index 0000000000..213398e761
--- /dev/null
+++ b/src/client/core/storage/index.ts
@@ -0,0 +1 @@
+export * from "./storage-blob-adapter";
diff --git a/src/client/core/storage/storage-blob-adapter.spec.ts b/src/client/core/storage/storage-blob-adapter.spec.ts
new file mode 100644
index 0000000000..1a922b5730
--- /dev/null
+++ b/src/client/core/storage/storage-blob-adapter.spec.ts
@@ -0,0 +1,224 @@
+import { StorageBlobAdapter } from "./storage-blob-adapter";
+
+describe("StorageBlobAdapter", () => {
+    let adapter: StorageBlobAdapter;
+    beforeEach(() => adapter = new StorageBlobAdapter(null));
+
+    describe("listContainer", () => {
+        let serviceClientSpy;
+        it("should return paged results", async () => {
+            const baseParams = { url: "url", account: "account", key: "key" };
+            serviceClientSpy = spyOn<any>(adapter, "getServiceClient")
+                .and.returnValue({
+                    listContainers: () => ({
+                        byPage: containerCountGenerator(20)
+                    })
+                });
+            let response = await adapter.listContainers(baseParams);
+            expect(response.data.length).toEqual(20);
+
+            serviceClientSpy.calls.reset();
+
+            response = await adapter.listContainers({
+                ...baseParams,
+                options: { maxPageSize: 6, maxPages: 3 }
+            });
+            expect(response.data.length).toEqual(18);
+
+            response = await adapter.listContainers({
+                ...baseParams,
+                continuationToken: response.continuationToken,
+                options: { maxPageSize: 6, maxPages: 3 }
+            });
+            expect(response.data.length).toEqual(2);
+        });
+    });
+
+    describe("listBlobs", () => {
+        const baseParams = {
+            url: "url",
+            account: "account",
+            key: "key",
+            containerName: "container",
+        };
+        let containerClientSpy;
+        function mockListBlobs(params: { count?: number; blobs?: string[] }) {
+            const { count, blobs } = params;
+            containerClientSpy =
+                spyOn<any>(adapter, "getContainerClient").and.returnValue({
+                    listBlobsByHierarchy: () => ({
+                        byPage: count ?
+                            blobCountGenerator(count) :
+                            blobItemGenerator(blobs)
+                    }),
+                    listBlobsFlat: () => ({
+                        byPage: count ?
+                            blobCountGenerator(count) :
+                            blobItemGenerator(blobs, true)
+                    })
+                });
+        }
+
+        it("should return paged results", async () => {
+            const params = {
+                ...baseParams,
+                options: {
+                    maxPages: 2,
+                    maxPageSize: 50
+                }
+            };
+            mockListBlobs({ count: 180 });
+            let response = await adapter.listBlobs(params);
+            expect(response.data.length).toEqual(100);
+            response = await adapter.listBlobs({
+                ...params, continuationToken: response.continuationToken
+            });
+            expect(response.data.length).toEqual(80);
+            expect(response.continuationToken).not.toBeDefined();
+        });
+        it("should handle the recursive option", async () => {
+            const fakeBlobs = [
+                "file1.txt",
+                "file2.txt",
+                "file3.txt",
+                "prefixA/file5.txt",
+                "prefixA/file6.txt"
+            ];
+            mockListBlobs({ blobs: fakeBlobs });
+            let response = await adapter.listBlobs({
+                ...baseParams, options: { recursive: false }
+            });
+            expect(response.data.length).toEqual(4);
+            expect(response.data[0]).toEqual(jasmine.objectContaining({
+                name: "prefixA",
+                url: "container/prefixA",
+                isDirectory: true,
+            }));
+            ["file1.txt", "file2.txt", "file3.txt"].forEach((name, i) => {
+                expect(response.data[i + 1]).toEqual(jasmine.objectContaining({
+                    name,
+                    isDirectory: false
+                }));
+            });
+
+            containerClientSpy.calls.reset();
+
+            response = await adapter.listBlobs({
+                ...baseParams, options: { recursive: true }
+            });
+            expect(response.data.length).toEqual(5);
+            expect(response.data).toEqual(
+                fakeBlobs.map(name => jasmine.objectContaining({
+                    name, isDirectory: false
+                }))
+            );
+        });
+    });
+});
+
+const indexes = {
+    file: 1,
+    folder: 1,
+    container: 1
+};
+
+function nitems(num, type, transformer) {
+    return [...Array(num).keys()].map(() => {
+        // eslint-disable-next-line security/detect-object-injection
+        const index = indexes[type]++;
+        return transformer(`${type}${index}`);
+    });
+}
+
+function blobItem(name) {
+    return {
+        name,
+        properties: {
+            contentLength: 20,
+            contentType: "type",
+            createdOn: null,
+            lastModified: null
+        }
+    }
+}
+
+function containerItem(name) {
+    return {
+        name,
+        properties: {
+            foo: "bar"
+        },
+        version: "1.0",
+        metadata: {
+            key1: "value1"
+        }
+    };
+}
+
+function blobPrefix(name) {
+    return { name };
+}
+
+function containerCountGenerator(count: number) {
+    return countGenerator(count, num => ({
+        containerItems: nitems(num, "container", containerItem)
+    }));
+}
+
+function blobCountGenerator(count: number) {
+    return countGenerator(count, (num) => ({
+        segment: {
+            blobItems: nitems(num, "file", blobItem),
+            blobPrefixes: []
+        }
+    }));
+}
+
+function countGenerator<T>(count: number, pageContents: (num: number) => T) {
+    return async function* (options) {
+        let token = options.continuationToken;
+        if (!token) {
+            token = "token:0";
+        }
+        let index =
+            parseInt(token.split(":")[1], 10);
+        if (count) {
+            while (index < count) {
+                const size =
+                    Math.min(options.maxPageSize, count - index);
+                index += size;
+                token = (index >= count) ? undefined :
+                    `token:${index}`;
+                yield {
+                    ...pageContents(size),
+                    continuationToken: token
+                }
+            }
+        }
+    }
+}
+
+function blobItemGenerator(items: string[], flat = false) {
+    const blobs = [], prefixes = {};
+    items.forEach(item => {
+        const parts = item.split("/");
+        // listBlobsHierarchy only lists top-level prefixes
+        if (parts.length > 1) {
+            if (flat) {
+                blobs.push(blobItem(item));
+            } else {
+                prefixes[parts[0]] = blobPrefix(parts[0]);
+            }
+        } else {
+            blobs.push(blobItem(item));
+        }
+    });
+    return async function* () {
+        yield {
+            segment: {
+                blobItems: blobs,
+                blobPrefixes: Object.values(prefixes)
+            }
+        }
+    }
+}
diff --git a/src/client/core/storage/storage-blob-adapter.ts b/src/client/core/storage/storage-blob-adapter.ts
new file mode 100644
index 0000000000..b6eb67238e
--- /dev/null
+++ b/src/client/core/storage/storage-blob-adapter.ts
@@ -0,0 +1,269 @@
+import { Injectable } from "@angular/core";
+import { BlobHierarchyListSegment, BlobSASPermissions, BlobServiceClient, ContainerSASPermissions, StorageSharedKeyCredential } from "@azure/storage-blob";
+import { autobind } from "@batch-flask/core";
+import { EncodingUtils } from "@batch-flask/utils";
+import * as blob from "app/services/storage/models/storage-blob";
+import { IpcEvent } from "common/constants";
+import { BlIpcMain } from "../bl-ipc-main";
+
+
+const storageIpc = IpcEvent.storageBlob;
+
+const MAX_CONTAINER_LIST_PAGE_SIZE = 100;
+const MAX_BLOB_LIST_PAGE_SIZE = 200;
+
+@Injectable({ providedIn: "root" })
+export class StorageBlobAdapter {
+    constructor(private ipcMain: BlIpcMain) {
+    }
+
+    public init() {
+        // TODO: Replace with method decorators?
+        this.ipcMain.on(storageIpc.listContainers, this.listContainers);
+        this.ipcMain.on(storageIpc.getContainerProperties,
+            this.getContainerProperties);
+        this.ipcMain.on(storageIpc.deleteContainer, this.deleteContainer);
+        this.ipcMain.on(storageIpc.createContainer, this.createContainer);
+
+        this.ipcMain.on(storageIpc.listBlobs, this.listBlobs);
+        this.ipcMain.on(storageIpc.getBlobProperties, this.getBlobProperties);
+        this.ipcMain.on(storageIpc.getBlobContent, this.getBlobContent);
+        this.ipcMain.on(storageIpc.generateSasUrl, this.generateSasUrl);
+        this.ipcMain.on(storageIpc.downloadBlob, this.downloadBlob);
+        this.ipcMain.on(storageIpc.uploadFile, this.uploadFile);
+        this.ipcMain.on(storageIpc.deleteBlob, this.deleteBlob);
+    }
+
+    @autobind()
+    public async listContainers(params: blob.ListContainersParams):
+        Promise<blob.ListContainersResult> {
+        const { prefix, continuationToken, options = {} } = params;
+        const client = this.getServiceClient(params);
+        const containers = [];
+
+        const { maxPageSize = MAX_CONTAINER_LIST_PAGE_SIZE, maxPages } =
+            options;
+
+        const pages = client.listContainers({ prefix }).byPage({
+            maxPageSize: maxPageSize,
+            // byPage() treats null token as valid, returning 0 pages
+            continuationToken: continuationToken ?? undefined
+        });
+
+        let pageIndex = 0;
+        let nextToken;
+        for await (const page of pages) {
+            pageIndex++;
+            nextToken = page.continuationToken;
+            for (const container of page.containerItems) {
+                containers.push({
+                    ...container.properties,
+                    metadata: container.metadata,
+                    version: container.version,
+                    deleted: container.deleted,
+                    id: container.name
+                });
+            }
+            nextToken = page.continuationToken;
+            if (maxPages && pageIndex >= maxPages) {
+                break;
+            }
+        }
+        return {
+            data: containers,
+            continuationToken: nextToken
+        };
+    }
+
+    @autobind()
+    public async getBlobProperties(params: blob.GetBlobPropertiesParams):
+        Promise<blob.GetBlobPropertiesResult> {
+        const { containerName, blobName, blobPrefix = "", options } = params;
+
+        const client = this.getBlobClient(params);
+        const blobPath = blobPrefix + blobName;
+        const props = await client.getProperties(options);
+
+        return {
+            data: {
+                name: blobName,
+                url: `${containerName}/${blobPath}`,
+                isDirectory: false,
+                properties: {
+                    contentLength: props.contentLength,
+                    contentType: props.contentType,
+                    creationTime: props.createdOn,
+                    lastModified: props.lastModified,
+                },
+            },
+        };
+    }
+
+    @autobind()
+    public async getContainerProperties(
+        params: blob.GetContainerPropertiesParams
+    ): Promise<blob.GetContainerPropertiesResult> {
+
+        const client = this.getContainerClient(params);
+        const props = await client.getProperties(params.options);
+
+        return { data: props };
+    }
+
+    @autobind()
+    public async listBlobs(params: blob.ListBlobsParams):
+        Promise<blob.ListBlobsResult> {
+        const { containerName, options = {}, continuationToken } = params;
+        const {
+            folder: prefix,
+            maxPageSize = MAX_BLOB_LIST_PAGE_SIZE,
+            maxPages,
+            recursive
+        } = options;
+        const client = this.getContainerClient(params);
+        const blobs = [];
+
+        const pages = (recursive
+            ? client.listBlobsFlat({ prefix })
+            : client.listBlobsByHierarchy("/", { prefix })
+        ).byPage({
+            maxPageSize,
+            // byPage() treats null token as valid, returning 0 pages
+            continuationToken: continuationToken ?? undefined
+        });
+
+        let pageIndex = 0;
+        let nextToken;
+        for await (const page of pages) {
+            pageIndex++;
+            const segment = page.segment;
+            nextToken = page.continuationToken;
+            if (!recursive) {
+                for (const prefix of (segment as BlobHierarchyListSegment).blobPrefixes) {
+                    blobs.push({
+                        name: prefix.name,
+                        url: `${containerName}/${prefix.name}`,
+                        isDirectory: true
+                    });
+                }
+            }
+            for (const blob of segment.blobItems) {
+                blobs.push({
+                    name: blob.name,
+                    url: `${containerName}/${blob.name}`,
+                    isDirectory: false,
+                    properties: {
+                        contentLength: blob.properties.contentLength,
+                        contentType: blob.properties.contentType,
+                        creationTime: blob.properties.createdOn,
+                        lastModified: blob.properties.lastModified,
+                    }
+                });
+            }
+            if (maxPages && pageIndex >= maxPages) {
+                break;
+            }
+        }
+
+        return { data: blobs, continuationToken: nextToken };
+    }
+
+    @autobind()
+    public async getBlobContent(params: blob.GetBlobContentParams):
+        Promise<blob.GetBlobContentResult> {
+        const { options } = params;
+        const client = this.getBlobClient(params);
+        const buffer = await client.downloadToBuffer(0, null, options);
+
+        const { encoding } = await EncodingUtils.detectEncodingFromBuffer({ buffer, bytesRead: buffer.length });
+        let content;
+        if (encoding) {
+            content = new TextDecoder(encoding).decode(buffer);
+        } else {
+            content = buffer.toString();
+        }
+
+        return { content };
+    }
+
+    @autobind()
+    public async deleteContainer(params: blob.DeleteContainerParams):
+        Promise<void> {
+        const { containerName, options } = params;
+        const client = this.getServiceClient(params);
+        await client.deleteContainer(containerName, options);
+        return;
+    }
+
+    @autobind()
+    public async createContainer(params: blob.CreateContainerParams):
+        Promise<boolean> {
+        const { containerName, unlessExists = false, options } = params;
+        if (unlessExists) {
+            const client = this.getContainerClient(params);
+            const response = await client.createIfNotExists(options);
+            return response.succeeded;
+        } else {
+            await this.getServiceClient(params).createContainer(containerName);
+            return true;
+        }
+    }
+
+    @autobind()
+    public async generateSasUrl(params: blob.GenerateSasUrlParams):
+        Promise<string> {
+        const { blobName, accessPolicy } = params;
+        const permissions = accessPolicy.AccessPolicy.Permissions;
+        if (blobName) {
+            return this.getBlobClient(
+                params as blob.BlobParams
+            ).generateSasUrl({
+                permissions: BlobSASPermissions.parse(permissions.join(""))
+            });
+        } else {
+            return this.getContainerClient(params).generateSasUrl({
+                permissions: ContainerSASPermissions.parse(permissions.join(""))
+            });
+        }
+    }
+
+    @autobind()
+    public async downloadBlob(params: blob.DownloadBlobParams):
+        Promise<void> {
+        const { localFileName, options } = params;
+        const client = this.getBlobClient(params);
+        await client.downloadToFile(localFileName, undefined, undefined,
+            options);
+        return;
+    }
+
+    @autobind()
+    public async uploadFile(params: blob.UploadFileParams):
+        Promise<blob.UploadFileResult> {
+        return this.getBlobClient(params).uploadFile(params.fileName);
+    }
+
+    @autobind()
+    public async deleteBlob(params: blob.DeleteBlobParams):
+        Promise<boolean> {
+        const client = this.getBlobClient(params);
+        const response = await client.deleteIfExists(params.options);
+        return response.succeeded;
+    }
+
+    private getServiceClient(params: blob.BaseParams) {
+        const { url, account, key } = params;
+        const credential = new StorageSharedKeyCredential(account, key);
+        return new BlobServiceClient(url, credential);
+    }
+
+    private getContainerClient(params: blob.ContainerParams) {
+        const { containerName } = params;
+        return this.getServiceClient(params).getContainerClient(containerName);
+    }
+
+    private getBlobClient(params: blob.BlobParams) {
+        const { blobName } = params;
+        return this.getContainerClient(params).getBlockBlobClient(blobName);
+    }
+}
diff --git a/src/common/constants/constants.ts b/src/common/constants/constants.ts
index c26f6d97d7..b0f347bd0f 100644
--- a/src/common/constants/constants.ts
+++ b/src/common/constants/constants.ts
@@ -118,7 +118,7 @@ export const ApiVersion = {
     costManagement: "2019-01-01",
 };
 
-export const providersApiVersion: {[resourceProvider: string]: string} = {
+export const providersApiVersion: { [resourceProvider: string]: string } = {
     "microsoft.batch": ApiVersion.armBatch,
     "microsoft.classicstorage": ApiVersion.armClassicStorage,
     "microsoft.storage": ApiVersion.armStorage,
@@ -213,6 +213,20 @@ export const IpcEvent = {
     logoutAndLogin: "LOGOUT_AND_LOGIN",
     sendTelemetry: "SEND_TELEMETRY",
     log: "SEND_LOG",
+    storageBlob: {
+        listContainers: "STORAGE_BLOB_LIST_CONTAINERS",
+        getContainerProperties: "STORAGE_BLOB_GET_CONTAINER_PROPERTIES",
+        deleteContainer: "STORAGE_BLOB_GET_DELETE_CONTAINER",
+        createContainer: "STORAGE_BLOB_CREATE_CONTAINER",
+
+        listBlobs: "STORAGE_BLOB_LIST_BLOBS",
+        getBlobProperties: "STORAGE_BLOB_GET_BLOB_PROPERTIES",
+        getBlobContent: "STORAGE_BLOB_GET_BLOB_CONTENT",
+        generateSasUrl: "STORAGE_BLOB_GENERATE_SAS_URL",
+        downloadBlob: "STORAGE_BLOB_DOWNLOAD_BLOB",
+        uploadFile: "STORAGE_BLOB_UPLOAD_FILE",
+        deleteBlob: "STORAGE_BLOB_DELETE_BLOB",
+    }
 };
 
 export const ExternalApplication = {

From f137c1593b4d8e26e5ec5c2ec37b7abf763730a8 Mon Sep 17 00:00:00 2001
From: Shiran Pasternak <shiran.pasternak@microsoft.com>
Date: Wed, 30 Nov 2022 13:24:53 -0500
Subject: [PATCH 36/72] Improves container delete dialog

---
 .../delete-container-dialog.component.ts      |  2 ++
 .../delete/delete-container-dialog.html       | 25 ++++++++-----------
 .../delete/delete-container-dialog.i18n.yml   |  6 +++++
 .../delete/delete-container-dialog.scss       | 15 +++++++++++
 4 files changed, 34 insertions(+), 14 deletions(-)
 create mode 100644 src/app/components/data/action/delete/delete-container-dialog.i18n.yml
 create mode 100644 src/app/components/data/action/delete/delete-container-dialog.scss

diff --git a/src/app/components/data/action/delete/delete-container-dialog.component.ts b/src/app/components/data/action/delete/delete-container-dialog.component.ts
index f3dac4053f..c6441612b5 100644
--- a/src/app/components/data/action/delete/delete-container-dialog.component.ts
+++ b/src/app/components/data/action/delete/delete-container-dialog.component.ts
@@ -4,6 +4,8 @@ import { autobind } from "@batch-flask/core";
 import { ConfirmationDialog } from "@batch-flask/ui";
 import { BlobContainer } from "app/models";
 
+import "./delete-container-dialog.scss";
+
 @Component({
     selector: "bl-delete-container-dialog",
     templateUrl: "delete-container-dialog.html",
diff --git a/src/app/components/data/action/delete/delete-container-dialog.html b/src/app/components/data/action/delete/delete-container-dialog.html
index bf4d50ef13..3d69bc551f 100644
--- a/src/app/components/data/action/delete/delete-container-dialog.html
+++ b/src/app/components/data/action/delete/delete-container-dialog.html
@@ -1,18 +1,15 @@
 <bl-simple-form [submit]="ok" [containerRef]="dialogRef" actionColor="warn" actionName="Delete" [stickyFooter]="false" [multiUse]="false"
-    size="small" title="Delete file group">
+    size="small" title="{{'delete-container-dialog.title' | i18n}}">
     <div class="message">
-        <p>Do you want to permantly delete file group(s):</p>
-        <table style="width: 100%; margin: 10px 0;">
-            <tr style="text-align: left;">
-                <th>Name</th>
-            </tr>
-            <tr *ngFor="let container of containers;trackBy: trackContainer">
-                <td>{{container.name}}</td>
-            </tr>
-        </table>
-        <p>
-            Warning! Deleting the file group listed above is irreversible.
-            The action you are about to take cannot be undone.
-        </p>
+        <p>{{"delete-container-dialog.message" | i18n}}</p>
+        <ul class="storage-container-list">
+            <li *ngFor="let container of containers;trackBy: trackContainer">
+                {{ container.name}}
+            </li>
+        </ul>
+        <div class="warning-message">
+            <i class="fa fa-warning"></i>&nbsp;
+            <span>{{"delete-container-dialog.warning" | i18n}}</span>
+        </div>
     </div>
 </bl-simple-form>
diff --git a/src/app/components/data/action/delete/delete-container-dialog.i18n.yml b/src/app/components/data/action/delete/delete-container-dialog.i18n.yml
new file mode 100644
index 0000000000..b64d42225d
--- /dev/null
+++ b/src/app/components/data/action/delete/delete-container-dialog.i18n.yml
@@ -0,0 +1,6 @@
+delete-container-dialog:
+  title: Delete Containers
+  message: Are you sure you want to permanently delete the following
+    container(s)?
+  warning: Deleting the container(s) listed above is irreversible. The action
+    you are about to take cannot be undone.
diff --git a/src/app/components/data/action/delete/delete-container-dialog.scss b/src/app/components/data/action/delete/delete-container-dialog.scss
new file mode 100644
index 0000000000..3446984454
--- /dev/null
+++ b/src/app/components/data/action/delete/delete-container-dialog.scss
@@ -0,0 +1,15 @@
+@import "app/styles/variables";
+
+bl-simple-form .message {
+    padding: 1em;
+    .storage-container-list {
+        padding: 1em;
+        li {
+            font-weight: bold;
+        }
+    }
+    .warning-message {
+        color: $danger-color;
+        font-weight: bold;
+    }
+}

From 4c8d689329eeb561f763c0aa6933d1167696596a Mon Sep 17 00:00:00 2001
From: David Watrous <509299+dpwatrous@users.noreply.github.com>
Date: Wed, 11 Jan 2023 14:42:13 -0500
Subject: [PATCH 37/72] Only set build variables when running dist pipelines
 (#2615)

This will make it so PR validation runs don't need permissions
to change build tags, etc.
---
 .vsts/common/set-dist-vars.yml | 7 +++++++
 .vsts/darwin/distribution.yml  | 1 +
 .vsts/dependencies.yml         | 3 ---
 .vsts/linux/distribution.yml   | 1 +
 .vsts/win/distribution.yml     | 4 ++--
 5 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 .vsts/common/set-dist-vars.yml

diff --git a/.vsts/common/set-dist-vars.yml b/.vsts/common/set-dist-vars.yml
new file mode 100644
index 0000000000..dd1b26d4c6
--- /dev/null
+++ b/.vsts/common/set-dist-vars.yml
@@ -0,0 +1,7 @@
+steps:
+
+  - powershell: $(Build.SourcesDirectory)/scripts/azpipelines/build-type.ps1 "$(Build.SourceBranch)" "$(Build.BuildNumber)"
+    displayName: Resolve build type
+
+  - powershell: $(Build.SourcesDirectory)/scripts/azpipelines/update-build-name.ps1
+    displayName: Resolve version
diff --git a/.vsts/darwin/distribution.yml b/.vsts/darwin/distribution.yml
index dec2164c0d..f3b46cae71 100644
--- a/.vsts/darwin/distribution.yml
+++ b/.vsts/darwin/distribution.yml
@@ -1,4 +1,5 @@
 steps:
+  - template: ../common/set-dist-vars.yml
   - template: ./darwin-dependencies.yml
   - script: |
       set -e
diff --git a/.vsts/dependencies.yml b/.vsts/dependencies.yml
index 05721ed7a4..5bffe0d7b7 100644
--- a/.vsts/dependencies.yml
+++ b/.vsts/dependencies.yml
@@ -1,6 +1,3 @@
 steps:
-  - powershell: ./scripts/azpipelines/build-type.ps1 "$(Build.SourceBranch)" "$(Build.BuildNumber)"
-    displayName: Resolve build type
-
   - template: ./node-setup.yml
   - template: ./python-setup.yml
diff --git a/.vsts/linux/distribution.yml b/.vsts/linux/distribution.yml
index 6a68d7ab84..850e7b8fcb 100644
--- a/.vsts/linux/distribution.yml
+++ b/.vsts/linux/distribution.yml
@@ -1,4 +1,5 @@
 steps:
+  - template: ../common/set-dist-vars.yml
   - template: ./linux-dependencies.yml
   - script: |
       set -e
diff --git a/.vsts/win/distribution.yml b/.vsts/win/distribution.yml
index 7bd551b599..82fecad01e 100644
--- a/.vsts/win/distribution.yml
+++ b/.vsts/win/distribution.yml
@@ -1,8 +1,8 @@
 steps:
+  - template: ../common/set-dist-vars.yml
   - template: ./credscan.yml
   - template: ./win-dependencies.yml
-  - powershell: ./scripts/azpipelines/update-build-name.ps1
-    displayName: Resolve version
+
   - powershell: |
       . .vsts/win/exec.ps1
       $ErrorActionPreference = "Stop"

From 07fa029b43d938b17a4066d5bf4138684d980876 Mon Sep 17 00:00:00 2001
From: David Watrous <509299+dpwatrous@users.noreply.github.com>
Date: Thu, 12 Jan 2023 13:24:57 -0500
Subject: [PATCH 38/72] Add NickKouds to CODEOWNERS (#2617)

---
 .github/CODEOWNERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index a498482560..96dbd6ed09 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -3,4 +3,4 @@
 # they will be requested for review when someone opens a
 # pull request.
 
-*       @cRui861  @dpwatrous  @gingi  @zfengms  @paterasMSFT  @seth-barshay  @wiboris  @skapur12
+*       @cRui861  @dpwatrous  @gingi  @zfengms  @paterasMSFT  @seth-barshay  @wiboris  @skapur12 @NickKouds

From 2d3c2e9396219f428b8b17718ec3628bcb783b2a Mon Sep 17 00:00:00 2001
From: Shiran Pasternak <shiran.pasternak@microsoft.com>
Date: Thu, 12 Jan 2023 16:05:58 -0500
Subject: [PATCH 39/72] Fixes AB#585: Name attribute in version button

---
 .../pool/action/add/os-picker/os-offer-tile/os-offer-tile.html   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/components/pool/action/add/os-picker/os-offer-tile/os-offer-tile.html b/src/app/components/pool/action/add/os-picker/os-offer-tile/os-offer-tile.html
index 39a7632092..e37cd0fea6 100644
--- a/src/app/components/pool/action/add/os-picker/os-offer-tile/os-offer-tile.html
+++ b/src/app/components/pool/action/add/os-picker/os-offer-tile/os-offer-tile.html
@@ -15,6 +15,7 @@
 <button
     class="select-version"
     [matMenuTriggerFor]="menu"
+    name="button-version-select-{{prettyName}}"
     matTooltip="{{'os-offer-tile.select-version-button.tooltip' | i18n}}"
     title="{{'os-offer-tile.select-version-button.tooltip' | i18n}} ({{prettyName}})">
     <i class="fa fa-cog" aria-hidden="true"></i>

From b55cfbeecf0549d91b88c4ae344e7f4b37e84337 Mon Sep 17 00:00:00 2001
From: Shiran Pasternak <shiran.pasternak@microsoft.com>
Date: Thu, 12 Jan 2023 16:11:50 -0500
Subject: [PATCH 40/72] Fixes AB#578: High-contrast green for status text

Adopted from Azure Portal color scheme (HEX 428000)
---
 data/themes/classic.json                              | 11 +++--------
 .../pool-state-graph/pool-state-graph.component.ts    |  6 +++---
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/data/themes/classic.json b/data/themes/classic.json
index d6bdf9c447..bc2e51fbf5 100644
--- a/data/themes/classic.json
+++ b/data/themes/classic.json
@@ -56,11 +56,11 @@
     "core-count": "#1c3f95",
     "low-priority-core-count": "#a36a00",
     "task-start-event": "#a36a00",
-    "task-complete-event": "#388e3c",
+    "task-complete-event": "#428000",
     "task-fail-event": "#aa3939",
     "starting-node-count": "#1c3f95",
     "idle-node-count": "#be93d9",
-    "running-node-count": "#388e3c",
+    "running-node-count": "#428000",
     "start-task-failed-node-count": "#aa3939",
     "rebooting-node-count": "#ff755c"
   },
@@ -74,10 +74,5 @@
     "disabled-text": "var(--color-text-primary)",
     "disabled-background": "#e5e5e5"
   },
-  "chart-colors": [
-    "#003f5c",
-    "#aa3939",
-    "#4caf50",
-    "#ffa600"
-  ]
+  "chart-colors": ["#003f5c", "#aa3939", "#4caf50", "#ffa600"]
 }
diff --git a/src/app/components/pool/graphs/pool-state-graph/pool-state-graph.component.ts b/src/app/components/pool/graphs/pool-state-graph/pool-state-graph.component.ts
index c3773c07bf..9ba4f2f205 100644
--- a/src/app/components/pool/graphs/pool-state-graph/pool-state-graph.component.ts
+++ b/src/app/components/pool/graphs/pool-state-graph/pool-state-graph.component.ts
@@ -16,7 +16,7 @@ import { Subscription } from "rxjs";
 import "./pool-state-graph.scss";
 
 const idleColor = "#edeef2";
-const runningColor = "#388e3c";
+const runningColor = "#328000";
 const waitingForStartTaskColor = "#be93d9";
 const offlineColor = "#305796";
 const preemptedColor = "#606060";
@@ -133,8 +133,8 @@ export class PoolStateGraphComponent implements OnChanges, OnDestroy {
             return this._counts.get(this.pool.id);
         }
 
-        const dedicatedCounts: NodeCountsAttributes = {...emptyNodeCount};
-        const lowPriorityCounts: NodeCountsAttributes = {...emptyNodeCount};
+        const dedicatedCounts: NodeCountsAttributes = { ...emptyNodeCount };
+        const lowPriorityCounts: NodeCountsAttributes = { ...emptyNodeCount };
 
         for (const count of this._counts.values()) {
             this._addToSum(dedicatedCounts, count.dedicated);

From 2f7f61f29c9b35ff8e73d8142ed258ac68e1c228 Mon Sep 17 00:00:00 2001
From: Shiran Pasternak <shiran.pasternak@microsoft.com>
Date: Thu, 12 Jan 2023 16:30:32 -0500
Subject: [PATCH 41/72] Fixes AB#611: VoiceOver reads updated list count on
 filter

---
 .../ui/list-and-show-layout/entity-details-list.html            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/@batch-flask/ui/list-and-show-layout/entity-details-list.html b/src/@batch-flask/ui/list-and-show-layout/entity-details-list.html
index a9982c1980..784fbc9aaf 100644
--- a/src/@batch-flask/ui/list-and-show-layout/entity-details-list.html
+++ b/src/@batch-flask/ui/list-and-show-layout/entity-details-list.html
@@ -21,6 +21,6 @@
         <ng-content select="[bl-list-buttons]"></ng-content>
     </div>
 </div>
-<div class="entity-details-list-content">
+<div class="entity-details-list-content" aria-live="polite">
     <ng-content></ng-content>
 </div>

From 158347f928a28163a374a91663afc179e4b6631a Mon Sep 17 00:00:00 2001
From: Shiran Pasternak <shiran.pasternak@microsoft.com>
Date: Thu, 12 Jan 2023 17:21:59 -0500
Subject: [PATCH 42/72] Fixes AB#484: Keyboard navigation on property links

---
 .../link-property/link-property.component.ts          | 11 ++++++++++-
 .../property-content/property-content.component.ts    |  1 -
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/@batch-flask/ui/property-list/link-property/link-property.component.ts b/src/@batch-flask/ui/property-list/link-property/link-property.component.ts
index f1cb0324e5..c8767ff0fa 100644
--- a/src/@batch-flask/ui/property-list/link-property/link-property.component.ts
+++ b/src/@batch-flask/ui/property-list/link-property/link-property.component.ts
@@ -1,4 +1,5 @@
-import { ChangeDetectionStrategy, Component, Input } from "@angular/core";
+import { ChangeDetectionStrategy, Component, HostListener, Input } from "@angular/core";
+import { ENTER, SPACE } from "@batch-flask/core/keys";
 
 @Component({
     selector: "bl-link-property",
@@ -11,4 +12,12 @@ export class LinkPropertyComponent {
     @Input() public value: string;
 
     @Input() public link: string;
+
+    @HostListener("keyup", ["$event"])
+    keyPressed($event: KeyboardEvent) {
+        $event.stopImmediatePropagation();
+        if ($event.code === ENTER || $event.code === SPACE) {
+            ($event.target as HTMLElement).click();
+        }
+    }
 }
diff --git a/src/@batch-flask/ui/property-list/property-content/property-content.component.ts b/src/@batch-flask/ui/property-list/property-content/property-content.component.ts
index 941dfddc07..4756530724 100644
--- a/src/@batch-flask/ui/property-list/property-content/property-content.component.ts
+++ b/src/@batch-flask/ui/property-list/property-content/property-content.component.ts
@@ -10,7 +10,6 @@ import "./property-content.scss";
 export class PropertyContentComponent {
     @Input() @HostBinding("class.wrap") public wrap = false;
 
-    @HostBinding("attr.role") public readonly role = "textbox";
     @HostBinding("attr.aria-readonly") public readonly ariaReadonly = true;
     @HostBinding("attr.aria-labelledby") public ariaLablledby = null;
     @HostBinding("attr.aria-describedby") public ariaDescribedBy = null;

From 4ed54c29e498f9996ef669ae5ec51053ec10151b Mon Sep 17 00:00:00 2001
From: Shiran Pasternak <shiran.pasternak@microsoft.com>
Date: Fri, 13 Jan 2023 09:43:37 -0500
Subject: [PATCH 43/72] Localizes pool graphs

---
 .../pool/graphs/pool-graphs.component.ts      |  1 +
 .../components/pool/graphs/pool-graphs.html   | 40 +++++++++++++------
 .../pool/graphs/pool-graphs.i18n.yml          | 19 +++++++--
 3 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/src/app/components/pool/graphs/pool-graphs.component.ts b/src/app/components/pool/graphs/pool-graphs.component.ts
index 268672f6c8..cdcdbb767f 100644
--- a/src/app/components/pool/graphs/pool-graphs.component.ts
+++ b/src/app/components/pool/graphs/pool-graphs.component.ts
@@ -156,6 +156,7 @@ export class PoolGraphsComponent implements OnChanges, OnDestroy {
 
     @autobind()
     public openEditStartTask() {
+        // eslint-disable-next-line security/detect-non-literal-fs-filename
         const ref = this.sidebarManager.open(`edit-start-task-${this.pool.id}`, StartTaskEditFormComponent);
         ref.component.pool = this.pool;
     }
diff --git a/src/app/components/pool/graphs/pool-graphs.html b/src/app/components/pool/graphs/pool-graphs.html
index 794aace310..0aced397d9 100644
--- a/src/app/components/pool/graphs/pool-graphs.html
+++ b/src/app/components/pool/graphs/pool-graphs.html
@@ -1,25 +1,39 @@
 <div>
-    <bl-banner *ngIf="startTaskFailedError" fixMessage="Edit the start task" [fix]="openEditStartTask">
-        <div message>The start task has failed on {{startTaskFailedError.failedStartTaskNodes}} out of {{startTaskFailedError.nodeCount}} nodes.</div>
-        <div [other-fix]="rebootFailedNodes" fixMessage="Reboot failed nodes"></div>
-        <div *ngIf="isPaasPool" [other-fix]="reimageFailedNodes" fixMessage="Reimage failed nodes"></div>
+    <bl-banner *ngIf="startTaskFailedError"
+        [fixMessage]="'pool-graphs.fixes.edit-start-task' | i18n"
+        [fix]="openEditStartTask">
+        <div message>
+            {{'pool-graphs.errors.start-task-failed' | i18n: {
+                failed: startTaskFailedError.failedStartTaskNodes,
+                total: startTaskFailedError.nodeCount
+            } }}
+        </div>
+        <div [other-fix]="rebootFailedNodes"
+            [fixMessage]="'pool-graphs.fixes.reboot-failed-nodes' | i18n">
+        </div>
+        <div *ngIf="isPaasPool" [other-fix]="reimageFailedNodes"
+            [fixMessage]="'pool-graphs.fixes.reimage-failed-nodes' | i18n">
+        </div>
     </bl-banner>
     <bl-banner *ngIf="unusableNodeError">
-        <div message>{{unusableNodeError.failedUnusableNodes}} out of {{unusableNodeError.nodeCount}} nodes are in an unusable state.
-            Please click the nodes for more details.
+        <div message>
+            {{'pool-graphs.errors.unusable-nodes' | i18n: {
+                failed: unusableNodeError.failedUnusableNodes,
+                total: unusableNodeError.nodeCount
+            } }}
         </div>
     </bl-banner>
 </div>
 <bl-metrics-monitor class="graphs-container">
     <!-- Only show the heatmap, available nodes and running tasks on the pool -->
     <ng-container *ngIf="!node">
-        <bl-metrics-monitor-metric label="Heatmap">
+        <bl-metrics-monitor-metric [label]="'pool-graphs.heatmap' | i18n">
             <bl-nodes-heatmap blMonitorGraphPreview [pool]="pool" [nodes]="nodes" [showRunningTasks]="false"
                 [showLegend]="false" [interactive]="false" [limitNode]="10"></bl-nodes-heatmap>
 
             <bl-nodes-heatmap blMonitorGraphChart [pool]="pool" [nodes]="nodes"></bl-nodes-heatmap>
         </bl-metrics-monitor-metric>
-        <bl-metrics-monitor-metric *blFeatureOn="'pool.graphs.nodes'" label="Available nodes">
+        <bl-metrics-monitor-metric *blFeatureOn="'pool.graphs.nodes'" [label]="'pool-graphs.available-nodes' | i18n">
             <bl-history-graph blMonitorGraphPreview [max]="pool.targetNodes" [history]="runningNodesHistory.history"
                 [interactive]="false" [historySize]="selectedHistoryLength.value">
             </bl-history-graph>
@@ -28,7 +42,7 @@
                 [historySize]="selectedHistoryLength.value">
             </bl-history-graph>
         </bl-metrics-monitor-metric>
-        <bl-metrics-monitor-metric *blFeatureOn="'pool.graphs.tasks'" label="Running tasks">
+        <bl-metrics-monitor-metric *blFeatureOn="'pool.graphs.tasks'" [label]="'pool-graphs.running-tasks' | i18n">
             <bl-history-graph blMonitorGraphPreview [max]="maxRunningTasks" [history]="runningTaskHistory.history"
                 [interactive]="false" [historySize]="selectedHistoryLength.value">
             </bl-history-graph>
@@ -70,12 +84,12 @@
 
                 <bl-network-usage-graph blMonitorGraphChart metric="network" [data]="performanceMetrics" [pool]="pool" class="full-display"></bl-network-usage-graph>
             </bl-metrics-monitor-metric>
-            <bl-metrics-monitor-metric label="Gpu usage" *ngIf="hasGPU">
+            <bl-metrics-monitor-metric [label]="'pool-graphs.gpu-usage' | i18n" *ngIf="hasGPU">
                 <bl-gpu-usage-graph blMonitorGraphPreview #gpuUsage [data]="performanceMetrics" [pool]="pool" [interactive]="false"></bl-gpu-usage-graph>
                 <div blMetricsStatus>{{gpuUsage.status | async}}</div>
                 <bl-gpu-usage-graph blMonitorGraphChart [data]="performanceMetrics" [pool]="pool" [showIndividualGpu]="node" class="full-display"></bl-gpu-usage-graph>
             </bl-metrics-monitor-metric>
-            <bl-metrics-monitor-metric label="Gpu memory" *ngIf="hasGPU">
+            <bl-metrics-monitor-metric [label]="'pool-graphs.gpu-memory' | i18n" *ngIf="hasGPU">
                 <bl-gpu-memory-usage-graph blMonitorGraphPreview #gpuUsage [data]="performanceMetrics" [pool]="pool" [interactive]="false"></bl-gpu-memory-usage-graph>
                 <div blMetricsStatus>{{gpuUsage.status | async}}</div>
                 <bl-gpu-memory-usage-graph blMonitorGraphChart [data]="performanceMetrics" [pool]="pool" [showIndividualGpu]="node"
@@ -84,9 +98,9 @@
         </ng-container>
     </ng-container>
     <ng-container *ngIf="!appInsightsEnabled">
-        <bl-metrics-monitor-metric *blFeatureOn="'pool.graphs.insights'" label="Application Insights">
+        <bl-metrics-monitor-metric *blFeatureOn="'pool.graphs.insights'" [label]="'pool-graphs.application-insights' | i18n">
             <bl-cpu-usage-graph blMonitorGraphPreview [data]="performanceMetrics" [pool]="pool" [interactive]="false"></bl-cpu-usage-graph>
-            <div blMetricsStatus>{{'pool-graphs.notEnabled' | i18n}}</div>
+            <div blMetricsStatus>{{'pool-graphs.not-enabled' | i18n}}</div>
 
             <bl-enable-app-insights-doc blMonitorGraphChart></bl-enable-app-insights-doc>
         </bl-metrics-monitor-metric>
diff --git a/src/app/components/pool/graphs/pool-graphs.i18n.yml b/src/app/components/pool/graphs/pool-graphs.i18n.yml
index 192f5d3a25..f5c0ec3501 100644
--- a/src/app/components/pool/graphs/pool-graphs.i18n.yml
+++ b/src/app/components/pool/graphs/pool-graphs.i18n.yml
@@ -1,11 +1,24 @@
 pool-graphs:
+  application-insights: Application Insights
+  available-nodes: Available nodes
   cpu: CPU
-  memory: Memory
   diskIO: Disk IO
   diskUsage: Disk usage
-  network: Network
-  notEnabled: Cpu, memory, disk, etc.
+  errors:
+    start-task-failed: The start task has failed on {failed} out of {total} nodes.
+    unusable-nodes: "{failed} out of {total} nodes are in an unusable state. Please click the nodes for more details."
+  fixes:
+    edit-start-task: Edit the start task
+    reboot-failed-nodes: Reboot failed nodes
+    reimage-failed-nodes: Reimage failed nodes
+  gpu-memory: Gpu memory
+  gpu-usage: Gpu usage
+  heatmap: Heatmap
   last: Last
+  memory: Memory
+  network: Network
+  not-enabled: Cpu, memory, disk, etc.
+  running-tasks: Running tasks
   timespan:
     label: Graphs timespan
     10min: 10 minutes

From 9678ca576835811a79218644880bcd387ff22b70 Mon Sep 17 00:00:00 2001
From: Shiran Pasternak <shiran.pasternak@microsoft.com>
Date: Fri, 13 Jan 2023 13:10:56 -0500
Subject: [PATCH 44/72] Fixes AB#488: ARIA label for select includes value

---
 src/@batch-flask/ui/select/select.component.spec.ts | 2 ++
 src/@batch-flask/ui/select/select.component.ts      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/@batch-flask/ui/select/select.component.spec.ts b/src/@batch-flask/ui/select/select.component.spec.ts
index 0b7255b55c..af65eafce7 100644
--- a/src/@batch-flask/ui/select/select.component.spec.ts
+++ b/src/@batch-flask/ui/select/select.component.spec.ts
@@ -120,12 +120,14 @@ describe("SelectComponent", () => {
 
         it("Should show placeholder when no value", () => {
             expect(labelEl.nativeElement.textContent).toContain("Myselect");
+            expect(de.nativeElement.getAttribute("aria-label")).toContain("Myselect");
         });
 
         it("Should show value when picked", () => {
             testComponent.value.setValue("opt-3");
             fixture.detectChanges();
             expect(labelEl.nativeElement.textContent).toContain("Carrot");
+            expect(de.nativeElement.getAttribute("aria-label")).toEqual("Myselect: Carrot");
         });
 
         it("list all options when clicking on button", async () => {
diff --git a/src/@batch-flask/ui/select/select.component.ts b/src/@batch-flask/ui/select/select.component.ts
index 869e664a8f..d63f57e9b8 100644
--- a/src/@batch-flask/ui/select/select.component.ts
+++ b/src/@batch-flask/ui/select/select.component.ts
@@ -116,7 +116,7 @@ export class SelectComponent<TValue = any> implements FormFieldControl<any>, Opt
     @HostBinding("attr.aria-haspopup") public readonly ariaHasPopup = "listbox";
     @Input("attr.aria-label") @HostBinding("attr.aria-label")
     public set ariaLabel(label: string) { this._ariaLabel = label; }
-    public get ariaLabel() { return this._ariaLabel || this.placeholder; }
+    public get ariaLabel() { return this._ariaLabel || this.title; }
     @HostBinding("attr.aria-expanded") public get ariaExpanded() { return this.dropdownOpen; }
     @HostBinding("attr.aria-owns") public get ariaOwns() { return this.dropdownId; }
     @HostBinding("attr.tabindex") public readonly tabindex = -1;

From 39249f71ad20e1ccc62a8a7f8bad13ef63491ce8 Mon Sep 17 00:00:00 2001
From: Shiran Pasternak <shiran.pasternak@microsoft.com>
Date: Fri, 13 Jan 2023 15:17:38 -0500
Subject: [PATCH 45/72] Fixes #511: Batch Insights doc title

---
 .../enable-app-insights-doc/enable-app-insights-doc.html    | 6 ++++--
 .../enable-app-insights-doc.i18n.yml                        | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 src/app/components/pool/graphs/performance-graph/enable-app-insights-doc/enable-app-insights-doc.i18n.yml

diff --git a/src/app/components/pool/graphs/performance-graph/enable-app-insights-doc/enable-app-insights-doc.html b/src/app/components/pool/graphs/performance-graph/enable-app-insights-doc/enable-app-insights-doc.html
index 5f7b4efd11..c2f2db6878 100644
--- a/src/app/components/pool/graphs/performance-graph/enable-app-insights-doc/enable-app-insights-doc.html
+++ b/src/app/components/pool/graphs/performance-graph/enable-app-insights-doc/enable-app-insights-doc.html
@@ -2,7 +2,9 @@ <h2>To view stats like cpu and memory usage you must enable application insights
 
 <p>
     You can check the documentation here
-    <bl-clickable (do)="openDoc()" role="link">https://github.com/Azure/batch-insights</bl-clickable>
+    <bl-clickable (do)="openDoc()"
+        [title]="'enable-app-insights-doc.doc-title' | i18n"
+        role="link">https://github.com/Azure/batch-insights</bl-clickable>
 </p>
 
 <h4>Quick Steps</h4>
@@ -10,7 +12,7 @@ <h4>Quick Steps</h4>
     <li>1. Add `APP_INSIGHTS_INSTRUMENTATION_KEY` environment variable in the start task(App insights instrumentation key)</li>
     <li>2. Add `APP_INSIGHTS_APP_ID` environment variable in the start task(App insights application ID)</li>
     <li>3. Add os specific one liner in your start task see
-        <bl-clickable (do)="openDoc('#ubuntu')"  role="link">doc</bl-clickable>
+        <bl-clickable (do)="openDoc('#ubuntu')" [title]="'enable-app-insights-doc.doc-title-os-specific' | i18n" role="link">doc</bl-clickable>
     </li>
 </ol>
 <p class="warning">
diff --git a/src/app/components/pool/graphs/performance-graph/enable-app-insights-doc/enable-app-insights-doc.i18n.yml b/src/app/components/pool/graphs/performance-graph/enable-app-insights-doc/enable-app-insights-doc.i18n.yml
new file mode 100644
index 0000000000..d60f274311
--- /dev/null
+++ b/src/app/components/pool/graphs/performance-graph/enable-app-insights-doc/enable-app-insights-doc.i18n.yml
@@ -0,0 +1,3 @@
+enable-app-insights-doc:
+  doc-title: Instructions on enabling Batch Insights
+  doc-title-os-specific: OS-specific instructions on adding Batch Insights to start task

From b09f4447874dd67d13dea6bbebe110beeca835f3 Mon Sep 17 00:00:00 2001
From: Shiran Pasternak <shiran.pasternak@microsoft.com>
Date: Tue, 17 Jan 2023 11:25:07 -0500
Subject: [PATCH 46/72] Updates SPACE event key code.

Was using the wrong value used by KeyboardEvent.code.

Updates AB#484, AB#807, AB#803
---
 src/@batch-flask/core/keys.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/@batch-flask/core/keys.ts b/src/@batch-flask/core/keys.ts
index fe0952f15e..56c66fe202 100644
--- a/src/@batch-flask/core/keys.ts
+++ b/src/@batch-flask/core/keys.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/naming-convention,no-underscore-dangle,id-blacklist,id-match */
 export const ENTER = "Enter";
-export const SPACE = " ";
+export const SPACE = "Space";
 
 /**
  * Mapping of the key to keyCode

From 1aa4a7417c25ff56099d93617f4f6680747fbf05 Mon Sep 17 00:00:00 2001
From: Shiran Pasternak <shiran.pasternak@microsoft.com>
Date: Tue, 17 Jan 2023 13:16:29 -0500
Subject: [PATCH 47/72] Ensures that warning messages are read

Adds aria-live attribute to certain elements that convey warning status.

Removes outdated warning (2019)

Fixes AB#525, AB#566
---
 .../ui/property-list/property-group/property-group.html  | 2 +-
 .../aad-credentials-picker/aad-credentials-picker.html   | 2 +-
 .../details/programatic-usage/programatic-usage.html     | 2 +-
 .../programing-sample/programing-sample.html             | 2 +-
 .../data/action/delete/delete-container-dialog.html      | 2 +-
 .../details/job-progress-status/job-progress-status.html | 2 +-
 .../pool/details/pool-cost-card/pool-cost-card.html      | 9 ---------
 src/app/components/task/base/task-state/task-state.html  | 2 +-
 8 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/@batch-flask/ui/property-list/property-group/property-group.html b/src/@batch-flask/ui/property-list/property-group/property-group.html
index 3903657c68..5b14a69d95 100644
--- a/src/@batch-flask/ui/property-list/property-group/property-group.html
+++ b/src/@batch-flask/ui/property-list/property-group/property-group.html
@@ -10,7 +10,7 @@ <h4 class="noselect">{{label}}</h4>
     <bl-button color="light" type="round" [action]="triggerEdit" *ngIf="edit" title="Edit"><i class="fa fa-pencil"></i></bl-button>
 </bl-clickable>
 <div class="group-content" *ngIf="!collapsed" [id]="contentId">
-    <div class="warning-message" *ngIf="warningMessage">
+    <div class="warning-message" *ngIf="warningMessage" aria-live="polite">
         <i class="fa fa-warning"></i>
         <span>{{warningMessage}}</span>
     </div>
diff --git a/src/app/components/account/details/programatic-usage/aad-credentials-picker/aad-credentials-picker.html b/src/app/components/account/details/programatic-usage/aad-credentials-picker/aad-credentials-picker.html
index 43f706bf65..23dfcbd7b3 100644
--- a/src/app/components/account/details/programatic-usage/aad-credentials-picker/aad-credentials-picker.html
+++ b/src/app/components/account/details/programatic-usage/aad-credentials-picker/aad-credentials-picker.html
@@ -23,7 +23,7 @@ <h1>AAD Credentials</h1>
             <bl-property-group>
                 <bl-text-property label="Tenant Id" [value]="tenantId"></bl-text-property>
                 <bl-text-property label="Client Id" [value]="pickedApplication.id"></bl-text-property>
-                <div class="danger">
+                <div class="danger" aria-live="polite">
                     <i class="fa fa-warning"></i>Save this key, you will not see it again after closing this dialog.
                 </div>
                 <bl-text-property label="Secret" [value]="pickedSecret.value"></bl-text-property>
diff --git a/src/app/components/account/details/programatic-usage/programatic-usage.html b/src/app/components/account/details/programatic-usage/programatic-usage.html
index 0432327e39..c264662442 100644
--- a/src/app/components/account/details/programatic-usage/programatic-usage.html
+++ b/src/app/components/account/details/programatic-usage/programatic-usage.html
@@ -17,7 +17,7 @@ <h1>
             <div>
                 {{'programatic-usage.credentials' | i18n}}
             </div>
-            <div *ngIf="pickedCredentialType === CredentialType.AAD && !aadCredentials" class="aad-needs-setup-creds"
+            <div *ngIf="pickedCredentialType === CredentialType.AAD && !aadCredentials" class="aad-needs-setup-creds" aria-live="polite"
                 matTooltip="Pick an application and generate a key to have the templates filled with the correct informations">
                 <i class="fa fa-warning"></i>{{'programatic-usage.setup' | i18n}}
             </div>
diff --git a/src/app/components/account/details/programatic-usage/programing-sample/programing-sample.html b/src/app/components/account/details/programatic-usage/programing-sample/programing-sample.html
index 3acf3ca5eb..bb68fcae38 100644
--- a/src/app/components/account/details/programatic-usage/programing-sample/programing-sample.html
+++ b/src/app/components/account/details/programatic-usage/programing-sample/programing-sample.html
@@ -1,5 +1,5 @@
 <div class="description">
-    <div *ngIf="credentialType === CredentialType.AAD && !aadCredentials" class="aad-needs-setup-creds">
+    <div *ngIf="credentialType === CredentialType.AAD && !aadCredentials" class="aad-needs-setup-creds" aria-live="polite">
         <i class="fa fa-warning"></i>You haven't picked an Azure AD application yet. The sample below will not have all the information filled.
     </div>
     <bl-property-group label="" class="wide" class="prerequisites">
diff --git a/src/app/components/data/action/delete/delete-container-dialog.html b/src/app/components/data/action/delete/delete-container-dialog.html
index 3d69bc551f..17f5d50273 100644
--- a/src/app/components/data/action/delete/delete-container-dialog.html
+++ b/src/app/components/data/action/delete/delete-container-dialog.html
@@ -7,7 +7,7 @@
                 {{ container.name}}
             </li>
         </ul>
-        <div class="warning-message">
+        <div class="warning-message" aria-live="polite">
             <i class="fa fa-warning"></i>&nbsp;
             <span>{{"delete-container-dialog.warning" | i18n}}</span>
         </div>
diff --git a/src/app/components/job/details/job-progress-status/job-progress-status.html b/src/app/components/job/details/job-progress-status/job-progress-status.html
index c76e415a4c..c29f83069a 100644
--- a/src/app/components/job/details/job-progress-status/job-progress-status.html
+++ b/src/app/components/job/details/job-progress-status/job-progress-status.html
@@ -21,7 +21,7 @@
         </div>
     </div>
 </div>
-<div class="warning-container">
+<div class="warning-container" aria-live="polite">
     <div class="unaccurate-data" *ngIf="taskCountTooHigh">
         <i class="fa fa-warning"></i>{{'job-progress-status.inaccurate' | i18n}}
     </div>
diff --git a/src/app/components/pool/details/pool-cost-card/pool-cost-card.html b/src/app/components/pool/details/pool-cost-card/pool-cost-card.html
index 8a0362de28..28de17f19a 100644
--- a/src/app/components/pool/details/pool-cost-card/pool-cost-card.html
+++ b/src/app/components/pool/details/pool-cost-card/pool-cost-card.html
@@ -7,13 +7,4 @@
             [attr.aria-label]="label">
         </canvas>
     </div>
-    <div class="total">
-        <i *ngIf="showPartialDataWarning" class="fa fa-warning" matTooltip="Cost tracking at the pool level is a recent change. Data will be missing before April 2019"></i>
-        <bl-time-range-picker [formControl]="timeRange" [quickRanges]="quickRanges" [showLabel]="false"></bl-time-range-picker>
-
-        <i *ngIf="loading" class="fa fa-spiner fa-spin"  title="Loading"></i>
-        <span *ngIf="!loading">
-            {{total}} {{currency}}
-        </span>
-    </div>
 </ng-container>
diff --git a/src/app/components/task/base/task-state/task-state.html b/src/app/components/task/base/task-state/task-state.html
index 87324bc352..ada457bfb2 100644
--- a/src/app/components/task/base/task-state/task-state.html
+++ b/src/app/components/task/base/task-state/task-state.html
@@ -1,4 +1,4 @@
-<span [matTooltip]="errorMessage" matTooltipPosition="right">
+<span [matTooltip]="errorMessage" matTooltipPosition="right" aria-live="polite">
     <i class="fa"
         aria-hidden="true"
         [class.fa-warning]="hasError"

From 63203d2ab284028afb77014837da0fcb5851cf91 Mon Sep 17 00:00:00 2001
From: Shiran Pasternak <shiran.pasternak@microsoft.com>
Date: Tue, 17 Jan 2023 13:17:09 -0500
Subject: [PATCH 48/72] Fixes AB#558: Accessible button tooltips

Custom tooltips replaced with user-agent tooltips (title attribute)
---
 .../generate-aad-app-secret/generate-aad-app-secret.html      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/components/account/details/programatic-usage/aad-credentials-picker/generate-aad-app-secret/generate-aad-app-secret.html b/src/app/components/account/details/programatic-usage/aad-credentials-picker/generate-aad-app-secret/generate-aad-app-secret.html
index 60f62a0261..ad7315bf74 100644
--- a/src/app/components/account/details/programatic-usage/aad-credentials-picker/generate-aad-app-secret/generate-aad-app-secret.html
+++ b/src/app/components/account/details/programatic-usage/aad-credentials-picker/generate-aad-app-secret/generate-aad-app-secret.html
@@ -31,11 +31,11 @@ <h4>Secret</h4>
         <bl-aad-app-secret-picker [formControl]="secret">
         </bl-aad-app-secret-picker>
 
-        <bl-button type="wide" color="primary" [action]="addNewSecret" matTooltip="Add a new secret without modifing the existing ones">
+        <bl-button type="wide" color="primary" [action]="addNewSecret" title="Add a new secret without modifing the existing ones">
             Add
         </bl-button>
 
-        <bl-button *ngIf="passwordCredentials.size > 0" type="wide" color="danger" [action]="resetCredentials" matTooltip="Reset credentials. This will remove all existing secrets and replace it with a new one">
+        <bl-button *ngIf="passwordCredentials.size > 0" type="wide" color="danger" [action]="resetCredentials" title="Reset credentials. This will remove all existing secrets and replace it with a new one">
             Reset
         </bl-button>
     </div>

From 8611dcc73c4a73583ce7d17c7777d3e3db013bad Mon Sep 17 00:00:00 2001
From: Shiran Pasternak <shiran.pasternak@microsoft.com>
Date: Tue, 17 Jan 2023 13:17:26 -0500
Subject: [PATCH 49/72] Tweak: rename error message

---
 python/server/websocket_server.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/server/websocket_server.py b/python/server/websocket_server.py
index 19b89dc1f0..fe9ec684ee 100644
--- a/python/server/websocket_server.py
+++ b/python/server/websocket_server.py
@@ -82,7 +82,7 @@ async def process_request(self, request: JsonRpcRequest):
             print(traceback.format_exc())
             response = JsonRpcResponse(
                 request=request,
-                error=error.JsonRpcError(500, "Server internal error", str(e)),
+                error=error.JsonRpcError(500, "Internal server error", str(e)),
             )
             await self.send_response(response)
 

From 97325799e036e49032fbcff2b6a05f712046efc6 Mon Sep 17 00:00:00 2001
From: Shiran Pasternak <shiran.pasternak@microsoft.com>
Date: Wed, 18 Jan 2023 12:13:32 -0500
Subject: [PATCH 50/72] Fixes AB#565: Ensures notifications are announced

---
 .../ui/notifications/notification-service.ts             | 9 +++++++--
 .../ui/notifications/toast/toast.component.ts            | 2 --
 src/@batch-flask/ui/notifications/toast/toast.html       | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/@batch-flask/ui/notifications/notification-service.ts b/src/@batch-flask/ui/notifications/notification-service.ts
index 881df72fbf..0bbf2c607d 100644
--- a/src/@batch-flask/ui/notifications/notification-service.ts
+++ b/src/@batch-flask/ui/notifications/notification-service.ts
@@ -1,4 +1,5 @@
-import { Injectable } from "@angular/core";
+import { LiveAnnouncer } from "@angular/cdk/a11y";
+import { Injectable, Injector } from "@angular/core";
 import { List } from "immutable";
 import { BehaviorSubject, Observable } from "rxjs";
 import { Notification, NotificationConfig, NotificationLevel, NotificationTimer } from "./notification";
@@ -16,9 +17,12 @@ export class NotificationService {
     private _persistedNotifications = new BehaviorSubject(List<Notification>([]));
     private _dismissTimers: StringMap<NotificationTimer> = {};
 
-    constructor() {
+    private liveAnnouncer: LiveAnnouncer;
+
+    constructor(injector: Injector) {
         this.notifications = this._notifications.asObservable();
         this.persistedNotifications = this._persistedNotifications.asObservable();
+        this.liveAnnouncer = injector.get(LiveAnnouncer);
     }
 
     public notify(
@@ -32,6 +36,7 @@ export class NotificationService {
         if (config.autoDismiss > 0) {
             this._registerForDismiss(notification);
         }
+        this.liveAnnouncer.announce(`${title} ${message}`, "polite");
         return notification;
     }
 
diff --git a/src/@batch-flask/ui/notifications/toast/toast.component.ts b/src/@batch-flask/ui/notifications/toast/toast.component.ts
index 72b7d21cd5..6df537d086 100644
--- a/src/@batch-flask/ui/notifications/toast/toast.component.ts
+++ b/src/@batch-flask/ui/notifications/toast/toast.component.ts
@@ -14,9 +14,7 @@ import "./toast.scss";
 export class ToastComponent extends ClickableComponent {
     @Input() public notification: Notification;
 
-    // Aria
     @HostBinding("attr.role") public readonly role = "alert";
-    @HostBinding("attr.live") public readonly ariaLive = "assertive";
 
     @HostBinding("class")
     public get notificationClass(): string {
diff --git a/src/@batch-flask/ui/notifications/toast/toast.html b/src/@batch-flask/ui/notifications/toast/toast.html
index 76afc57f03..2d900c89a4 100644
--- a/src/@batch-flask/ui/notifications/toast/toast.html
+++ b/src/@batch-flask/ui/notifications/toast/toast.html
@@ -1,7 +1,7 @@
 <div class="notification-title">{{notification.title}}</div>
 <div class="notification-message">{{notification.message}}</div>
 <div class="separator"></div>
-<div class="actions">
+<div *ngIf="actions.length > 0" class="actions" autofocus>
     <bl-clickable *ngFor="let action of actions;trackBy: trackAction" (do)="performAction($event, action)" class="action">
         {{action.name}}
     </bl-clickable>

From 727f1cae36a2a7ca951b415fe1b4453fcdd77d82 Mon Sep 17 00:00:00 2001
From: Shiran Pasternak <shiran.pasternak@microsoft.com>
Date: Wed, 18 Jan 2023 12:54:44 -0500
Subject: [PATCH 51/72] Fixes AB#610: Form field errors are announced

---
 src/@batch-flask/ui/form/form-field/form-field.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/@batch-flask/ui/form/form-field/form-field.html b/src/@batch-flask/ui/form/form-field/form-field.html
index b203038a2e..98e7066dad 100644
--- a/src/@batch-flask/ui/form/form-field/form-field.html
+++ b/src/@batch-flask/ui/form/form-field/form-field.html
@@ -19,9 +19,9 @@
         <ng-content select="[blFormFieldSuffix]"></ng-content>
     </div>
 </div>
-<div class="hints-container" *ngIf="hints.length > 0">
+<div class="hints-container" aria-live="polite">
     <ng-content select="bl-hint"></ng-content>
 </div>
-<div class="errors-container" *ngIf="errors.length > 0">
+<div class="errors-container" aria-live="assertive">
     <ng-content select="bl-error"></ng-content>
 </div>

From db944ebe842a6eaf254abcff803527fedba79537 Mon Sep 17 00:00:00 2001
From: Shiran Pasternak <shiran.pasternak@microsoft.com>
Date: Mon, 23 Jan 2023 15:26:26 -0500
Subject: [PATCH 52/72] Component governance updates

* Fixes AB#1016, AB#1017: Bumps d3-color
    * Requires upgrade of d3 to v7.x.x
* Fixes AB#1028: Bumps Luxon
* Fixes AB#1015: Bumps minimatch
    * Requires upgrade of electron-builder to v23.x.x
---
 package-lock.json                             | 4124 +++++++----------
 package.json                                  |   10 +-
 .../ui/graphs/gauge/gauge.component.ts        |    6 +-
 .../heatmap/nodes-heatmap.component.spec.ts   |   10 +-
 .../graphs/heatmap/nodes-heatmap.component.ts |   29 +-
 5 files changed, 1760 insertions(+), 2419 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e02b14bad1..3771718851 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -27,7 +27,7 @@
         "chart.js": "^2.9.3",
         "chokidar": "^3.4.3",
         "commander": "^8.0.0",
-        "d3": "^5.16.0",
+        "d3": "^7.8.2",
         "decode-uri-component": "^0.2.1",
         "download": "^8.0.0",
         "electron-updater": "^4.3.4",
@@ -45,7 +45,7 @@
         "jschardet": "^2.2.1",
         "keytar": "^7.7.0",
         "load-json-file": "^5.3.0",
-        "luxon": "^1.24.1",
+        "luxon": "^1.28.1",
         "make-dir": "^2.1.0",
         "node-abi": "^2.18.0",
         "node-forge": "^1.3.0",
@@ -68,14 +68,14 @@
         "@ngtools/webpack": "^11.0.0",
         "@playwright/test": "^1.18.1",
         "@types/chart.js": "^2.9.24",
-        "@types/d3": "^5.7.2",
+        "@types/d3": "^7.4.0",
         "@types/extract-zip": "^1.6.2",
         "@types/glob": "^7.1.3",
         "@types/hammerjs": "^2.0.36",
         "@types/inflection": "^1.5.28",
         "@types/jasmine": "^3.5.12",
         "@types/js-yaml": "^3.12.5",
-        "@types/luxon": "^1.24.3",
+        "@types/luxon": "^1.27.1",
         "@types/node": "^14.16.0",
         "@types/node-fetch": "^2.5.7",
         "@types/proxyquire": "^1.3.28",
@@ -92,7 +92,7 @@
         "cross-env": "^5.2.1",
         "css-loader": "^2.1.1",
         "electron": "^13.6.9",
-        "electron-builder": "22.14.13",
+        "electron-builder": "^23.6.0",
         "eslint": "^7.19.0",
         "eslint-config-prettier": "^7.2.0",
         "eslint-plugin-ban": "^1.5.2",
@@ -1167,16 +1167,18 @@
       }
     },
     "node_modules/@electron/universal": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-1.0.5.tgz",
-      "integrity": "sha512-zX9O6+jr2NMyAdSkwEUlyltiI4/EBLu2Ls/VD3pUQdi3cAYeYfdQnT2AJJ38HE4QxLccbU13LSpccw1IWlkyag==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-1.2.1.tgz",
+      "integrity": "sha512-7323HyMh7KBAl/nPDppdLsC87G6RwRU02dy5FPeGB1eS7rUePh55+WNWiDPLhFQqqVPHzh77M69uhmoT8XnwMQ==",
       "dev": true,
       "dependencies": {
         "@malept/cross-spawn-promise": "^1.1.0",
-        "asar": "^3.0.3",
+        "asar": "^3.1.0",
         "debug": "^4.3.1",
         "dir-compare": "^2.4.0",
-        "fs-extra": "^9.0.1"
+        "fs-extra": "^9.0.1",
+        "minimatch": "^3.0.4",
+        "plist": "^3.0.4"
       },
       "engines": {
         "node": ">=8.6"
@@ -1563,14 +1565,11 @@
         "node": ">=4"
       }
     },
-    "node_modules/@socket.io/base64-arraybuffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@socket.io/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
-      "integrity": "sha512-dOlCBKnDw4iShaIsH/bxujKTM18+2TOAsYz+KSc11Am38H4q5Xw8Bbz97ZYdrVNM+um3p7w86Bvvmcn9q+5+eQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6.0"
-      }
+    "node_modules/@socket.io/component-emitter": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",
+      "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==",
+      "dev": true
     },
     "node_modules/@stylelint/postcss-css-in-js": {
       "version": "0.37.2",
@@ -1615,12 +1614,6 @@
         "moment": "^2.10.2"
       }
     },
-    "node_modules/@types/component-emitter": {
-      "version": "1.2.11",
-      "resolved": "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.11.tgz",
-      "integrity": "sha512-SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ==",
-      "dev": true
-    },
     "node_modules/@types/cookie": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz",
@@ -1628,48 +1621,50 @@
       "dev": true
     },
     "node_modules/@types/cors": {
-      "version": "2.8.12",
-      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz",
-      "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==",
-      "dev": true
-    },
-    "node_modules/@types/d3": {
-      "version": "5.16.4",
-      "resolved": "https://registry.npmjs.org/@types/d3/-/d3-5.16.4.tgz",
-      "integrity": "sha512-2u0O9iP1MubFiQ+AhR1id4Egs+07BLtvRATG6IL2Gs9+KzdrfaxCKNq5hxEyw1kxwsqB/lCgr108XuHcKtb/5w==",
+      "version": "2.8.13",
+      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.13.tgz",
+      "integrity": "sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA==",
       "dev": true,
       "dependencies": {
-        "@types/d3-array": "^1",
-        "@types/d3-axis": "^1",
-        "@types/d3-brush": "^1",
-        "@types/d3-chord": "^1",
-        "@types/d3-collection": "*",
-        "@types/d3-color": "^1",
-        "@types/d3-contour": "^1",
-        "@types/d3-dispatch": "^1",
-        "@types/d3-drag": "^1",
-        "@types/d3-dsv": "^1",
-        "@types/d3-ease": "^1",
-        "@types/d3-fetch": "^1",
-        "@types/d3-force": "^1",
-        "@types/d3-format": "^1",
-        "@types/d3-geo": "^1",
-        "@types/d3-hierarchy": "^1",
-        "@types/d3-interpolate": "^1",
-        "@types/d3-path": "^1",
-        "@types/d3-polygon": "^1",
-        "@types/d3-quadtree": "^1",
-        "@types/d3-random": "^1",
-        "@types/d3-scale": "^2",
-        "@types/d3-scale-chromatic": "^1",
-        "@types/d3-selection": "^1",
-        "@types/d3-shape": "^1",
-        "@types/d3-time": "^1",
-        "@types/d3-time-format": "^2",
-        "@types/d3-timer": "^1",
-        "@types/d3-transition": "^1",
-        "@types/d3-voronoi": "*",
-        "@types/d3-zoom": "^1"
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/d3": {
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@types/d3/-/d3-7.4.0.tgz",
+      "integrity": "sha512-jIfNVK0ZlxcuRDKtRS/SypEyOQ6UHaFQBKv032X45VvxSJ6Yi5G9behy9h6tNTHTDGh5Vq+KbmBjUWLgY4meCA==",
+      "dev": true,
+      "dependencies": {
+        "@types/d3-array": "*",
+        "@types/d3-axis": "*",
+        "@types/d3-brush": "*",
+        "@types/d3-chord": "*",
+        "@types/d3-color": "*",
+        "@types/d3-contour": "*",
+        "@types/d3-delaunay": "*",
+        "@types/d3-dispatch": "*",
+        "@types/d3-drag": "*",
+        "@types/d3-dsv": "*",
+        "@types/d3-ease": "*",
+        "@types/d3-fetch": "*",
+        "@types/d3-force": "*",
+        "@types/d3-format": "*",
+        "@types/d3-geo": "*",
+        "@types/d3-hierarchy": "*",
+        "@types/d3-interpolate": "*",
+        "@types/d3-path": "*",
+        "@types/d3-polygon": "*",
+        "@types/d3-quadtree": "*",
+        "@types/d3-random": "*",
+        "@types/d3-scale": "*",
+        "@types/d3-scale-chromatic": "*",
+        "@types/d3-selection": "*",
+        "@types/d3-shape": "*",
+        "@types/d3-time": "*",
+        "@types/d3-time-format": "*",
+        "@types/d3-timer": "*",
+        "@types/d3-transition": "*",
+        "@types/d3-zoom": "*"
       }
     },
     "node_modules/@types/d3-array": {
@@ -1687,6 +1682,12 @@
         "@types/d3-selection": "^1"
       }
     },
+    "node_modules/@types/d3-axis/node_modules/@types/d3-selection": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-1.4.3.tgz",
+      "integrity": "sha512-GjKQWVZO6Sa96HiKO6R93VBE8DUW+DDkFpIMf9vpY5S78qZTlRRSNUsHr/afDpF7TvLDV7VxrUFOWW7vdIlYkA==",
+      "dev": true
+    },
     "node_modules/@types/d3-brush": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/@types/d3-brush/-/d3-brush-1.1.4.tgz",
@@ -1696,18 +1697,18 @@
         "@types/d3-selection": "^1"
       }
     },
+    "node_modules/@types/d3-brush/node_modules/@types/d3-selection": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-1.4.3.tgz",
+      "integrity": "sha512-GjKQWVZO6Sa96HiKO6R93VBE8DUW+DDkFpIMf9vpY5S78qZTlRRSNUsHr/afDpF7TvLDV7VxrUFOWW7vdIlYkA==",
+      "dev": true
+    },
     "node_modules/@types/d3-chord": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/@types/d3-chord/-/d3-chord-1.0.10.tgz",
       "integrity": "sha512-U6YojfET6ITL1/bUJo+/Lh3pMV9XPAfOWwbshl3y3RlgAX9VO/Bxa13IMAylZIDY4VsA3Gkh29kZP1AcAeyoYA==",
       "dev": true
     },
-    "node_modules/@types/d3-collection": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/@types/d3-collection/-/d3-collection-1.0.10.tgz",
-      "integrity": "sha512-54Fdv8u5JbuXymtmXm2SYzi1x/Svt+jfWBU5junkhrCewL92VjqtCBDn97coBRVwVFmYNnVTNDyV8gQyPYfm+A==",
-      "dev": true
-    },
     "node_modules/@types/d3-color": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-1.4.1.tgz",
@@ -1724,6 +1725,12 @@
         "@types/geojson": "*"
       }
     },
+    "node_modules/@types/d3-delaunay": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-delaunay/-/d3-delaunay-6.0.1.tgz",
+      "integrity": "sha512-tLxQ2sfT0p6sxdG75c6f/ekqxjyYR0+LwPrsO1mbC9YDBzPJhs2HbJJRrn8Ez1DBoHRo2yx7YEATI+8V1nGMnQ==",
+      "dev": true
+    },
     "node_modules/@types/d3-dispatch": {
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/@types/d3-dispatch/-/d3-dispatch-1.0.9.tgz",
@@ -1739,6 +1746,12 @@
         "@types/d3-selection": "^1"
       }
     },
+    "node_modules/@types/d3-drag/node_modules/@types/d3-selection": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-1.4.3.tgz",
+      "integrity": "sha512-GjKQWVZO6Sa96HiKO6R93VBE8DUW+DDkFpIMf9vpY5S78qZTlRRSNUsHr/afDpF7TvLDV7VxrUFOWW7vdIlYkA==",
+      "dev": true
+    },
     "node_modules/@types/d3-dsv": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/@types/d3-dsv/-/d3-dsv-1.2.1.tgz",
@@ -1836,9 +1849,9 @@
       "dev": true
     },
     "node_modules/@types/d3-selection": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-1.4.3.tgz",
-      "integrity": "sha512-GjKQWVZO6Sa96HiKO6R93VBE8DUW+DDkFpIMf9vpY5S78qZTlRRSNUsHr/afDpF7TvLDV7VxrUFOWW7vdIlYkA==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-3.0.4.tgz",
+      "integrity": "sha512-ZeykX7286BCyMg9sH5fIAORyCB6hcATPSRQpN47jwBA2bMbAT0s+EvtDP5r1FZYJ95R8QoEE1CKJX+n0/M5Vhg==",
       "dev": true
     },
     "node_modules/@types/d3-shape": {
@@ -1869,20 +1882,14 @@
       "dev": true
     },
     "node_modules/@types/d3-transition": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@types/d3-transition/-/d3-transition-1.3.1.tgz",
-      "integrity": "sha512-U9CpMlTL/NlqdGXBlHYxTZwbmy/vN1cFv8TuAIFPX+xOW/1iChbeJBY2xmINhDQfkGJbgkH4IovafCwI1ZDrgg==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-transition/-/d3-transition-3.0.3.tgz",
+      "integrity": "sha512-/S90Od8Id1wgQNvIA8iFv9jRhCiZcGhPd2qX0bKF/PS+y0W5CrXKgIiELd2CvG1mlQrWK/qlYh3VxicqG1ZvgA==",
       "dev": true,
       "dependencies": {
-        "@types/d3-selection": "^1"
+        "@types/d3-selection": "*"
       }
     },
-    "node_modules/@types/d3-voronoi": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/@types/d3-voronoi/-/d3-voronoi-1.1.9.tgz",
-      "integrity": "sha512-DExNQkaHd1F3dFPvGA/Aw2NGyjMln6E9QzsiqOcBgnE+VInYnFBHBBySbZQts6z6xD+5jTfKCP7M4OqMyVjdwQ==",
-      "dev": true
-    },
     "node_modules/@types/d3-zoom": {
       "version": "1.8.2",
       "resolved": "https://registry.npmjs.org/@types/d3-zoom/-/d3-zoom-1.8.2.tgz",
@@ -1893,6 +1900,12 @@
         "@types/d3-selection": "^1"
       }
     },
+    "node_modules/@types/d3-zoom/node_modules/@types/d3-selection": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-1.4.3.tgz",
+      "integrity": "sha512-GjKQWVZO6Sa96HiKO6R93VBE8DUW+DDkFpIMf9vpY5S78qZTlRRSNUsHr/afDpF7TvLDV7VxrUFOWW7vdIlYkA==",
+      "dev": true
+    },
     "node_modules/@types/debug": {
       "version": "4.1.7",
       "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.7.tgz",
@@ -1970,9 +1983,9 @@
       "dev": true
     },
     "node_modules/@types/luxon": {
-      "version": "1.26.1",
-      "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-1.26.1.tgz",
-      "integrity": "sha512-VW+JT7SDiSKjQss7iX/3bB8CUwSqzhKuW8EcyhzFTb/mwbIkcm92cPmok5FDWYz5TskB/tWFK/mn2ByHCf44AQ==",
+      "version": "1.27.1",
+      "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-1.27.1.tgz",
+      "integrity": "sha512-cPiXpOvPFDr2edMnOXlz3UBDApwUfR+cpizvxCy0n3vp9bz/qe8BWzHPIEFcy+ogUOyjKuCISgyq77ELZPmkkg==",
       "dev": true
     },
     "node_modules/@types/mdast": {
@@ -2052,16 +2065,6 @@
         "xmlbuilder": ">=11.0.1"
       }
     },
-    "node_modules/@types/plist/node_modules/xmlbuilder": {
-      "version": "15.1.1",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz",
-      "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
     "node_modules/@types/proxyquire": {
       "version": "1.3.28",
       "resolved": "https://registry.npmjs.org/@types/proxyquire/-/proxyquire-1.3.28.tgz",
@@ -2100,9 +2103,9 @@
       "dev": true
     },
     "node_modules/@types/verror": {
-      "version": "1.10.5",
-      "resolved": "https://registry.npmjs.org/@types/verror/-/verror-1.10.5.tgz",
-      "integrity": "sha512-9UjMCHK5GPgQRoNbqdLIAvAy0EInuiqbW0PBMtVP6B5B2HQJlvoJHM+KodPZMEjOa5VkSc+5LH7xy+cUzQdmHw==",
+      "version": "1.10.6",
+      "resolved": "https://registry.npmjs.org/@types/verror/-/verror-1.10.6.tgz",
+      "integrity": "sha512-NNm+gdePAX1VGvPcGZCDKQZKYSiAWigKhKaz5KF94hG6f2s8de9Ow5+7AbXoeKxL8gavZfk4UquSAygOF2duEQ==",
       "dev": true,
       "optional": true
     },
@@ -2511,13 +2514,13 @@
       "dev": true
     },
     "node_modules/accepts": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
-      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
       "dev": true,
       "dependencies": {
-        "mime-types": "~2.1.24",
-        "negotiator": "0.6.2"
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
       },
       "engines": {
         "node": ">= 0.6"
@@ -2605,7 +2608,7 @@
     "node_modules/angular2-template-loader": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/angular2-template-loader/-/angular2-template-loader-0.6.2.tgz",
-      "integrity": "sha1-wNROkP/w+sleiyPwQ6zaf9HFHXw=",
+      "integrity": "sha512-jBSrm2yDsTA48GG0H57upn8rmTfJS3/R7EhUeAL/3ryWS8deT9You8UQKWpW4eVSEY7uMJ52iFwpOYXc8QEtGg==",
       "dev": true,
       "dependencies": {
         "loader-utils": "^0.2.15"
@@ -2632,7 +2635,7 @@
     "node_modules/angular2-template-loader/node_modules/json5": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+      "integrity": "sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==",
       "dev": true,
       "bin": {
         "json5": "lib/cli.js"
@@ -2641,7 +2644,7 @@
     "node_modules/angular2-template-loader/node_modules/loader-utils": {
       "version": "0.2.17",
       "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
-      "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
+      "integrity": "sha512-tiv66G0SmiOx+pLWMtGEkfSEejxvb6N6uRrQjfWJIT79W9GMpgKeCAmm9aVBKtd4WEgntciI8CsGqjpDoCWJug==",
       "dev": true,
       "dependencies": {
         "big.js": "^3.1.3",
@@ -2650,50 +2653,6 @@
         "object-assign": "^4.0.1"
       }
     },
-    "node_modules/ansi-align": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz",
-      "integrity": "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^3.0.0"
-      }
-    },
-    "node_modules/ansi-align/node_modules/ansi-regex": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/ansi-align/node_modules/string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/ansi-align/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/ansi-colors": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
@@ -2747,41 +2706,42 @@
       }
     },
     "node_modules/app-builder-bin": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.7.1.tgz",
-      "integrity": "sha512-ql93vEUq6WsstGXD+SBLSIQw6SNnhbDEM0swzgugytMxLp3rT24Ag/jcC80ZHxiPRTdew1niuR7P3/FCrDqIjw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-4.0.0.tgz",
+      "integrity": "sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA==",
       "dev": true
     },
     "node_modules/app-builder-lib": {
-      "version": "22.14.13",
-      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.14.13.tgz",
-      "integrity": "sha512-SufmrtxU+D0Tn948fjEwAOlCN9757UXLkzzTWXMwZKR/5hisvgqeeBepWfphMIE6OkDGz0fbzEhL1P2Pty4XMg==",
+      "version": "23.6.0",
+      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-23.6.0.tgz",
+      "integrity": "sha512-dQYDuqm/rmy8GSCE6Xl/3ShJg6Ab4bZJMT8KaTKGzT436gl1DN4REP3FCWfXoh75qGTJ+u+WsdnnpO9Jl8nyMA==",
       "dev": true,
       "dependencies": {
         "@develar/schema-utils": "~2.6.5",
-        "@electron/universal": "1.0.5",
+        "@electron/universal": "1.2.1",
         "@malept/flatpak-bundler": "^0.4.0",
         "7zip-bin": "~5.1.1",
         "async-exit-hook": "^2.0.1",
         "bluebird-lst": "^1.0.9",
-        "builder-util": "22.14.13",
-        "builder-util-runtime": "8.9.2",
+        "builder-util": "23.6.0",
+        "builder-util-runtime": "9.1.1",
         "chromium-pickle-js": "^0.2.0",
-        "debug": "^4.3.2",
-        "ejs": "^3.1.6",
-        "electron-osx-sign": "^0.5.0",
-        "electron-publish": "22.14.13",
+        "debug": "^4.3.4",
+        "ejs": "^3.1.7",
+        "electron-osx-sign": "^0.6.0",
+        "electron-publish": "23.6.0",
         "form-data": "^4.0.0",
-        "fs-extra": "^10.0.0",
-        "hosted-git-info": "^4.0.2",
+        "fs-extra": "^10.1.0",
+        "hosted-git-info": "^4.1.0",
         "is-ci": "^3.0.0",
-        "isbinaryfile": "^4.0.8",
+        "isbinaryfile": "^4.0.10",
         "js-yaml": "^4.1.0",
         "lazy-val": "^1.0.5",
-        "minimatch": "^3.0.4",
+        "minimatch": "^3.1.2",
         "read-config-file": "6.2.0",
         "sanitize-filename": "^1.6.3",
-        "semver": "^7.3.5",
+        "semver": "^7.3.7",
+        "tar": "^6.1.11",
         "temp-file": "^3.4.0"
       },
       "engines": {
@@ -2795,28 +2755,22 @@
       "dev": true
     },
     "node_modules/app-builder-lib/node_modules/builder-util-runtime": {
-      "version": "8.9.2",
-      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz",
-      "integrity": "sha512-rhuKm5vh7E0aAmT6i8aoSfEjxzdYEFX7zDApK+eNgOhjofnWb74d9SRJv0H/8nsgOkos0TZ4zxW0P8J4N7xQ2A==",
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz",
+      "integrity": "sha512-azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw==",
       "dev": true,
       "dependencies": {
-        "debug": "^4.3.2",
+        "debug": "^4.3.4",
         "sax": "^1.2.4"
       },
       "engines": {
         "node": ">=12.0.0"
       }
     },
-    "node_modules/app-builder-lib/node_modules/ci-info": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.3.0.tgz",
-      "integrity": "sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw==",
-      "dev": true
-    },
     "node_modules/app-builder-lib/node_modules/fs-extra": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
-      "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
       "dev": true,
       "dependencies": {
         "graceful-fs": "^4.2.0",
@@ -2839,16 +2793,16 @@
         "node": ">=10"
       }
     },
-    "node_modules/app-builder-lib/node_modules/is-ci": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz",
-      "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==",
+    "node_modules/app-builder-lib/node_modules/isbinaryfile": {
+      "version": "4.0.10",
+      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.10.tgz",
+      "integrity": "sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==",
       "dev": true,
-      "dependencies": {
-        "ci-info": "^3.2.0"
+      "engines": {
+        "node": ">= 8.0.0"
       },
-      "bin": {
-        "is-ci": "bin.js"
+      "funding": {
+        "url": "https://github.com/sponsors/gjtorikian/"
       }
     },
     "node_modules/app-builder-lib/node_modules/js-yaml": {
@@ -2876,9 +2830,9 @@
       }
     },
     "node_modules/app-builder-lib/node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
       "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -3090,9 +3044,10 @@
       }
     },
     "node_modules/asar": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/asar/-/asar-3.1.0.tgz",
-      "integrity": "sha512-vyxPxP5arcAqN4F/ebHd/HhwnAiZtwhglvdmc7BR2f0ywbVNTOpSeyhLDbGXtE/y58hv1oC75TaNIXutnsOZsQ==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/asar/-/asar-3.2.0.tgz",
+      "integrity": "sha512-COdw2ZQvKdFGFxXwX3oYh2/sOsJWJegrdJCGxnN4MZ7IULgRBp9P6665aqj9z1v9VwP4oP1hRBojRDQ//IGgAg==",
+      "deprecated": "Please use @electron/asar moving forward.  There is no API change, just a package name change",
       "dev": true,
       "dependencies": {
         "chromium-pickle-js": "^0.2.0",
@@ -3150,7 +3105,7 @@
     "node_modules/assert-plus": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
       "dev": true,
       "optional": true,
       "engines": {
@@ -3698,24 +3653,27 @@
       "dev": true
     },
     "node_modules/body-parser": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
-      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
       "dev": true,
       "dependencies": {
-        "bytes": "3.1.0",
+        "bytes": "3.1.2",
         "content-type": "~1.0.4",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.7.2",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.7.0",
-        "raw-body": "2.4.0",
-        "type-is": "~1.6.17"
+        "on-finished": "2.4.1",
+        "qs": "6.11.0",
+        "raw-body": "2.5.1",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
       }
     },
     "node_modules/body-parser/node_modules/debug": {
@@ -3727,12 +3685,33 @@
         "ms": "2.0.0"
       }
     },
+    "node_modules/body-parser/node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/body-parser/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
       "dev": true
     },
+    "node_modules/body-parser/node_modules/on-finished": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+      "dev": true,
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/bonjour": {
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
@@ -3760,116 +3739,6 @@
       "dev": true,
       "optional": true
     },
-    "node_modules/boxen": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/boxen/-/boxen-5.0.0.tgz",
-      "integrity": "sha512-5bvsqw+hhgUi3oYGK0Vf4WpIkyemp60WBInn7+WNfoISzAqk/HX4L7WNROq38E6UR/y3YADpv6pEm4BfkeEAdA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-align": "^3.0.0",
-        "camelcase": "^6.2.0",
-        "chalk": "^4.1.0",
-        "cli-boxes": "^2.2.1",
-        "string-width": "^4.2.0",
-        "type-fest": "^0.20.2",
-        "widest-line": "^3.1.0",
-        "wrap-ansi": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/boxen/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/boxen/node_modules/camelcase": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
-      "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/boxen/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/boxen/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/boxen/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/boxen/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/boxen/node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -4083,7 +3952,7 @@
     "node_modules/buffer-equal": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
-      "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=",
+      "integrity": "sha512-tcBWO2Dl4e7Asr9hTGcpVrCe+F7DubpmqWCTbj4FHLmjqO2hIaC383acQubWtRJhdceqs5uBHs6Es+Sk//RKiQ==",
       "dev": true,
       "engines": {
         "node": ">=0.4.0"
@@ -4117,20 +3986,20 @@
       "dev": true
     },
     "node_modules/builder-util": {
-      "version": "22.14.13",
-      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.14.13.tgz",
-      "integrity": "sha512-oePC/qrrUuerhmH5iaCJzPRAKlSBylrhzuAJmRQClTyWnZUv6jbaHh+VoHMbEiE661wrj2S2aV7/bQh12cj1OA==",
+      "version": "23.6.0",
+      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-23.6.0.tgz",
+      "integrity": "sha512-QiQHweYsh8o+U/KNCZFSvISRnvRctb8m/2rB2I1JdByzvNKxPeFLlHFRPQRXab6aYeXc18j9LpsDLJ3sGQmWTQ==",
       "dev": true,
       "dependencies": {
         "@types/debug": "^4.1.6",
         "@types/fs-extra": "^9.0.11",
         "7zip-bin": "~5.1.1",
-        "app-builder-bin": "3.7.1",
+        "app-builder-bin": "4.0.0",
         "bluebird-lst": "^1.0.9",
-        "builder-util-runtime": "8.9.2",
+        "builder-util-runtime": "9.1.1",
         "chalk": "^4.1.1",
         "cross-spawn": "^7.0.3",
-        "debug": "^4.3.2",
+        "debug": "^4.3.4",
         "fs-extra": "^10.0.0",
         "http-proxy-agent": "^5.0.0",
         "https-proxy-agent": "^5.0.0",
@@ -4187,12 +4056,12 @@
       "dev": true
     },
     "node_modules/builder-util/node_modules/builder-util-runtime": {
-      "version": "8.9.2",
-      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz",
-      "integrity": "sha512-rhuKm5vh7E0aAmT6i8aoSfEjxzdYEFX7zDApK+eNgOhjofnWb74d9SRJv0H/8nsgOkos0TZ4zxW0P8J4N7xQ2A==",
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz",
+      "integrity": "sha512-azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw==",
       "dev": true,
       "dependencies": {
-        "debug": "^4.3.2",
+        "debug": "^4.3.4",
         "sax": "^1.2.4"
       },
       "engines": {
@@ -4215,12 +4084,6 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/builder-util/node_modules/ci-info": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.3.0.tgz",
-      "integrity": "sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw==",
-      "dev": true
-    },
     "node_modules/builder-util/node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -4248,9 +4111,9 @@
       }
     },
     "node_modules/builder-util/node_modules/fs-extra": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
-      "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
       "dev": true,
       "dependencies": {
         "graceful-fs": "^4.2.0",
@@ -4271,9 +4134,9 @@
       }
     },
     "node_modules/builder-util/node_modules/https-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
       "dev": true,
       "dependencies": {
         "agent-base": "6",
@@ -4283,18 +4146,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/builder-util/node_modules/is-ci": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz",
-      "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==",
-      "dev": true,
-      "dependencies": {
-        "ci-info": "^3.2.0"
-      },
-      "bin": {
-        "is-ci": "bin.js"
-      }
-    },
     "node_modules/builder-util/node_modules/js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -4404,9 +4255,9 @@
       "dev": true
     },
     "node_modules/bytes": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
       "dev": true,
       "engines": {
         "node": ">= 0.8"
@@ -4714,14 +4565,23 @@
     "node_modules/chromium-pickle-js": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz",
-      "integrity": "sha1-BKEGZywYsIWrd02YPfo+oTjyIgU=",
+      "integrity": "sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw==",
       "dev": true
     },
     "node_modules/ci-info": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-      "dev": true
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.7.1.tgz",
+      "integrity": "sha512-4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "engines": {
+        "node": ">=8"
+      }
     },
     "node_modules/cipher-base": {
       "version": "1.0.4",
@@ -4879,18 +4739,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/cli-boxes": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz",
-      "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/cli-truncate": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
@@ -5128,7 +4976,7 @@
     "node_modules/compare-version": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz",
-      "integrity": "sha1-AWLsLZNR9d3VmpICy6k1NmpyUIA=",
+      "integrity": "sha512-pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -5368,50 +5216,6 @@
         "proto-list": "~1.2.1"
       }
     },
-    "node_modules/configstore": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz",
-      "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==",
-      "dev": true,
-      "dependencies": {
-        "dot-prop": "^5.2.0",
-        "graceful-fs": "^4.1.2",
-        "make-dir": "^3.0.0",
-        "unique-string": "^2.0.0",
-        "write-file-atomic": "^3.0.0",
-        "xdg-basedir": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/configstore/node_modules/make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "dev": true,
-      "dependencies": {
-        "semver": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/configstore/node_modules/write-file-atomic": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-      "dev": true,
-      "dependencies": {
-        "imurmurhash": "^0.1.4",
-        "is-typedarray": "^1.0.0",
-        "signal-exit": "^3.0.2",
-        "typedarray-to-buffer": "^3.1.5"
-      }
-    },
     "node_modules/connect": {
       "version": "3.7.0",
       "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
@@ -5478,16 +5282,35 @@
       }
     },
     "node_modules/content-disposition": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
-      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
       "dependencies": {
-        "safe-buffer": "5.1.2"
+        "safe-buffer": "5.2.1"
       },
       "engines": {
         "node": ">= 0.6"
       }
     },
+    "node_modules/content-disposition/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
     "node_modules/content-type": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
@@ -5583,9 +5406,9 @@
       }
     },
     "node_modules/copy-webpack-plugin/node_modules/loader-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-      "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
       "dev": true,
       "dependencies": {
         "big.js": "^5.2.2",
@@ -5773,15 +5596,6 @@
         "node": "*"
       }
     },
-    "node_modules/crypto-random-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
-      "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/css-loader": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-2.1.1.tgz",
@@ -5854,283 +5668,392 @@
       "dev": true
     },
     "node_modules/d3": {
-      "version": "5.16.0",
-      "resolved": "https://registry.npmjs.org/d3/-/d3-5.16.0.tgz",
-      "integrity": "sha512-4PL5hHaHwX4m7Zr1UapXW23apo6pexCgdetdJ5kTmADpG/7T9Gkxw0M0tf/pjoB63ezCCm0u5UaFYy2aMt0Mcw==",
-      "dependencies": {
-        "d3-array": "1",
-        "d3-axis": "1",
-        "d3-brush": "1",
-        "d3-chord": "1",
-        "d3-collection": "1",
-        "d3-color": "1",
-        "d3-contour": "1",
-        "d3-dispatch": "1",
-        "d3-drag": "1",
-        "d3-dsv": "1",
-        "d3-ease": "1",
-        "d3-fetch": "1",
-        "d3-force": "1",
-        "d3-format": "1",
-        "d3-geo": "1",
-        "d3-hierarchy": "1",
-        "d3-interpolate": "1",
-        "d3-path": "1",
-        "d3-polygon": "1",
-        "d3-quadtree": "1",
-        "d3-random": "1",
-        "d3-scale": "2",
-        "d3-scale-chromatic": "1",
-        "d3-selection": "1",
-        "d3-shape": "1",
-        "d3-time": "1",
-        "d3-time-format": "2",
-        "d3-timer": "1",
-        "d3-transition": "1",
-        "d3-voronoi": "1",
-        "d3-zoom": "1"
+      "version": "7.8.2",
+      "resolved": "https://registry.npmjs.org/d3/-/d3-7.8.2.tgz",
+      "integrity": "sha512-WXty7qOGSHb7HR7CfOzwN1Gw04MUOzN8qh9ZUsvwycIMb4DYMpY9xczZ6jUorGtO6bR9BPMPaueIKwiDxu9uiQ==",
+      "dependencies": {
+        "d3-array": "3",
+        "d3-axis": "3",
+        "d3-brush": "3",
+        "d3-chord": "3",
+        "d3-color": "3",
+        "d3-contour": "4",
+        "d3-delaunay": "6",
+        "d3-dispatch": "3",
+        "d3-drag": "3",
+        "d3-dsv": "3",
+        "d3-ease": "3",
+        "d3-fetch": "3",
+        "d3-force": "3",
+        "d3-format": "3",
+        "d3-geo": "3",
+        "d3-hierarchy": "3",
+        "d3-interpolate": "3",
+        "d3-path": "3",
+        "d3-polygon": "3",
+        "d3-quadtree": "3",
+        "d3-random": "3",
+        "d3-scale": "4",
+        "d3-scale-chromatic": "3",
+        "d3-selection": "3",
+        "d3-shape": "3",
+        "d3-time": "3",
+        "d3-time-format": "4",
+        "d3-timer": "3",
+        "d3-transition": "3",
+        "d3-zoom": "3"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/d3-array": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-1.2.4.tgz",
-      "integrity": "sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw=="
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.2.tgz",
+      "integrity": "sha512-yEEyEAbDrF8C6Ob2myOBLjwBLck1Z89jMGFee0oPsn95GqjerpaOA4ch+vc2l0FNFFwMD5N7OCSEN5eAlsUbgQ==",
+      "dependencies": {
+        "internmap": "1 - 2"
+      },
+      "engines": {
+        "node": ">=12"
+      }
     },
     "node_modules/d3-axis": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-1.0.12.tgz",
-      "integrity": "sha512-ejINPfPSNdGFKEOAtnBtdkpr24c4d4jsei6Lg98mxf424ivoDP2956/5HDpIAtmHo85lqT4pruy+zEgvRUBqaQ=="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-3.0.0.tgz",
+      "integrity": "sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw==",
+      "engines": {
+        "node": ">=12"
+      }
     },
     "node_modules/d3-brush": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-1.1.6.tgz",
-      "integrity": "sha512-7RW+w7HfMCPyZLifTz/UnJmI5kdkXtpCbombUSs8xniAyo0vIbrDzDwUJB6eJOgl9u5DQOt2TQlYumxzD1SvYA==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-3.0.0.tgz",
+      "integrity": "sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ==",
       "dependencies": {
-        "d3-dispatch": "1",
-        "d3-drag": "1",
-        "d3-interpolate": "1",
-        "d3-selection": "1",
-        "d3-transition": "1"
+        "d3-dispatch": "1 - 3",
+        "d3-drag": "2 - 3",
+        "d3-interpolate": "1 - 3",
+        "d3-selection": "3",
+        "d3-transition": "3"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/d3-chord": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-1.0.6.tgz",
-      "integrity": "sha512-JXA2Dro1Fxw9rJe33Uv+Ckr5IrAa74TlfDEhE/jfLOaXegMQFQTAgAw9WnZL8+HxVBRXaRGCkrNU7pJeylRIuA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-3.0.1.tgz",
+      "integrity": "sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==",
       "dependencies": {
-        "d3-array": "1",
-        "d3-path": "1"
+        "d3-path": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/d3-collection": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/d3-collection/-/d3-collection-1.0.7.tgz",
-      "integrity": "sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A=="
-    },
     "node_modules/d3-color": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.4.1.tgz",
-      "integrity": "sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q=="
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz",
+      "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==",
+      "engines": {
+        "node": ">=12"
+      }
     },
     "node_modules/d3-contour": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-1.3.2.tgz",
-      "integrity": "sha512-hoPp4K/rJCu0ladiH6zmJUEz6+u3lgR+GSm/QdM2BBvDraU39Vr7YdDCicJcxP1z8i9B/2dJLgDC1NcvlF8WCg==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-4.0.2.tgz",
+      "integrity": "sha512-4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA==",
+      "dependencies": {
+        "d3-array": "^3.2.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-delaunay": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-6.0.2.tgz",
+      "integrity": "sha512-IMLNldruDQScrcfT+MWnazhHbDJhcRJyOEBAJfwQnHle1RPh6WDuLvxNArUju2VSMSUuKlY5BGHRJ2cYyoFLQQ==",
       "dependencies": {
-        "d3-array": "^1.1.1"
+        "delaunator": "5"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/d3-dispatch": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-1.0.6.tgz",
-      "integrity": "sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA=="
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz",
+      "integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==",
+      "engines": {
+        "node": ">=12"
+      }
     },
     "node_modules/d3-drag": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-1.2.5.tgz",
-      "integrity": "sha512-rD1ohlkKQwMZYkQlYVCrSFxsWPzI97+W+PaEIBNTMxRuxz9RF0Hi5nJWHGVJ3Om9d2fRTe1yOBINJyy/ahV95w==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-3.0.0.tgz",
+      "integrity": "sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==",
       "dependencies": {
-        "d3-dispatch": "1",
-        "d3-selection": "1"
+        "d3-dispatch": "1 - 3",
+        "d3-selection": "3"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/d3-dsv": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-1.2.0.tgz",
-      "integrity": "sha512-9yVlqvZcSOMhCYzniHE7EVUws7Fa1zgw+/EAV2BxJoG3ME19V6BQFBwI855XQDsxyOuG7NibqRMTtiF/Qup46g==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz",
+      "integrity": "sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==",
       "dependencies": {
-        "commander": "2",
-        "iconv-lite": "0.4",
+        "commander": "7",
+        "iconv-lite": "0.6",
         "rw": "1"
       },
       "bin": {
-        "csv2json": "bin/dsv2json",
-        "csv2tsv": "bin/dsv2dsv",
-        "dsv2dsv": "bin/dsv2dsv",
-        "dsv2json": "bin/dsv2json",
-        "json2csv": "bin/json2dsv",
-        "json2dsv": "bin/json2dsv",
-        "json2tsv": "bin/json2dsv",
-        "tsv2csv": "bin/dsv2dsv",
-        "tsv2json": "bin/dsv2json"
+        "csv2json": "bin/dsv2json.js",
+        "csv2tsv": "bin/dsv2dsv.js",
+        "dsv2dsv": "bin/dsv2dsv.js",
+        "dsv2json": "bin/dsv2json.js",
+        "json2csv": "bin/json2dsv.js",
+        "json2dsv": "bin/json2dsv.js",
+        "json2tsv": "bin/json2dsv.js",
+        "tsv2csv": "bin/dsv2dsv.js",
+        "tsv2json": "bin/dsv2json.js"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/d3-dsv/node_modules/commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/d3-dsv/node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
     "node_modules/d3-ease": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-1.0.7.tgz",
-      "integrity": "sha512-lx14ZPYkhNx0s/2HX5sLFUI3mbasHjSSpwO/KaaNACweVwxUruKyWVcb293wMv1RqTPZyZ8kSZ2NogUZNcLOFQ=="
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz",
+      "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==",
+      "engines": {
+        "node": ">=12"
+      }
     },
     "node_modules/d3-fetch": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/d3-fetch/-/d3-fetch-1.2.0.tgz",
-      "integrity": "sha512-yC78NBVcd2zFAyR/HnUiBS7Lf6inSCoWcSxFfw8FYL7ydiqe80SazNwoffcqOfs95XaLo7yebsmQqDKSsXUtvA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-fetch/-/d3-fetch-3.0.1.tgz",
+      "integrity": "sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw==",
       "dependencies": {
-        "d3-dsv": "1"
+        "d3-dsv": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/d3-force": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-1.2.1.tgz",
-      "integrity": "sha512-HHvehyaiUlVo5CxBJ0yF/xny4xoaxFxDnBXNvNcfW9adORGZfyNF1dj6DGLKyk4Yh3brP/1h3rnDzdIAwL08zg==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-3.0.0.tgz",
+      "integrity": "sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==",
       "dependencies": {
-        "d3-collection": "1",
-        "d3-dispatch": "1",
-        "d3-quadtree": "1",
-        "d3-timer": "1"
+        "d3-dispatch": "1 - 3",
+        "d3-quadtree": "1 - 3",
+        "d3-timer": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/d3-format": {
-      "version": "1.4.5",
-      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.4.5.tgz",
-      "integrity": "sha512-J0piedu6Z8iB6TbIGfZgDzfXxUFN3qQRMofy2oPdXzQibYGqPB/9iMcxr/TGalU+2RsyDO+U4f33id8tbnSRMQ=="
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz",
+      "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==",
+      "engines": {
+        "node": ">=12"
+      }
     },
     "node_modules/d3-geo": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-1.12.1.tgz",
-      "integrity": "sha512-XG4d1c/UJSEX9NfU02KwBL6BYPj8YKHxgBEw5om2ZnTRSbIcego6dhHwcxuSR3clxh0EpE38os1DVPOmnYtTPg==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.0.tgz",
+      "integrity": "sha512-JEo5HxXDdDYXCaWdwLRt79y7giK8SbhZJbFWXqbRTolCHFI5jRqteLzCsq51NKbUoX0PjBVSohxrx+NoOUujYA==",
       "dependencies": {
-        "d3-array": "1"
+        "d3-array": "2.5.0 - 3"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/d3-hierarchy": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-1.1.9.tgz",
-      "integrity": "sha512-j8tPxlqh1srJHAtxfvOUwKNYJkQuBFdM1+JAUfq6xqH5eAqf93L7oG1NVqDa4CpFZNvnNKtCYEUC8KY9yEn9lQ=="
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz",
+      "integrity": "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==",
+      "engines": {
+        "node": ">=12"
+      }
     },
     "node_modules/d3-interpolate": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
-      "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
+      "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==",
       "dependencies": {
-        "d3-color": "1"
+        "d3-color": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/d3-path": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-1.0.9.tgz",
-      "integrity": "sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg=="
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz",
+      "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==",
+      "engines": {
+        "node": ">=12"
+      }
     },
     "node_modules/d3-polygon": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-1.0.6.tgz",
-      "integrity": "sha512-k+RF7WvI08PC8reEoXa/w2nSg5AUMTi+peBD9cmFc+0ixHfbs4QmxxkarVal1IkVkgxVuk9JSHhJURHiyHKAuQ=="
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-3.0.1.tgz",
+      "integrity": "sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg==",
+      "engines": {
+        "node": ">=12"
+      }
     },
     "node_modules/d3-quadtree": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-1.0.7.tgz",
-      "integrity": "sha512-RKPAeXnkC59IDGD0Wu5mANy0Q2V28L+fNe65pOCXVdVuTJS3WPKaJlFHer32Rbh9gIo9qMuJXio8ra4+YmIymA=="
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz",
+      "integrity": "sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==",
+      "engines": {
+        "node": ">=12"
+      }
     },
     "node_modules/d3-random": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-1.1.2.tgz",
-      "integrity": "sha512-6AK5BNpIFqP+cx/sreKzNjWbwZQCSUatxq+pPRmFIQaWuoD+NrbVWw7YWpHiXpCQ/NanKdtGDuB+VQcZDaEmYQ=="
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-3.0.1.tgz",
+      "integrity": "sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==",
+      "engines": {
+        "node": ">=12"
+      }
     },
     "node_modules/d3-scale": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-2.2.2.tgz",
-      "integrity": "sha512-LbeEvGgIb8UMcAa0EATLNX0lelKWGYDQiPdHj+gLblGVhGLyNbaCn3EvrJf0A3Y/uOOU5aD6MTh5ZFCdEwGiCw==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz",
+      "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==",
       "dependencies": {
-        "d3-array": "^1.2.0",
-        "d3-collection": "1",
-        "d3-format": "1",
-        "d3-interpolate": "1",
-        "d3-time": "1",
-        "d3-time-format": "2"
+        "d3-array": "2.10.0 - 3",
+        "d3-format": "1 - 3",
+        "d3-interpolate": "1.2.0 - 3",
+        "d3-time": "2.1.1 - 3",
+        "d3-time-format": "2 - 4"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/d3-scale-chromatic": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-1.5.0.tgz",
-      "integrity": "sha512-ACcL46DYImpRFMBcpk9HhtIyC7bTBR4fNOPxwVSl0LfulDAwyiHyPOTqcDG1+t5d4P9W7t/2NAuWu59aKko/cg==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.0.0.tgz",
+      "integrity": "sha512-Lx9thtxAKrO2Pq6OO2Ua474opeziKr279P/TKZsMAhYyNDD3EnCffdbgeSYN5O7m2ByQsxtuP2CSDczNUIZ22g==",
       "dependencies": {
-        "d3-color": "1",
-        "d3-interpolate": "1"
+        "d3-color": "1 - 3",
+        "d3-interpolate": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/d3-selection": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-1.4.2.tgz",
-      "integrity": "sha512-SJ0BqYihzOjDnnlfyeHT0e30k0K1+5sR3d5fNueCNeuhZTnGw4M4o8mqJchSwgKMXCNFo+e2VTChiSJ0vYtXkg=="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz",
+      "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==",
+      "engines": {
+        "node": ">=12"
+      }
     },
     "node_modules/d3-shape": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.7.tgz",
-      "integrity": "sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz",
+      "integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==",
       "dependencies": {
-        "d3-path": "1"
+        "d3-path": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/d3-time": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-1.1.0.tgz",
-      "integrity": "sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA=="
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz",
+      "integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==",
+      "dependencies": {
+        "d3-array": "2 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
     },
     "node_modules/d3-time-format": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
-      "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz",
+      "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==",
       "dependencies": {
-        "d3-time": "1"
+        "d3-time": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/d3-timer": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-1.0.10.tgz",
-      "integrity": "sha512-B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw=="
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz",
+      "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==",
+      "engines": {
+        "node": ">=12"
+      }
     },
     "node_modules/d3-transition": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-1.3.2.tgz",
-      "integrity": "sha512-sc0gRU4PFqZ47lPVHloMn9tlPcv8jxgOQg+0zjhfZXMQuvppjG6YuwdMBE0TuqCZjeJkLecku/l9R0JPcRhaDA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-3.0.1.tgz",
+      "integrity": "sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==",
       "dependencies": {
-        "d3-color": "1",
-        "d3-dispatch": "1",
-        "d3-ease": "1",
-        "d3-interpolate": "1",
-        "d3-selection": "^1.1.0",
-        "d3-timer": "1"
+        "d3-color": "1 - 3",
+        "d3-dispatch": "1 - 3",
+        "d3-ease": "1 - 3",
+        "d3-interpolate": "1 - 3",
+        "d3-timer": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "peerDependencies": {
+        "d3-selection": "2 - 3"
       }
     },
-    "node_modules/d3-voronoi": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/d3-voronoi/-/d3-voronoi-1.1.4.tgz",
-      "integrity": "sha512-dArJ32hchFsrQ8uMiTBLq256MpnZjeuBtdHpaDlYuQyjU0CVzCJl/BVW+SkszaAeH95D/8gxqAhgx0ouAWAfRg=="
-    },
     "node_modules/d3-zoom": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-1.8.3.tgz",
-      "integrity": "sha512-VoLXTK4wvy1a0JpH2Il+F2CiOhVu7VRXWF5M/LroMIh3/zBAC3WAt7QoIvPibOavVo20hN6/37vwAsdBejLyKQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-3.0.0.tgz",
+      "integrity": "sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==",
       "dependencies": {
-        "d3-dispatch": "1",
-        "d3-drag": "1",
-        "d3-interpolate": "1",
-        "d3-selection": "1",
-        "d3-transition": "1"
+        "d3-dispatch": "1 - 3",
+        "d3-drag": "2 - 3",
+        "d3-interpolate": "1 - 3",
+        "d3-selection": "2 - 3",
+        "d3-transition": "2 - 3"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/date-fns": {
@@ -6156,9 +6079,9 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -6524,6 +6447,14 @@
         "node": ">=6"
       }
     },
+    "node_modules/delaunator": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.0.0.tgz",
+      "integrity": "sha512-AyLvtyJdbv/U1GkiS6gUUzclRoAY4Gs75qkMygJJhU75LW4DNuSF2RMzpxs9jw9Oz1BobHjTdkG3zdP55VxAqw==",
+      "dependencies": {
+        "robust-predicates": "^3.0.0"
+      }
+    },
     "node_modules/delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -6566,10 +6497,14 @@
       }
     },
     "node_modules/destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
-      "dev": true
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
     },
     "node_modules/detect-file": {
       "version": "1.0.0",
@@ -6683,7 +6618,7 @@
     "node_modules/dir-compare/node_modules/colors": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
-      "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
+      "integrity": "sha512-pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw==",
       "dev": true,
       "engines": {
         "node": ">=0.1.90"
@@ -6692,7 +6627,7 @@
     "node_modules/dir-compare/node_modules/commander": {
       "version": "2.9.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-      "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
+      "integrity": "sha512-bmkUukX8wAOjHdN26xj5c4ctEV22TQ7dQYhSmuckKhToXrkUn0iIaolHdIxYYqD55nhpSPA9zPQ1yP57GdXP2A==",
       "dev": true,
       "dependencies": {
         "graceful-readlink": ">= 1.0.0"
@@ -6701,6 +6636,18 @@
         "node": ">= 0.6.x"
       }
     },
+    "node_modules/dir-compare/node_modules/minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/dir-glob": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
@@ -6714,20 +6661,20 @@
       }
     },
     "node_modules/dmg-builder": {
-      "version": "22.14.13",
-      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.14.13.tgz",
-      "integrity": "sha512-xNOugB6AbIRETeU2uID15sUfjdZZcKdxK8xkFnwIggsM00PJ12JxpLNPTjcRoUnfwj3WrPjilrO64vRMwNItQg==",
+      "version": "23.6.0",
+      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-23.6.0.tgz",
+      "integrity": "sha512-jFZvY1JohyHarIAlTbfQOk+HnceGjjAdFjVn3n8xlDWKsYNqbO4muca6qXEZTfGXeQMG7TYim6CeS5XKSfSsGA==",
       "dev": true,
       "dependencies": {
-        "app-builder-lib": "22.14.13",
-        "builder-util": "22.14.13",
-        "builder-util-runtime": "8.9.2",
+        "app-builder-lib": "23.6.0",
+        "builder-util": "23.6.0",
+        "builder-util-runtime": "9.1.1",
         "fs-extra": "^10.0.0",
         "iconv-lite": "^0.6.2",
         "js-yaml": "^4.1.0"
       },
       "optionalDependencies": {
-        "dmg-license": "^1.0.9"
+        "dmg-license": "^1.0.11"
       }
     },
     "node_modules/dmg-builder/node_modules/argparse": {
@@ -6737,12 +6684,12 @@
       "dev": true
     },
     "node_modules/dmg-builder/node_modules/builder-util-runtime": {
-      "version": "8.9.2",
-      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz",
-      "integrity": "sha512-rhuKm5vh7E0aAmT6i8aoSfEjxzdYEFX7zDApK+eNgOhjofnWb74d9SRJv0H/8nsgOkos0TZ4zxW0P8J4N7xQ2A==",
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz",
+      "integrity": "sha512-azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw==",
       "dev": true,
       "dependencies": {
-        "debug": "^4.3.2",
+        "debug": "^4.3.4",
         "sax": "^1.2.4"
       },
       "engines": {
@@ -6750,9 +6697,9 @@
       }
     },
     "node_modules/dmg-builder/node_modules/fs-extra": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
-      "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
       "dev": true,
       "dependencies": {
         "graceful-fs": "^4.2.0",
@@ -6809,9 +6756,9 @@
       }
     },
     "node_modules/dmg-license": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/dmg-license/-/dmg-license-1.0.10.tgz",
-      "integrity": "sha512-SVeeyiOeinV5JCPHXMdKOgK1YVbak/4+8WL2rBnfqRYpA5FaeFaQnQWb25x628am1w70CbipGDv9S51biph63A==",
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/dmg-license/-/dmg-license-1.0.11.tgz",
+      "integrity": "sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q==",
       "dev": true,
       "optional": true,
       "os": [
@@ -6954,18 +6901,6 @@
         "domelementtype": "1"
       }
     },
-    "node_modules/dot-prop": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
-      "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
-      "dev": true,
-      "dependencies": {
-        "is-obj": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/dotenv": {
       "version": "9.0.2",
       "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-9.0.2.tgz",
@@ -7034,9 +6969,9 @@
       "dev": true
     },
     "node_modules/ejs": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.7.tgz",
-      "integrity": "sha512-BIar7R6abbUxDA3bfXrO4DSgwo8I+fB5/1zgujl3HLLjwd6+9iOnrT+t3grn2qbk9vOgBubXOFwX2m9axoFaGw==",
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.8.tgz",
+      "integrity": "sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==",
       "dev": true,
       "dependencies": {
         "jake": "^10.8.5"
@@ -7067,23 +7002,23 @@
       }
     },
     "node_modules/electron-builder": {
-      "version": "22.14.13",
-      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.14.13.tgz",
-      "integrity": "sha512-3fgLxqF2TXVKiUPeg74O4V3l0l3j7ERLazo8sUbRkApw0+4iVAf2BJkHsHMaXiigsgCoEzK/F4/rB5rne/VAnw==",
+      "version": "23.6.0",
+      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-23.6.0.tgz",
+      "integrity": "sha512-y8D4zO+HXGCNxFBV/JlyhFnoQ0Y0K7/sFH+XwIbj47pqaW8S6PGYQbjoObolKBR1ddQFPt4rwp4CnwMJrW3HAw==",
       "dev": true,
       "dependencies": {
         "@types/yargs": "^17.0.1",
-        "app-builder-lib": "22.14.13",
-        "builder-util": "22.14.13",
-        "builder-util-runtime": "8.9.2",
+        "app-builder-lib": "23.6.0",
+        "builder-util": "23.6.0",
+        "builder-util-runtime": "9.1.1",
         "chalk": "^4.1.1",
-        "dmg-builder": "22.14.13",
+        "dmg-builder": "23.6.0",
         "fs-extra": "^10.0.0",
         "is-ci": "^3.0.0",
         "lazy-val": "^1.0.5",
         "read-config-file": "6.2.0",
-        "update-notifier": "^5.1.0",
-        "yargs": "^17.0.1"
+        "simple-update-notifier": "^1.0.7",
+        "yargs": "^17.5.1"
       },
       "bin": {
         "electron-builder": "cli.js",
@@ -7118,12 +7053,12 @@
       }
     },
     "node_modules/electron-builder/node_modules/builder-util-runtime": {
-      "version": "8.9.2",
-      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz",
-      "integrity": "sha512-rhuKm5vh7E0aAmT6i8aoSfEjxzdYEFX7zDApK+eNgOhjofnWb74d9SRJv0H/8nsgOkos0TZ4zxW0P8J4N7xQ2A==",
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz",
+      "integrity": "sha512-azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw==",
       "dev": true,
       "dependencies": {
-        "debug": "^4.3.2",
+        "debug": "^4.3.4",
         "sax": "^1.2.4"
       },
       "engines": {
@@ -7146,11 +7081,19 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/electron-builder/node_modules/ci-info": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-      "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
-      "dev": true
+    "node_modules/electron-builder/node_modules/cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
     },
     "node_modules/electron-builder/node_modules/color-convert": {
       "version": "2.0.1",
@@ -7187,18 +7130,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/electron-builder/node_modules/is-ci": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.0.tgz",
-      "integrity": "sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ==",
-      "dev": true,
-      "dependencies": {
-        "ci-info": "^3.1.1"
-      },
-      "bin": {
-        "is-ci": "bin.js"
-      }
-    },
     "node_modules/electron-builder/node_modules/jsonfile": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
@@ -7233,36 +7164,37 @@
       }
     },
     "node_modules/electron-builder/node_modules/yargs": {
-      "version": "17.2.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.2.1.tgz",
-      "integrity": "sha512-XfR8du6ua4K6uLGm5S6fA+FIJom/MdJcFNVY8geLlp2v8GYbOXD4EB1tPNZsRn4vBzKGMgb5DRZMeWuFc2GO8Q==",
+      "version": "17.6.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz",
+      "integrity": "sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==",
       "dev": true,
       "dependencies": {
-        "cliui": "^7.0.2",
+        "cliui": "^8.0.1",
         "escalade": "^3.1.1",
         "get-caller-file": "^2.0.5",
         "require-directory": "^2.1.1",
-        "string-width": "^4.2.0",
+        "string-width": "^4.2.3",
         "y18n": "^5.0.5",
-        "yargs-parser": "^20.2.2"
+        "yargs-parser": "^21.1.1"
       },
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/electron-builder/node_modules/yargs-parser": {
-      "version": "20.2.9",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
       "dev": true,
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       }
     },
     "node_modules/electron-osx-sign": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.5.0.tgz",
-      "integrity": "sha512-icoRLHzFz/qxzDh/N4Pi2z4yVHurlsCAYQvsCSG7fCedJ4UJXBS6PoQyGH71IfcqKupcKeK7HX/NkyfG+v6vlQ==",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.6.0.tgz",
+      "integrity": "sha512-+hiIEb2Xxk6eDKJ2FFlpofCnemCbjbT5jz+BKGpVBrRNT3kWTGs4DfNX6IzGwgi33hUcXF+kFs9JW+r6Wc1LRg==",
+      "deprecated": "Please use @electron/osx-sign moving forward. Be aware the API is slightly different",
       "dev": true,
       "dependencies": {
         "bluebird": "^3.5.0",
@@ -7304,18 +7236,18 @@
     "node_modules/electron-osx-sign/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
     "node_modules/electron-publish": {
-      "version": "22.14.13",
-      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.14.13.tgz",
-      "integrity": "sha512-0oP3QiNj3e8ewOaEpEJV/o6Zrmy2VarVvZ/bH7kyO/S/aJf9x8vQsKVWpsdmSiZ5DJEHgarFIXrnO0ZQf0P9iQ==",
+      "version": "23.6.0",
+      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-23.6.0.tgz",
+      "integrity": "sha512-jPj3y+eIZQJF/+t5SLvsI5eS4mazCbNYqatv5JihbqOstIM13k0d1Z3vAWntvtt13Itl61SO6seicWdioOU5dg==",
       "dev": true,
       "dependencies": {
         "@types/fs-extra": "^9.0.11",
-        "builder-util": "22.14.13",
-        "builder-util-runtime": "8.9.2",
+        "builder-util": "23.6.0",
+        "builder-util-runtime": "9.1.1",
         "chalk": "^4.1.1",
         "fs-extra": "^10.0.0",
         "lazy-val": "^1.0.5",
@@ -7338,12 +7270,12 @@
       }
     },
     "node_modules/electron-publish/node_modules/builder-util-runtime": {
-      "version": "8.9.2",
-      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz",
-      "integrity": "sha512-rhuKm5vh7E0aAmT6i8aoSfEjxzdYEFX7zDApK+eNgOhjofnWb74d9SRJv0H/8nsgOkos0TZ4zxW0P8J4N7xQ2A==",
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz",
+      "integrity": "sha512-azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw==",
       "dev": true,
       "dependencies": {
-        "debug": "^4.3.2",
+        "debug": "^4.3.4",
         "sax": "^1.2.4"
       },
       "engines": {
@@ -7379,9 +7311,9 @@
       }
     },
     "node_modules/electron-publish/node_modules/fs-extra": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
-      "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
       "dev": true,
       "dependencies": {
         "graceful-fs": "^4.2.0",
@@ -7592,9 +7524,9 @@
       }
     },
     "node_modules/engine.io": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.1.2.tgz",
-      "integrity": "sha512-v/7eGHxPvO2AWsksyx2PUsQvBafuvqs0jJJQ0FdmJG1b9qIvgSbqDRGwNhfk2XHaTTbTXiC4quRE8Q9nRjsrQQ==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.1.tgz",
+      "integrity": "sha512-ECceEFcAaNRybd3lsGQKas3ZlMVjN3cyWwMP25D2i0zWfyiytVbTpRPa34qrr+FHddtpBVOmq4H/DCv1O0lZRA==",
       "dev": true,
       "dependencies": {
         "@types/cookie": "^0.4.1",
@@ -7605,7 +7537,7 @@
         "cookie": "~0.4.1",
         "cors": "~2.8.5",
         "debug": "~4.3.1",
-        "engine.io-parser": "~5.0.0",
+        "engine.io-parser": "~5.0.3",
         "ws": "~8.2.3"
       },
       "engines": {
@@ -7613,13 +7545,10 @@
       }
     },
     "node_modules/engine.io-parser": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.3.tgz",
-      "integrity": "sha512-BtQxwF27XUNnSafQLvDi0dQ8s3i6VgzSoQMJacpIcGNrlUdfHSKbgm3jmjCVvQluGzqwujQMPAoMai3oYSTurg==",
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.6.tgz",
+      "integrity": "sha512-tjuoZDMAdEhVnSFleYPCtdL2GXwVTGtNjoeJd9IhIG3C1xs9uwxqRNEu5WpnDZCaozwVlK/nuQhpodhXSIMaxw==",
       "dev": true,
-      "dependencies": {
-        "@socket.io/base64-arraybuffer": "~1.0.2"
-      },
       "engines": {
         "node": ">=10.0.0"
       }
@@ -7769,15 +7698,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/escape-goat": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz",
-      "integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
@@ -8086,12 +8006,6 @@
         "eslint": ">=7.23.0"
       }
     },
-    "node_modules/eslint-plugin-unicorn/node_modules/ci-info": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.1.1.tgz",
-      "integrity": "sha512-kdRWLBIJwdsYJWYJFtAFFYxybguqeF91qpZaggjG5Nf8QKdizFG2hjqvaTXbxFIcYbSaD74KpAXv6BSm17DHEQ==",
-      "dev": true
-    },
     "node_modules/eslint-plugin-unicorn/node_modules/find-up": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
@@ -8644,7 +8558,7 @@
     "node_modules/etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
       "dev": true,
       "engines": {
         "node": ">= 0.6"
@@ -8880,38 +8794,39 @@
       }
     },
     "node_modules/express": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
-      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
+      "version": "4.18.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
       "dev": true,
       "dependencies": {
-        "accepts": "~1.3.7",
+        "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.19.0",
-        "content-disposition": "0.5.3",
+        "body-parser": "1.20.1",
+        "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.4.0",
+        "cookie": "0.5.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
+        "depd": "2.0.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
+        "finalhandler": "1.2.0",
         "fresh": "0.5.2",
+        "http-errors": "2.0.0",
         "merge-descriptors": "1.0.1",
         "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.5",
-        "qs": "6.7.0",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.11.0",
         "range-parser": "~1.2.1",
-        "safe-buffer": "5.1.2",
-        "send": "0.17.1",
-        "serve-static": "1.14.1",
-        "setprototypeof": "1.1.1",
-        "statuses": "~1.5.0",
+        "safe-buffer": "5.2.1",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
         "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
@@ -8927,9 +8842,9 @@
       "dev": true
     },
     "node_modules/express/node_modules/cookie": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
-      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
       "dev": true,
       "engines": {
         "node": ">= 0.6"
@@ -8944,12 +8859,80 @@
         "ms": "2.0.0"
       }
     },
+    "node_modules/express/node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/express/node_modules/finalhandler": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+      "dev": true,
+      "dependencies": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "statuses": "2.0.1",
+        "unpipe": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/express/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
       "dev": true
     },
+    "node_modules/express/node_modules/on-finished": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+      "dev": true,
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/express/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/express/node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/ext-list": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz",
@@ -9072,9 +9055,9 @@
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
     },
     "node_modules/extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz",
+      "integrity": "sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==",
       "dev": true,
       "engines": [
         "node >=0.6.0"
@@ -9252,9 +9235,9 @@
       "optional": true
     },
     "node_modules/filelist": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.3.tgz",
-      "integrity": "sha512-LwjCsruLWQULGYKy7TX0OPtrL9kLpojOFKc5VCTxdFTV7w5zbsgqVKfnkKG7Qgjtq50gKfO56hJv88OfcGb70Q==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
+      "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
       "dev": true,
       "dependencies": {
         "minimatch": "^5.0.1"
@@ -9270,9 +9253,9 @@
       }
     },
     "node_modules/filelist/node_modules/minimatch": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
-      "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
       "dev": true,
       "dependencies": {
         "brace-expansion": "^2.0.1"
@@ -9826,9 +9809,9 @@
       }
     },
     "node_modules/forwarded": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
       "dev": true,
       "engines": {
         "node": ">= 0.6"
@@ -9849,7 +9832,7 @@
     "node_modules/fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
       "dev": true,
       "engines": {
         "node": ">= 0.6"
@@ -10127,30 +10110,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/global-dirs": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.0.tgz",
-      "integrity": "sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==",
-      "dev": true,
-      "dependencies": {
-        "ini": "2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/global-dirs/node_modules/ini": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz",
-      "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/global-modules": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
@@ -10494,15 +10453,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/has-yarn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz",
-      "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/hash-base": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
@@ -10689,7 +10639,7 @@
     "node_modules/html-webpack-plugin": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz",
-      "integrity": "sha1-sBq71yOsqqeze2r0SS69oD2d03s=",
+      "integrity": "sha512-Br4ifmjQojUP4EmHnRBoUIYcZ9J7M4bTMcm7u6xoIAIuq2Nte4TzXX0533owvkQKQD1WeMTTTyD4Ni4QKxS0Bg==",
       "deprecated": "3.x is no longer supported",
       "dev": true,
       "dependencies": {
@@ -10729,7 +10679,7 @@
     "node_modules/html-webpack-plugin/node_modules/json5": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+      "integrity": "sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==",
       "dev": true,
       "bin": {
         "json5": "lib/cli.js"
@@ -10738,7 +10688,7 @@
     "node_modules/html-webpack-plugin/node_modules/loader-utils": {
       "version": "0.2.17",
       "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
-      "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
+      "integrity": "sha512-tiv66G0SmiOx+pLWMtGEkfSEejxvb6N6uRrQjfWJIT79W9GMpgKeCAmm9aVBKtd4WEgntciI8CsGqjpDoCWJug==",
       "dev": true,
       "dependencies": {
         "big.js": "^3.1.3",
@@ -10822,26 +10772,38 @@
       "dev": true
     },
     "node_modules/http-errors": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
-      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
       "dev": true,
       "dependencies": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.1",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.0"
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/http-errors/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-      "dev": true
+    "node_modules/http-errors/node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/http-errors/node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
     "node_modules/http-parser-js": {
       "version": "0.5.3",
@@ -10951,6 +10913,7 @@
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
       "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dev": true,
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3"
       },
@@ -11170,6 +11133,14 @@
         "node": ">=6"
       }
     },
+    "node_modules/internmap": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
+      "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/interpret": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
@@ -11372,12 +11343,12 @@
       }
     },
     "node_modules/is-ci": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz",
+      "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==",
       "dev": true,
       "dependencies": {
-        "ci-info": "^2.0.0"
+        "ci-info": "^3.2.0"
       },
       "bin": {
         "is-ci": "bin.js"
@@ -11505,22 +11476,6 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/is-installed-globally": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz",
-      "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==",
-      "dev": true,
-      "dependencies": {
-        "global-dirs": "^3.0.0",
-        "is-path-inside": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/is-natural-number": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz",
@@ -11538,18 +11493,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-npm": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-5.0.0.tgz",
-      "integrity": "sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/is-number": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -11592,15 +11535,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-obj": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
-      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/is-object": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz",
@@ -11642,15 +11576,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/is-path-inside": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz",
-      "integrity": "sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/is-plain-obj": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
@@ -11754,12 +11679,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-yarn-global": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz",
-      "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==",
-      "dev": true
-    },
     "node_modules/isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -12198,13 +12117,10 @@
       "dev": true
     },
     "node_modules/json5": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-      "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
       "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
       "bin": {
         "json5": "lib/cli.js"
       },
@@ -12693,18 +12609,6 @@
       "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz",
       "integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A=="
     },
-    "node_modules/latest-version": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz",
-      "integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==",
-      "dev": true,
-      "dependencies": {
-        "package-json": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/lazy-val": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.5.tgz",
@@ -12797,9 +12701,9 @@
       }
     },
     "node_modules/loader-utils/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
       "dev": true,
       "dependencies": {
         "minimist": "^1.2.0"
@@ -12962,9 +12866,9 @@
       }
     },
     "node_modules/luxon": {
-      "version": "1.26.0",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-1.26.0.tgz",
-      "integrity": "sha512-+V5QIQ5f6CDXQpWNICELwjwuHdqeJM1UenlZWx5ujcRMc9venvluCjFb4t5NYLhb6IhkbMVOxzVuOqkgMxee2A==",
+      "version": "1.28.1",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-1.28.1.tgz",
+      "integrity": "sha512-gYHAa180mKrNIUJCbwpmD0aTu9kV0dREDrwNnuyFAsO1Wt0EVYSZelPnJlbj9HplzXX/YWXHFTL45kvZ53M0pw==",
       "engines": {
         "node": "*"
       }
@@ -13452,19 +13356,19 @@
       }
     },
     "node_modules/mime-db": {
-      "version": "1.46.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.46.0.tgz",
-      "integrity": "sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ==",
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/mime-types": {
-      "version": "2.1.29",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.29.tgz",
-      "integrity": "sha512-Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ==",
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "dependencies": {
-        "mime-db": "1.46.0"
+        "mime-db": "1.52.0"
       },
       "engines": {
         "node": ">= 0.6"
@@ -13531,9 +13435,9 @@
       "dev": true
     },
     "node_modules/minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -13813,9 +13717,9 @@
       "dev": true
     },
     "node_modules/negotiator": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
-      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
       "dev": true,
       "engines": {
         "node": ">= 0.6"
@@ -14784,118 +14688,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/package-json": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz",
-      "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==",
-      "dev": true,
-      "dependencies": {
-        "got": "^9.6.0",
-        "registry-auth-token": "^4.0.0",
-        "registry-url": "^5.0.0",
-        "semver": "^6.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/package-json/node_modules/@sindresorhus/is": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
-      "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/package-json/node_modules/cacheable-request": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
-      "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==",
-      "dev": true,
-      "dependencies": {
-        "clone-response": "^1.0.2",
-        "get-stream": "^5.1.0",
-        "http-cache-semantics": "^4.0.0",
-        "keyv": "^3.0.0",
-        "lowercase-keys": "^2.0.0",
-        "normalize-url": "^4.1.0",
-        "responselike": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/package-json/node_modules/cacheable-request/node_modules/get-stream": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-      "dev": true,
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/package-json/node_modules/cacheable-request/node_modules/lowercase-keys": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/package-json/node_modules/got": {
-      "version": "9.6.0",
-      "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
-      "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==",
-      "dev": true,
-      "dependencies": {
-        "@sindresorhus/is": "^0.14.0",
-        "@szmarczak/http-timer": "^1.1.2",
-        "cacheable-request": "^6.0.0",
-        "decompress-response": "^3.3.0",
-        "duplexer3": "^0.1.4",
-        "get-stream": "^4.1.0",
-        "lowercase-keys": "^1.0.1",
-        "mimic-response": "^1.0.1",
-        "p-cancelable": "^1.0.0",
-        "to-readable-stream": "^1.0.0",
-        "url-parse-lax": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/package-json/node_modules/http-cache-semantics": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
-      "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==",
-      "dev": true
-    },
-    "node_modules/package-json/node_modules/normalize-url": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
-      "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/package-json/node_modules/p-cancelable": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
-      "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/pako": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
@@ -15280,13 +15072,13 @@
       }
     },
     "node_modules/plist": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.5.tgz",
-      "integrity": "sha512-83vX4eYdQp3vP9SxuYgEM/G/pJQqLUz/V/xzPrzruLs7fz7jxGQ1msZ/mg1nwZxUSuOp4sb+/bEIbRrbzZRxDA==",
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.6.tgz",
+      "integrity": "sha512-WiIVYyrp8TD4w8yCvyeIr+lkmrGRd5u0VbRnU+tP/aRLxP/YadJUYOMZJ/6hIa3oUyVCsycXvtNRgd5XBJIbiA==",
       "dev": true,
       "dependencies": {
         "base64-js": "^1.5.1",
-        "xmlbuilder": "^9.0.7"
+        "xmlbuilder": "^15.1.1"
       },
       "engines": {
         "node": ">=6"
@@ -15633,12 +15425,12 @@
       "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk="
     },
     "node_modules/proxy-addr": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
-      "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
       "dev": true,
       "dependencies": {
-        "forwarded": "~0.1.2",
+        "forwarded": "0.2.0",
         "ipaddr.js": "1.9.1"
       },
       "engines": {
@@ -15731,18 +15523,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/pupa": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz",
-      "integrity": "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==",
-      "dev": true,
-      "dependencies": {
-        "escape-goat": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/qjobs": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz",
@@ -15753,12 +15533,18 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
       "dev": true,
+      "dependencies": {
+        "side-channel": "^1.0.4"
+      },
       "engines": {
         "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/query-string": {
@@ -15856,13 +15642,13 @@
       }
     },
     "node_modules/raw-body": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
-      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
       "dev": true,
       "dependencies": {
-        "bytes": "3.1.0",
-        "http-errors": "1.7.2",
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "unpipe": "1.0.0"
       },
@@ -16274,30 +16060,6 @@
         "node": ">=0.1.14"
       }
     },
-    "node_modules/registry-auth-token": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.1.tgz",
-      "integrity": "sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==",
-      "dev": true,
-      "dependencies": {
-        "rc": "^1.2.8"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/registry-url": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz",
-      "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==",
-      "dev": true,
-      "dependencies": {
-        "rc": "^1.2.8"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/relateurl": {
       "version": "0.2.7",
       "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
@@ -16751,6 +16513,11 @@
         "node": ">=8.0"
       }
     },
+    "node_modules/robust-predicates": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.1.tgz",
+      "integrity": "sha512-ndEIpszUHiG4HtDsQLeIuMvRsDnn8c8rYStabochtUeCvfuvNptb5TUbVD68LRAILPX7p9nqQGh4xJgn3EHS/g=="
+    },
     "node_modules/run-parallel": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
@@ -16786,7 +16553,7 @@
     "node_modules/rw": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
-      "integrity": "sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q="
+      "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ=="
     },
     "node_modules/rxjs": {
       "version": "6.6.7",
@@ -16885,9 +16652,9 @@
       }
     },
     "node_modules/sass-loader/node_modules/loader-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-      "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
       "dev": true,
       "dependencies": {
         "big.js": "^5.2.2",
@@ -17010,37 +16777,25 @@
       "dev": true,
       "optional": true
     },
-    "node_modules/semver-diff": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz",
-      "integrity": "sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==",
-      "dev": true,
-      "dependencies": {
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/send": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
-      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "dev": true,
       "dependencies": {
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "~1.7.2",
+        "http-errors": "2.0.0",
         "mime": "1.6.0",
-        "ms": "2.1.1",
-        "on-finished": "~2.3.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
         "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
+        "statuses": "2.0.1"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -17058,9 +16813,18 @@
     "node_modules/send/node_modules/debug/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
+    "node_modules/send/node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/send/node_modules/mime": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
@@ -17074,11 +16838,32 @@
       }
     },
     "node_modules/send/node_modules/ms": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-      "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "dev": true
     },
+    "node_modules/send/node_modules/on-finished": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+      "dev": true,
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/send/node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/serialize-error": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz",
@@ -17178,15 +16963,15 @@
       "dev": true
     },
     "node_modules/serve-static": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
-      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
       "dev": true,
       "dependencies": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.17.1"
+        "send": "0.18.0"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -17240,9 +17025,9 @@
       "dev": true
     },
     "node_modules/setprototypeof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
       "dev": true
     },
     "node_modules/sha.js": {
@@ -17296,6 +17081,20 @@
       "resolved": "https://registry.npmjs.org/shimmer/-/shimmer-1.2.1.tgz",
       "integrity": "sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw=="
     },
+    "node_modules/side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/signal-exit": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
@@ -17365,6 +17164,27 @@
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
       "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
     },
+    "node_modules/simple-update-notifier": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz",
+      "integrity": "sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==",
+      "dev": true,
+      "dependencies": {
+        "semver": "~7.0.0"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/simple-update-notifier/node_modules/semver": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
+      "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
     "node_modules/slash": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
@@ -17649,36 +17469,35 @@
       }
     },
     "node_modules/socket.io": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.4.1.tgz",
-      "integrity": "sha512-s04vrBswdQBUmuWJuuNTmXUVJhP0cVky8bBDhdkf8y0Ptsu7fKU2LuLbts9g+pdmAdyMMn8F/9Mf1/wbtUN0fg==",
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.4.tgz",
+      "integrity": "sha512-m3GC94iK9MfIEeIBfbhJs5BqFibMtkRk8ZpKwG2QwxV0m/eEhPIV4ara6XCF1LWNAus7z58RodiZlAH71U3EhQ==",
       "dev": true,
       "dependencies": {
         "accepts": "~1.3.4",
         "base64id": "~2.0.0",
         "debug": "~4.3.2",
-        "engine.io": "~6.1.0",
-        "socket.io-adapter": "~2.3.3",
-        "socket.io-parser": "~4.0.4"
+        "engine.io": "~6.2.1",
+        "socket.io-adapter": "~2.4.0",
+        "socket.io-parser": "~4.2.1"
       },
       "engines": {
         "node": ">=10.0.0"
       }
     },
     "node_modules/socket.io-adapter": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.3.3.tgz",
-      "integrity": "sha512-Qd/iwn3VskrpNO60BeRyCyr8ZWw9CPZyitW4AQwmRZ8zCiyDiL+znRnWX6tDHXnWn1sJrM1+b6Mn6wEDJJ4aYQ==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz",
+      "integrity": "sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg==",
       "dev": true
     },
     "node_modules/socket.io-parser": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.5.tgz",
-      "integrity": "sha512-sNjbT9dX63nqUFIOv95tTVm6elyIU4RvB1m8dOeZt+IgWwcWklFDOdmGcfo3zSiRsnR/3pJkjY5lfoGqEe4Eig==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.2.tgz",
+      "integrity": "sha512-DJtziuKypFkMMHCm2uIshOYC7QaylbtzQwiMYDuCKy3OPkjLzu4B2vAhTlqipRHHzrI0NJeBAizTK7X+6m1jVw==",
       "dev": true,
       "dependencies": {
-        "@types/component-emitter": "^1.2.10",
-        "component-emitter": "~1.3.0",
+        "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.3.1"
       },
       "engines": {
@@ -19133,9 +18952,9 @@
       }
     },
     "node_modules/temp-file/node_modules/fs-extra": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
-      "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
       "dev": true,
       "dependencies": {
         "graceful-fs": "^4.2.0",
@@ -19647,9 +19466,9 @@
       }
     },
     "node_modules/toidentifier": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
       "dev": true,
       "engines": {
         "node": ">=0.6"
@@ -19744,7 +19563,7 @@
     "node_modules/truncate-utf8-bytes": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz",
-      "integrity": "sha1-QFkjkJWS1W94pYGENLC3hInKXys=",
+      "integrity": "sha512-95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ==",
       "dev": true,
       "dependencies": {
         "utf8-byte-length": "^1.0.1"
@@ -19816,9 +19635,9 @@
       }
     },
     "node_modules/tsconfig-paths/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
       "dev": true,
       "dependencies": {
         "minimist": "^1.2.0"
@@ -20091,18 +19910,6 @@
         "imurmurhash": "^0.1.4"
       }
     },
-    "node_modules/unique-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
-      "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
-      "dev": true,
-      "dependencies": {
-        "crypto-random-string": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/unist-util-find-all-after": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz",
@@ -20215,122 +20022,6 @@
         "yarn": "*"
       }
     },
-    "node_modules/update-notifier": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-5.1.0.tgz",
-      "integrity": "sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw==",
-      "dev": true,
-      "dependencies": {
-        "boxen": "^5.0.0",
-        "chalk": "^4.1.0",
-        "configstore": "^5.0.1",
-        "has-yarn": "^2.1.0",
-        "import-lazy": "^2.1.0",
-        "is-ci": "^2.0.0",
-        "is-installed-globally": "^0.4.0",
-        "is-npm": "^5.0.0",
-        "is-yarn-global": "^0.3.0",
-        "latest-version": "^5.1.0",
-        "pupa": "^2.1.1",
-        "semver": "^7.3.4",
-        "semver-diff": "^3.1.1",
-        "xdg-basedir": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/yeoman/update-notifier?sponsor=1"
-      }
-    },
-    "node_modules/update-notifier/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/update-notifier/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/update-notifier/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/update-notifier/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/update-notifier/node_modules/import-lazy": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
-      "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/update-notifier/node_modules/semver": {
-      "version": "7.3.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
-      "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/update-notifier/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/upper-case": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
@@ -20440,7 +20131,7 @@
     "node_modules/utf8-byte-length": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz",
-      "integrity": "sha1-9F8VDExm7uloGGUFq5P8u4rWv2E=",
+      "integrity": "sha512-4+wkEYLBbWxqTahEsWrhxepcoVOJ+1z5PGIjPZxRkytcdSUaNjIjBM7Xn8E+pdSuV7SzvWovBFA54FO0JSoqhA==",
       "dev": true
     },
     "node_modules/util": {
@@ -20524,18 +20215,18 @@
       }
     },
     "node_modules/verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.1.tgz",
+      "integrity": "sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg==",
       "dev": true,
-      "engines": [
-        "node >=0.6.0"
-      ],
       "optional": true,
       "dependencies": {
         "assert-plus": "^1.0.0",
         "core-util-is": "1.0.2",
         "extsprintf": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=0.6.0"
       }
     },
     "node_modules/vfile": {
@@ -21683,18 +21374,6 @@
         "string-width": "^1.0.2 || 2 || 3 || 4"
       }
     },
-    "node_modules/widest-line": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
-      "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/winston": {
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/winston/-/winston-3.3.3.tgz",
@@ -21973,15 +21652,6 @@
         }
       }
     },
-    "node_modules/xdg-basedir": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
-      "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/xhr2": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/xhr2/-/xhr2-0.2.1.tgz",
@@ -22011,12 +21681,12 @@
       }
     },
     "node_modules/xmlbuilder": {
-      "version": "9.0.7",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
-      "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=",
+      "version": "15.1.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz",
+      "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==",
       "dev": true,
       "engines": {
-        "node": ">=4.0"
+        "node": ">=8.0"
       }
     },
     "node_modules/xtend": {
@@ -22898,16 +22568,18 @@
       }
     },
     "@electron/universal": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-1.0.5.tgz",
-      "integrity": "sha512-zX9O6+jr2NMyAdSkwEUlyltiI4/EBLu2Ls/VD3pUQdi3cAYeYfdQnT2AJJ38HE4QxLccbU13LSpccw1IWlkyag==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-1.2.1.tgz",
+      "integrity": "sha512-7323HyMh7KBAl/nPDppdLsC87G6RwRU02dy5FPeGB1eS7rUePh55+WNWiDPLhFQqqVPHzh77M69uhmoT8XnwMQ==",
       "dev": true,
       "requires": {
         "@malept/cross-spawn-promise": "^1.1.0",
-        "asar": "^3.0.3",
+        "asar": "^3.1.0",
         "debug": "^4.3.1",
         "dir-compare": "^2.4.0",
-        "fs-extra": "^9.0.1"
+        "fs-extra": "^9.0.1",
+        "minimatch": "^3.0.4",
+        "plist": "^3.0.4"
       },
       "dependencies": {
         "fs-extra": {
@@ -23189,10 +22861,10 @@
       "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz",
       "integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow=="
     },
-    "@socket.io/base64-arraybuffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@socket.io/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
-      "integrity": "sha512-dOlCBKnDw4iShaIsH/bxujKTM18+2TOAsYz+KSc11Am38H4q5Xw8Bbz97ZYdrVNM+um3p7w86Bvvmcn9q+5+eQ==",
+    "@socket.io/component-emitter": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",
+      "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==",
       "dev": true
     },
     "@stylelint/postcss-css-in-js": {
@@ -23228,12 +22900,6 @@
         "moment": "^2.10.2"
       }
     },
-    "@types/component-emitter": {
-      "version": "1.2.11",
-      "resolved": "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.11.tgz",
-      "integrity": "sha512-SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ==",
-      "dev": true
-    },
     "@types/cookie": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz",
@@ -23241,48 +22907,50 @@
       "dev": true
     },
     "@types/cors": {
-      "version": "2.8.12",
-      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz",
-      "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==",
-      "dev": true
-    },
-    "@types/d3": {
-      "version": "5.16.4",
-      "resolved": "https://registry.npmjs.org/@types/d3/-/d3-5.16.4.tgz",
-      "integrity": "sha512-2u0O9iP1MubFiQ+AhR1id4Egs+07BLtvRATG6IL2Gs9+KzdrfaxCKNq5hxEyw1kxwsqB/lCgr108XuHcKtb/5w==",
+      "version": "2.8.13",
+      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.13.tgz",
+      "integrity": "sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA==",
       "dev": true,
       "requires": {
-        "@types/d3-array": "^1",
-        "@types/d3-axis": "^1",
-        "@types/d3-brush": "^1",
-        "@types/d3-chord": "^1",
-        "@types/d3-collection": "*",
-        "@types/d3-color": "^1",
-        "@types/d3-contour": "^1",
-        "@types/d3-dispatch": "^1",
-        "@types/d3-drag": "^1",
-        "@types/d3-dsv": "^1",
-        "@types/d3-ease": "^1",
-        "@types/d3-fetch": "^1",
-        "@types/d3-force": "^1",
-        "@types/d3-format": "^1",
-        "@types/d3-geo": "^1",
-        "@types/d3-hierarchy": "^1",
-        "@types/d3-interpolate": "^1",
-        "@types/d3-path": "^1",
-        "@types/d3-polygon": "^1",
-        "@types/d3-quadtree": "^1",
-        "@types/d3-random": "^1",
-        "@types/d3-scale": "^2",
-        "@types/d3-scale-chromatic": "^1",
-        "@types/d3-selection": "^1",
-        "@types/d3-shape": "^1",
-        "@types/d3-time": "^1",
-        "@types/d3-time-format": "^2",
-        "@types/d3-timer": "^1",
-        "@types/d3-transition": "^1",
-        "@types/d3-voronoi": "*",
-        "@types/d3-zoom": "^1"
+        "@types/node": "*"
+      }
+    },
+    "@types/d3": {
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@types/d3/-/d3-7.4.0.tgz",
+      "integrity": "sha512-jIfNVK0ZlxcuRDKtRS/SypEyOQ6UHaFQBKv032X45VvxSJ6Yi5G9behy9h6tNTHTDGh5Vq+KbmBjUWLgY4meCA==",
+      "dev": true,
+      "requires": {
+        "@types/d3-array": "*",
+        "@types/d3-axis": "*",
+        "@types/d3-brush": "*",
+        "@types/d3-chord": "*",
+        "@types/d3-color": "*",
+        "@types/d3-contour": "*",
+        "@types/d3-delaunay": "*",
+        "@types/d3-dispatch": "*",
+        "@types/d3-drag": "*",
+        "@types/d3-dsv": "*",
+        "@types/d3-ease": "*",
+        "@types/d3-fetch": "*",
+        "@types/d3-force": "*",
+        "@types/d3-format": "*",
+        "@types/d3-geo": "*",
+        "@types/d3-hierarchy": "*",
+        "@types/d3-interpolate": "*",
+        "@types/d3-path": "*",
+        "@types/d3-polygon": "*",
+        "@types/d3-quadtree": "*",
+        "@types/d3-random": "*",
+        "@types/d3-scale": "*",
+        "@types/d3-scale-chromatic": "*",
+        "@types/d3-selection": "*",
+        "@types/d3-shape": "*",
+        "@types/d3-time": "*",
+        "@types/d3-time-format": "*",
+        "@types/d3-timer": "*",
+        "@types/d3-transition": "*",
+        "@types/d3-zoom": "*"
       }
     },
     "@types/d3-array": {
@@ -23298,6 +22966,14 @@
       "dev": true,
       "requires": {
         "@types/d3-selection": "^1"
+      },
+      "dependencies": {
+        "@types/d3-selection": {
+          "version": "1.4.3",
+          "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-1.4.3.tgz",
+          "integrity": "sha512-GjKQWVZO6Sa96HiKO6R93VBE8DUW+DDkFpIMf9vpY5S78qZTlRRSNUsHr/afDpF7TvLDV7VxrUFOWW7vdIlYkA==",
+          "dev": true
+        }
       }
     },
     "@types/d3-brush": {
@@ -23307,6 +22983,14 @@
       "dev": true,
       "requires": {
         "@types/d3-selection": "^1"
+      },
+      "dependencies": {
+        "@types/d3-selection": {
+          "version": "1.4.3",
+          "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-1.4.3.tgz",
+          "integrity": "sha512-GjKQWVZO6Sa96HiKO6R93VBE8DUW+DDkFpIMf9vpY5S78qZTlRRSNUsHr/afDpF7TvLDV7VxrUFOWW7vdIlYkA==",
+          "dev": true
+        }
       }
     },
     "@types/d3-chord": {
@@ -23315,12 +22999,6 @@
       "integrity": "sha512-U6YojfET6ITL1/bUJo+/Lh3pMV9XPAfOWwbshl3y3RlgAX9VO/Bxa13IMAylZIDY4VsA3Gkh29kZP1AcAeyoYA==",
       "dev": true
     },
-    "@types/d3-collection": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/@types/d3-collection/-/d3-collection-1.0.10.tgz",
-      "integrity": "sha512-54Fdv8u5JbuXymtmXm2SYzi1x/Svt+jfWBU5junkhrCewL92VjqtCBDn97coBRVwVFmYNnVTNDyV8gQyPYfm+A==",
-      "dev": true
-    },
     "@types/d3-color": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-1.4.1.tgz",
@@ -23337,6 +23015,12 @@
         "@types/geojson": "*"
       }
     },
+    "@types/d3-delaunay": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-delaunay/-/d3-delaunay-6.0.1.tgz",
+      "integrity": "sha512-tLxQ2sfT0p6sxdG75c6f/ekqxjyYR0+LwPrsO1mbC9YDBzPJhs2HbJJRrn8Ez1DBoHRo2yx7YEATI+8V1nGMnQ==",
+      "dev": true
+    },
     "@types/d3-dispatch": {
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/@types/d3-dispatch/-/d3-dispatch-1.0.9.tgz",
@@ -23350,6 +23034,14 @@
       "dev": true,
       "requires": {
         "@types/d3-selection": "^1"
+      },
+      "dependencies": {
+        "@types/d3-selection": {
+          "version": "1.4.3",
+          "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-1.4.3.tgz",
+          "integrity": "sha512-GjKQWVZO6Sa96HiKO6R93VBE8DUW+DDkFpIMf9vpY5S78qZTlRRSNUsHr/afDpF7TvLDV7VxrUFOWW7vdIlYkA==",
+          "dev": true
+        }
       }
     },
     "@types/d3-dsv": {
@@ -23449,9 +23141,9 @@
       "dev": true
     },
     "@types/d3-selection": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-1.4.3.tgz",
-      "integrity": "sha512-GjKQWVZO6Sa96HiKO6R93VBE8DUW+DDkFpIMf9vpY5S78qZTlRRSNUsHr/afDpF7TvLDV7VxrUFOWW7vdIlYkA==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-3.0.4.tgz",
+      "integrity": "sha512-ZeykX7286BCyMg9sH5fIAORyCB6hcATPSRQpN47jwBA2bMbAT0s+EvtDP5r1FZYJ95R8QoEE1CKJX+n0/M5Vhg==",
       "dev": true
     },
     "@types/d3-shape": {
@@ -23482,20 +23174,14 @@
       "dev": true
     },
     "@types/d3-transition": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@types/d3-transition/-/d3-transition-1.3.1.tgz",
-      "integrity": "sha512-U9CpMlTL/NlqdGXBlHYxTZwbmy/vN1cFv8TuAIFPX+xOW/1iChbeJBY2xmINhDQfkGJbgkH4IovafCwI1ZDrgg==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-transition/-/d3-transition-3.0.3.tgz",
+      "integrity": "sha512-/S90Od8Id1wgQNvIA8iFv9jRhCiZcGhPd2qX0bKF/PS+y0W5CrXKgIiELd2CvG1mlQrWK/qlYh3VxicqG1ZvgA==",
       "dev": true,
       "requires": {
-        "@types/d3-selection": "^1"
+        "@types/d3-selection": "*"
       }
     },
-    "@types/d3-voronoi": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/@types/d3-voronoi/-/d3-voronoi-1.1.9.tgz",
-      "integrity": "sha512-DExNQkaHd1F3dFPvGA/Aw2NGyjMln6E9QzsiqOcBgnE+VInYnFBHBBySbZQts6z6xD+5jTfKCP7M4OqMyVjdwQ==",
-      "dev": true
-    },
     "@types/d3-zoom": {
       "version": "1.8.2",
       "resolved": "https://registry.npmjs.org/@types/d3-zoom/-/d3-zoom-1.8.2.tgz",
@@ -23504,6 +23190,14 @@
       "requires": {
         "@types/d3-interpolate": "^1",
         "@types/d3-selection": "^1"
+      },
+      "dependencies": {
+        "@types/d3-selection": {
+          "version": "1.4.3",
+          "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-1.4.3.tgz",
+          "integrity": "sha512-GjKQWVZO6Sa96HiKO6R93VBE8DUW+DDkFpIMf9vpY5S78qZTlRRSNUsHr/afDpF7TvLDV7VxrUFOWW7vdIlYkA==",
+          "dev": true
+        }
       }
     },
     "@types/debug": {
@@ -23583,9 +23277,9 @@
       "dev": true
     },
     "@types/luxon": {
-      "version": "1.26.1",
-      "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-1.26.1.tgz",
-      "integrity": "sha512-VW+JT7SDiSKjQss7iX/3bB8CUwSqzhKuW8EcyhzFTb/mwbIkcm92cPmok5FDWYz5TskB/tWFK/mn2ByHCf44AQ==",
+      "version": "1.27.1",
+      "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-1.27.1.tgz",
+      "integrity": "sha512-cPiXpOvPFDr2edMnOXlz3UBDApwUfR+cpizvxCy0n3vp9bz/qe8BWzHPIEFcy+ogUOyjKuCISgyq77ELZPmkkg==",
       "dev": true
     },
     "@types/mdast": {
@@ -23662,15 +23356,6 @@
       "requires": {
         "@types/node": "*",
         "xmlbuilder": ">=11.0.1"
-      },
-      "dependencies": {
-        "xmlbuilder": {
-          "version": "15.1.1",
-          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz",
-          "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==",
-          "dev": true,
-          "optional": true
-        }
       }
     },
     "@types/proxyquire": {
@@ -23711,9 +23396,9 @@
       "dev": true
     },
     "@types/verror": {
-      "version": "1.10.5",
-      "resolved": "https://registry.npmjs.org/@types/verror/-/verror-1.10.5.tgz",
-      "integrity": "sha512-9UjMCHK5GPgQRoNbqdLIAvAy0EInuiqbW0PBMtVP6B5B2HQJlvoJHM+KodPZMEjOa5VkSc+5LH7xy+cUzQdmHw==",
+      "version": "1.10.6",
+      "resolved": "https://registry.npmjs.org/@types/verror/-/verror-1.10.6.tgz",
+      "integrity": "sha512-NNm+gdePAX1VGvPcGZCDKQZKYSiAWigKhKaz5KF94hG6f2s8de9Ow5+7AbXoeKxL8gavZfk4UquSAygOF2duEQ==",
       "dev": true,
       "optional": true
     },
@@ -24040,13 +23725,13 @@
       "dev": true
     },
     "accepts": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
-      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
       "dev": true,
       "requires": {
-        "mime-types": "~2.1.24",
-        "negotiator": "0.6.2"
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
       }
     },
     "acorn": {
@@ -24109,7 +23794,7 @@
     "angular2-template-loader": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/angular2-template-loader/-/angular2-template-loader-0.6.2.tgz",
-      "integrity": "sha1-wNROkP/w+sleiyPwQ6zaf9HFHXw=",
+      "integrity": "sha512-jBSrm2yDsTA48GG0H57upn8rmTfJS3/R7EhUeAL/3ryWS8deT9You8UQKWpW4eVSEY7uMJ52iFwpOYXc8QEtGg==",
       "dev": true,
       "requires": {
         "loader-utils": "^0.2.15"
@@ -24130,13 +23815,13 @@
         "json5": {
           "version": "0.5.1",
           "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-          "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+          "integrity": "sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==",
           "dev": true
         },
         "loader-utils": {
           "version": "0.2.17",
           "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
-          "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
+          "integrity": "sha512-tiv66G0SmiOx+pLWMtGEkfSEejxvb6N6uRrQjfWJIT79W9GMpgKeCAmm9aVBKtd4WEgntciI8CsGqjpDoCWJug==",
           "dev": true,
           "requires": {
             "big.js": "^3.1.3",
@@ -24147,43 +23832,6 @@
         }
       }
     },
-    "ansi-align": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz",
-      "integrity": "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==",
-      "dev": true,
-      "requires": {
-        "string-width": "^3.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        }
-      }
-    },
     "ansi-colors": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
@@ -24219,41 +23867,42 @@
       }
     },
     "app-builder-bin": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.7.1.tgz",
-      "integrity": "sha512-ql93vEUq6WsstGXD+SBLSIQw6SNnhbDEM0swzgugytMxLp3rT24Ag/jcC80ZHxiPRTdew1niuR7P3/FCrDqIjw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-4.0.0.tgz",
+      "integrity": "sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA==",
       "dev": true
     },
     "app-builder-lib": {
-      "version": "22.14.13",
-      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.14.13.tgz",
-      "integrity": "sha512-SufmrtxU+D0Tn948fjEwAOlCN9757UXLkzzTWXMwZKR/5hisvgqeeBepWfphMIE6OkDGz0fbzEhL1P2Pty4XMg==",
+      "version": "23.6.0",
+      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-23.6.0.tgz",
+      "integrity": "sha512-dQYDuqm/rmy8GSCE6Xl/3ShJg6Ab4bZJMT8KaTKGzT436gl1DN4REP3FCWfXoh75qGTJ+u+WsdnnpO9Jl8nyMA==",
       "dev": true,
       "requires": {
         "@develar/schema-utils": "~2.6.5",
-        "@electron/universal": "1.0.5",
+        "@electron/universal": "1.2.1",
         "@malept/flatpak-bundler": "^0.4.0",
         "7zip-bin": "~5.1.1",
         "async-exit-hook": "^2.0.1",
         "bluebird-lst": "^1.0.9",
-        "builder-util": "22.14.13",
-        "builder-util-runtime": "8.9.2",
+        "builder-util": "23.6.0",
+        "builder-util-runtime": "9.1.1",
         "chromium-pickle-js": "^0.2.0",
-        "debug": "^4.3.2",
-        "ejs": "^3.1.6",
-        "electron-osx-sign": "^0.5.0",
-        "electron-publish": "22.14.13",
+        "debug": "^4.3.4",
+        "ejs": "^3.1.7",
+        "electron-osx-sign": "^0.6.0",
+        "electron-publish": "23.6.0",
         "form-data": "^4.0.0",
-        "fs-extra": "^10.0.0",
-        "hosted-git-info": "^4.0.2",
+        "fs-extra": "^10.1.0",
+        "hosted-git-info": "^4.1.0",
         "is-ci": "^3.0.0",
-        "isbinaryfile": "^4.0.8",
+        "isbinaryfile": "^4.0.10",
         "js-yaml": "^4.1.0",
         "lazy-val": "^1.0.5",
-        "minimatch": "^3.0.4",
+        "minimatch": "^3.1.2",
         "read-config-file": "6.2.0",
         "sanitize-filename": "^1.6.3",
-        "semver": "^7.3.5",
+        "semver": "^7.3.7",
+        "tar": "^6.1.11",
         "temp-file": "^3.4.0"
       },
       "dependencies": {
@@ -24264,25 +23913,19 @@
           "dev": true
         },
         "builder-util-runtime": {
-          "version": "8.9.2",
-          "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz",
-          "integrity": "sha512-rhuKm5vh7E0aAmT6i8aoSfEjxzdYEFX7zDApK+eNgOhjofnWb74d9SRJv0H/8nsgOkos0TZ4zxW0P8J4N7xQ2A==",
+          "version": "9.1.1",
+          "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz",
+          "integrity": "sha512-azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw==",
           "dev": true,
           "requires": {
-            "debug": "^4.3.2",
+            "debug": "^4.3.4",
             "sax": "^1.2.4"
           }
         },
-        "ci-info": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.3.0.tgz",
-          "integrity": "sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw==",
-          "dev": true
-        },
         "fs-extra": {
-          "version": "10.0.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
-          "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
+          "version": "10.1.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+          "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
           "dev": true,
           "requires": {
             "graceful-fs": "^4.2.0",
@@ -24299,14 +23942,11 @@
             "lru-cache": "^6.0.0"
           }
         },
-        "is-ci": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz",
-          "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==",
-          "dev": true,
-          "requires": {
-            "ci-info": "^3.2.0"
-          }
+        "isbinaryfile": {
+          "version": "4.0.10",
+          "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.10.tgz",
+          "integrity": "sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==",
+          "dev": true
         },
         "js-yaml": {
           "version": "4.1.0",
@@ -24328,9 +23968,9 @@
           }
         },
         "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "version": "7.3.8",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
           "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
@@ -24497,9 +24137,9 @@
       "dev": true
     },
     "asar": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/asar/-/asar-3.1.0.tgz",
-      "integrity": "sha512-vyxPxP5arcAqN4F/ebHd/HhwnAiZtwhglvdmc7BR2f0ywbVNTOpSeyhLDbGXtE/y58hv1oC75TaNIXutnsOZsQ==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/asar/-/asar-3.2.0.tgz",
+      "integrity": "sha512-COdw2ZQvKdFGFxXwX3oYh2/sOsJWJegrdJCGxnN4MZ7IULgRBp9P6665aqj9z1v9VwP4oP1hRBojRDQ//IGgAg==",
       "dev": true,
       "requires": {
         "@types/glob": "^7.1.1",
@@ -24567,7 +24207,7 @@
     "assert-plus": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
       "dev": true,
       "optional": true
     },
@@ -25016,21 +24656,23 @@
       "dev": true
     },
     "body-parser": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
-      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
       "dev": true,
       "requires": {
-        "bytes": "3.1.0",
+        "bytes": "3.1.2",
         "content-type": "~1.0.4",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.7.2",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.7.0",
-        "raw-body": "2.4.0",
-        "type-is": "~1.6.17"
+        "on-finished": "2.4.1",
+        "qs": "6.11.0",
+        "raw-body": "2.5.1",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
       },
       "dependencies": {
         "debug": {
@@ -25042,11 +24684,26 @@
             "ms": "2.0.0"
           }
         },
+        "depd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+          "dev": true
+        },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
           "dev": true
+        },
+        "on-finished": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+          "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+          "dev": true,
+          "requires": {
+            "ee-first": "1.1.1"
+          }
         }
       }
     },
@@ -25077,79 +24734,6 @@
       "dev": true,
       "optional": true
     },
-    "boxen": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/boxen/-/boxen-5.0.0.tgz",
-      "integrity": "sha512-5bvsqw+hhgUi3oYGK0Vf4WpIkyemp60WBInn7+WNfoISzAqk/HX4L7WNROq38E6UR/y3YADpv6pEm4BfkeEAdA==",
-      "dev": true,
-      "requires": {
-        "ansi-align": "^3.0.0",
-        "camelcase": "^6.2.0",
-        "chalk": "^4.1.0",
-        "cli-boxes": "^2.2.1",
-        "string-width": "^4.2.0",
-        "type-fest": "^0.20.2",
-        "widest-line": "^3.1.0",
-        "wrap-ansi": "^7.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "camelcase": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
-          "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
-          "dev": true
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "type-fest": {
-          "version": "0.20.2",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-          "dev": true
-        }
-      }
-    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -25318,7 +24902,7 @@
     "buffer-equal": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
-      "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=",
+      "integrity": "sha512-tcBWO2Dl4e7Asr9hTGcpVrCe+F7DubpmqWCTbj4FHLmjqO2hIaC383acQubWtRJhdceqs5uBHs6Es+Sk//RKiQ==",
       "dev": true
     },
     "buffer-equal-constant-time": {
@@ -25349,20 +24933,20 @@
       "dev": true
     },
     "builder-util": {
-      "version": "22.14.13",
-      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.14.13.tgz",
-      "integrity": "sha512-oePC/qrrUuerhmH5iaCJzPRAKlSBylrhzuAJmRQClTyWnZUv6jbaHh+VoHMbEiE661wrj2S2aV7/bQh12cj1OA==",
+      "version": "23.6.0",
+      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-23.6.0.tgz",
+      "integrity": "sha512-QiQHweYsh8o+U/KNCZFSvISRnvRctb8m/2rB2I1JdByzvNKxPeFLlHFRPQRXab6aYeXc18j9LpsDLJ3sGQmWTQ==",
       "dev": true,
       "requires": {
         "@types/debug": "^4.1.6",
         "@types/fs-extra": "^9.0.11",
         "7zip-bin": "~5.1.1",
-        "app-builder-bin": "3.7.1",
+        "app-builder-bin": "4.0.0",
         "bluebird-lst": "^1.0.9",
-        "builder-util-runtime": "8.9.2",
+        "builder-util-runtime": "9.1.1",
         "chalk": "^4.1.1",
         "cross-spawn": "^7.0.3",
-        "debug": "^4.3.2",
+        "debug": "^4.3.4",
         "fs-extra": "^10.0.0",
         "http-proxy-agent": "^5.0.0",
         "https-proxy-agent": "^5.0.0",
@@ -25398,12 +24982,12 @@
           "dev": true
         },
         "builder-util-runtime": {
-          "version": "8.9.2",
-          "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz",
-          "integrity": "sha512-rhuKm5vh7E0aAmT6i8aoSfEjxzdYEFX7zDApK+eNgOhjofnWb74d9SRJv0H/8nsgOkos0TZ4zxW0P8J4N7xQ2A==",
+          "version": "9.1.1",
+          "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz",
+          "integrity": "sha512-azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw==",
           "dev": true,
           "requires": {
-            "debug": "^4.3.2",
+            "debug": "^4.3.4",
             "sax": "^1.2.4"
           }
         },
@@ -25417,12 +25001,6 @@
             "supports-color": "^7.1.0"
           }
         },
-        "ci-info": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.3.0.tgz",
-          "integrity": "sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw==",
-          "dev": true
-        },
         "color-convert": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -25444,9 +25022,9 @@
           }
         },
         "fs-extra": {
-          "version": "10.0.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
-          "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
+          "version": "10.1.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+          "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
           "dev": true,
           "requires": {
             "graceful-fs": "^4.2.0",
@@ -25461,24 +25039,15 @@
           "dev": true
         },
         "https-proxy-agent": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-          "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+          "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
           "dev": true,
           "requires": {
             "agent-base": "6",
             "debug": "4"
           }
         },
-        "is-ci": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz",
-          "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==",
-          "dev": true,
-          "requires": {
-            "ci-info": "^3.2.0"
-          }
-        },
         "js-yaml": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -25567,9 +25136,9 @@
       "dev": true
     },
     "bytes": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
       "dev": true
     },
     "cacache": {
@@ -25808,13 +25377,13 @@
     "chromium-pickle-js": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz",
-      "integrity": "sha1-BKEGZywYsIWrd02YPfo+oTjyIgU=",
+      "integrity": "sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw==",
       "dev": true
     },
     "ci-info": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.7.1.tgz",
+      "integrity": "sha512-4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w==",
       "dev": true
     },
     "cipher-base": {
@@ -25943,12 +25512,6 @@
       "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
       "dev": true
     },
-    "cli-boxes": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz",
-      "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==",
-      "dev": true
-    },
     "cli-truncate": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
@@ -26149,7 +25712,7 @@
     "compare-version": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz",
-      "integrity": "sha1-AWLsLZNR9d3VmpICy6k1NmpyUIA=",
+      "integrity": "sha512-pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A==",
       "dev": true
     },
     "component-emitter": {
@@ -26359,43 +25922,6 @@
         "proto-list": "~1.2.1"
       }
     },
-    "configstore": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz",
-      "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==",
-      "dev": true,
-      "requires": {
-        "dot-prop": "^5.2.0",
-        "graceful-fs": "^4.1.2",
-        "make-dir": "^3.0.0",
-        "unique-string": "^2.0.0",
-        "write-file-atomic": "^3.0.0",
-        "xdg-basedir": "^4.0.0"
-      },
-      "dependencies": {
-        "make-dir": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-          "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-          "dev": true,
-          "requires": {
-            "semver": "^6.0.0"
-          }
-        },
-        "write-file-atomic": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-          "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-          "dev": true,
-          "requires": {
-            "imurmurhash": "^0.1.4",
-            "is-typedarray": "^1.0.0",
-            "signal-exit": "^3.0.2",
-            "typedarray-to-buffer": "^3.1.5"
-          }
-        }
-      }
-    },
     "connect": {
       "version": "3.7.0",
       "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
@@ -26455,11 +25981,18 @@
       "dev": true
     },
     "content-disposition": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
-      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
       "requires": {
-        "safe-buffer": "5.1.2"
+        "safe-buffer": "5.2.1"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+        }
       }
     },
     "content-type": {
@@ -26538,9 +26071,9 @@
       },
       "dependencies": {
         "loader-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+          "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
           "dev": true,
           "requires": {
             "big.js": "^5.2.2",
@@ -26701,12 +26234,6 @@
         "randomfill": "^1.0.3"
       }
     },
-    "crypto-random-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
-      "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
-      "dev": true
-    },
     "css-loader": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-2.1.1.tgz",
@@ -26763,274 +26290,281 @@
       "dev": true
     },
     "d3": {
-      "version": "5.16.0",
-      "resolved": "https://registry.npmjs.org/d3/-/d3-5.16.0.tgz",
-      "integrity": "sha512-4PL5hHaHwX4m7Zr1UapXW23apo6pexCgdetdJ5kTmADpG/7T9Gkxw0M0tf/pjoB63ezCCm0u5UaFYy2aMt0Mcw==",
-      "requires": {
-        "d3-array": "1",
-        "d3-axis": "1",
-        "d3-brush": "1",
-        "d3-chord": "1",
-        "d3-collection": "1",
-        "d3-color": "1",
-        "d3-contour": "1",
-        "d3-dispatch": "1",
-        "d3-drag": "1",
-        "d3-dsv": "1",
-        "d3-ease": "1",
-        "d3-fetch": "1",
-        "d3-force": "1",
-        "d3-format": "1",
-        "d3-geo": "1",
-        "d3-hierarchy": "1",
-        "d3-interpolate": "1",
-        "d3-path": "1",
-        "d3-polygon": "1",
-        "d3-quadtree": "1",
-        "d3-random": "1",
-        "d3-scale": "2",
-        "d3-scale-chromatic": "1",
-        "d3-selection": "1",
-        "d3-shape": "1",
-        "d3-time": "1",
-        "d3-time-format": "2",
-        "d3-timer": "1",
-        "d3-transition": "1",
-        "d3-voronoi": "1",
-        "d3-zoom": "1"
+      "version": "7.8.2",
+      "resolved": "https://registry.npmjs.org/d3/-/d3-7.8.2.tgz",
+      "integrity": "sha512-WXty7qOGSHb7HR7CfOzwN1Gw04MUOzN8qh9ZUsvwycIMb4DYMpY9xczZ6jUorGtO6bR9BPMPaueIKwiDxu9uiQ==",
+      "requires": {
+        "d3-array": "3",
+        "d3-axis": "3",
+        "d3-brush": "3",
+        "d3-chord": "3",
+        "d3-color": "3",
+        "d3-contour": "4",
+        "d3-delaunay": "6",
+        "d3-dispatch": "3",
+        "d3-drag": "3",
+        "d3-dsv": "3",
+        "d3-ease": "3",
+        "d3-fetch": "3",
+        "d3-force": "3",
+        "d3-format": "3",
+        "d3-geo": "3",
+        "d3-hierarchy": "3",
+        "d3-interpolate": "3",
+        "d3-path": "3",
+        "d3-polygon": "3",
+        "d3-quadtree": "3",
+        "d3-random": "3",
+        "d3-scale": "4",
+        "d3-scale-chromatic": "3",
+        "d3-selection": "3",
+        "d3-shape": "3",
+        "d3-time": "3",
+        "d3-time-format": "4",
+        "d3-timer": "3",
+        "d3-transition": "3",
+        "d3-zoom": "3"
       }
     },
     "d3-array": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-1.2.4.tgz",
-      "integrity": "sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw=="
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.2.tgz",
+      "integrity": "sha512-yEEyEAbDrF8C6Ob2myOBLjwBLck1Z89jMGFee0oPsn95GqjerpaOA4ch+vc2l0FNFFwMD5N7OCSEN5eAlsUbgQ==",
+      "requires": {
+        "internmap": "1 - 2"
+      }
     },
     "d3-axis": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-1.0.12.tgz",
-      "integrity": "sha512-ejINPfPSNdGFKEOAtnBtdkpr24c4d4jsei6Lg98mxf424ivoDP2956/5HDpIAtmHo85lqT4pruy+zEgvRUBqaQ=="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-3.0.0.tgz",
+      "integrity": "sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw=="
     },
     "d3-brush": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-1.1.6.tgz",
-      "integrity": "sha512-7RW+w7HfMCPyZLifTz/UnJmI5kdkXtpCbombUSs8xniAyo0vIbrDzDwUJB6eJOgl9u5DQOt2TQlYumxzD1SvYA==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-3.0.0.tgz",
+      "integrity": "sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ==",
       "requires": {
-        "d3-dispatch": "1",
-        "d3-drag": "1",
-        "d3-interpolate": "1",
-        "d3-selection": "1",
-        "d3-transition": "1"
+        "d3-dispatch": "1 - 3",
+        "d3-drag": "2 - 3",
+        "d3-interpolate": "1 - 3",
+        "d3-selection": "3",
+        "d3-transition": "3"
       }
     },
     "d3-chord": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-1.0.6.tgz",
-      "integrity": "sha512-JXA2Dro1Fxw9rJe33Uv+Ckr5IrAa74TlfDEhE/jfLOaXegMQFQTAgAw9WnZL8+HxVBRXaRGCkrNU7pJeylRIuA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-3.0.1.tgz",
+      "integrity": "sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==",
       "requires": {
-        "d3-array": "1",
-        "d3-path": "1"
+        "d3-path": "1 - 3"
       }
     },
-    "d3-collection": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/d3-collection/-/d3-collection-1.0.7.tgz",
-      "integrity": "sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A=="
-    },
     "d3-color": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.4.1.tgz",
-      "integrity": "sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q=="
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz",
+      "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA=="
     },
     "d3-contour": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-1.3.2.tgz",
-      "integrity": "sha512-hoPp4K/rJCu0ladiH6zmJUEz6+u3lgR+GSm/QdM2BBvDraU39Vr7YdDCicJcxP1z8i9B/2dJLgDC1NcvlF8WCg==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-4.0.2.tgz",
+      "integrity": "sha512-4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA==",
       "requires": {
-        "d3-array": "^1.1.1"
+        "d3-array": "^3.2.0"
+      }
+    },
+    "d3-delaunay": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-6.0.2.tgz",
+      "integrity": "sha512-IMLNldruDQScrcfT+MWnazhHbDJhcRJyOEBAJfwQnHle1RPh6WDuLvxNArUju2VSMSUuKlY5BGHRJ2cYyoFLQQ==",
+      "requires": {
+        "delaunator": "5"
       }
     },
     "d3-dispatch": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-1.0.6.tgz",
-      "integrity": "sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA=="
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz",
+      "integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg=="
     },
     "d3-drag": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-1.2.5.tgz",
-      "integrity": "sha512-rD1ohlkKQwMZYkQlYVCrSFxsWPzI97+W+PaEIBNTMxRuxz9RF0Hi5nJWHGVJ3Om9d2fRTe1yOBINJyy/ahV95w==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-3.0.0.tgz",
+      "integrity": "sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==",
       "requires": {
-        "d3-dispatch": "1",
-        "d3-selection": "1"
+        "d3-dispatch": "1 - 3",
+        "d3-selection": "3"
       }
     },
     "d3-dsv": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-1.2.0.tgz",
-      "integrity": "sha512-9yVlqvZcSOMhCYzniHE7EVUws7Fa1zgw+/EAV2BxJoG3ME19V6BQFBwI855XQDsxyOuG7NibqRMTtiF/Qup46g==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz",
+      "integrity": "sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==",
       "requires": {
-        "commander": "2",
-        "iconv-lite": "0.4",
+        "commander": "7",
+        "iconv-lite": "0.6",
         "rw": "1"
       },
       "dependencies": {
         "commander": {
-          "version": "2.20.3",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+          "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="
+        },
+        "iconv-lite": {
+          "version": "0.6.3",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+          "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3.0.0"
+          }
         }
       }
     },
     "d3-ease": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-1.0.7.tgz",
-      "integrity": "sha512-lx14ZPYkhNx0s/2HX5sLFUI3mbasHjSSpwO/KaaNACweVwxUruKyWVcb293wMv1RqTPZyZ8kSZ2NogUZNcLOFQ=="
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz",
+      "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w=="
     },
     "d3-fetch": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/d3-fetch/-/d3-fetch-1.2.0.tgz",
-      "integrity": "sha512-yC78NBVcd2zFAyR/HnUiBS7Lf6inSCoWcSxFfw8FYL7ydiqe80SazNwoffcqOfs95XaLo7yebsmQqDKSsXUtvA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-fetch/-/d3-fetch-3.0.1.tgz",
+      "integrity": "sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw==",
       "requires": {
-        "d3-dsv": "1"
+        "d3-dsv": "1 - 3"
       }
     },
     "d3-force": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-1.2.1.tgz",
-      "integrity": "sha512-HHvehyaiUlVo5CxBJ0yF/xny4xoaxFxDnBXNvNcfW9adORGZfyNF1dj6DGLKyk4Yh3brP/1h3rnDzdIAwL08zg==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-3.0.0.tgz",
+      "integrity": "sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==",
       "requires": {
-        "d3-collection": "1",
-        "d3-dispatch": "1",
-        "d3-quadtree": "1",
-        "d3-timer": "1"
+        "d3-dispatch": "1 - 3",
+        "d3-quadtree": "1 - 3",
+        "d3-timer": "1 - 3"
       }
     },
     "d3-format": {
-      "version": "1.4.5",
-      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.4.5.tgz",
-      "integrity": "sha512-J0piedu6Z8iB6TbIGfZgDzfXxUFN3qQRMofy2oPdXzQibYGqPB/9iMcxr/TGalU+2RsyDO+U4f33id8tbnSRMQ=="
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz",
+      "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA=="
     },
     "d3-geo": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-1.12.1.tgz",
-      "integrity": "sha512-XG4d1c/UJSEX9NfU02KwBL6BYPj8YKHxgBEw5om2ZnTRSbIcego6dhHwcxuSR3clxh0EpE38os1DVPOmnYtTPg==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.0.tgz",
+      "integrity": "sha512-JEo5HxXDdDYXCaWdwLRt79y7giK8SbhZJbFWXqbRTolCHFI5jRqteLzCsq51NKbUoX0PjBVSohxrx+NoOUujYA==",
       "requires": {
-        "d3-array": "1"
+        "d3-array": "2.5.0 - 3"
       }
     },
     "d3-hierarchy": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-1.1.9.tgz",
-      "integrity": "sha512-j8tPxlqh1srJHAtxfvOUwKNYJkQuBFdM1+JAUfq6xqH5eAqf93L7oG1NVqDa4CpFZNvnNKtCYEUC8KY9yEn9lQ=="
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz",
+      "integrity": "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA=="
     },
     "d3-interpolate": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
-      "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
+      "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==",
       "requires": {
-        "d3-color": "1"
+        "d3-color": "1 - 3"
       }
     },
     "d3-path": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-1.0.9.tgz",
-      "integrity": "sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg=="
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz",
+      "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ=="
     },
     "d3-polygon": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-1.0.6.tgz",
-      "integrity": "sha512-k+RF7WvI08PC8reEoXa/w2nSg5AUMTi+peBD9cmFc+0ixHfbs4QmxxkarVal1IkVkgxVuk9JSHhJURHiyHKAuQ=="
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-3.0.1.tgz",
+      "integrity": "sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg=="
     },
     "d3-quadtree": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-1.0.7.tgz",
-      "integrity": "sha512-RKPAeXnkC59IDGD0Wu5mANy0Q2V28L+fNe65pOCXVdVuTJS3WPKaJlFHer32Rbh9gIo9qMuJXio8ra4+YmIymA=="
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz",
+      "integrity": "sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw=="
     },
     "d3-random": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-1.1.2.tgz",
-      "integrity": "sha512-6AK5BNpIFqP+cx/sreKzNjWbwZQCSUatxq+pPRmFIQaWuoD+NrbVWw7YWpHiXpCQ/NanKdtGDuB+VQcZDaEmYQ=="
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-3.0.1.tgz",
+      "integrity": "sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ=="
     },
     "d3-scale": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-2.2.2.tgz",
-      "integrity": "sha512-LbeEvGgIb8UMcAa0EATLNX0lelKWGYDQiPdHj+gLblGVhGLyNbaCn3EvrJf0A3Y/uOOU5aD6MTh5ZFCdEwGiCw==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz",
+      "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==",
       "requires": {
-        "d3-array": "^1.2.0",
-        "d3-collection": "1",
-        "d3-format": "1",
-        "d3-interpolate": "1",
-        "d3-time": "1",
-        "d3-time-format": "2"
+        "d3-array": "2.10.0 - 3",
+        "d3-format": "1 - 3",
+        "d3-interpolate": "1.2.0 - 3",
+        "d3-time": "2.1.1 - 3",
+        "d3-time-format": "2 - 4"
       }
     },
     "d3-scale-chromatic": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-1.5.0.tgz",
-      "integrity": "sha512-ACcL46DYImpRFMBcpk9HhtIyC7bTBR4fNOPxwVSl0LfulDAwyiHyPOTqcDG1+t5d4P9W7t/2NAuWu59aKko/cg==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.0.0.tgz",
+      "integrity": "sha512-Lx9thtxAKrO2Pq6OO2Ua474opeziKr279P/TKZsMAhYyNDD3EnCffdbgeSYN5O7m2ByQsxtuP2CSDczNUIZ22g==",
       "requires": {
-        "d3-color": "1",
-        "d3-interpolate": "1"
+        "d3-color": "1 - 3",
+        "d3-interpolate": "1 - 3"
       }
     },
     "d3-selection": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-1.4.2.tgz",
-      "integrity": "sha512-SJ0BqYihzOjDnnlfyeHT0e30k0K1+5sR3d5fNueCNeuhZTnGw4M4o8mqJchSwgKMXCNFo+e2VTChiSJ0vYtXkg=="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz",
+      "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ=="
     },
     "d3-shape": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.7.tgz",
-      "integrity": "sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz",
+      "integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==",
       "requires": {
-        "d3-path": "1"
+        "d3-path": "^3.1.0"
       }
     },
     "d3-time": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-1.1.0.tgz",
-      "integrity": "sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA=="
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz",
+      "integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==",
+      "requires": {
+        "d3-array": "2 - 3"
+      }
     },
     "d3-time-format": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
-      "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz",
+      "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==",
       "requires": {
-        "d3-time": "1"
+        "d3-time": "1 - 3"
       }
     },
     "d3-timer": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-1.0.10.tgz",
-      "integrity": "sha512-B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw=="
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz",
+      "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA=="
     },
     "d3-transition": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-1.3.2.tgz",
-      "integrity": "sha512-sc0gRU4PFqZ47lPVHloMn9tlPcv8jxgOQg+0zjhfZXMQuvppjG6YuwdMBE0TuqCZjeJkLecku/l9R0JPcRhaDA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-3.0.1.tgz",
+      "integrity": "sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==",
       "requires": {
-        "d3-color": "1",
-        "d3-dispatch": "1",
-        "d3-ease": "1",
-        "d3-interpolate": "1",
-        "d3-selection": "^1.1.0",
-        "d3-timer": "1"
+        "d3-color": "1 - 3",
+        "d3-dispatch": "1 - 3",
+        "d3-ease": "1 - 3",
+        "d3-interpolate": "1 - 3",
+        "d3-timer": "1 - 3"
       }
     },
-    "d3-voronoi": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/d3-voronoi/-/d3-voronoi-1.1.4.tgz",
-      "integrity": "sha512-dArJ32hchFsrQ8uMiTBLq256MpnZjeuBtdHpaDlYuQyjU0CVzCJl/BVW+SkszaAeH95D/8gxqAhgx0ouAWAfRg=="
-    },
     "d3-zoom": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-1.8.3.tgz",
-      "integrity": "sha512-VoLXTK4wvy1a0JpH2Il+F2CiOhVu7VRXWF5M/LroMIh3/zBAC3WAt7QoIvPibOavVo20hN6/37vwAsdBejLyKQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-3.0.0.tgz",
+      "integrity": "sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==",
       "requires": {
-        "d3-dispatch": "1",
-        "d3-drag": "1",
-        "d3-interpolate": "1",
-        "d3-selection": "1",
-        "d3-transition": "1"
+        "d3-dispatch": "1 - 3",
+        "d3-drag": "2 - 3",
+        "d3-interpolate": "1 - 3",
+        "d3-selection": "2 - 3",
+        "d3-transition": "2 - 3"
       }
     },
     "date-fns": {
@@ -27046,9 +26580,9 @@
       "dev": true
     },
     "debug": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "requires": {
         "ms": "2.1.2"
       }
@@ -27332,6 +26866,14 @@
         }
       }
     },
+    "delaunator": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.0.0.tgz",
+      "integrity": "sha512-AyLvtyJdbv/U1GkiS6gUUzclRoAY4Gs75qkMygJJhU75LW4DNuSF2RMzpxs9jw9Oz1BobHjTdkG3zdP55VxAqw==",
+      "requires": {
+        "robust-predicates": "^3.0.0"
+      }
+    },
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -27365,9 +26907,9 @@
       }
     },
     "destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
       "dev": true
     },
     "detect-file": {
@@ -27463,17 +27005,26 @@
         "colors": {
           "version": "1.0.3",
           "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
-          "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
+          "integrity": "sha512-pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw==",
           "dev": true
         },
         "commander": {
           "version": "2.9.0",
           "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-          "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
+          "integrity": "sha512-bmkUukX8wAOjHdN26xj5c4ctEV22TQ7dQYhSmuckKhToXrkUn0iIaolHdIxYYqD55nhpSPA9zPQ1yP57GdXP2A==",
           "dev": true,
           "requires": {
             "graceful-readlink": ">= 1.0.0"
           }
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
         }
       }
     },
@@ -27487,15 +27038,15 @@
       }
     },
     "dmg-builder": {
-      "version": "22.14.13",
-      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.14.13.tgz",
-      "integrity": "sha512-xNOugB6AbIRETeU2uID15sUfjdZZcKdxK8xkFnwIggsM00PJ12JxpLNPTjcRoUnfwj3WrPjilrO64vRMwNItQg==",
+      "version": "23.6.0",
+      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-23.6.0.tgz",
+      "integrity": "sha512-jFZvY1JohyHarIAlTbfQOk+HnceGjjAdFjVn3n8xlDWKsYNqbO4muca6qXEZTfGXeQMG7TYim6CeS5XKSfSsGA==",
       "dev": true,
       "requires": {
-        "app-builder-lib": "22.14.13",
-        "builder-util": "22.14.13",
-        "builder-util-runtime": "8.9.2",
-        "dmg-license": "^1.0.9",
+        "app-builder-lib": "23.6.0",
+        "builder-util": "23.6.0",
+        "builder-util-runtime": "9.1.1",
+        "dmg-license": "^1.0.11",
         "fs-extra": "^10.0.0",
         "iconv-lite": "^0.6.2",
         "js-yaml": "^4.1.0"
@@ -27508,19 +27059,19 @@
           "dev": true
         },
         "builder-util-runtime": {
-          "version": "8.9.2",
-          "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz",
-          "integrity": "sha512-rhuKm5vh7E0aAmT6i8aoSfEjxzdYEFX7zDApK+eNgOhjofnWb74d9SRJv0H/8nsgOkos0TZ4zxW0P8J4N7xQ2A==",
+          "version": "9.1.1",
+          "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz",
+          "integrity": "sha512-azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw==",
           "dev": true,
           "requires": {
-            "debug": "^4.3.2",
+            "debug": "^4.3.4",
             "sax": "^1.2.4"
           }
         },
         "fs-extra": {
-          "version": "10.0.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
-          "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
+          "version": "10.1.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+          "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
           "dev": true,
           "requires": {
             "graceful-fs": "^4.2.0",
@@ -27565,9 +27116,9 @@
       }
     },
     "dmg-license": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/dmg-license/-/dmg-license-1.0.10.tgz",
-      "integrity": "sha512-SVeeyiOeinV5JCPHXMdKOgK1YVbak/4+8WL2rBnfqRYpA5FaeFaQnQWb25x628am1w70CbipGDv9S51biph63A==",
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/dmg-license/-/dmg-license-1.0.11.tgz",
+      "integrity": "sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q==",
       "dev": true,
       "optional": true,
       "requires": {
@@ -27690,15 +27241,6 @@
         "domelementtype": "1"
       }
     },
-    "dot-prop": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
-      "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
-      "dev": true,
-      "requires": {
-        "is-obj": "^2.0.0"
-      }
-    },
     "dotenv": {
       "version": "9.0.2",
       "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-9.0.2.tgz",
@@ -27761,9 +27303,9 @@
       "dev": true
     },
     "ejs": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.7.tgz",
-      "integrity": "sha512-BIar7R6abbUxDA3bfXrO4DSgwo8I+fB5/1zgujl3HLLjwd6+9iOnrT+t3grn2qbk9vOgBubXOFwX2m9axoFaGw==",
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.8.tgz",
+      "integrity": "sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==",
       "dev": true,
       "requires": {
         "jake": "^10.8.5"
@@ -27781,23 +27323,23 @@
       }
     },
     "electron-builder": {
-      "version": "22.14.13",
-      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.14.13.tgz",
-      "integrity": "sha512-3fgLxqF2TXVKiUPeg74O4V3l0l3j7ERLazo8sUbRkApw0+4iVAf2BJkHsHMaXiigsgCoEzK/F4/rB5rne/VAnw==",
+      "version": "23.6.0",
+      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-23.6.0.tgz",
+      "integrity": "sha512-y8D4zO+HXGCNxFBV/JlyhFnoQ0Y0K7/sFH+XwIbj47pqaW8S6PGYQbjoObolKBR1ddQFPt4rwp4CnwMJrW3HAw==",
       "dev": true,
       "requires": {
         "@types/yargs": "^17.0.1",
-        "app-builder-lib": "22.14.13",
-        "builder-util": "22.14.13",
-        "builder-util-runtime": "8.9.2",
+        "app-builder-lib": "23.6.0",
+        "builder-util": "23.6.0",
+        "builder-util-runtime": "9.1.1",
         "chalk": "^4.1.1",
-        "dmg-builder": "22.14.13",
+        "dmg-builder": "23.6.0",
         "fs-extra": "^10.0.0",
         "is-ci": "^3.0.0",
         "lazy-val": "^1.0.5",
         "read-config-file": "6.2.0",
-        "update-notifier": "^5.1.0",
-        "yargs": "^17.0.1"
+        "simple-update-notifier": "^1.0.7",
+        "yargs": "^17.5.1"
       },
       "dependencies": {
         "@types/yargs": {
@@ -27819,12 +27361,12 @@
           }
         },
         "builder-util-runtime": {
-          "version": "8.9.2",
-          "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz",
-          "integrity": "sha512-rhuKm5vh7E0aAmT6i8aoSfEjxzdYEFX7zDApK+eNgOhjofnWb74d9SRJv0H/8nsgOkos0TZ4zxW0P8J4N7xQ2A==",
+          "version": "9.1.1",
+          "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz",
+          "integrity": "sha512-azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw==",
           "dev": true,
           "requires": {
-            "debug": "^4.3.2",
+            "debug": "^4.3.4",
             "sax": "^1.2.4"
           }
         },
@@ -27838,11 +27380,16 @@
             "supports-color": "^7.1.0"
           }
         },
-        "ci-info": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-          "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
-          "dev": true
+        "cliui": {
+          "version": "8.0.1",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+          "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+          "dev": true,
+          "requires": {
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.1",
+            "wrap-ansi": "^7.0.0"
+          }
         },
         "color-convert": {
           "version": "2.0.1",
@@ -27870,15 +27417,6 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "is-ci": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.0.tgz",
-          "integrity": "sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ==",
-          "dev": true,
-          "requires": {
-            "ci-info": "^3.1.1"
-          }
-        },
         "jsonfile": {
           "version": "6.1.0",
           "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
@@ -27905,32 +27443,32 @@
           "dev": true
         },
         "yargs": {
-          "version": "17.2.1",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.2.1.tgz",
-          "integrity": "sha512-XfR8du6ua4K6uLGm5S6fA+FIJom/MdJcFNVY8geLlp2v8GYbOXD4EB1tPNZsRn4vBzKGMgb5DRZMeWuFc2GO8Q==",
+          "version": "17.6.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz",
+          "integrity": "sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==",
           "dev": true,
           "requires": {
-            "cliui": "^7.0.2",
+            "cliui": "^8.0.1",
             "escalade": "^3.1.1",
             "get-caller-file": "^2.0.5",
             "require-directory": "^2.1.1",
-            "string-width": "^4.2.0",
+            "string-width": "^4.2.3",
             "y18n": "^5.0.5",
-            "yargs-parser": "^20.2.2"
+            "yargs-parser": "^21.1.1"
           }
         },
         "yargs-parser": {
-          "version": "20.2.9",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-          "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+          "version": "21.1.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+          "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
           "dev": true
         }
       }
     },
     "electron-osx-sign": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.5.0.tgz",
-      "integrity": "sha512-icoRLHzFz/qxzDh/N4Pi2z4yVHurlsCAYQvsCSG7fCedJ4UJXBS6PoQyGH71IfcqKupcKeK7HX/NkyfG+v6vlQ==",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.6.0.tgz",
+      "integrity": "sha512-+hiIEb2Xxk6eDKJ2FFlpofCnemCbjbT5jz+BKGpVBrRNT3kWTGs4DfNX6IzGwgi33hUcXF+kFs9JW+r6Wc1LRg==",
       "dev": true,
       "requires": {
         "bluebird": "^3.5.0",
@@ -27962,20 +27500,20 @@
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
           "dev": true
         }
       }
     },
     "electron-publish": {
-      "version": "22.14.13",
-      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.14.13.tgz",
-      "integrity": "sha512-0oP3QiNj3e8ewOaEpEJV/o6Zrmy2VarVvZ/bH7kyO/S/aJf9x8vQsKVWpsdmSiZ5DJEHgarFIXrnO0ZQf0P9iQ==",
+      "version": "23.6.0",
+      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-23.6.0.tgz",
+      "integrity": "sha512-jPj3y+eIZQJF/+t5SLvsI5eS4mazCbNYqatv5JihbqOstIM13k0d1Z3vAWntvtt13Itl61SO6seicWdioOU5dg==",
       "dev": true,
       "requires": {
         "@types/fs-extra": "^9.0.11",
-        "builder-util": "22.14.13",
-        "builder-util-runtime": "8.9.2",
+        "builder-util": "23.6.0",
+        "builder-util-runtime": "9.1.1",
         "chalk": "^4.1.1",
         "fs-extra": "^10.0.0",
         "lazy-val": "^1.0.5",
@@ -27992,12 +27530,12 @@
           }
         },
         "builder-util-runtime": {
-          "version": "8.9.2",
-          "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz",
-          "integrity": "sha512-rhuKm5vh7E0aAmT6i8aoSfEjxzdYEFX7zDApK+eNgOhjofnWb74d9SRJv0H/8nsgOkos0TZ4zxW0P8J4N7xQ2A==",
+          "version": "9.1.1",
+          "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz",
+          "integrity": "sha512-azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw==",
           "dev": true,
           "requires": {
-            "debug": "^4.3.2",
+            "debug": "^4.3.4",
             "sax": "^1.2.4"
           }
         },
@@ -28021,9 +27559,9 @@
           }
         },
         "fs-extra": {
-          "version": "10.0.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
-          "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
+          "version": "10.1.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+          "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
           "dev": true,
           "requires": {
             "graceful-fs": "^4.2.0",
@@ -28203,9 +27741,9 @@
       }
     },
     "engine.io": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.1.2.tgz",
-      "integrity": "sha512-v/7eGHxPvO2AWsksyx2PUsQvBafuvqs0jJJQ0FdmJG1b9qIvgSbqDRGwNhfk2XHaTTbTXiC4quRE8Q9nRjsrQQ==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.1.tgz",
+      "integrity": "sha512-ECceEFcAaNRybd3lsGQKas3ZlMVjN3cyWwMP25D2i0zWfyiytVbTpRPa34qrr+FHddtpBVOmq4H/DCv1O0lZRA==",
       "dev": true,
       "requires": {
         "@types/cookie": "^0.4.1",
@@ -28216,18 +27754,15 @@
         "cookie": "~0.4.1",
         "cors": "~2.8.5",
         "debug": "~4.3.1",
-        "engine.io-parser": "~5.0.0",
+        "engine.io-parser": "~5.0.3",
         "ws": "~8.2.3"
       }
     },
     "engine.io-parser": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.3.tgz",
-      "integrity": "sha512-BtQxwF27XUNnSafQLvDi0dQ8s3i6VgzSoQMJacpIcGNrlUdfHSKbgm3jmjCVvQluGzqwujQMPAoMai3oYSTurg==",
-      "dev": true,
-      "requires": {
-        "@socket.io/base64-arraybuffer": "~1.0.2"
-      }
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.6.tgz",
+      "integrity": "sha512-tjuoZDMAdEhVnSFleYPCtdL2GXwVTGtNjoeJd9IhIG3C1xs9uwxqRNEu5WpnDZCaozwVlK/nuQhpodhXSIMaxw==",
+      "dev": true
     },
     "enhanced-resolve": {
       "version": "4.3.0",
@@ -28344,12 +27879,6 @@
       "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
       "dev": true
     },
-    "escape-goat": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz",
-      "integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==",
-      "dev": true
-    },
     "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
@@ -28757,12 +28286,6 @@
         "semver": "^7.3.5"
       },
       "dependencies": {
-        "ci-info": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.1.1.tgz",
-          "integrity": "sha512-kdRWLBIJwdsYJWYJFtAFFYxybguqeF91qpZaggjG5Nf8QKdizFG2hjqvaTXbxFIcYbSaD74KpAXv6BSm17DHEQ==",
-          "dev": true
-        },
         "find-up": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
@@ -29008,7 +28531,7 @@
     "etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
       "dev": true
     },
     "eventemitter3": {
@@ -29199,38 +28722,39 @@
       }
     },
     "express": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
-      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
+      "version": "4.18.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
       "dev": true,
       "requires": {
-        "accepts": "~1.3.7",
+        "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.19.0",
-        "content-disposition": "0.5.3",
+        "body-parser": "1.20.1",
+        "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.4.0",
+        "cookie": "0.5.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
+        "depd": "2.0.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
+        "finalhandler": "1.2.0",
         "fresh": "0.5.2",
+        "http-errors": "2.0.0",
         "merge-descriptors": "1.0.1",
         "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.5",
-        "qs": "6.7.0",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.11.0",
         "range-parser": "~1.2.1",
-        "safe-buffer": "5.1.2",
-        "send": "0.17.1",
-        "serve-static": "1.14.1",
-        "setprototypeof": "1.1.1",
-        "statuses": "~1.5.0",
+        "safe-buffer": "5.2.1",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
         "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
@@ -29243,9 +28767,9 @@
           "dev": true
         },
         "cookie": {
-          "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
-          "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+          "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
           "dev": true
         },
         "debug": {
@@ -29257,11 +28781,53 @@
             "ms": "2.0.0"
           }
         },
+        "depd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+          "dev": true
+        },
+        "finalhandler": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+          "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+          "dev": true,
+          "requires": {
+            "debug": "2.6.9",
+            "encodeurl": "~1.0.2",
+            "escape-html": "~1.0.3",
+            "on-finished": "2.4.1",
+            "parseurl": "~1.3.3",
+            "statuses": "2.0.1",
+            "unpipe": "~1.0.0"
+          }
+        },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
           "dev": true
+        },
+        "on-finished": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+          "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+          "dev": true,
+          "requires": {
+            "ee-first": "1.1.1"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "dev": true
+        },
+        "statuses": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+          "dev": true
         }
       }
     },
@@ -29367,9 +28933,9 @@
       }
     },
     "extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz",
+      "integrity": "sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==",
       "dev": true,
       "optional": true
     },
@@ -29524,9 +29090,9 @@
       "optional": true
     },
     "filelist": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.3.tgz",
-      "integrity": "sha512-LwjCsruLWQULGYKy7TX0OPtrL9kLpojOFKc5VCTxdFTV7w5zbsgqVKfnkKG7Qgjtq50gKfO56hJv88OfcGb70Q==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
+      "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
       "dev": true,
       "requires": {
         "minimatch": "^5.0.1"
@@ -29542,9 +29108,9 @@
           }
         },
         "minimatch": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
-          "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
+          "version": "5.1.6",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+          "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
           "dev": true,
           "requires": {
             "brace-expansion": "^2.0.1"
@@ -29974,9 +29540,9 @@
       }
     },
     "forwarded": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
       "dev": true
     },
     "fragment-cache": {
@@ -29991,7 +29557,7 @@
     "fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
       "dev": true
     },
     "from2": {
@@ -30215,23 +29781,6 @@
         }
       }
     },
-    "global-dirs": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.0.tgz",
-      "integrity": "sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==",
-      "dev": true,
-      "requires": {
-        "ini": "2.0.0"
-      },
-      "dependencies": {
-        "ini": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz",
-          "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==",
-          "dev": true
-        }
-      }
-    },
     "global-modules": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
@@ -30492,12 +30041,6 @@
         }
       }
     },
-    "has-yarn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz",
-      "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==",
-      "dev": true
-    },
     "hash-base": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
@@ -30647,7 +30190,7 @@
     "html-webpack-plugin": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz",
-      "integrity": "sha1-sBq71yOsqqeze2r0SS69oD2d03s=",
+      "integrity": "sha512-Br4ifmjQojUP4EmHnRBoUIYcZ9J7M4bTMcm7u6xoIAIuq2Nte4TzXX0533owvkQKQD1WeMTTTyD4Ni4QKxS0Bg==",
       "dev": true,
       "requires": {
         "html-minifier": "^3.2.3",
@@ -30674,13 +30217,13 @@
         "json5": {
           "version": "0.5.1",
           "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-          "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+          "integrity": "sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==",
           "dev": true
         },
         "loader-utils": {
           "version": "0.2.17",
           "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
-          "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
+          "integrity": "sha512-tiv66G0SmiOx+pLWMtGEkfSEejxvb6N6uRrQjfWJIT79W9GMpgKeCAmm9aVBKtd4WEgntciI8CsGqjpDoCWJug==",
           "dev": true,
           "requires": {
             "big.js": "^3.1.3",
@@ -30751,22 +30294,28 @@
       "dev": true
     },
     "http-errors": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
-      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
       "dev": true,
       "requires": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.1",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.0"
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
       },
       "dependencies": {
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+        "depd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+          "dev": true
+        },
+        "statuses": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
           "dev": true
         }
       }
@@ -30862,6 +30411,7 @@
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
       "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dev": true,
       "requires": {
         "safer-buffer": ">= 2.1.2 < 3"
       }
@@ -31020,6 +30570,11 @@
         "ipaddr.js": "^1.9.0"
       }
     },
+    "internmap": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
+      "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg=="
+    },
     "interpret": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
@@ -31152,12 +30707,12 @@
       "dev": true
     },
     "is-ci": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz",
+      "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==",
       "dev": true,
       "requires": {
-        "ci-info": "^2.0.0"
+        "ci-info": "^3.2.0"
       }
     },
     "is-core-module": {
@@ -31241,16 +30796,6 @@
       "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==",
       "dev": true
     },
-    "is-installed-globally": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz",
-      "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==",
-      "dev": true,
-      "requires": {
-        "global-dirs": "^3.0.0",
-        "is-path-inside": "^3.0.2"
-      }
-    },
     "is-natural-number": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz",
@@ -31262,12 +30807,6 @@
       "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
       "dev": true
     },
-    "is-npm": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-5.0.0.tgz",
-      "integrity": "sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA==",
-      "dev": true
-    },
     "is-number": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -31300,12 +30839,6 @@
       "integrity": "sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==",
       "dev": true
     },
-    "is-obj": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
-      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
-      "dev": true
-    },
     "is-object": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz",
@@ -31337,12 +30870,6 @@
         }
       }
     },
-    "is-path-inside": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz",
-      "integrity": "sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==",
-      "dev": true
-    },
     "is-plain-obj": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
@@ -31410,12 +30937,6 @@
       "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
       "dev": true
     },
-    "is-yarn-global": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz",
-      "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==",
-      "dev": true
-    },
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -31769,13 +31290,10 @@
       "dev": true
     },
     "json5": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-      "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
-      "dev": true,
-      "requires": {
-        "minimist": "^1.2.5"
-      }
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "dev": true
     },
     "jsonfile": {
       "version": "4.0.0",
@@ -32169,15 +31687,6 @@
       "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz",
       "integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A=="
     },
-    "latest-version": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz",
-      "integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==",
-      "dev": true,
-      "requires": {
-        "package-json": "^6.3.0"
-      }
-    },
     "lazy-val": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.5.tgz",
@@ -32254,9 +31763,9 @@
       },
       "dependencies": {
         "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
           "dev": true,
           "requires": {
             "minimist": "^1.2.0"
@@ -32389,9 +31898,9 @@
       }
     },
     "luxon": {
-      "version": "1.26.0",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-1.26.0.tgz",
-      "integrity": "sha512-+V5QIQ5f6CDXQpWNICELwjwuHdqeJM1UenlZWx5ujcRMc9venvluCjFb4t5NYLhb6IhkbMVOxzVuOqkgMxee2A=="
+      "version": "1.28.1",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-1.28.1.tgz",
+      "integrity": "sha512-gYHAa180mKrNIUJCbwpmD0aTu9kV0dREDrwNnuyFAsO1Wt0EVYSZelPnJlbj9HplzXX/YWXHFTL45kvZ53M0pw=="
     },
     "magic-string": {
       "version": "0.25.7",
@@ -32773,16 +32282,16 @@
       "dev": true
     },
     "mime-db": {
-      "version": "1.46.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.46.0.tgz",
-      "integrity": "sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ=="
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
     },
     "mime-types": {
-      "version": "2.1.29",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.29.tgz",
-      "integrity": "sha512-Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ==",
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "requires": {
-        "mime-db": "1.46.0"
+        "mime-db": "1.52.0"
       }
     },
     "mimic-response": {
@@ -32833,9 +32342,9 @@
       "dev": true
     },
     "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "requires": {
         "brace-expansion": "^1.1.7"
       }
@@ -33068,9 +32577,9 @@
       "dev": true
     },
     "negotiator": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
-      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
       "dev": true
     },
     "neo-async": {
@@ -33838,95 +33347,6 @@
         "release-zalgo": "^1.0.0"
       }
     },
-    "package-json": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz",
-      "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==",
-      "dev": true,
-      "requires": {
-        "got": "^9.6.0",
-        "registry-auth-token": "^4.0.0",
-        "registry-url": "^5.0.0",
-        "semver": "^6.2.0"
-      },
-      "dependencies": {
-        "@sindresorhus/is": {
-          "version": "0.14.0",
-          "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
-          "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==",
-          "dev": true
-        },
-        "cacheable-request": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
-          "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==",
-          "dev": true,
-          "requires": {
-            "clone-response": "^1.0.2",
-            "get-stream": "^5.1.0",
-            "http-cache-semantics": "^4.0.0",
-            "keyv": "^3.0.0",
-            "lowercase-keys": "^2.0.0",
-            "normalize-url": "^4.1.0",
-            "responselike": "^1.0.2"
-          },
-          "dependencies": {
-            "get-stream": {
-              "version": "5.2.0",
-              "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-              "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-              "dev": true,
-              "requires": {
-                "pump": "^3.0.0"
-              }
-            },
-            "lowercase-keys": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-              "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
-              "dev": true
-            }
-          }
-        },
-        "got": {
-          "version": "9.6.0",
-          "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
-          "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==",
-          "dev": true,
-          "requires": {
-            "@sindresorhus/is": "^0.14.0",
-            "@szmarczak/http-timer": "^1.1.2",
-            "cacheable-request": "^6.0.0",
-            "decompress-response": "^3.3.0",
-            "duplexer3": "^0.1.4",
-            "get-stream": "^4.1.0",
-            "lowercase-keys": "^1.0.1",
-            "mimic-response": "^1.0.1",
-            "p-cancelable": "^1.0.0",
-            "to-readable-stream": "^1.0.0",
-            "url-parse-lax": "^3.0.0"
-          }
-        },
-        "http-cache-semantics": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
-          "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==",
-          "dev": true
-        },
-        "normalize-url": {
-          "version": "4.5.1",
-          "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
-          "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==",
-          "dev": true
-        },
-        "p-cancelable": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
-          "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==",
-          "dev": true
-        }
-      }
-    },
     "pako": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
@@ -34232,13 +33652,13 @@
       "dev": true
     },
     "plist": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.5.tgz",
-      "integrity": "sha512-83vX4eYdQp3vP9SxuYgEM/G/pJQqLUz/V/xzPrzruLs7fz7jxGQ1msZ/mg1nwZxUSuOp4sb+/bEIbRrbzZRxDA==",
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.6.tgz",
+      "integrity": "sha512-WiIVYyrp8TD4w8yCvyeIr+lkmrGRd5u0VbRnU+tP/aRLxP/YadJUYOMZJ/6hIa3oUyVCsycXvtNRgd5XBJIbiA==",
       "dev": true,
       "requires": {
         "base64-js": "^1.5.1",
-        "xmlbuilder": "^9.0.7"
+        "xmlbuilder": "^15.1.1"
       }
     },
     "pluralize": {
@@ -34513,12 +33933,12 @@
       "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk="
     },
     "proxy-addr": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
-      "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
       "dev": true,
       "requires": {
-        "forwarded": "~0.1.2",
+        "forwarded": "0.2.0",
         "ipaddr.js": "1.9.1"
       }
     },
@@ -34609,15 +34029,6 @@
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
       "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
     },
-    "pupa": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz",
-      "integrity": "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==",
-      "dev": true,
-      "requires": {
-        "escape-goat": "^2.0.0"
-      }
-    },
     "qjobs": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz",
@@ -34625,10 +34036,13 @@
       "dev": true
     },
     "qs": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
-      "dev": true
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "dev": true,
+      "requires": {
+        "side-channel": "^1.0.4"
+      }
     },
     "query-string": {
       "version": "5.1.1",
@@ -34695,13 +34109,13 @@
       "dev": true
     },
     "raw-body": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
-      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
       "dev": true,
       "requires": {
-        "bytes": "3.1.0",
-        "http-errors": "1.7.2",
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "unpipe": "1.0.0"
       }
@@ -35030,24 +34444,6 @@
       "integrity": "sha512-9YXf6xtW+qzQ+hcMQXx95MOvfqXFgsKDZodX3qZB0x2n5Z94ioetIITsBtvJbiOyxa/6s9AtyweBLCdPmPko/w==",
       "dev": true
     },
-    "registry-auth-token": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.1.tgz",
-      "integrity": "sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==",
-      "dev": true,
-      "requires": {
-        "rc": "^1.2.8"
-      }
-    },
-    "registry-url": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz",
-      "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==",
-      "dev": true,
-      "requires": {
-        "rc": "^1.2.8"
-      }
-    },
     "relateurl": {
       "version": "0.2.7",
       "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
@@ -35393,6 +34789,11 @@
         "sprintf-js": "^1.1.2"
       }
     },
+    "robust-predicates": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.1.tgz",
+      "integrity": "sha512-ndEIpszUHiG4HtDsQLeIuMvRsDnn8c8rYStabochtUeCvfuvNptb5TUbVD68LRAILPX7p9nqQGh4xJgn3EHS/g=="
+    },
     "run-parallel": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
@@ -35414,7 +34815,7 @@
     "rw": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
-      "integrity": "sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q="
+      "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ=="
     },
     "rxjs": {
       "version": "6.6.7",
@@ -35482,9 +34883,9 @@
       },
       "dependencies": {
         "loader-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+          "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
           "dev": true,
           "requires": {
             "big.js": "^5.2.2",
@@ -35580,34 +34981,25 @@
       "dev": true,
       "optional": true
     },
-    "semver-diff": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz",
-      "integrity": "sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==",
-      "dev": true,
-      "requires": {
-        "semver": "^6.3.0"
-      }
-    },
     "send": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
-      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "dev": true,
       "requires": {
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "~1.7.2",
+        "http-errors": "2.0.0",
         "mime": "1.6.0",
-        "ms": "2.1.1",
-        "on-finished": "~2.3.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
         "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
+        "statuses": "2.0.1"
       },
       "dependencies": {
         "debug": {
@@ -35622,11 +35014,17 @@
             "ms": {
               "version": "2.0.0",
               "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+              "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
               "dev": true
             }
           }
         },
+        "depd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+          "dev": true
+        },
         "mime": {
           "version": "1.6.0",
           "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
@@ -35634,9 +35032,24 @@
           "dev": true
         },
         "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+          "dev": true
+        },
+        "on-finished": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+          "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+          "dev": true,
+          "requires": {
+            "ee-first": "1.1.1"
+          }
+        },
+        "statuses": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
           "dev": true
         }
       }
@@ -35726,15 +35139,15 @@
       }
     },
     "serve-static": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
-      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
       "dev": true,
       "requires": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.17.1"
+        "send": "0.18.0"
       }
     },
     "set-blocking": {
@@ -35778,9 +35191,9 @@
       "dev": true
     },
     "setprototypeof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
       "dev": true
     },
     "sha.js": {
@@ -35822,6 +35235,17 @@
       "resolved": "https://registry.npmjs.org/shimmer/-/shimmer-1.2.1.tgz",
       "integrity": "sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw=="
     },
+    "side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      }
+    },
     "signal-exit": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
@@ -35872,6 +35296,23 @@
         }
       }
     },
+    "simple-update-notifier": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz",
+      "integrity": "sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==",
+      "dev": true,
+      "requires": {
+        "semver": "~7.0.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
+          "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
+          "dev": true
+        }
+      }
+    },
     "slash": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
@@ -36101,33 +35542,32 @@
       }
     },
     "socket.io": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.4.1.tgz",
-      "integrity": "sha512-s04vrBswdQBUmuWJuuNTmXUVJhP0cVky8bBDhdkf8y0Ptsu7fKU2LuLbts9g+pdmAdyMMn8F/9Mf1/wbtUN0fg==",
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.4.tgz",
+      "integrity": "sha512-m3GC94iK9MfIEeIBfbhJs5BqFibMtkRk8ZpKwG2QwxV0m/eEhPIV4ara6XCF1LWNAus7z58RodiZlAH71U3EhQ==",
       "dev": true,
       "requires": {
         "accepts": "~1.3.4",
         "base64id": "~2.0.0",
         "debug": "~4.3.2",
-        "engine.io": "~6.1.0",
-        "socket.io-adapter": "~2.3.3",
-        "socket.io-parser": "~4.0.4"
+        "engine.io": "~6.2.1",
+        "socket.io-adapter": "~2.4.0",
+        "socket.io-parser": "~4.2.1"
       }
     },
     "socket.io-adapter": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.3.3.tgz",
-      "integrity": "sha512-Qd/iwn3VskrpNO60BeRyCyr8ZWw9CPZyitW4AQwmRZ8zCiyDiL+znRnWX6tDHXnWn1sJrM1+b6Mn6wEDJJ4aYQ==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz",
+      "integrity": "sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg==",
       "dev": true
     },
     "socket.io-parser": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.5.tgz",
-      "integrity": "sha512-sNjbT9dX63nqUFIOv95tTVm6elyIU4RvB1m8dOeZt+IgWwcWklFDOdmGcfo3zSiRsnR/3pJkjY5lfoGqEe4Eig==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.2.tgz",
+      "integrity": "sha512-DJtziuKypFkMMHCm2uIshOYC7QaylbtzQwiMYDuCKy3OPkjLzu4B2vAhTlqipRHHzrI0NJeBAizTK7X+6m1jVw==",
       "dev": true,
       "requires": {
-        "@types/component-emitter": "^1.2.10",
-        "component-emitter": "~1.3.0",
+        "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.3.1"
       }
     },
@@ -37307,9 +36747,9 @@
       },
       "dependencies": {
         "fs-extra": {
-          "version": "10.0.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
-          "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
+          "version": "10.1.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+          "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
           "dev": true,
           "requires": {
             "graceful-fs": "^4.2.0",
@@ -37745,9 +37185,9 @@
       }
     },
     "toidentifier": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
       "dev": true
     },
     "toposort": {
@@ -37819,7 +37259,7 @@
     "truncate-utf8-bytes": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz",
-      "integrity": "sha1-QFkjkJWS1W94pYGENLC3hInKXys=",
+      "integrity": "sha512-95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ==",
       "dev": true,
       "requires": {
         "utf8-byte-length": "^1.0.1"
@@ -37872,9 +37312,9 @@
       },
       "dependencies": {
         "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
           "dev": true,
           "requires": {
             "minimist": "^1.2.0"
@@ -38091,15 +37531,6 @@
         "imurmurhash": "^0.1.4"
       }
     },
-    "unique-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
-      "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
-      "dev": true,
-      "requires": {
-        "crypto-random-string": "^2.0.0"
-      }
-    },
     "unist-util-find-all-after": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz",
@@ -38182,88 +37613,6 @@
       "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
       "dev": true
     },
-    "update-notifier": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-5.1.0.tgz",
-      "integrity": "sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw==",
-      "dev": true,
-      "requires": {
-        "boxen": "^5.0.0",
-        "chalk": "^4.1.0",
-        "configstore": "^5.0.1",
-        "has-yarn": "^2.1.0",
-        "import-lazy": "^2.1.0",
-        "is-ci": "^2.0.0",
-        "is-installed-globally": "^0.4.0",
-        "is-npm": "^5.0.0",
-        "is-yarn-global": "^0.3.0",
-        "latest-version": "^5.1.0",
-        "pupa": "^2.1.1",
-        "semver": "^7.3.4",
-        "semver-diff": "^3.1.1",
-        "xdg-basedir": "^4.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "import-lazy": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
-          "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=",
-          "dev": true
-        },
-        "semver": {
-          "version": "7.3.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
-          "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "upper-case": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
@@ -38358,7 +37707,7 @@
     "utf8-byte-length": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz",
-      "integrity": "sha1-9F8VDExm7uloGGUFq5P8u4rWv2E=",
+      "integrity": "sha512-4+wkEYLBbWxqTahEsWrhxepcoVOJ+1z5PGIjPZxRkytcdSUaNjIjBM7Xn8E+pdSuV7SzvWovBFA54FO0JSoqhA==",
       "dev": true
     },
     "util": {
@@ -38434,9 +37783,9 @@
       "dev": true
     },
     "verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.1.tgz",
+      "integrity": "sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg==",
       "dev": true,
       "optional": true,
       "requires": {
@@ -39383,15 +38732,6 @@
         "string-width": "^1.0.2 || 2 || 3 || 4"
       }
     },
-    "widest-line": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
-      "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==",
-      "dev": true,
-      "requires": {
-        "string-width": "^4.0.0"
-      }
-    },
     "winston": {
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/winston/-/winston-3.3.3.tgz",
@@ -39610,12 +38950,6 @@
       "dev": true,
       "requires": {}
     },
-    "xdg-basedir": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
-      "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==",
-      "dev": true
-    },
     "xhr2": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/xhr2/-/xhr2-0.2.1.tgz",
@@ -39638,9 +38972,9 @@
       }
     },
     "xmlbuilder": {
-      "version": "9.0.7",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
-      "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=",
+      "version": "15.1.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz",
+      "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==",
       "dev": true
     },
     "xtend": {
diff --git a/package.json b/package.json
index 78e80ce522..7f86b3b3d0 100644
--- a/package.json
+++ b/package.json
@@ -78,14 +78,14 @@
     "@ngtools/webpack": "^11.0.0",
     "@playwright/test": "^1.18.1",
     "@types/chart.js": "^2.9.24",
-    "@types/d3": "^5.7.2",
+    "@types/d3": "^7.4.0",
     "@types/extract-zip": "^1.6.2",
     "@types/glob": "^7.1.3",
     "@types/hammerjs": "^2.0.36",
     "@types/inflection": "^1.5.28",
     "@types/jasmine": "^3.5.12",
     "@types/js-yaml": "^3.12.5",
-    "@types/luxon": "^1.24.3",
+    "@types/luxon": "^1.27.1",
     "@types/node": "^14.16.0",
     "@types/node-fetch": "^2.5.7",
     "@types/proxyquire": "^1.3.28",
@@ -102,7 +102,7 @@
     "cross-env": "^5.2.1",
     "css-loader": "^2.1.1",
     "electron": "^13.6.9",
-    "electron-builder": "22.14.13",
+    "electron-builder": "^23.6.0",
     "eslint": "^7.19.0",
     "eslint-config-prettier": "^7.2.0",
     "eslint-plugin-ban": "^1.5.2",
@@ -179,7 +179,7 @@
     "chart.js": "^2.9.3",
     "chokidar": "^3.4.3",
     "commander": "^8.0.0",
-    "d3": "^5.16.0",
+    "d3": "^7.8.2",
     "decode-uri-component": "^0.2.1",
     "download": "^8.0.0",
     "electron-updater": "^4.3.4",
@@ -197,7 +197,7 @@
     "jschardet": "^2.2.1",
     "keytar": "^7.7.0",
     "load-json-file": "^5.3.0",
-    "luxon": "^1.24.1",
+    "luxon": "^1.28.1",
     "make-dir": "^2.1.0",
     "node-abi": "^2.18.0",
     "node-forge": "^1.3.0",
diff --git a/src/@batch-flask/ui/graphs/gauge/gauge.component.ts b/src/@batch-flask/ui/graphs/gauge/gauge.component.ts
index 1f155e646a..347c212b64 100644
--- a/src/@batch-flask/ui/graphs/gauge/gauge.component.ts
+++ b/src/@batch-flask/ui/graphs/gauge/gauge.component.ts
@@ -5,6 +5,8 @@ import * as d3 from "d3";
 import { GaugeConfig, GaugeLabel, defaultOptions } from "./gauge-config";
 import { degToRad, getLabelFor, invalidSizeMessage, percToRad, presetSizes } from "./gauge-utils";
 
+type D3Selection = d3.Selection<d3.BaseType, unknown, d3.BaseType, unknown>;
+
 const margin = {
     top: 0,
     right: 0,
@@ -60,8 +62,8 @@ export class GaugeComponent implements AfterViewInit, OnChanges {
 
     public percent = 0;
 
-    private _svg: d3.Selection<any, any, any, any>;
-    private _chart: d3.Selection<any, any, any, any>;
+    private _svg: D3Selection;
+    private _chart: D3Selection;
     /**
      * Arc representing the filled part of the gauge
      */
diff --git a/src/app/components/pool/graphs/heatmap/nodes-heatmap.component.spec.ts b/src/app/components/pool/graphs/heatmap/nodes-heatmap.component.spec.ts
index d4bb83add7..084f781902 100644
--- a/src/app/components/pool/graphs/heatmap/nodes-heatmap.component.spec.ts
+++ b/src/app/components/pool/graphs/heatmap/nodes-heatmap.component.spec.ts
@@ -167,7 +167,7 @@ describe("NodesHeatmapComponent", () => {
             { usagePercent: "100%", runningTaskSlotsCount: 100, fill: "fill: rgb(23, 141, 23);" },
         ];
         params.forEach((param) => {
-            it(`should be ${ param.usagePercent } task slot usage color`, () => {
+            it(`should be ${param.usagePercent} task slot usage color`, () => {
                 testComponent.nodes = createNodes(1, true, 100, param.runningTaskSlotsCount);
                 testComponent.pool = new Pool({ id: "pool-1", taskSlotsPerNode: 100 });
                 fixture.detectChanges();
@@ -336,10 +336,10 @@ describe("NodesHeatmapComponent", () => {
 });
 
 function createNodes(
-        count: number,
-        dedicated = true,
-        runningTasksCount = defaultRunningTasksCount,
-        runningTaskSlotsCount = defaultRunningTaskSlotsCount) {
+    count: number,
+    dedicated = true,
+    runningTasksCount = defaultRunningTasksCount,
+    runningTaskSlotsCount = defaultRunningTaskSlotsCount) {
     const nodes: Node[] = [];
     for (let i = 0; i < count; i++) {
         nodes.push(Fixture.node.create({
diff --git a/src/app/components/pool/graphs/heatmap/nodes-heatmap.component.ts b/src/app/components/pool/graphs/heatmap/nodes-heatmap.component.ts
index ad4b76e8a0..b1d4e47e44 100644
--- a/src/app/components/pool/graphs/heatmap/nodes-heatmap.component.ts
+++ b/src/app/components/pool/graphs/heatmap/nodes-heatmap.component.ts
@@ -9,6 +9,7 @@ import { NodeCommands } from "app/components/node/action";
 import { Node, NodeState, Pool } from "app/models";
 import { ComponentUtils, NodeUtils } from "app/utils";
 import * as d3 from "d3";
+import { BaseType, Selection } from "d3";
 import * as elementResizeDetectorMaker from "element-resize-detector";
 import { List } from "immutable";
 import { BehaviorSubject } from "rxjs";
@@ -22,6 +23,8 @@ interface HeatmapTile {
     node: Node;
 }
 
+type NodeSelection = Selection<SVGGElement, HeatmapTile, BaseType, unknown>;
+
 const idleColor = "#edeef2";
 const runningColor = "#178D17";
 
@@ -37,11 +40,11 @@ const stateTree: StateTree = [
                 The server will not return these states. These are solely for populating
                 the heatmap for task slot usage.
             */
-            { state: NodeState.running25, color: "#B1D5D4"},
-            { state: NodeState.running50, color: "#8CC3B0"},
-            { state: NodeState.running75, color: "#4EB17C"},
-            { state: NodeState.running99, color: "#22A042"},
-            { state: NodeState.running100, color: runningColor},
+            { state: NodeState.running25, color: "#B1D5D4" },
+            { state: NodeState.running50, color: "#8CC3B0" },
+            { state: NodeState.running75, color: "#4EB17C" },
+            { state: NodeState.running99, color: "#22A042" },
+            { state: NodeState.running100, color: runningColor },
         ],
     },
     { state: NodeState.waitingForStartTask, color: "#be93d9" },
@@ -113,7 +116,7 @@ export class NodesHeatmapComponent implements AfterViewInit, OnChanges, OnDestro
     };
 
     private _erd: any;
-    private _svg: d3.Selection<any, any, any, any>;
+    private _svg: Selection<BaseType, unknown, BaseType, unknown>;
     private _width: number = 0;
     private _height: number = 0;
     private _nodes: List<Node>;
@@ -200,7 +203,9 @@ export class NodesHeatmapComponent implements AfterViewInit, OnChanges, OnDestro
     public redraw() {
         this._computeDimensions();
         const tiles = this._nodes.map((node, index) => ({ node, index }));
-        const groups = this._svg.selectAll("g.node-group").data(tiles.toJS());
+        const groups = this._svg
+            .selectAll<SVGSVGElement, HeatmapTile[]>("g.node-group")
+            .data(tiles.toJS() as HeatmapTile[]);
         groups.exit().remove();
         this._updateSvg(groups);
     }
@@ -212,23 +217,23 @@ export class NodesHeatmapComponent implements AfterViewInit, OnChanges, OnDestro
         this.redraw();
     }
 
-    private _updateSvg(groups: any) {
+    private _updateSvg(groups: NodeSelection) {
         const spaceInBetweenNode = Math.ceil(this.dimensions.tileSize / 20);
         const z = Math.max(this.dimensions.tileSize - spaceInBetweenNode, 0);
         const nodeEnter = groups.enter().append("g")
             .attr("class", "node-group")
-            .on("click", (tile) => {
+            .on("click", (_event: MouseEvent, tile: HeatmapTile) => {
                 if (!this.interactive) {
                     return;
                 }
                 this.selectedNodeId.next(tile.node.id);
                 this._updateSvg(this._svg.selectAll("g.node-group"));
-            }).on("dblclick", (tile) => {
+            }).on("dblclick", (_event: MouseEvent, tile: HeatmapTile) => {
                 if (!this.interactive) {
                     return;
                 }
                 this._gotoNode(tile.node);
-            }).on("contextmenu", (tile) => {
+            }).on("contextmenu", (_event: Event, tile: HeatmapTile) => {
                 if (!this.interactive) {
                     return;
                 }
@@ -355,7 +360,7 @@ export class NodesHeatmapComponent implements AfterViewInit, OnChanges, OnDestro
             } else {
                 return `${taskCount} tasks (${taskSlotsCount}/${this.pool.taskSlotsPerNode} slots) running on node (${tile.node.id})`;
             }
-       });
+        });
     }
 
     /**

From ee1f66dbbee3743d5355c35db06b8f8f2afd825b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Jan 2023 19:55:00 +0000
Subject: [PATCH 53/72] Bump ua-parser-js from 0.7.31 to 0.7.33

Bumps [ua-parser-js](https://github.com/faisalman/ua-parser-js) from 0.7.31 to 0.7.33.
- [Release notes](https://github.com/faisalman/ua-parser-js/releases)
- [Changelog](https://github.com/faisalman/ua-parser-js/blob/master/changelog.md)
- [Commits](https://github.com/faisalman/ua-parser-js/compare/0.7.31...0.7.33)

---
updated-dependencies:
- dependency-name: ua-parser-js
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3771718851..d37ffdc038 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19759,9 +19759,9 @@
       }
     },
     "node_modules/ua-parser-js": {
-      "version": "0.7.31",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.31.tgz",
-      "integrity": "sha512-qLK/Xe9E2uzmYI3qLeOmI0tEOt+TBBQyUIAh4aAgU05FVYzeZrKUdkAZfBNVGRaHVgV0TDkdEngJSw/SyQchkQ==",
+      "version": "0.7.33",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.33.tgz",
+      "integrity": "sha512-s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw==",
       "dev": true,
       "funding": [
         {
@@ -37409,9 +37409,9 @@
       "dev": true
     },
     "ua-parser-js": {
-      "version": "0.7.31",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.31.tgz",
-      "integrity": "sha512-qLK/Xe9E2uzmYI3qLeOmI0tEOt+TBBQyUIAh4aAgU05FVYzeZrKUdkAZfBNVGRaHVgV0TDkdEngJSw/SyQchkQ==",
+      "version": "0.7.33",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.33.tgz",
+      "integrity": "sha512-s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw==",
       "dev": true
     },
     "uc.micro": {

From 9adfb3359489af3828f444a61ee74a0019d3ebb3 Mon Sep 17 00:00:00 2001
From: Shiran Pasternak <shiran.pasternak@microsoft.com>
Date: Tue, 24 Jan 2023 15:40:03 -0500
Subject: [PATCH 54/72] Corrects spelling of "programatic" and "programing"

---
 i18n/resources.de.json                        |  4 +--
 i18n/resources.es.json                        |  4 +--
 i18n/resources.fr.json                        |  4 +--
 i18n/resources.it.json                        |  8 ++---
 i18n/resources.ja.json                        |  8 ++---
 i18n/resources.ko.json                        |  8 ++---
 i18n/resources.pt-BR.json                     |  8 ++---
 i18n/resources.pt.json                        |  6 ++--
 i18n/resources.ru.json                        |  4 +--
 i18n/resources.zh-Hans.json                   |  8 ++---
 i18n/resources.zh-Hant.json                   |  6 ++--
 src/app/components/account/account.module.ts  |  4 +--
 .../account/action/account-commands.ts        |  4 +--
 .../getting-started-card.component.ts         |  4 +--
 .../details/programatic-usage/index.ts        |  3 --
 .../programing-sample/index.ts                |  1 -
 .../aad-app-picker.component.ts               |  0
 .../aad-app-picker/aad-app-picker.html        |  0
 .../aad-app-picker/aad-app-picker.scss        |  0
 .../aad-app-picker/index.ts                   |  0
 .../aad-app-secret-picker.component.ts        |  0
 .../aad-app-secret-picker.html                |  0
 .../aad-app-secret-picker.i18n.yml            |  0
 .../aad-app-secret-picker.scss                |  0
 .../aad-app-secret-picker/index.ts            |  0
 .../aad-credentials-picker.component.ts       |  2 +-
 .../aad-credentials-picker.html               |  0
 .../aad-credentials-picker.scss               |  0
 .../create-new-aad-app.component.ts           |  0
 .../create-new-aad-app.html                   |  0
 .../create-new-aad-app.i18n.yml               |  0
 .../create-new-aad-app.scss                   |  0
 .../create-new-aad-app/index.ts               |  0
 .../generate-aad-app-secret.component.ts      |  0
 .../generate-aad-app-secret.html              |  0
 .../generate-aad-app-secret.scss              |  0
 .../generate-aad-app-secret/index.ts          |  0
 .../aad-credentials-picker/index.ts           |  0
 .../resource-permission-button/index.ts       |  0
 ...source-permission-button.component.spec.ts |  0
 .../resource-permission-button.component.ts   |  0
 .../resource-permission-button.html           |  0
 .../resource-permission-button.i18n.yml       |  0
 .../resource-permission-button.scss           |  0
 .../details/programmatic-usage/index.ts       |  3 ++
 .../programmatic-usage.component.ts}          |  8 ++---
 .../programmatic-usage.html}                  | 30 +++++++++----------
 .../programmatic-usage.i18n.yml}              |  2 +-
 .../programmatic-usage.module.ts}             | 12 ++++----
 .../programmatic-usage.scss}                  |  2 +-
 .../programming-sample/index.ts               |  1 +
 .../programming-sample.component.spec.ts}     | 14 ++++-----
 .../programming-sample.component.ts}          | 12 ++++----
 .../programming-sample.html}                  |  0
 .../programming-sample.scss}                  |  2 +-
 .../samples/aad/aztk.yaml.template            |  0
 .../samples/aad/csharp.cs.template            |  0
 .../samples/aad/doAzureParallel.json.template |  0
 .../samples/aad/node.js.template              |  0
 .../samples/aad/python.py.template            |  0
 .../programming-sample}/samples/index.ts      |  0
 .../samples/shared-key/csharp.cs.template     |  0
 .../shared-key/doAzureParallel.json.template  |  0
 .../samples/shared-key/node.js.template       |  0
 .../samples/shared-key/python.py.template     |  0
 .../shared-key-credentials.model.ts           |  0
 66 files changed, 86 insertions(+), 86 deletions(-)
 delete mode 100644 src/app/components/account/details/programatic-usage/index.ts
 delete mode 100644 src/app/components/account/details/programatic-usage/programing-sample/index.ts
 rename src/app/components/account/details/{programatic-usage => programmatic-usage}/aad-credentials-picker/aad-app-picker/aad-app-picker.component.ts (100%)
 rename src/app/components/account/details/{programatic-usage => programmatic-usage}/aad-credentials-picker/aad-app-picker/aad-app-picker.html (100%)
 rename src/app/components/account/details/{programatic-usage => programmatic-usage}/aad-credentials-picker/aad-app-picker/aad-app-picker.scss (100%)
 rename src/app/components/account/details/{programatic-usage => programmatic-usage}/aad-credentials-picker/aad-app-picker/index.ts (100%)
 rename src/app/components/account/details/{programatic-usage => programmatic-usage}/aad-credentials-picker/aad-app-secret-picker/aad-app-secret-picker.component.ts (100%)
 rename src/app/components/account/details/{programatic-usage => programmatic-usage}/aad-credentials-picker/aad-app-secret-picker/aad-app-secret-picker.html (100%)
 rename src/app/components/account/details/{programatic-usage => programmatic-usage}/aad-credentials-picker/aad-app-secret-picker/aad-app-secret-picker.i18n.yml (100%)
 rename src/app/components/account/details/{programatic-usage => programmatic-usage}/aad-credentials-picker/aad-app-secret-picker/aad-app-secret-picker.scss (100%)
 rename src/app/components/account/details/{programatic-usage => programmatic-usage}/aad-credentials-picker/aad-app-secret-picker/index.ts (100%)
 rename src/app/components/account/details/{programatic-usage => programmatic-usage}/aad-credentials-picker/aad-credentials-picker.component.ts (97%)
 rename src/app/components/account/details/{programatic-usage => programmatic-usage}/aad-credentials-picker/aad-credentials-picker.html (100%)
 rename src/app/components/account/details/{programatic-usage => programmatic-usage}/aad-credentials-picker/aad-credentials-picker.scss (100%)
 rename src/app/components/account/details/{programatic-usage => programmatic-usage}/aad-credentials-picker/create-new-aad-app/create-new-aad-app.component.ts (100%)
 rename src/app/components/account/details/{programatic-usage => programmatic-usage}/aad-credentials-picker/create-new-aad-app/create-new-aad-app.html (100%)
 rename src/app/components/account/details/{programatic-usage => programmatic-usage}/aad-credentials-picker/create-new-aad-app/create-new-aad-app.i18n.yml (100%)
 rename src/app/components/account/details/{programatic-usage => programmatic-usage}/aad-credentials-picker/create-new-aad-app/create-new-aad-app.scss (100%)
 rename src/app/components/account/details/{programatic-usage => programmatic-usage}/aad-credentials-picker/create-new-aad-app/index.ts (100%)
 rename src/app/components/account/details/{programatic-usage => programmatic-usage}/aad-credentials-picker/generate-aad-app-secret/generate-aad-app-secret.component.ts (100%)
 rename src/app/components/account/details/{programatic-usage => programmatic-usage}/aad-credentials-picker/generate-aad-app-secret/generate-aad-app-secret.html (100%)
 rename src/app/components/account/details/{programatic-usage => programmatic-usage}/aad-credentials-picker/generate-aad-app-secret/generate-aad-app-secret.scss (100%)
 rename src/app/components/account/details/{programatic-usage => programmatic-usage}/aad-credentials-picker/generate-aad-app-secret/index.ts (100%)
 rename src/app/components/account/details/{programatic-usage => programmatic-usage}/aad-credentials-picker/index.ts (100%)
 rename src/app/components/account/details/{programatic-usage => programmatic-usage}/aad-credentials-picker/resource-permission-button/index.ts (100%)
 rename src/app/components/account/details/{programatic-usage => programmatic-usage}/aad-credentials-picker/resource-permission-button/resource-permission-button.component.spec.ts (100%)
 rename src/app/components/account/details/{programatic-usage => programmatic-usage}/aad-credentials-picker/resource-permission-button/resource-permission-button.component.ts (100%)
 rename src/app/components/account/details/{programatic-usage => programmatic-usage}/aad-credentials-picker/resource-permission-button/resource-permission-button.html (100%)
 rename src/app/components/account/details/{programatic-usage => programmatic-usage}/aad-credentials-picker/resource-permission-button/resource-permission-button.i18n.yml (100%)
 rename src/app/components/account/details/{programatic-usage => programmatic-usage}/aad-credentials-picker/resource-permission-button/resource-permission-button.scss (100%)
 create mode 100644 src/app/components/account/details/programmatic-usage/index.ts
 rename src/app/components/account/details/{programatic-usage/programatic-usage.component.ts => programmatic-usage/programmatic-usage.component.ts} (95%)
 rename src/app/components/account/details/{programatic-usage/programatic-usage.html => programmatic-usage/programmatic-usage.html} (80%)
 rename src/app/components/account/details/{programatic-usage/programatic-usage.i18n.yml => programmatic-usage/programmatic-usage.i18n.yml} (87%)
 rename src/app/components/account/details/{programatic-usage/programatic-usage.module.ts => programmatic-usage/programmatic-usage.module.ts} (76%)
 rename src/app/components/account/details/{programatic-usage/programatic-usage.scss => programmatic-usage/programmatic-usage.scss} (97%)
 create mode 100644 src/app/components/account/details/programmatic-usage/programming-sample/index.ts
 rename src/app/components/account/details/{programatic-usage/programing-sample/programing-sample.component.spec.ts => programmatic-usage/programming-sample/programming-sample.component.spec.ts} (88%)
 rename src/app/components/account/details/{programatic-usage/programing-sample/programing-sample.component.ts => programmatic-usage/programming-sample/programming-sample.component.ts} (91%)
 rename src/app/components/account/details/{programatic-usage/programing-sample/programing-sample.html => programmatic-usage/programming-sample/programming-sample.html} (100%)
 rename src/app/components/account/details/{programatic-usage/programing-sample/programing-sample.scss => programmatic-usage/programming-sample/programming-sample.scss} (93%)
 rename src/app/components/account/details/{programatic-usage/programing-sample => programmatic-usage/programming-sample}/samples/aad/aztk.yaml.template (100%)
 rename src/app/components/account/details/{programatic-usage/programing-sample => programmatic-usage/programming-sample}/samples/aad/csharp.cs.template (100%)
 rename src/app/components/account/details/{programatic-usage/programing-sample => programmatic-usage/programming-sample}/samples/aad/doAzureParallel.json.template (100%)
 rename src/app/components/account/details/{programatic-usage/programing-sample => programmatic-usage/programming-sample}/samples/aad/node.js.template (100%)
 rename src/app/components/account/details/{programatic-usage/programing-sample => programmatic-usage/programming-sample}/samples/aad/python.py.template (100%)
 rename src/app/components/account/details/{programatic-usage/programing-sample => programmatic-usage/programming-sample}/samples/index.ts (100%)
 rename src/app/components/account/details/{programatic-usage/programing-sample => programmatic-usage/programming-sample}/samples/shared-key/csharp.cs.template (100%)
 rename src/app/components/account/details/{programatic-usage/programing-sample => programmatic-usage/programming-sample}/samples/shared-key/doAzureParallel.json.template (100%)
 rename src/app/components/account/details/{programatic-usage/programing-sample => programmatic-usage/programming-sample}/samples/shared-key/node.js.template (100%)
 rename src/app/components/account/details/{programatic-usage/programing-sample => programmatic-usage/programming-sample}/samples/shared-key/python.py.template (100%)
 rename src/app/components/account/details/{programatic-usage => programmatic-usage}/shared-key-credentials.model.ts (100%)

diff --git a/i18n/resources.de.json b/i18n/resources.de.json
index cc9fa9cad7..d4a0e89acd 100644
--- a/i18n/resources.de.json
+++ b/i18n/resources.de.json
@@ -76,8 +76,8 @@
   "profile-button.profile": "Profil",
   "profile-button.settings": "Einstellungen",
   "profile-button.viewLogs": "Logs anzeigen",
-  "programatic-usage.authenticationType": "Authentifizierungstyp",
-  "programatic-usage.credentials": "Anmeldeinformationen",
+  "programmatic-usage.authenticationType": "Authentifizierungstyp",
+  "programmatic-usage.credentials": "Anmeldeinformationen",
   "rerun-task-form.action": "Erneut ausführen",
   "resource-permission-button.none": "NONE",
   "resource-permission-button.permission": "Berechtigung",
diff --git a/i18n/resources.es.json b/i18n/resources.es.json
index 3b74ba7ae4..68677fb493 100644
--- a/i18n/resources.es.json
+++ b/i18n/resources.es.json
@@ -128,8 +128,8 @@
   "profile-button.settings": "Configuración",
   "profile-button.viewLogs": "Ver registros",
   "profile-button.viewTheme": "Ver colores del tema",
-  "programatic-usage.authenticationType": "Tipo de autenticación",
-  "programatic-usage.credentials": "Credenciales",
+  "programmatic-usage.authenticationType": "Tipo de autenticación",
+  "programmatic-usage.credentials": "Credenciales",
   "rerun-task-form.action": "Volver a ejecutar",
   "rerun-task-form.title": "Volver a ejecutar tarea",
   "resource-permission-button.giveRole": "Papel de dar {rol}",
diff --git a/i18n/resources.fr.json b/i18n/resources.fr.json
index 2e24f16e8f..4e23ffe983 100644
--- a/i18n/resources.fr.json
+++ b/i18n/resources.fr.json
@@ -154,8 +154,8 @@
   "profile-button.settings": "Paramètres",
   "profile-button.thirdPartyNotices": "Avis de tiers",
   "profile-button.viewTheme": "Couleurs de thème d’affichage",
-  "programatic-usage.authenticationType": "Type d'authentification ",
-  "programatic-usage.credentials": "Informations d'identification",
+  "programmatic-usage.authenticationType": "Type d'authentification ",
+  "programmatic-usage.credentials": "Informations d'identification",
   "rerun-task-form.action": "Réexécuter",
   "rerun-task-form.title": "Réexécuter la tâche",
   "resource-permission-button.none": "Aucun(e)",
diff --git a/i18n/resources.it.json b/i18n/resources.it.json
index 67565f73c3..043a92c6b5 100644
--- a/i18n/resources.it.json
+++ b/i18n/resources.it.json
@@ -120,10 +120,10 @@
   "profile-button.settings": "Impostazioni",
   "profile-button.viewLogs": "Visualizza i log",
   "profile-button.viewTheme": "Mostra colori del tema",
-  "programatic-usage.authenticationType": "Tipo di autenticazione",
-  "programatic-usage.credentials": "Credenziali",
-  "programatic-usage.setup": "setup",
-  "programatic-usage.title": "Credenziali ed esempi di codice per questo account batch",
+  "programmatic-usage.authenticationType": "Tipo di autenticazione",
+  "programmatic-usage.credentials": "Credenziali",
+  "programmatic-usage.setup": "setup",
+  "programmatic-usage.title": "Credenziali ed esempi di codice per questo account batch",
   "rerun-task-form.action": "Riesegui",
   "rerun-task-form.subtitle": "Questo eliminerà il task e ne creerà uno nuovo con lo stesso id.",
   "rerun-task-form.title": "Riesegui attività",
diff --git a/i18n/resources.ja.json b/i18n/resources.ja.json
index aa91d44b21..2c2d46c29d 100644
--- a/i18n/resources.ja.json
+++ b/i18n/resources.ja.json
@@ -216,10 +216,10 @@
   "profile-button.thirdPartyNotices": "サードパーティ通知",
   "profile-button.viewLogs": "ログの表示",
   "profile-button.viewTheme": "テーマカラーの表示",
-  "programatic-usage.authenticationType": "認証の種類",
-  "programatic-usage.credentials": "資格情報",
-  "programatic-usage.setup": "セットアップ",
-  "programatic-usage.title": "資格情報とこのバッチ アカウントのコード サンプル",
+  "programmatic-usage.authenticationType": "認証の種類",
+  "programmatic-usage.credentials": "資格情報",
+  "programmatic-usage.setup": "セットアップ",
+  "programmatic-usage.title": "資格情報とこのバッチ アカウントのコード サンプル",
   "rerun-task-form.action": "再実行",
   "rerun-task-form.subtitle": "タスクを削除し、同じ id で新しいタスクを作成します。",
   "rerun-task-form.title": "タスクの再実行",
diff --git a/i18n/resources.ko.json b/i18n/resources.ko.json
index af6817899d..ec374ebe6c 100644
--- a/i18n/resources.ko.json
+++ b/i18n/resources.ko.json
@@ -207,10 +207,10 @@
   "profile-button.thirdPartyNotices": "제 3자 통지",
   "profile-button.viewLogs": "로그 보기",
   "profile-button.viewTheme": "테마 색상 보기",
-  "programatic-usage.authenticationType": "인증 유형",
-  "programatic-usage.credentials": "자격 증명",
-  "programatic-usage.setup": "설치",
-  "programatic-usage.title": "이 배치 계정의 자격증명 및 코드샘플",
+  "programmatic-usage.authenticationType": "인증 유형",
+  "programmatic-usage.credentials": "자격 증명",
+  "programmatic-usage.setup": "설치",
+  "programmatic-usage.title": "이 배치 계정의 자격증명 및 코드샘플",
   "rerun-task-form.action": "재실행",
   "rerun-task-form.subtitle": "이렇게 하면 작업이 삭제되고 동일한 ID로 새 작업이 생성됩니다.",
   "rerun-task-form.title": "작업 재실행",
diff --git a/i18n/resources.pt-BR.json b/i18n/resources.pt-BR.json
index 436b3a1b7d..606550ad9a 100644
--- a/i18n/resources.pt-BR.json
+++ b/i18n/resources.pt-BR.json
@@ -216,10 +216,10 @@
   "profile-button.thirdPartyNotices": "Anúncios de terceiros",
   "profile-button.viewLogs": "Exibição de Logs",
   "profile-button.viewTheme": "Exibição de cores de tema",
-  "programatic-usage.authenticationType": "Tipo de autenticação",
-  "programatic-usage.credentials": "Credenciais",
-  "programatic-usage.setup": "Configuração",
-  "programatic-usage.title": "Credenciais e exemplos de código para esta conta de lote",
+  "programmatic-usage.authenticationType": "Tipo de autenticação",
+  "programmatic-usage.credentials": "Credenciais",
+  "programmatic-usage.setup": "Configuração",
+  "programmatic-usage.title": "Credenciais e exemplos de código para esta conta de lote",
   "rerun-task-form.action": "Reexecutar",
   "rerun-task-form.subtitle": "Isto irá excluir a tarefa e criar uma nova com o mesmo id.",
   "rerun-task-form.title": "Reexecutar tarefa",
diff --git a/i18n/resources.pt.json b/i18n/resources.pt.json
index 515e4ae58f..be8216693d 100644
--- a/i18n/resources.pt.json
+++ b/i18n/resources.pt.json
@@ -86,9 +86,9 @@
   "profile-button.settings": "Definições",
   "profile-button.thirdPartyNotices": "Avisos de terceiros",
   "profile-button.viewLogs": "Ver Registos",
-  "programatic-usage.authenticationType": "Tipo de autenticação",
-  "programatic-usage.credentials": "Credenciais",
-  "programatic-usage.setup": "Configuração",
+  "programmatic-usage.authenticationType": "Tipo de autenticação",
+  "programmatic-usage.credentials": "Credenciais",
+  "programmatic-usage.setup": "Configuração",
   "rerun-task-form.action": "Voltar a executar",
   "resource-permission-button.none": "Nenhum",
   "resource-permission-button.removeAccess": "Remover acesso",
diff --git a/i18n/resources.ru.json b/i18n/resources.ru.json
index 62d2001505..c591927ab6 100644
--- a/i18n/resources.ru.json
+++ b/i18n/resources.ru.json
@@ -69,8 +69,8 @@
   "pool-picker.reset": "Сброс",
   "profile-button.profile": "Профиль",
   "profile-button.settings": "Параметры",
-  "programatic-usage.authenticationType": "Тип проверки подлинности",
-  "programatic-usage.credentials": "Учетные данные",
+  "programmatic-usage.authenticationType": "Тип проверки подлинности",
+  "programmatic-usage.credentials": "Учетные данные",
   "resource-permission-button.none": "NONE",
   "resource-permission-button.permission": "Разрешение",
   "settings.general": "Общее",
diff --git a/i18n/resources.zh-Hans.json b/i18n/resources.zh-Hans.json
index 5c19913502..d44517cf46 100644
--- a/i18n/resources.zh-Hans.json
+++ b/i18n/resources.zh-Hans.json
@@ -216,10 +216,10 @@
   "profile-button.thirdPartyNotices": "第三方通知",
   "profile-button.viewLogs": "查看日志",
   "profile-button.viewTheme": "查看主题颜色",
-  "programatic-usage.authenticationType": "身份验证类型",
-  "programatic-usage.credentials": "凭据",
-  "programatic-usage.setup": "设置",
-  "programatic-usage.title": "这批帐户的凭据和代码示例",
+  "programmatic-usage.authenticationType": "身份验证类型",
+  "programmatic-usage.credentials": "凭据",
+  "programmatic-usage.setup": "设置",
+  "programmatic-usage.title": "这批帐户的凭据和代码示例",
   "rerun-task-form.action": "重新运行",
   "rerun-task-form.subtitle": "这将删除该任务并创建一个具有相同ID的新任务。",
   "rerun-task-form.title": "重新运行任务",
diff --git a/i18n/resources.zh-Hant.json b/i18n/resources.zh-Hant.json
index 98e7415afb..6b6b2edb52 100644
--- a/i18n/resources.zh-Hant.json
+++ b/i18n/resources.zh-Hant.json
@@ -63,8 +63,8 @@
   "profile-button.report": "回報 bug 或功能請求",
   "profile-button.settings": "設定",
   "profile-button.viewLogs": "查看日誌",
-  "programatic-usage.authenticationType": "驗證類型",
-  "programatic-usage.credentials": "認證",
+  "programmatic-usage.authenticationType": "驗證類型",
+  "programmatic-usage.credentials": "認證",
   "resource-permission-button.giveRole": "給 {role} 角色",
   "resource-permission-button.none": "無",
   "resource-permission-button.permission": "使用權限",
@@ -88,4 +88,4 @@
   "task-resource-files.fileMode": "檔案模式",
   "user-account-picker.password": "密碼",
   "user-account-picker.username": "使用者名稱"
-}
\ No newline at end of file
+}
diff --git a/src/app/components/account/account.module.ts b/src/app/components/account/account.module.ts
index 3a4d234d86..e76afb6c44 100644
--- a/src/app/components/account/account.module.ts
+++ b/src/app/components/account/account.module.ts
@@ -15,7 +15,7 @@ import { AccountCostCardComponent } from "./details/account-cost-card";
 import { AccountMonitoringSectionComponent } from "./details/account-monitoring-section";
 import { AccountQuotasCardComponent } from "./details/account-quotas-card";
 import { AccountSummaryCardComponent } from "./details/account-summary-card";
-import { ProgramaticUsageModule } from "./details/programatic-usage";
+import { ProgrammaticUsageModule } from "./details/programmatic-usage";
 import { StorageAccountCardComponent } from "./details/storage-account-card";
 import { AccountHomeComponent } from "./home";
 import { AccountMonitoringModule } from "./monitoring";
@@ -33,7 +33,7 @@ const modules = [
     AccountBrowseModule,
     AccountMonitoringModule,
     PoolBaseModule,
-    ProgramaticUsageModule,
+    ProgrammaticUsageModule,
     PoolGraphsModule,
 ];
 
diff --git a/src/app/components/account/action/account-commands.ts b/src/app/components/account/action/account-commands.ts
index 5c22eb91b7..53766a7c8a 100644
--- a/src/app/components/account/action/account-commands.ts
+++ b/src/app/components/account/action/account-commands.ts
@@ -2,7 +2,7 @@ import { Injectable, Injector } from "@angular/core";
 import {
     COMMAND_LABEL_ICON, DialogService, EntityCommand, EntityCommands, Permission, SidebarManager,
 } from "@batch-flask/ui";
-import { ProgramaticUsageComponent } from "app/components/account/details/programatic-usage";
+import { ProgrammaticUsageComponent } from "app/components/account/details/programmatic-usage";
 import { BatchAccount, BatchAccountProvisingState, LocalBatchAccount } from "app/models";
 import { BatchAccountService } from "app/services";
 import { EditLocalBatchAccountComponent } from "./add";
@@ -83,7 +83,7 @@ export class BatchAccountCommands extends EntityCommands<BatchAccount> {
     }
 
     private _showKeys(account: BatchAccount) {
-        const ref = this.dialogService.open(ProgramaticUsageComponent);
+        const ref = this.dialogService.open(ProgrammaticUsageComponent);
         ref.componentInstance.accountId = account.id;
     }
 
diff --git a/src/app/components/account/details/getting-started-card/getting-started-card.component.ts b/src/app/components/account/details/getting-started-card/getting-started-card.component.ts
index 3cd9876c1b..b59afa454a 100644
--- a/src/app/components/account/details/getting-started-card/getting-started-card.component.ts
+++ b/src/app/components/account/details/getting-started-card/getting-started-card.component.ts
@@ -1,7 +1,7 @@
 import { ChangeDetectionStrategy, Component, Input } from "@angular/core";
 import { ElectronShell } from "@batch-flask/electron";
 import { DialogService } from "@batch-flask/ui/dialogs";
-import { CredentialType, ProgramaticUsageComponent } from "../programatic-usage";
+import { CredentialType, ProgrammaticUsageComponent } from "../programmatic-usage";
 
 import "./getting-started-card.scss";
 
@@ -20,7 +20,7 @@ export class GettingStartedCardComponent {
     }
 
     public openPage(src: string, credType: CredentialType) {
-        const ref = this.dialogService.open(ProgramaticUsageComponent);
+        const ref = this.dialogService.open(ProgrammaticUsageComponent);
         ref.componentInstance.accountId = this.accountId;
         ref.componentInstance.pickCredentialType(credType);
         ref.componentInstance.pickType(src);
diff --git a/src/app/components/account/details/programatic-usage/index.ts b/src/app/components/account/details/programatic-usage/index.ts
deleted file mode 100644
index 14ad5a87d9..0000000000
--- a/src/app/components/account/details/programatic-usage/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from "./programatic-usage.component";
-export * from "./aad-credentials-picker";
-export * from "./programatic-usage.module";
diff --git a/src/app/components/account/details/programatic-usage/programing-sample/index.ts b/src/app/components/account/details/programatic-usage/programing-sample/index.ts
deleted file mode 100644
index 18bee58dff..0000000000
--- a/src/app/components/account/details/programatic-usage/programing-sample/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./programing-sample.component";
diff --git a/src/app/components/account/details/programatic-usage/aad-credentials-picker/aad-app-picker/aad-app-picker.component.ts b/src/app/components/account/details/programmatic-usage/aad-credentials-picker/aad-app-picker/aad-app-picker.component.ts
similarity index 100%
rename from src/app/components/account/details/programatic-usage/aad-credentials-picker/aad-app-picker/aad-app-picker.component.ts
rename to src/app/components/account/details/programmatic-usage/aad-credentials-picker/aad-app-picker/aad-app-picker.component.ts
diff --git a/src/app/components/account/details/programatic-usage/aad-credentials-picker/aad-app-picker/aad-app-picker.html b/src/app/components/account/details/programmatic-usage/aad-credentials-picker/aad-app-picker/aad-app-picker.html
similarity index 100%
rename from src/app/components/account/details/programatic-usage/aad-credentials-picker/aad-app-picker/aad-app-picker.html
rename to src/app/components/account/details/programmatic-usage/aad-credentials-picker/aad-app-picker/aad-app-picker.html
diff --git a/src/app/components/account/details/programatic-usage/aad-credentials-picker/aad-app-picker/aad-app-picker.scss b/src/app/components/account/details/programmatic-usage/aad-credentials-picker/aad-app-picker/aad-app-picker.scss
similarity index 100%
rename from src/app/components/account/details/programatic-usage/aad-credentials-picker/aad-app-picker/aad-app-picker.scss
rename to src/app/components/account/details/programmatic-usage/aad-credentials-picker/aad-app-picker/aad-app-picker.scss
diff --git a/src/app/components/account/details/programatic-usage/aad-credentials-picker/aad-app-picker/index.ts b/src/app/components/account/details/programmatic-usage/aad-credentials-picker/aad-app-picker/index.ts
similarity index 100%
rename from src/app/components/account/details/programatic-usage/aad-credentials-picker/aad-app-picker/index.ts
rename to src/app/components/account/details/programmatic-usage/aad-credentials-picker/aad-app-picker/index.ts
diff --git a/src/app/components/account/details/programatic-usage/aad-credentials-picker/aad-app-secret-picker/aad-app-secret-picker.component.ts b/src/app/components/account/details/programmatic-usage/aad-credentials-picker/aad-app-secret-picker/aad-app-secret-picker.component.ts
similarity index 100%
rename from src/app/components/account/details/programatic-usage/aad-credentials-picker/aad-app-secret-picker/aad-app-secret-picker.component.ts
rename to src/app/components/account/details/programmatic-usage/aad-credentials-picker/aad-app-secret-picker/aad-app-secret-picker.component.ts
diff --git a/src/app/components/account/details/programatic-usage/aad-credentials-picker/aad-app-secret-picker/aad-app-secret-picker.html b/src/app/components/account/details/programmatic-usage/aad-credentials-picker/aad-app-secret-picker/aad-app-secret-picker.html
similarity index 100%
rename from src/app/components/account/details/programatic-usage/aad-credentials-picker/aad-app-secret-picker/aad-app-secret-picker.html
rename to src/app/components/account/details/programmatic-usage/aad-credentials-picker/aad-app-secret-picker/aad-app-secret-picker.html
diff --git a/src/app/components/account/details/programatic-usage/aad-credentials-picker/aad-app-secret-picker/aad-app-secret-picker.i18n.yml b/src/app/components/account/details/programmatic-usage/aad-credentials-picker/aad-app-secret-picker/aad-app-secret-picker.i18n.yml
similarity index 100%
rename from src/app/components/account/details/programatic-usage/aad-credentials-picker/aad-app-secret-picker/aad-app-secret-picker.i18n.yml
rename to src/app/components/account/details/programmatic-usage/aad-credentials-picker/aad-app-secret-picker/aad-app-secret-picker.i18n.yml
diff --git a/src/app/components/account/details/programatic-usage/aad-credentials-picker/aad-app-secret-picker/aad-app-secret-picker.scss b/src/app/components/account/details/programmatic-usage/aad-credentials-picker/aad-app-secret-picker/aad-app-secret-picker.scss
similarity index 100%
rename from src/app/components/account/details/programatic-usage/aad-credentials-picker/aad-app-secret-picker/aad-app-secret-picker.scss
rename to src/app/components/account/details/programmatic-usage/aad-credentials-picker/aad-app-secret-picker/aad-app-secret-picker.scss
diff --git a/src/app/components/account/details/programatic-usage/aad-credentials-picker/aad-app-secret-picker/index.ts b/src/app/components/account/details/programmatic-usage/aad-credentials-picker/aad-app-secret-picker/index.ts
similarity index 100%
rename from src/app/components/account/details/programatic-usage/aad-credentials-picker/aad-app-secret-picker/index.ts
rename to src/app/components/account/details/programmatic-usage/aad-credentials-picker/aad-app-secret-picker/index.ts
diff --git a/src/app/components/account/details/programatic-usage/aad-credentials-picker/aad-credentials-picker.component.ts b/src/app/components/account/details/programmatic-usage/aad-credentials-picker/aad-credentials-picker.component.ts
similarity index 97%
rename from src/app/components/account/details/programatic-usage/aad-credentials-picker/aad-credentials-picker.component.ts
rename to src/app/components/account/details/programmatic-usage/aad-credentials-picker/aad-credentials-picker.component.ts
index 4e9de47e0e..baaabb9bae 100644
--- a/src/app/components/account/details/programatic-usage/aad-credentials-picker/aad-credentials-picker.component.ts
+++ b/src/app/components/account/details/programmatic-usage/aad-credentials-picker/aad-credentials-picker.component.ts
@@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, In
 import { ArmBatchAccount } from "app/models";
 import { AADApplication, PasswordCredential } from "app/models/ms-graph";
 import { ServicePrincipalService } from "app/services/ms-graph";
-import { AADCredential } from "../programatic-usage.component";
+import { AADCredential } from "../programmatic-usage.component";
 import { AppCreatedEvent } from "./create-new-aad-app";
 
 import "./aad-credentials-picker.scss";
diff --git a/src/app/components/account/details/programatic-usage/aad-credentials-picker/aad-credentials-picker.html b/src/app/components/account/details/programmatic-usage/aad-credentials-picker/aad-credentials-picker.html
similarity index 100%
rename from src/app/components/account/details/programatic-usage/aad-credentials-picker/aad-credentials-picker.html
rename to src/app/components/account/details/programmatic-usage/aad-credentials-picker/aad-credentials-picker.html
diff --git a/src/app/components/account/details/programatic-usage/aad-credentials-picker/aad-credentials-picker.scss b/src/app/components/account/details/programmatic-usage/aad-credentials-picker/aad-credentials-picker.scss
similarity index 100%
rename from src/app/components/account/details/programatic-usage/aad-credentials-picker/aad-credentials-picker.scss
rename to src/app/components/account/details/programmatic-usage/aad-credentials-picker/aad-credentials-picker.scss
diff --git a/src/app/components/account/details/programatic-usage/aad-credentials-picker/create-new-aad-app/create-new-aad-app.component.ts b/src/app/components/account/details/programmatic-usage/aad-credentials-picker/create-new-aad-app/create-new-aad-app.component.ts
similarity index 100%
rename from src/app/components/account/details/programatic-usage/aad-credentials-picker/create-new-aad-app/create-new-aad-app.component.ts
rename to src/app/components/account/details/programmatic-usage/aad-credentials-picker/create-new-aad-app/create-new-aad-app.component.ts
diff --git a/src/app/components/account/details/programatic-usage/aad-credentials-picker/create-new-aad-app/create-new-aad-app.html b/src/app/components/account/details/programmatic-usage/aad-credentials-picker/create-new-aad-app/create-new-aad-app.html
similarity index 100%
rename from src/app/components/account/details/programatic-usage/aad-credentials-picker/create-new-aad-app/create-new-aad-app.html
rename to src/app/components/account/details/programmatic-usage/aad-credentials-picker/create-new-aad-app/create-new-aad-app.html
diff --git a/src/app/components/account/details/programatic-usage/aad-credentials-picker/create-new-aad-app/create-new-aad-app.i18n.yml b/src/app/components/account/details/programmatic-usage/aad-credentials-picker/create-new-aad-app/create-new-aad-app.i18n.yml
similarity index 100%
rename from src/app/components/account/details/programatic-usage/aad-credentials-picker/create-new-aad-app/create-new-aad-app.i18n.yml
rename to src/app/components/account/details/programmatic-usage/aad-credentials-picker/create-new-aad-app/create-new-aad-app.i18n.yml
diff --git a/src/app/components/account/details/programatic-usage/aad-credentials-picker/create-new-aad-app/create-new-aad-app.scss b/src/app/components/account/details/programmatic-usage/aad-credentials-picker/create-new-aad-app/create-new-aad-app.scss
similarity index 100%
rename from src/app/components/account/details/programatic-usage/aad-credentials-picker/create-new-aad-app/create-new-aad-app.scss
rename to src/app/components/account/details/programmatic-usage/aad-credentials-picker/create-new-aad-app/create-new-aad-app.scss
diff --git a/src/app/components/account/details/programatic-usage/aad-credentials-picker/create-new-aad-app/index.ts b/src/app/components/account/details/programmatic-usage/aad-credentials-picker/create-new-aad-app/index.ts
similarity index 100%
rename from src/app/components/account/details/programatic-usage/aad-credentials-picker/create-new-aad-app/index.ts
rename to src/app/components/account/details/programmatic-usage/aad-credentials-picker/create-new-aad-app/index.ts
diff --git a/src/app/components/account/details/programatic-usage/aad-credentials-picker/generate-aad-app-secret/generate-aad-app-secret.component.ts b/src/app/components/account/details/programmatic-usage/aad-credentials-picker/generate-aad-app-secret/generate-aad-app-secret.component.ts
similarity index 100%
rename from src/app/components/account/details/programatic-usage/aad-credentials-picker/generate-aad-app-secret/generate-aad-app-secret.component.ts
rename to src/app/components/account/details/programmatic-usage/aad-credentials-picker/generate-aad-app-secret/generate-aad-app-secret.component.ts
diff --git a/src/app/components/account/details/programatic-usage/aad-credentials-picker/generate-aad-app-secret/generate-aad-app-secret.html b/src/app/components/account/details/programmatic-usage/aad-credentials-picker/generate-aad-app-secret/generate-aad-app-secret.html
similarity index 100%
rename from src/app/components/account/details/programatic-usage/aad-credentials-picker/generate-aad-app-secret/generate-aad-app-secret.html
rename to src/app/components/account/details/programmatic-usage/aad-credentials-picker/generate-aad-app-secret/generate-aad-app-secret.html
diff --git a/src/app/components/account/details/programatic-usage/aad-credentials-picker/generate-aad-app-secret/generate-aad-app-secret.scss b/src/app/components/account/details/programmatic-usage/aad-credentials-picker/generate-aad-app-secret/generate-aad-app-secret.scss
similarity index 100%
rename from src/app/components/account/details/programatic-usage/aad-credentials-picker/generate-aad-app-secret/generate-aad-app-secret.scss
rename to src/app/components/account/details/programmatic-usage/aad-credentials-picker/generate-aad-app-secret/generate-aad-app-secret.scss
diff --git a/src/app/components/account/details/programatic-usage/aad-credentials-picker/generate-aad-app-secret/index.ts b/src/app/components/account/details/programmatic-usage/aad-credentials-picker/generate-aad-app-secret/index.ts
similarity index 100%
rename from src/app/components/account/details/programatic-usage/aad-credentials-picker/generate-aad-app-secret/index.ts
rename to src/app/components/account/details/programmatic-usage/aad-credentials-picker/generate-aad-app-secret/index.ts
diff --git a/src/app/components/account/details/programatic-usage/aad-credentials-picker/index.ts b/src/app/components/account/details/programmatic-usage/aad-credentials-picker/index.ts
similarity index 100%
rename from src/app/components/account/details/programatic-usage/aad-credentials-picker/index.ts
rename to src/app/components/account/details/programmatic-usage/aad-credentials-picker/index.ts
diff --git a/src/app/components/account/details/programatic-usage/aad-credentials-picker/resource-permission-button/index.ts b/src/app/components/account/details/programmatic-usage/aad-credentials-picker/resource-permission-button/index.ts
similarity index 100%
rename from src/app/components/account/details/programatic-usage/aad-credentials-picker/resource-permission-button/index.ts
rename to src/app/components/account/details/programmatic-usage/aad-credentials-picker/resource-permission-button/index.ts
diff --git a/src/app/components/account/details/programatic-usage/aad-credentials-picker/resource-permission-button/resource-permission-button.component.spec.ts b/src/app/components/account/details/programmatic-usage/aad-credentials-picker/resource-permission-button/resource-permission-button.component.spec.ts
similarity index 100%
rename from src/app/components/account/details/programatic-usage/aad-credentials-picker/resource-permission-button/resource-permission-button.component.spec.ts
rename to src/app/components/account/details/programmatic-usage/aad-credentials-picker/resource-permission-button/resource-permission-button.component.spec.ts
diff --git a/src/app/components/account/details/programatic-usage/aad-credentials-picker/resource-permission-button/resource-permission-button.component.ts b/src/app/components/account/details/programmatic-usage/aad-credentials-picker/resource-permission-button/resource-permission-button.component.ts
similarity index 100%
rename from src/app/components/account/details/programatic-usage/aad-credentials-picker/resource-permission-button/resource-permission-button.component.ts
rename to src/app/components/account/details/programmatic-usage/aad-credentials-picker/resource-permission-button/resource-permission-button.component.ts
diff --git a/src/app/components/account/details/programatic-usage/aad-credentials-picker/resource-permission-button/resource-permission-button.html b/src/app/components/account/details/programmatic-usage/aad-credentials-picker/resource-permission-button/resource-permission-button.html
similarity index 100%
rename from src/app/components/account/details/programatic-usage/aad-credentials-picker/resource-permission-button/resource-permission-button.html
rename to src/app/components/account/details/programmatic-usage/aad-credentials-picker/resource-permission-button/resource-permission-button.html
diff --git a/src/app/components/account/details/programatic-usage/aad-credentials-picker/resource-permission-button/resource-permission-button.i18n.yml b/src/app/components/account/details/programmatic-usage/aad-credentials-picker/resource-permission-button/resource-permission-button.i18n.yml
similarity index 100%
rename from src/app/components/account/details/programatic-usage/aad-credentials-picker/resource-permission-button/resource-permission-button.i18n.yml
rename to src/app/components/account/details/programmatic-usage/aad-credentials-picker/resource-permission-button/resource-permission-button.i18n.yml
diff --git a/src/app/components/account/details/programatic-usage/aad-credentials-picker/resource-permission-button/resource-permission-button.scss b/src/app/components/account/details/programmatic-usage/aad-credentials-picker/resource-permission-button/resource-permission-button.scss
similarity index 100%
rename from src/app/components/account/details/programatic-usage/aad-credentials-picker/resource-permission-button/resource-permission-button.scss
rename to src/app/components/account/details/programmatic-usage/aad-credentials-picker/resource-permission-button/resource-permission-button.scss
diff --git a/src/app/components/account/details/programmatic-usage/index.ts b/src/app/components/account/details/programmatic-usage/index.ts
new file mode 100644
index 0000000000..7e8c2def32
--- /dev/null
+++ b/src/app/components/account/details/programmatic-usage/index.ts
@@ -0,0 +1,3 @@
+export * from "./programmatic-usage.component";
+export * from "./aad-credentials-picker";
+export * from "./programmatic-usage.module";
diff --git a/src/app/components/account/details/programatic-usage/programatic-usage.component.ts b/src/app/components/account/details/programmatic-usage/programmatic-usage.component.ts
similarity index 95%
rename from src/app/components/account/details/programatic-usage/programatic-usage.component.ts
rename to src/app/components/account/details/programmatic-usage/programmatic-usage.component.ts
index 1acbb537dc..e11ab6b6d7 100644
--- a/src/app/components/account/details/programatic-usage/programatic-usage.component.ts
+++ b/src/app/components/account/details/programmatic-usage/programmatic-usage.component.ts
@@ -5,7 +5,7 @@ import { BatchAccountService, StorageAccountService } from "app/services";
 import { StorageAccountKeysService } from "app/services/storage";
 import { SharedKeyCredentials } from "./shared-key-credentials.model";
 
-import "./programatic-usage.scss";
+import "./programmatic-usage.scss";
 
 export enum CredentialType {
     SharedKey = "shared-key",
@@ -19,11 +19,11 @@ export interface AADCredential {
 }
 
 @Component({
-    selector: "bl-programatic-usage",
-    templateUrl: "programatic-usage.html",
+    selector: "bl-programmatic-usage",
+    templateUrl: "programmatic-usage.html",
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class ProgramaticUsageComponent {
+export class ProgrammaticUsageComponent {
     @ViewChild("tabs", { static: false }) public tabs: VTabGroupComponent;
     public CredentialType = CredentialType;
     public account: BatchAccount;
diff --git a/src/app/components/account/details/programatic-usage/programatic-usage.html b/src/app/components/account/details/programmatic-usage/programmatic-usage.html
similarity index 80%
rename from src/app/components/account/details/programatic-usage/programatic-usage.html
rename to src/app/components/account/details/programmatic-usage/programmatic-usage.html
index c264662442..058ba4e8c7 100644
--- a/src/app/components/account/details/programatic-usage/programatic-usage.html
+++ b/src/app/components/account/details/programmatic-usage/programmatic-usage.html
@@ -1,11 +1,11 @@
 <div class="header">
     <h1>
-        {{'programatic-usage.title' | i18n}}
+        {{'programmatic-usage.title' | i18n}}
     </h1>
 
     <div class="credential-type-picker">
-        {{'programatic-usage.authenticationType' | i18n}}
-        <bl-select [placeholder]="'programatic-usage.authenticationType' | i18n" [ngModel]="pickedCredentialType" (ngModelChange)="pickCredentialType($event)">
+        {{'programmatic-usage.authenticationType' | i18n}}
+        <bl-select [placeholder]="'programmatic-usage.authenticationType' | i18n" [ngModel]="pickedCredentialType" (ngModelChange)="pickCredentialType($event)">
             <bl-option [value]="CredentialType.SharedKey" label="Shared key"></bl-option>
             <bl-option [value]="CredentialType.AAD" label="Azure AD"></bl-option>
         </bl-select>
@@ -15,11 +15,11 @@ <h1>
     <bl-vtab id="credentials">
         <div tabLabel>
             <div>
-                {{'programatic-usage.credentials' | i18n}}
+                {{'programmatic-usage.credentials' | i18n}}
             </div>
             <div *ngIf="pickedCredentialType === CredentialType.AAD && !aadCredentials" class="aad-needs-setup-creds" aria-live="polite"
                 matTooltip="Pick an application and generate a key to have the templates filled with the correct informations">
-                <i class="fa fa-warning"></i>{{'programatic-usage.setup' | i18n}}
+                <i class="fa fa-warning"></i>{{'programmatic-usage.setup' | i18n}}
             </div>
 
         </div>
@@ -45,52 +45,52 @@ <h1>
         <div tabLabel>
             Python
         </div>
-        <bl-programing-sample target="python"
+        <bl-programming-sample target="python"
             [account]="account"
             [credentialType]="pickedCredentialType"
             [sharedKeyCredentials]="sharedKeyCredentials"
-            [aadCredentials]="aadCredentials"></bl-programing-sample>
+            [aadCredentials]="aadCredentials"></bl-programming-sample>
     </bl-vtab>
     <bl-vtab id="csharp">
         <div tabLabel aria-label="C Sharp">
             <!-- This is needed so it reads C Sharp and not C Number https://dev.azure.com/azurebatch/BatchExplorer/_workitems/edit/144 -->
             <span aria-hidden="true">C#</span>
         </div>
-        <bl-programing-sample target="csharp"
+        <bl-programming-sample target="csharp"
             [account]="account"
             [credentialType]="pickedCredentialType"
             [sharedKeyCredentials]="sharedKeyCredentials"
-            [aadCredentials]="aadCredentials"></bl-programing-sample>
+            [aadCredentials]="aadCredentials"></bl-programming-sample>
     </bl-vtab>
 
     <bl-vtab id="nodejs">
         <div tabLabel>
             Node.js
         </div>
-        <bl-programing-sample target="nodejs"
+        <bl-programming-sample target="nodejs"
             [account]="account"
             [credentialType]="pickedCredentialType"
             [sharedKeyCredentials]="sharedKeyCredentials"
-            [aadCredentials]="aadCredentials"></bl-programing-sample>
+            [aadCredentials]="aadCredentials"></bl-programming-sample>
     </bl-vtab>
     <bl-vtab id="aztk">
         <div tabLabel>
             Aztk
         </div>
-        <bl-programing-sample target="aztk"
+        <bl-programming-sample target="aztk"
             [account]="account"
             [credentialType]="pickedCredentialType"
             [sharedKeyCredentials]="sharedKeyCredentials"
-            [aadCredentials]="aadCredentials"></bl-programing-sample>
+            [aadCredentials]="aadCredentials"></bl-programming-sample>
     </bl-vtab>
     <bl-vtab id="doAzureParallel">
         <div tabLabel>
             doAzureParallel
         </div>
-        <bl-programing-sample target="doAzureParallel"
+        <bl-programming-sample target="doAzureParallel"
             [account]="account"
             [credentialType]="pickedCredentialType"
             [sharedKeyCredentials]="sharedKeyCredentials"
-            [aadCredentials]="aadCredentials"></bl-programing-sample>
+            [aadCredentials]="aadCredentials"></bl-programming-sample>
     </bl-vtab>
 </bl-vtab-group>
diff --git a/src/app/components/account/details/programatic-usage/programatic-usage.i18n.yml b/src/app/components/account/details/programmatic-usage/programmatic-usage.i18n.yml
similarity index 87%
rename from src/app/components/account/details/programatic-usage/programatic-usage.i18n.yml
rename to src/app/components/account/details/programmatic-usage/programmatic-usage.i18n.yml
index 2ccf47be06..7207a70963 100644
--- a/src/app/components/account/details/programatic-usage/programatic-usage.i18n.yml
+++ b/src/app/components/account/details/programmatic-usage/programmatic-usage.i18n.yml
@@ -1,4 +1,4 @@
-programatic-usage:
+programmatic-usage:
   title: Credentials and code samples for this Batch account
   authenticationType: Authentication type
   credentials: Credentials
diff --git a/src/app/components/account/details/programatic-usage/programatic-usage.module.ts b/src/app/components/account/details/programmatic-usage/programmatic-usage.module.ts
similarity index 76%
rename from src/app/components/account/details/programatic-usage/programatic-usage.module.ts
rename to src/app/components/account/details/programmatic-usage/programmatic-usage.module.ts
index 2d5ca16903..15102d669b 100644
--- a/src/app/components/account/details/programatic-usage/programatic-usage.module.ts
+++ b/src/app/components/account/details/programmatic-usage/programmatic-usage.module.ts
@@ -7,8 +7,8 @@ import {
     GenerateAADAppSecretComponent,
     ResourcePermissionButtonComponent,
 } from "./aad-credentials-picker";
-import { ProgramaticUsageComponent } from "./programatic-usage.component";
-import { ProgramingSampleComponent } from "./programing-sample";
+import { ProgrammaticUsageComponent } from "./programmatic-usage.component";
+import { ProgrammingSampleComponent } from "./programming-sample";
 
 const privateComponents = [
     AADCredentialsPickerComponent,
@@ -17,11 +17,11 @@ const privateComponents = [
     ResourcePermissionButtonComponent,
     AADAppSecretPickerComponent,
     CreateNewAadAppComponent,
-    ProgramingSampleComponent,
+    ProgrammingSampleComponent,
 ];
 
 const publicComponents = [
-    ProgramaticUsageComponent,
+    ProgrammaticUsageComponent,
 ];
 
 const modules = [
@@ -38,10 +38,10 @@ const modules = [
         ...publicComponents,
     ],
     entryComponents: [
-        ProgramaticUsageComponent,
+        ProgrammaticUsageComponent,
     ],
     imports: modules,
 })
-export class ProgramaticUsageModule {
+export class ProgrammaticUsageModule {
 
 }
diff --git a/src/app/components/account/details/programatic-usage/programatic-usage.scss b/src/app/components/account/details/programmatic-usage/programmatic-usage.scss
similarity index 97%
rename from src/app/components/account/details/programatic-usage/programatic-usage.scss
rename to src/app/components/account/details/programmatic-usage/programmatic-usage.scss
index a92d270550..f9406a863f 100644
--- a/src/app/components/account/details/programatic-usage/programatic-usage.scss
+++ b/src/app/components/account/details/programmatic-usage/programmatic-usage.scss
@@ -1,6 +1,6 @@
 @import "app/styles/variables";
 
-bl-programatic-usage {
+bl-programmatic-usage {
     display: block;
     $header-height: 50px;
     position: relative;
diff --git a/src/app/components/account/details/programmatic-usage/programming-sample/index.ts b/src/app/components/account/details/programmatic-usage/programming-sample/index.ts
new file mode 100644
index 0000000000..bf56daa44d
--- /dev/null
+++ b/src/app/components/account/details/programmatic-usage/programming-sample/index.ts
@@ -0,0 +1 @@
+export * from "./programming-sample.component";
diff --git a/src/app/components/account/details/programatic-usage/programing-sample/programing-sample.component.spec.ts b/src/app/components/account/details/programmatic-usage/programming-sample/programming-sample.component.spec.ts
similarity index 88%
rename from src/app/components/account/details/programatic-usage/programing-sample/programing-sample.component.spec.ts
rename to src/app/components/account/details/programmatic-usage/programming-sample/programming-sample.component.spec.ts
index 12faee3464..c16d2563d9 100644
--- a/src/app/components/account/details/programatic-usage/programing-sample/programing-sample.component.spec.ts
+++ b/src/app/components/account/details/programmatic-usage/programming-sample/programming-sample.component.spec.ts
@@ -7,13 +7,13 @@ import { PropertyListModule } from "@batch-flask/ui/property-list";
 import { EditorMockComponent, EditorTestingModule } from "@batch-flask/ui/testing";
 import { BatchExplorerService } from "app/services";
 import * as Fixtures from "test/fixture";
-import { ProgramingSampleComponent } from "./programing-sample.component";
+import { ProgrammingSampleComponent } from "./programming-sample.component";
 
 const account1 = Fixtures.account.create();
 @Component({
     template: `
-        <bl-programing-sample [target]="target" [sharedKeyCredentials]="sharedKeyCredentials" [account]="account">
-        </bl-programing-sample>`,
+        <bl-programming-sample [target]="target" [sharedKeyCredentials]="sharedKeyCredentials" [account]="account">
+        </bl-programming-sample>`,
 })
 class TestComponent {
     public target = null;
@@ -27,10 +27,10 @@ class TestComponent {
     public account = account1;
 }
 
-describe("ProgramingSampleComponent", () => {
+describe("ProgrammingSampleComponent", () => {
     let fixture: ComponentFixture<TestComponent>;
     let testComponent: TestComponent;
-    let component: ProgramingSampleComponent;
+    let component: ProgrammingSampleComponent;
     let de: DebugElement;
     let codeEl: DebugElement;
     let code: EditorMockComponent;
@@ -38,7 +38,7 @@ describe("ProgramingSampleComponent", () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             imports: [PropertyListModule, FormsModule, ReactiveFormsModule, EditorTestingModule],
-            declarations: [ProgramingSampleComponent, TestComponent],
+            declarations: [ProgrammingSampleComponent, TestComponent],
             schemas: [NO_ERRORS_SCHEMA],
             providers: [
                 { provide: ClipboardService, useValue: {} },
@@ -47,7 +47,7 @@ describe("ProgramingSampleComponent", () => {
         });
         fixture = TestBed.createComponent(TestComponent);
         testComponent = fixture.componentInstance;
-        de = fixture.debugElement.query(By.css("bl-programing-sample"));
+        de = fixture.debugElement.query(By.css("bl-programming-sample"));
         component = de.componentInstance;
         fixture.detectChanges();
         codeEl = de.query(By.css("bl-editor"));
diff --git a/src/app/components/account/details/programatic-usage/programing-sample/programing-sample.component.ts b/src/app/components/account/details/programmatic-usage/programming-sample/programming-sample.component.ts
similarity index 91%
rename from src/app/components/account/details/programatic-usage/programing-sample/programing-sample.component.ts
rename to src/app/components/account/details/programmatic-usage/programming-sample/programming-sample.component.ts
index 5fa56f75c1..5ddb2c4125 100644
--- a/src/app/components/account/details/programatic-usage/programing-sample/programing-sample.component.ts
+++ b/src/app/components/account/details/programmatic-usage/programming-sample/programming-sample.component.ts
@@ -2,11 +2,11 @@ import { ChangeDetectionStrategy, Component, Input, OnChanges } from "@angular/c
 import { EditorConfig } from "@batch-flask/ui/editor";
 import { BatchAccount } from "app/models";
 import { BatchExplorerService } from "app/services";
-import { AADCredential, CredentialType } from "../programatic-usage.component";
+import { AADCredential, CredentialType } from "../programmatic-usage.component";
 import { SharedKeyCredentials } from "../shared-key-credentials.model";
 import { prerequisites, sampleTemplates } from "./samples";
 
-import "./programing-sample.scss";
+import "./programming-sample.scss";
 
 export enum SampleTarget {
     python = "python",
@@ -23,11 +23,11 @@ const engineLanguages = {
 };
 
 @Component({
-    selector: "bl-programing-sample",
-    templateUrl: "programing-sample.html",
+    selector: "bl-programming-sample",
+    templateUrl: "programming-sample.html",
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class ProgramingSampleComponent implements OnChanges {
+export class ProgrammingSampleComponent implements OnChanges {
     public CredentialType = CredentialType;
     @Input() public target: SampleTarget;
     @Input() public account: BatchAccount;
@@ -39,7 +39,7 @@ export class ProgramingSampleComponent implements OnChanges {
     public content: string;
     public editorConfig: EditorConfig;
 
-    constructor(private batchExplorer: BatchExplorerService) {}
+    constructor(private batchExplorer: BatchExplorerService) { }
 
     public ngOnChanges(changes) {
         this._updateContent();
diff --git a/src/app/components/account/details/programatic-usage/programing-sample/programing-sample.html b/src/app/components/account/details/programmatic-usage/programming-sample/programming-sample.html
similarity index 100%
rename from src/app/components/account/details/programatic-usage/programing-sample/programing-sample.html
rename to src/app/components/account/details/programmatic-usage/programming-sample/programming-sample.html
diff --git a/src/app/components/account/details/programatic-usage/programing-sample/programing-sample.scss b/src/app/components/account/details/programmatic-usage/programming-sample/programming-sample.scss
similarity index 93%
rename from src/app/components/account/details/programatic-usage/programing-sample/programing-sample.scss
rename to src/app/components/account/details/programmatic-usage/programming-sample/programming-sample.scss
index c1a5c5ed7f..aa6a166f61 100644
--- a/src/app/components/account/details/programatic-usage/programing-sample/programing-sample.scss
+++ b/src/app/components/account/details/programmatic-usage/programming-sample/programming-sample.scss
@@ -1,6 +1,6 @@
 @import "app/styles/variables";
 
-bl-programing-sample {
+bl-programming-sample {
     display: flex;
     flex-direction: column;
     height: 100%;
diff --git a/src/app/components/account/details/programatic-usage/programing-sample/samples/aad/aztk.yaml.template b/src/app/components/account/details/programmatic-usage/programming-sample/samples/aad/aztk.yaml.template
similarity index 100%
rename from src/app/components/account/details/programatic-usage/programing-sample/samples/aad/aztk.yaml.template
rename to src/app/components/account/details/programmatic-usage/programming-sample/samples/aad/aztk.yaml.template
diff --git a/src/app/components/account/details/programatic-usage/programing-sample/samples/aad/csharp.cs.template b/src/app/components/account/details/programmatic-usage/programming-sample/samples/aad/csharp.cs.template
similarity index 100%
rename from src/app/components/account/details/programatic-usage/programing-sample/samples/aad/csharp.cs.template
rename to src/app/components/account/details/programmatic-usage/programming-sample/samples/aad/csharp.cs.template
diff --git a/src/app/components/account/details/programatic-usage/programing-sample/samples/aad/doAzureParallel.json.template b/src/app/components/account/details/programmatic-usage/programming-sample/samples/aad/doAzureParallel.json.template
similarity index 100%
rename from src/app/components/account/details/programatic-usage/programing-sample/samples/aad/doAzureParallel.json.template
rename to src/app/components/account/details/programmatic-usage/programming-sample/samples/aad/doAzureParallel.json.template
diff --git a/src/app/components/account/details/programatic-usage/programing-sample/samples/aad/node.js.template b/src/app/components/account/details/programmatic-usage/programming-sample/samples/aad/node.js.template
similarity index 100%
rename from src/app/components/account/details/programatic-usage/programing-sample/samples/aad/node.js.template
rename to src/app/components/account/details/programmatic-usage/programming-sample/samples/aad/node.js.template
diff --git a/src/app/components/account/details/programatic-usage/programing-sample/samples/aad/python.py.template b/src/app/components/account/details/programmatic-usage/programming-sample/samples/aad/python.py.template
similarity index 100%
rename from src/app/components/account/details/programatic-usage/programing-sample/samples/aad/python.py.template
rename to src/app/components/account/details/programmatic-usage/programming-sample/samples/aad/python.py.template
diff --git a/src/app/components/account/details/programatic-usage/programing-sample/samples/index.ts b/src/app/components/account/details/programmatic-usage/programming-sample/samples/index.ts
similarity index 100%
rename from src/app/components/account/details/programatic-usage/programing-sample/samples/index.ts
rename to src/app/components/account/details/programmatic-usage/programming-sample/samples/index.ts
diff --git a/src/app/components/account/details/programatic-usage/programing-sample/samples/shared-key/csharp.cs.template b/src/app/components/account/details/programmatic-usage/programming-sample/samples/shared-key/csharp.cs.template
similarity index 100%
rename from src/app/components/account/details/programatic-usage/programing-sample/samples/shared-key/csharp.cs.template
rename to src/app/components/account/details/programmatic-usage/programming-sample/samples/shared-key/csharp.cs.template
diff --git a/src/app/components/account/details/programatic-usage/programing-sample/samples/shared-key/doAzureParallel.json.template b/src/app/components/account/details/programmatic-usage/programming-sample/samples/shared-key/doAzureParallel.json.template
similarity index 100%
rename from src/app/components/account/details/programatic-usage/programing-sample/samples/shared-key/doAzureParallel.json.template
rename to src/app/components/account/details/programmatic-usage/programming-sample/samples/shared-key/doAzureParallel.json.template
diff --git a/src/app/components/account/details/programatic-usage/programing-sample/samples/shared-key/node.js.template b/src/app/components/account/details/programmatic-usage/programming-sample/samples/shared-key/node.js.template
similarity index 100%
rename from src/app/components/account/details/programatic-usage/programing-sample/samples/shared-key/node.js.template
rename to src/app/components/account/details/programmatic-usage/programming-sample/samples/shared-key/node.js.template
diff --git a/src/app/components/account/details/programatic-usage/programing-sample/samples/shared-key/python.py.template b/src/app/components/account/details/programmatic-usage/programming-sample/samples/shared-key/python.py.template
similarity index 100%
rename from src/app/components/account/details/programatic-usage/programing-sample/samples/shared-key/python.py.template
rename to src/app/components/account/details/programmatic-usage/programming-sample/samples/shared-key/python.py.template
diff --git a/src/app/components/account/details/programatic-usage/shared-key-credentials.model.ts b/src/app/components/account/details/programmatic-usage/shared-key-credentials.model.ts
similarity index 100%
rename from src/app/components/account/details/programatic-usage/shared-key-credentials.model.ts
rename to src/app/components/account/details/programmatic-usage/shared-key-credentials.model.ts

From 05a78244e7a4fd3d8944eba021f130065a727d80 Mon Sep 17 00:00:00 2001
From: Shiran Pasternak <shiran.pasternak@microsoft.com>
Date: Tue, 24 Jan 2023 16:24:17 -0500
Subject: [PATCH 55/72] Localization of programming sample

---
 .../programming-sample.component.spec.ts                   | 7 +++++--
 .../programming-sample/programming-sample.html             | 5 +++--
 .../programming-sample/programming-sample.i18n.yml         | 3 +++
 3 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 src/app/components/account/details/programmatic-usage/programming-sample/programming-sample.i18n.yml

diff --git a/src/app/components/account/details/programmatic-usage/programming-sample/programming-sample.component.spec.ts b/src/app/components/account/details/programmatic-usage/programming-sample/programming-sample.component.spec.ts
index c16d2563d9..600a9a1ac8 100644
--- a/src/app/components/account/details/programmatic-usage/programming-sample/programming-sample.component.spec.ts
+++ b/src/app/components/account/details/programmatic-usage/programming-sample/programming-sample.component.spec.ts
@@ -2,6 +2,7 @@ import { Component, DebugElement, NO_ERRORS_SCHEMA } from "@angular/core";
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { FormsModule, ReactiveFormsModule } from "@angular/forms";
 import { By } from "@angular/platform-browser";
+import { I18nTestingModule } from "@batch-flask/core/testing";
 import { ClipboardService } from "@batch-flask/electron";
 import { PropertyListModule } from "@batch-flask/ui/property-list";
 import { EditorMockComponent, EditorTestingModule } from "@batch-flask/ui/testing";
@@ -12,7 +13,8 @@ import { ProgrammingSampleComponent } from "./programming-sample.component";
 const account1 = Fixtures.account.create();
 @Component({
     template: `
-        <bl-programming-sample [target]="target" [sharedKeyCredentials]="sharedKeyCredentials" [account]="account">
+        <bl-programming-sample [target]="target"
+            [sharedKeyCredentials]="sharedKeyCredentials" [account]="account">
         </bl-programming-sample>`,
 })
 class TestComponent {
@@ -37,7 +39,8 @@ describe("ProgrammingSampleComponent", () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            imports: [PropertyListModule, FormsModule, ReactiveFormsModule, EditorTestingModule],
+            imports: [PropertyListModule, FormsModule, ReactiveFormsModule,
+                EditorTestingModule, I18nTestingModule],
             declarations: [ProgrammingSampleComponent, TestComponent],
             schemas: [NO_ERRORS_SCHEMA],
             providers: [
diff --git a/src/app/components/account/details/programmatic-usage/programming-sample/programming-sample.html b/src/app/components/account/details/programmatic-usage/programming-sample/programming-sample.html
index bb68fcae38..a7dcca586a 100644
--- a/src/app/components/account/details/programmatic-usage/programming-sample/programming-sample.html
+++ b/src/app/components/account/details/programmatic-usage/programming-sample/programming-sample.html
@@ -1,11 +1,12 @@
 <div class="description">
     <div *ngIf="credentialType === CredentialType.AAD && !aadCredentials" class="aad-needs-setup-creds" aria-live="polite">
-        <i class="fa fa-warning"></i>You haven't picked an Azure AD application yet. The sample below will not have all the information filled.
+        <i class="fa fa-warning"></i>
+        {{'programming-sample.aad-setup-warning' | i18n}}
     </div>
     <bl-property-group label="" class="wide" class="prerequisites">
         <bl-table-property label="Prerequisites" *ngIf="prerequisites">
             <bl-table-property-row *ngFor="let prerequisite of prerequisites;trackBy: trackPrerequisite">
-                <bl-tp-cell [value]="prerequisite" role="button" attr.aria-label="Copy {{prerequisite}} to clipboard"></bl-tp-cell>
+                <bl-tp-cell [value]="prerequisite" role="button" attr.aria-label="{{'programming-sample.copy-title' | i18n: { 'prerequisite': prerequisite } }}"></bl-tp-cell>
             </bl-table-property-row>
         </bl-table-property>
     </bl-property-group>
diff --git a/src/app/components/account/details/programmatic-usage/programming-sample/programming-sample.i18n.yml b/src/app/components/account/details/programmatic-usage/programming-sample/programming-sample.i18n.yml
new file mode 100644
index 0000000000..4f20648338
--- /dev/null
+++ b/src/app/components/account/details/programmatic-usage/programming-sample/programming-sample.i18n.yml
@@ -0,0 +1,3 @@
+programming-sample:
+  copy-title: Copy {prerequisite} to clipboard
+  aad-setup-warning: You haven't picked an Azure AD application yet. The sample below will not have all the information filled.

From aa42afe3a89af23f84529961b02faad3ba2e1b61 Mon Sep 17 00:00:00 2001
From: Shiran Pasternak <shiran.pasternak@microsoft.com>
Date: Wed, 25 Jan 2023 09:40:19 -0500
Subject: [PATCH 56/72] Fixes AB#555: Transparent background for icon buttons

---
 src/@batch-flask/ui/buttons/button.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/@batch-flask/ui/buttons/button.scss b/src/@batch-flask/ui/buttons/button.scss
index b290dba47c..90d496394b 100644
--- a/src/@batch-flask/ui/buttons/button.scss
+++ b/src/@batch-flask/ui/buttons/button.scss
@@ -125,9 +125,9 @@ bl-button {
 
         &[color="light"] {
             color: $button-basic-text-color;
-            background: $button-basic-bg-color;
+            background: transparent;
 
-            &:hover, &:focus {
+            &:hover {
                 background: $button-basic-hover-bg-color;
             }
         }

From 07a4b1d39245728c6d7857d75900205381dc8210 Mon Sep 17 00:00:00 2001
From: Shiran Pasternak <shiran.pasternak@microsoft.com>
Date: Wed, 25 Jan 2023 11:45:29 -0500
Subject: [PATCH 57/72] Improved required fields

Ensures required field inputs show an asterisk and have correct ARIA markup. Also removes custom CSS from specific components.

Fixes AB#553, AB#602, AB#607, AB#777, AB#875, AB#916, AB#986
---
 .../ui/form/form-field/form-field.html        |  2 +-
 .../ui/form/form-field/form-field.scss        | 12 +++--
 .../ui/form/input/input.directive.spec.ts     | 51 ++++++++++++++++++-
 .../ui/form/input/input.directive.ts          | 31 ++++++++++-
 .../job/action/add/add-job-form.scss          |  5 --
 .../action/add/pool-create-basic-dialog.scss  |  5 --
 6 files changed, 87 insertions(+), 19 deletions(-)

diff --git a/src/@batch-flask/ui/form/form-field/form-field.html b/src/@batch-flask/ui/form/form-field/form-field.html
index 98e7066dad..18422a0dba 100644
--- a/src/@batch-flask/ui/form/form-field/form-field.html
+++ b/src/@batch-flask/ui/form/form-field/form-field.html
@@ -5,7 +5,7 @@
         [attr.for]="control.id"
         [attr.aria-owns]="control.id">
         {{control.placeholder}}
-        <sup *ngIf="control.required">
+        <sup class="required" *ngIf="control.required">
             <i class="fa fa-asterisk" aria-hidden="true"></i>
         </sup>
     </label>
diff --git a/src/@batch-flask/ui/form/form-field/form-field.scss b/src/@batch-flask/ui/form/form-field/form-field.scss
index a768dd9ab2..0b5f3d6477 100644
--- a/src/@batch-flask/ui/form/form-field/form-field.scss
+++ b/src/@batch-flask/ui/form/form-field/form-field.scss
@@ -5,6 +5,13 @@ bl-form-field {
     .label-container {
         display: block;
         color: $primary-text;
+        sup.required {
+            line-height: 1em;
+            .fa-asterisk {
+                color: var(--color-danger);
+                font-size: 8px;
+            }
+        }
     }
 
     .input-container {
@@ -28,11 +35,6 @@ bl-form-field {
         // Having this opacity make contrast ratio too loos
         // opacity: 0.5;
     }
-
-    .fa-asterisk {
-        color: var(--color-danger);
-        font-size: 8px;
-    }
 }
 
 bl-form-field {
diff --git a/src/@batch-flask/ui/form/input/input.directive.spec.ts b/src/@batch-flask/ui/form/input/input.directive.spec.ts
index ca3e08d276..73e57bdb94 100644
--- a/src/@batch-flask/ui/form/input/input.directive.spec.ts
+++ b/src/@batch-flask/ui/form/input/input.directive.spec.ts
@@ -1,6 +1,6 @@
 import { Component, DebugElement } from "@angular/core";
 import { ComponentFixture, TestBed } from "@angular/core/testing";
-import { FormControl, FormsModule, ReactiveFormsModule } from "@angular/forms";
+import { FormControl, FormsModule, ReactiveFormsModule, Validators } from "@angular/forms";
 import { By } from "@angular/platform-browser";
 import { InputDirective } from "./input.directive";
 
@@ -13,7 +13,7 @@ describe("InputDirective", () => {
 
     function createComponent(comp) {
         TestBed.configureTestingModule({
-            imports: [ FormsModule, ReactiveFormsModule],
+            imports: [FormsModule, ReactiveFormsModule],
             declarations: [InputDirective, comp],
         });
         fixture = TestBed.createComponent(comp);
@@ -64,6 +64,45 @@ describe("InputDirective", () => {
         });
     });
 
+    describe("when setting required", () => {
+        it("should mark as required based on form control validation", () => {
+            createComponent(BlInputWithFormControl);
+            const testComponent = fixture.componentInstance;
+
+            fixture.detectChanges();
+            expect(de.nativeElement.required).toBeFalsy();
+
+            testComponent.formControl.setValidators(Validators.required);
+            testComponent.formControl.updateValueAndValidity();
+            fixture.detectChanges();
+            expect(de.nativeElement.required).toBe(true);
+            expect(de.nativeElement.getAttribute("aria-required")).toBe("true");
+
+            testComponent.formControl.clearValidators();
+            fixture.detectChanges();
+            expect(de.nativeElement.required).toBe(false);
+            expect(de.nativeElement.getAttribute("aria-required"))
+                .toBeFalsy();
+        });
+        it("should mark as required based on attribute", () => {
+            createComponent(BlInputWithRequired);
+            const testComponent = fixture.componentInstance;
+
+            testComponent.required = true;
+            fixture.detectChanges();
+            expect(de.nativeElement.required).toBe(true);
+
+            // Attribute overrides form control validation
+            testComponent.required = false;
+            testComponent.formControl.setValidators(Validators.required);
+            testComponent.formControl.updateValueAndValidity();
+            fixture.detectChanges();
+            expect(de.nativeElement.required).toBe(false);
+            expect(de.nativeElement.getAttribute("aria-required"))
+                .toBeFalsy();
+        });
+    });
+
     describe("when using a form control", () => {
         let testComponent: BlInputWithFormControl;
 
@@ -99,6 +138,14 @@ class BlInputWithDisabled {
     public disabled: boolean;
 }
 
+@Component({
+    template: `<input blInput [required]="required">`,
+})
+class BlInputWithRequired {
+    public required: boolean;
+    public formControl = new FormControl();
+}
+
 @Component({
     template: `<input blInput [formControl]="formControl">`,
 })
diff --git a/src/@batch-flask/ui/form/input/input.directive.ts b/src/@batch-flask/ui/form/input/input.directive.ts
index 656a9c8652..0f8cff0645 100644
--- a/src/@batch-flask/ui/form/input/input.directive.ts
+++ b/src/@batch-flask/ui/form/input/input.directive.ts
@@ -48,6 +48,8 @@ export class InputDirective implements FormFieldControl<any>, OnChanges, OnDestr
 
     public readonly stateChanges = new Subject<void>();
     public readonly controlType: string = "bl-input";
+    private _required: boolean;
+    private _requiredAttribute = false;
 
     @Input()
     @HostBinding("disabled")
@@ -70,7 +72,34 @@ export class InputDirective implements FormFieldControl<any>, OnChanges, OnDestr
     @HostBinding("attr.placeholder")
     public placeholder: string;
 
-    @Input() @FlagInput() @HostBinding("required") public required = false;
+    @Input() @FlagInput()
+    @HostBinding("required")
+    public get required(): boolean {
+        if (this._requiredAttribute) {
+            return this._required;
+        }
+        if (this.ngControl?.control?.validator) {
+            return this.ngControl.control
+                .validator({} as FormControl)?.required;
+        }
+        return false;
+    }
+
+    /* By default, the `blInput` directive uses the validator on the attached
+     * control to determine if the input element is required. However, if a
+     * template specifies a `required` attribute directly, e.g.
+     *
+     *      <input blInput type="text" required>,
+     *
+     * the directive will use it instead.
+     */
+    public set required(value: boolean) {
+        this._required = coerceBooleanProperty(value);
+        this._requiredAttribute = true;
+    }
+
+    @HostBinding("attr.aria-required")
+    public get ariaRequired(): string { return this.required ? "true" : null; }
 
     /** Input type of the element. */
     @Input()
diff --git a/src/app/components/job/action/add/add-job-form.scss b/src/app/components/job/action/add/add-job-form.scss
index 2461721ce9..4d4afada1b 100644
--- a/src/app/components/job/action/add/add-job-form.scss
+++ b/src/app/components/job/action/add/add-job-form.scss
@@ -6,8 +6,3 @@
     margin-bottom: 5px;
     vertical-align: top;
 }
-
-.required label:after {
-    content: "*";
-    color: $validation-error-color;
-}
diff --git a/src/app/components/pool/action/add/pool-create-basic-dialog.scss b/src/app/components/pool/action/add/pool-create-basic-dialog.scss
index 8a2b29b71c..c55e1e0e04 100644
--- a/src/app/components/pool/action/add/pool-create-basic-dialog.scss
+++ b/src/app/components/pool/action/add/pool-create-basic-dialog.scss
@@ -26,8 +26,3 @@ bl-pool-create-basic-dialog {
         color: #1d54af;
     }
 }
-
-.required label:after {
-    content: "*";
-    color: $validation-error-color;
-}

From 97978400e67271c89083a7b35c2f3f033952f67d Mon Sep 17 00:00:00 2001
From: Shiran Pasternak <shiran.pasternak@microsoft.com>
Date: Wed, 25 Jan 2023 15:25:03 -0500
Subject: [PATCH 58/72] Fixes AB#552: Dropdown button title

Adds localization to dropdowns and bookmarks menu
---
 .../activity-monitor-footer.component.spec.ts |  3 +-
 .../ui/dropdown/dropdown.component.spec.ts    | 48 +++++++++++++++++++
 .../ui/dropdown/dropdown.component.ts         | 15 +++++-
 src/@batch-flask/ui/dropdown/dropdown.html    |  8 +++-
 .../ui/dropdown/dropdown.i18n.yml             |  2 +
 .../ui/dropdown/dropdown.module.ts            |  2 +
 .../sidebar-bookmarks/sidebar-bookmarks.html  |  5 +-
 .../sidebar-bookmarks.i18n.yml                |  3 ++
 src/@batch-flask/ui/sidebar/sidebar.module.ts |  2 +
 .../pinned-dropdown.component.spec.ts         |  3 +-
 .../workspace-dropdown.component.spec.ts      |  4 +-
 11 files changed, 87 insertions(+), 8 deletions(-)
 create mode 100644 src/@batch-flask/ui/dropdown/dropdown.component.spec.ts
 create mode 100644 src/@batch-flask/ui/dropdown/dropdown.i18n.yml
 create mode 100644 src/@batch-flask/ui/sidebar/sidebar-bookmarks/sidebar-bookmarks.i18n.yml

diff --git a/src/@batch-flask/ui/activity/activity-monitor-footer/activity-monitor-footer.component.spec.ts b/src/@batch-flask/ui/activity/activity-monitor-footer/activity-monitor-footer.component.spec.ts
index d06a057f93..8e2184bf7f 100644
--- a/src/@batch-flask/ui/activity/activity-monitor-footer/activity-monitor-footer.component.spec.ts
+++ b/src/@batch-flask/ui/activity/activity-monitor-footer/activity-monitor-footer.component.spec.ts
@@ -2,6 +2,7 @@ import { ComponentFixture, TestBed, fakeAsync, inject, tick } from "@angular/cor
 import { By } from "@angular/platform-browser";
 import { Router } from "@angular/router";
 import { MaterialModule } from "@batch-flask/core";
+import { I18nTestingModule } from "@batch-flask/core/testing";
 import {
     Activity,
     ActivityModule,
@@ -22,7 +23,7 @@ describe("ActivityMonitorFooterComponent", () => {
         };
 
         TestBed.configureTestingModule({
-            imports: [MaterialModule, ActivityModule],
+            imports: [MaterialModule, ActivityModule, I18nTestingModule],
             declarations: [
             ],
             providers: [
diff --git a/src/@batch-flask/ui/dropdown/dropdown.component.spec.ts b/src/@batch-flask/ui/dropdown/dropdown.component.spec.ts
new file mode 100644
index 0000000000..862d902a67
--- /dev/null
+++ b/src/@batch-flask/ui/dropdown/dropdown.component.spec.ts
@@ -0,0 +1,48 @@
+import { Component, Type } from "@angular/core";
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { FormsModule } from "@angular/forms";
+import { By } from "@angular/platform-browser";
+import { I18nTestingModule } from "@batch-flask/core/testing";
+import { ButtonsModule } from "../buttons";
+import { DropdownComponent } from "./dropdown.component";
+
+describe("DropdownComponent", () => {
+    let fixture: ComponentFixture<Component>;
+
+    function createComponent(comp: Type<Component>) {
+        TestBed.configureTestingModule({
+            imports: [FormsModule, ButtonsModule, I18nTestingModule],
+            declarations: [DropdownComponent, comp],
+        });
+        fixture = TestBed.createComponent(comp);
+        fixture.detectChanges();
+    }
+
+    function $(selector) {
+        return fixture.debugElement.query(By.css("bl-dropdown"))
+            .nativeElement.querySelector(selector);
+    }
+
+    it("uses a default title", () => {
+        createComponent(TestComponent);
+
+        expect($(".dropdown-btn-container").getAttribute("title"))
+            .toEqual("dropdown.button-title");
+    });
+    it("uses a host button title", () => {
+        createComponent(TestComponentWithButton);
+
+        expect($(".dropdown-btn-container").getAttribute("title"))
+            .toEqual("Host title");
+    });
+});
+
+@Component({ template: `<bl-dropdown [title]="title"></bl-dropdown>` })
+class TestComponent { }
+
+@Component({
+    template: `<bl-dropdown [title]="title">
+        <div bl-dropdown-btn button-title="Host title">Button</div>
+    </bl-dropdown>`
+})
+class TestComponentWithButton { }
diff --git a/src/@batch-flask/ui/dropdown/dropdown.component.ts b/src/@batch-flask/ui/dropdown/dropdown.component.ts
index a4ca1e61ec..d7f529ce08 100644
--- a/src/@batch-flask/ui/dropdown/dropdown.component.ts
+++ b/src/@batch-flask/ui/dropdown/dropdown.component.ts
@@ -1,6 +1,7 @@
 import {
-    ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, HostListener, Input, Output,
+    ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, EventEmitter, HostListener, Input, Output,
 } from "@angular/core";
+import { I18nService } from "@batch-flask/core";
 
 import "./dropdown.scss";
 
@@ -18,7 +19,11 @@ export class DropdownComponent {
     public forcedOpen = false;
     public showDropdown = false;
 
-    constructor(private changeDetector: ChangeDetectorRef) { }
+    constructor(
+        private changeDetector: ChangeDetectorRef,
+        private elementRef: ElementRef,
+        private i18n: I18nService,
+    ) { }
 
     public mouseEnter() {
         this.showDropdown = true;
@@ -51,6 +56,12 @@ export class DropdownComponent {
         }
     }
 
+    public dropdownButtonTitle() {
+        const hostTitle = this.elementRef.nativeElement
+            .querySelector("[bl-dropdown-btn")?.getAttribute("button-title");
+        return hostTitle || this.i18n.t("dropdown.button-title");
+    }
+
     public close() {
         this.showDropdown = false;
         this.changeDetector.markForCheck();
diff --git a/src/@batch-flask/ui/dropdown/dropdown.html b/src/@batch-flask/ui/dropdown/dropdown.html
index 820154ab0e..c0b8778047 100644
--- a/src/@batch-flask/ui/dropdown/dropdown.html
+++ b/src/@batch-flask/ui/dropdown/dropdown.html
@@ -1,5 +1,11 @@
 <div class="dropdown" (mouseenter)="mouseEnter()" (mouseleave)="mouseLeave()">
-    <bl-clickable class="dropdown-btn-container" [class.active]="showDropdown" (do)="toggleForceOpen($event)" (dblclick)="dblClick.emit($event)">
+    <bl-clickable
+        class="dropdown-btn-container"
+        [class.active]="showDropdown"
+        (do)="toggleForceOpen($event)"
+        (dblclick)="dblClick.emit($event)"
+        [title]="dropdownButtonTitle()"
+    >
         <ng-content select="[bl-dropdown-btn]"></ng-content>
     </bl-clickable>
     <div class="dropdown-content" *ngIf="showDropdown" [class.above]="footer" [class.below]="!footer" [attr.align]="align">
diff --git a/src/@batch-flask/ui/dropdown/dropdown.i18n.yml b/src/@batch-flask/ui/dropdown/dropdown.i18n.yml
new file mode 100644
index 0000000000..b4d8505e88
--- /dev/null
+++ b/src/@batch-flask/ui/dropdown/dropdown.i18n.yml
@@ -0,0 +1,2 @@
+dropdown:
+  button-title: Dropdown button
diff --git a/src/@batch-flask/ui/dropdown/dropdown.module.ts b/src/@batch-flask/ui/dropdown/dropdown.module.ts
index a6bde2a1f2..eeab30985e 100644
--- a/src/@batch-flask/ui/dropdown/dropdown.module.ts
+++ b/src/@batch-flask/ui/dropdown/dropdown.module.ts
@@ -3,6 +3,7 @@ import { NgModule } from "@angular/core";
 import { FormsModule } from "@angular/forms";
 import { MaterialModule } from "@batch-flask/core";
 import { ButtonsModule } from "@batch-flask/ui/buttons";
+import { I18nUIModule } from "@batch-flask/ui/i18n";
 import { ScrollableModule } from "../scrollable";
 import { DropdownComponent } from "./dropdown.component";
 
@@ -19,6 +20,7 @@ import { DropdownComponent } from "./dropdown.component";
         MaterialModule,
         ScrollableModule,
         ButtonsModule,
+        I18nUIModule
     ],
 })
 export class DropdownModule {
diff --git a/src/@batch-flask/ui/sidebar/sidebar-bookmarks/sidebar-bookmarks.html b/src/@batch-flask/ui/sidebar/sidebar-bookmarks/sidebar-bookmarks.html
index 95312bca29..6dcd4835fd 100644
--- a/src/@batch-flask/ui/sidebar/sidebar-bookmarks/sidebar-bookmarks.html
+++ b/src/@batch-flask/ui/sidebar/sidebar-bookmarks/sidebar-bookmarks.html
@@ -1,5 +1,6 @@
 <bl-dropdown [footer]="false" align="right">
-    <div bl-dropdown-btn  attr.aria-label="{{references.length}}-forms in progress">
+    <div bl-dropdown-btn
+        [attr.button-title]="'sidebar-bookmarks.dropdown-button-title' | i18n">
         <i class="fa fa-wpforms"></i>
         <span class="count" *ngIf="references.length > 0">{{references.length}}</span>
     </div>
@@ -15,7 +16,7 @@
         </div>
 
         <div *ngIf="references.length === 0" class="dropdown-item no-bookmarks">
-            <div> No forms in progress</div>
+            <div>{{'sidebar-bookmarks.no-references' | i18n }}</div>
         </div>
     </div>
 </bl-dropdown>
diff --git a/src/@batch-flask/ui/sidebar/sidebar-bookmarks/sidebar-bookmarks.i18n.yml b/src/@batch-flask/ui/sidebar/sidebar-bookmarks/sidebar-bookmarks.i18n.yml
new file mode 100644
index 0000000000..73a7e8125b
--- /dev/null
+++ b/src/@batch-flask/ui/sidebar/sidebar-bookmarks/sidebar-bookmarks.i18n.yml
@@ -0,0 +1,3 @@
+sidebar-bookmarks:
+  dropdown-button-title: Toggle bookmarks menu
+  no-references: No bookmark references
diff --git a/src/@batch-flask/ui/sidebar/sidebar.module.ts b/src/@batch-flask/ui/sidebar/sidebar.module.ts
index 4334d31021..2e7cba802f 100644
--- a/src/@batch-flask/ui/sidebar/sidebar.module.ts
+++ b/src/@batch-flask/ui/sidebar/sidebar.module.ts
@@ -3,6 +3,7 @@ import { NgModule } from "@angular/core";
 import { FormsModule } from "@angular/forms";
 import { MaterialModule } from "@batch-flask/core";
 import { DropdownModule } from "@batch-flask/ui/dropdown";
+import { I18nUIModule } from "@batch-flask/ui/i18n";
 import { SidebarBookmarksComponent } from "./sidebar-bookmarks";
 import { SidebarContentComponent } from "./sidebar-content";
 import { SidebarManager } from "./sidebar-manager";
@@ -26,6 +27,7 @@ const privateComponents = [];
         FormsModule,
         DropdownModule,
         MaterialModule,
+        I18nUIModule
     ],
     providers: [
         SidebarManager, // This needs to be here otherwise entry components in lazy loaded doesn't work
diff --git a/src/app/components/layout/pinned-entity-dropdown/pinned-dropdown.component.spec.ts b/src/app/components/layout/pinned-entity-dropdown/pinned-dropdown.component.spec.ts
index 266a07573f..d383ba3acb 100644
--- a/src/app/components/layout/pinned-entity-dropdown/pinned-dropdown.component.spec.ts
+++ b/src/app/components/layout/pinned-entity-dropdown/pinned-dropdown.component.spec.ts
@@ -3,6 +3,7 @@ import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { By } from "@angular/platform-browser";
 import { RouterTestingModule } from "@angular/router/testing";
 import { NavigableRecord, PinnableEntity, PinnedEntityType } from "@batch-flask/core";
+import { I18nTestingModule } from "@batch-flask/core/testing";
 import { ContextMenuService } from "@batch-flask/ui";
 import { DropdownModule } from "@batch-flask/ui/dropdown";
 import { BatchAccountService, PinnedEntityService } from "app/services";
@@ -54,7 +55,7 @@ describe("PinnedDropDownComponent", () => {
         };
 
         TestBed.configureTestingModule({
-            imports: [DropdownModule, RouterTestingModule],
+            imports: [DropdownModule, RouterTestingModule, I18nTestingModule],
             declarations: [PinnedDropDownComponent, TestComponent],
             providers: [
                 { provide: BatchAccountService, useValue: accountServiceSpy },
diff --git a/src/app/components/workspace/workspace-selector/workspace-dropdown.component.spec.ts b/src/app/components/workspace/workspace-selector/workspace-dropdown.component.spec.ts
index c14465acd9..ce4fe5eda9 100644
--- a/src/app/components/workspace/workspace-selector/workspace-dropdown.component.spec.ts
+++ b/src/app/components/workspace/workspace-selector/workspace-dropdown.component.spec.ts
@@ -2,6 +2,7 @@ import { ChangeDetectorRef, Component, NO_ERRORS_SCHEMA } from "@angular/core";
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { By } from "@angular/platform-browser";
 import { RouterTestingModule } from "@angular/router/testing";
+import { I18nTestingModule } from "@batch-flask/core/testing";
 import { Workspace, WorkspaceService } from "@batch-flask/ui";
 import { ButtonsModule } from "@batch-flask/ui/buttons";
 import { DropdownModule } from "@batch-flask/ui/dropdown";
@@ -40,7 +41,8 @@ describe("WorkspaceDropDownComponent", () => {
         };
 
         TestBed.configureTestingModule({
-            imports: [ButtonsModule, DropdownModule, RouterTestingModule],
+            imports: [ButtonsModule, DropdownModule, RouterTestingModule,
+                I18nTestingModule],
             declarations: [WorkspaceDropDownComponent, TestComponent],
             providers: [
                 { provide: ChangeDetectorRef, useValue: null },

From cef8010c202a3680eaea4b0fd127c83a7d49c4f0 Mon Sep 17 00:00:00 2001
From: Shiran Pasternak <shiran.pasternak@microsoft.com>
Date: Thu, 26 Jan 2023 10:05:34 -0500
Subject: [PATCH 59/72] Theme danger color for warning icons

---
 src/@batch-flask/ui/form/complex-form/footer/form-footer.scss | 3 +++
 .../container-configuration-picker.scss                       | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/@batch-flask/ui/form/complex-form/footer/form-footer.scss b/src/@batch-flask/ui/form/complex-form/footer/form-footer.scss
index b0baa6ef9a..21273f0f9b 100644
--- a/src/@batch-flask/ui/form/complex-form/footer/form-footer.scss
+++ b/src/@batch-flask/ui/form/complex-form/footer/form-footer.scss
@@ -12,6 +12,9 @@ bl-form-footer {
     > .toggle-error-btn {
         button {
             font-size: 26px;
+            mat-icon {
+                color: $danger-color;
+            }
         }
     }
 
diff --git a/src/app/components/pool/action/add/container-configuration-picker/container-configuration-picker.scss b/src/app/components/pool/action/add/container-configuration-picker/container-configuration-picker.scss
index 6a029752a6..4d4df8f10a 100644
--- a/src/app/components/pool/action/add/container-configuration-picker/container-configuration-picker.scss
+++ b/src/app/components/pool/action/add/container-configuration-picker/container-configuration-picker.scss
@@ -1,3 +1,5 @@
+@import "app/styles/variables";
+
 bl-container-configuration-picker {
     .form-element {
         .form-left {
@@ -11,6 +13,6 @@ bl-container-configuration-picker {
         }
     }
     span.required {
-        color: #f44336;
+        color: $danger-color;
     }
 }

From d226b5c50481373774e0b41aa5255cca390e0606 Mon Sep 17 00:00:00 2001
From: Shiran Pasternak <shiran.pasternak@microsoft.com>
Date: Thu, 26 Jan 2023 10:29:31 -0500
Subject: [PATCH 60/72] Fixes AB#537: server error button ARIA expanded

Also adds localization.
---
 .../form/simple-form/simple-form.component.spec.ts   |  3 ++-
 .../ui/server-error/server-error.component.spec.ts   |  7 ++++++-
 src/@batch-flask/ui/server-error/server-error.html   | 12 ++++++++----
 .../ui/server-error/server-error.i18n.yml            |  2 ++
 .../ui/server-error/server-error.module.ts           |  3 ++-
 5 files changed, 20 insertions(+), 7 deletions(-)
 create mode 100644 src/@batch-flask/ui/server-error/server-error.i18n.yml

diff --git a/src/@batch-flask/ui/form/simple-form/simple-form.component.spec.ts b/src/@batch-flask/ui/form/simple-form/simple-form.component.spec.ts
index 32d6024504..a090b9b9f5 100644
--- a/src/@batch-flask/ui/form/simple-form/simple-form.component.spec.ts
+++ b/src/@batch-flask/ui/form/simple-form/simple-form.component.spec.ts
@@ -3,6 +3,7 @@ import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { FormBuilder, FormGroup, ReactiveFormsModule, Validators } from "@angular/forms";
 import { By } from "@angular/platform-browser";
 import { MaterialModule } from "@batch-flask/core";
+import { I18nTestingModule } from "@batch-flask/core/testing";
 import { ButtonComponent } from "@batch-flask/ui/buttons";
 import { SimpleFormComponent } from "@batch-flask/ui/form/simple-form";
 import { ServerErrorComponent } from "@batch-flask/ui/server-error";
@@ -50,7 +51,7 @@ describe("SimpleFormComponent", () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            imports: [ReactiveFormsModule, MaterialModule],
+            imports: [ReactiveFormsModule, MaterialModule, I18nTestingModule],
             declarations: [
                 ButtonComponent,
                 FormTestComponent,
diff --git a/src/@batch-flask/ui/server-error/server-error.component.spec.ts b/src/@batch-flask/ui/server-error/server-error.component.spec.ts
index 87b2bd9624..2e6dd514cc 100644
--- a/src/@batch-flask/ui/server-error/server-error.component.spec.ts
+++ b/src/@batch-flask/ui/server-error/server-error.component.spec.ts
@@ -2,6 +2,7 @@ import { Component, DebugElement } from "@angular/core";
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { By } from "@angular/platform-browser";
 import { MaterialModule, ServerError } from "@batch-flask/core";
+import { I18nTestingModule } from "@batch-flask/core/testing";
 import { ClickableComponent } from "@batch-flask/ui/buttons";
 import { click } from "test/utils/helpers";
 import { ServerErrorComponent } from "./server-error.component";
@@ -43,7 +44,7 @@ describe("ServerErrorComponent", () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            imports: [MaterialModule],
+            imports: [MaterialModule, I18nTestingModule],
             declarations: [
                 ClickableComponent,
                 ServerErrorComponent,
@@ -84,12 +85,16 @@ describe("ServerErrorComponent", () => {
         });
 
         it("should show the request id and time after clicking on the debug button", () => {
+            expect(troubleshootBtn.nativeElement.getAttribute("aria-expanded"))
+                .toBe("false");
             click(troubleshootBtn);
             fixture.detectChanges();
 
             expect(de.nativeElement.textContent).toContain("abc-def");
             expect(de.nativeElement.textContent)
                 .toContain(date.toString());
+            expect(troubleshootBtn.nativeElement.getAttribute("aria-expanded"))
+                .toBe("true");
         });
     });
 
diff --git a/src/@batch-flask/ui/server-error/server-error.html b/src/@batch-flask/ui/server-error/server-error.html
index 0fd6b38497..3b5e3a4e99 100644
--- a/src/@batch-flask/ui/server-error/server-error.html
+++ b/src/@batch-flask/ui/server-error/server-error.html
@@ -1,4 +1,4 @@
-<div class="error-banner" *ngIf="error" [attr.aria-expanded]="showDebugInformation" role="alert">
+<div class="error-banner" *ngIf="error" role="alert">
     <div class="content">
         <div class="main-content">
             <div class="main-info">
@@ -7,8 +7,11 @@ <h4>{{error.code}}</h4>
             </div>
             <div class="troubleshoot-btn">
                 <bl-clickable (do)="toggleDebugInformation()"
-                        aria-label="Troubleshoot details"
-                        matTooltip="Troubleshoot details">
+                    [attr.aria-expanded]="showDebugInformation"
+                    aria-controls="troubleshoot-debug-info"
+                    role="button"
+                    title="{{'server-error.debug-button-label' | i18n}}"
+                >
                     <i class="fa fa-bug"></i>
                 </bl-clickable>
             </div>
@@ -19,7 +22,8 @@ <h4>{{error.code}}</h4>
             </div>
         </div>
     </div>
-    <div class="troubleshoot-info" *ngIf="showDebugInformation">
+    <div class="troubleshoot-info" *ngIf="showDebugInformation"
+        id="troubleshoot-debug-info">
         <table>
             <tr *ngIf="error.requestId">
                 <td><b>Request ID</b></td>
diff --git a/src/@batch-flask/ui/server-error/server-error.i18n.yml b/src/@batch-flask/ui/server-error/server-error.i18n.yml
new file mode 100644
index 0000000000..391f51e881
--- /dev/null
+++ b/src/@batch-flask/ui/server-error/server-error.i18n.yml
@@ -0,0 +1,2 @@
+server-error:
+  debug-button-label: Toggle troubleshooting info
diff --git a/src/@batch-flask/ui/server-error/server-error.module.ts b/src/@batch-flask/ui/server-error/server-error.module.ts
index abaa0775c8..5fcf76fc91 100644
--- a/src/@batch-flask/ui/server-error/server-error.module.ts
+++ b/src/@batch-flask/ui/server-error/server-error.module.ts
@@ -1,13 +1,14 @@
 import { CommonModule } from "@angular/common";
 import { NgModule } from "@angular/core";
 import { ButtonsModule } from "@batch-flask/ui/buttons";
+import { I18nUIModule } from "../i18n";
 import { ServerErrorComponent } from "./server-error.component";
 
 const publicComponents = [ServerErrorComponent];
 const privateComponents = [];
 
 @NgModule({
-    imports: [CommonModule, ButtonsModule],
+    imports: [CommonModule, ButtonsModule, I18nUIModule],
     declarations: [...publicComponents, ...privateComponents],
     exports: publicComponents,
     entryComponents: [],

From c4e03bbcd3e7396a98c41d0ce1f3cca3cabbe1dc Mon Sep 17 00:00:00 2001
From: Shiran Pasternak <shiran.pasternak@microsoft.com>
Date: Thu, 26 Jan 2023 10:56:51 -0500
Subject: [PATCH 61/72] Localization of storage account picker

---
 ...o-storage-account-picker.component.spec.ts |  4 ++-
 .../auto-storage-account-picker.html          | 26 +++++++++++++------
 .../auto-storage-account-picker.i18n.yml      | 12 +++++++++
 3 files changed, 33 insertions(+), 9 deletions(-)
 create mode 100644 src/app/components/account/base/auto-storage-account-picker/auto-storage-account-picker.i18n.yml

diff --git a/src/app/components/account/base/auto-storage-account-picker/auto-storage-account-picker.component.spec.ts b/src/app/components/account/base/auto-storage-account-picker/auto-storage-account-picker.component.spec.ts
index d6c49b27af..0897aaac36 100644
--- a/src/app/components/account/base/auto-storage-account-picker/auto-storage-account-picker.component.spec.ts
+++ b/src/app/components/account/base/auto-storage-account-picker/auto-storage-account-picker.component.spec.ts
@@ -3,6 +3,7 @@ import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { FormsModule } from "@angular/forms";
 import { By } from "@angular/platform-browser";
 import { RouterTestingModule } from "@angular/router/testing";
+import { I18nTestingModule } from "@batch-flask/core/testing";
 import { ElectronTestingModule } from "@batch-flask/electron/testing";
 import { BreadcrumbService } from "@batch-flask/ui/breadcrumbs";
 import { TableTestingModule } from "@batch-flask/ui/testing";
@@ -49,7 +50,8 @@ describe("AutoStorageAccountPickerComponent", () => {
             ])),
         };
         TestBed.configureTestingModule({
-            imports: [RouterTestingModule, FormsModule, TableTestingModule, ElectronTestingModule],
+            imports: [RouterTestingModule, FormsModule, TableTestingModule,
+                ElectronTestingModule, I18nTestingModule],
             declarations: [
                 AutoStorageAccountPickerComponent,
                 LoadingMockComponent, TestComponent,
diff --git a/src/app/components/account/base/auto-storage-account-picker/auto-storage-account-picker.html b/src/app/components/account/base/auto-storage-account-picker/auto-storage-account-picker.html
index b8f7e37d47..5e82ac8aeb 100644
--- a/src/app/components/account/base/auto-storage-account-picker/auto-storage-account-picker.html
+++ b/src/app/components/account/base/auto-storage-account-picker/auto-storage-account-picker.html
@@ -1,24 +1,30 @@
 <bl-loading [status]="loadingStatus">
     <div *ngIf="loadingStatus">
         <bl-button type="wide" (do)="pickStorageAccount(noSelectionKey)">
-            Clear
+            {{'auto-storage-account-picker.clear-button-label' | i18n}}
         </bl-button>
-        <h3>Storage accounts in the same region as your batch account({{account.location}})</h3>
+        <h3>{{'auto-storage-account-picker.same-region-title' | i18n: {
+            location: account.location } }}</h3>
         <div class="prefered">
             <ng-template *ngIf="preferedAccounts.size > 0"
                     [ngTemplateOutlet]="accountTableTemplate"
                     [ngTemplateOutletContext]="{$implicit: preferedAccounts}"></ng-template>
         </div>
         <div *ngIf="preferedAccounts.size === 0" class="no-prefered-account">
-            You have no accounts in the same region!
+            {{'auto-storage-account-picker.warnings.no-accounts-same' | i18n}}
         </div>
 
         <div *ngIf="otherAccounts.size > 0" class="others">
-            <h3>Other regions</h3>
+            <h3>
+                {{'auto-storage-account-picker.other-regions-title' | i18n }}
+            </h3>
             <ng-template *ngIf="otherAccounts.size > 0"
                     [ngTemplateOutlet]="accountTableTemplate"
                     [ngTemplateOutletContext]="{$implicit: otherAccounts}"></ng-template>
         </div>
+        <div *ngIf="otherAccounts.size === 0" class="no-other-accounts">
+            {{'auto-storage-account-picker.warnings.no-accounts-other' | i18n}}
+        </div>
     </div>
 </bl-loading>
 
@@ -29,17 +35,21 @@ <h3>Other regions</h3>
         [activeItem]="pickedStorageAccountId"
         (activeItemChange)="pickStorageAccount($event)">
         <bl-column [sortable]="true" name="name">
-            <div *blHeadCellDef>Name</div>
+            <div *blHeadCellDef>
+                {{'auto-storage-account-picker.fields.name' | i18n}}
+            </div>
             <div *blCellDef="let account">{{account.name}}</div>
         </bl-column>
         <bl-column [sortable]="true" name="location">
-            <div *blHeadCellDef>Location</div>
+            <div *blHeadCellDef>
+                {{'auto-storage-account-picker.fields.location' | i18n}}
+            </div>
             <div *blCellDef="let account">{{account.location}}</div>
         </bl-column>
         <bl-column [sortable]="false" name="isClassic">
             <div *blCellDef="let account">
-                <span class="classic-warning" matTooltip="Classic storage accounts are not compatible with data and gallery" *ngIf="account.isClassic">
-                    <span class="fa fa-warning"></span> Classic
+                <span class="classic-warning" [matTooltip]="'auto-storage-account-picker.warnings.classic-incompatible' | i18n" *ngIf="account.isClassic">
+                    <span class="fa fa-warning"></span> {{'auto-storage-account-picker.fields.classic' | i18n}}
                 </span>
             </div>
         </bl-column>
diff --git a/src/app/components/account/base/auto-storage-account-picker/auto-storage-account-picker.i18n.yml b/src/app/components/account/base/auto-storage-account-picker/auto-storage-account-picker.i18n.yml
new file mode 100644
index 0000000000..ebc28ae111
--- /dev/null
+++ b/src/app/components/account/base/auto-storage-account-picker/auto-storage-account-picker.i18n.yml
@@ -0,0 +1,12 @@
+auto-storage-account-picker:
+  clear-button-label: Clear
+  same-region-title: Storage accounts in the same region as your batch account ({location})
+  other-regions-title: Other regions
+  warnings:
+    no-accounts-same: You have no accounts in the same region
+    no-accounts-other: You have no accounts in other regions
+    classic-incompatible: Classic storage accounts are not compatible with data and gallery
+  fields:
+    name: Name
+    location: Location
+    classic: Classic

From 87c2a3444eafd3ce062b4850682c001f499e2346 Mon Sep 17 00:00:00 2001
From: Shiran Pasternak <shiran.pasternak@microsoft.com>
Date: Thu, 26 Jan 2023 14:29:56 -0500
Subject: [PATCH 62/72] Fixes AB#535: tooltip on storage picker keyboard
 navigation

---
 ...o-storage-account-picker.component.spec.ts |  3 +-
 .../auto-storage-account-picker.component.ts  | 40 ++++++++++++++++++-
 .../auto-storage-account-picker.html          | 12 +++++-
 3 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/src/app/components/account/base/auto-storage-account-picker/auto-storage-account-picker.component.spec.ts b/src/app/components/account/base/auto-storage-account-picker/auto-storage-account-picker.component.spec.ts
index 0897aaac36..2cace588d8 100644
--- a/src/app/components/account/base/auto-storage-account-picker/auto-storage-account-picker.component.spec.ts
+++ b/src/app/components/account/base/auto-storage-account-picker/auto-storage-account-picker.component.spec.ts
@@ -3,6 +3,7 @@ import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { FormsModule } from "@angular/forms";
 import { By } from "@angular/platform-browser";
 import { RouterTestingModule } from "@angular/router/testing";
+import { MaterialModule } from "@batch-flask/core";
 import { I18nTestingModule } from "@batch-flask/core/testing";
 import { ElectronTestingModule } from "@batch-flask/electron/testing";
 import { BreadcrumbService } from "@batch-flask/ui/breadcrumbs";
@@ -51,7 +52,7 @@ describe("AutoStorageAccountPickerComponent", () => {
         };
         TestBed.configureTestingModule({
             imports: [RouterTestingModule, FormsModule, TableTestingModule,
-                ElectronTestingModule, I18nTestingModule],
+                ElectronTestingModule, I18nTestingModule, MaterialModule],
             declarations: [
                 AutoStorageAccountPickerComponent,
                 LoadingMockComponent, TestComponent,
diff --git a/src/app/components/account/base/auto-storage-account-picker/auto-storage-account-picker.component.ts b/src/app/components/account/base/auto-storage-account-picker/auto-storage-account-picker.component.ts
index 817343a543..edbd769ae6 100644
--- a/src/app/components/account/base/auto-storage-account-picker/auto-storage-account-picker.component.ts
+++ b/src/app/components/account/base/auto-storage-account-picker/auto-storage-account-picker.component.ts
@@ -1,5 +1,7 @@
-import { Component, Input, OnInit, forwardRef } from "@angular/core";
+import { Component, Input, OnInit, forwardRef, ViewChild } from "@angular/core";
 import { ControlValueAccessor, FormControl, NG_VALIDATORS, NG_VALUE_ACCESSOR } from "@angular/forms";
+import { MatTooltip } from "@angular/material/tooltip";
+import { ListSelection } from "@batch-flask/core";
 import { LoadingStatus } from "@batch-flask/ui/loading";
 import { ArmBatchAccount, StorageAccount } from "app/models";
 import { StorageAccountService } from "app/services";
@@ -18,12 +20,15 @@ import "./auto-storage-account-picker.scss";
 export class AutoStorageAccountPickerComponent implements OnInit, ControlValueAccessor {
     public noSelectionKey = "-1";
 
+    @ViewChild("classicTooltip") public classicTooltip: MatTooltip;
     @Input() public account: ArmBatchAccount;
 
     public preferedAccounts: List<StorageAccount> = List([]);
     public otherAccounts: List<StorageAccount> = List([]);
+    public classicAccounts: Set<string> = new Set();
     public loadingStatus = LoadingStatus.Loading;
     public pickedStorageAccountId: string;
+    public selectedStorageAccounts: Set<string> = new Set();
     public pickedName: string;
 
     private _propagateChange: (value: string) => void;
@@ -81,15 +86,46 @@ export class AutoStorageAccountPickerComponent implements OnInit, ControlValueAc
     private _processStorageAccounts(storageAccounts: List<StorageAccount>) {
         const prefered = [];
         const others = [];
-        storageAccounts.forEach((account) => {
+        storageAccounts.forEach((account, i) => {
+            account.isClassic = i % 2 === 0;
             if (account.location.toLowerCase() === this.account.location.toLowerCase()) {
                 prefered.push(account);
             } else {
                 others.push(account);
             }
+            if (account.isClassic) {
+                this.classicAccounts.add(account.id.toLowerCase());
+            }
         });
 
         this.preferedAccounts = List(prefered);
         this.otherAccounts = List(others);
     }
+
+    /* Show classic tooltip when navigating with keyboard. The "Tab" key is also
+     * when navigating into or out of the component.
+     *
+     * Note also that they keyboard event is fired AFTER the selection has been
+     * updated so we can safely assume the selection is correct.
+     *
+     * TODO: A more robust solution at the SelectionList component might
+     * triangulate both keyboard and selection events and allow sub-components
+     * to define a custom handler.
+     */
+    onKeydown(event: KeyboardEvent) {
+        this.classicTooltip.hide();
+        if (event.key === "ArrowDown" || event.key === "ArrowUp" ||
+            event.key === "Tab") {
+            if (this.selectedStorageAccounts.size === 1) {
+                const id = this.selectedStorageAccounts.values().next().value;
+                if (this.classicAccounts.has(id)) {
+                    this.classicTooltip.show();
+                }
+            }
+        }
+    }
+
+    setStorageAccountSelection(selection: ListSelection) {
+        this.selectedStorageAccounts = selection.keys;
+    }
 }
diff --git a/src/app/components/account/base/auto-storage-account-picker/auto-storage-account-picker.html b/src/app/components/account/base/auto-storage-account-picker/auto-storage-account-picker.html
index 5e82ac8aeb..32d32a587e 100644
--- a/src/app/components/account/base/auto-storage-account-picker/auto-storage-account-picker.html
+++ b/src/app/components/account/base/auto-storage-account-picker/auto-storage-account-picker.html
@@ -33,7 +33,11 @@ <h3>
     <bl-table
         [data]="accounts"
         [activeItem]="pickedStorageAccountId"
-        (activeItemChange)="pickStorageAccount($event)">
+        (keydown)="onKeydown($event)"
+        (activeItemChange)="pickStorageAccount($event)"
+        (blur)="classicTooltip.hide()"
+        (mousemove)="classicTooltip.hide()"
+        (selectionChange)="setStorageAccountSelection($event)">
         <bl-column [sortable]="true" name="name">
             <div *blHeadCellDef>
                 {{'auto-storage-account-picker.fields.name' | i18n}}
@@ -48,7 +52,11 @@ <h3>
         </bl-column>
         <bl-column [sortable]="false" name="isClassic">
             <div *blCellDef="let account">
-                <span class="classic-warning" [matTooltip]="'auto-storage-account-picker.warnings.classic-incompatible' | i18n" *ngIf="account.isClassic">
+                <span class="classic-warning"
+                    [matTooltip]="'auto-storage-account-picker.warnings.classic-incompatible' | i18n"
+                    *ngIf="account.isClassic"
+                    #classicTooltip="matTooltip"
+                >
                     <span class="fa fa-warning"></span> {{'auto-storage-account-picker.fields.classic' | i18n}}
                 </span>
             </div>

From a4dacc3b98f03bb96be5ca6e577ae2908f1c5721 Mon Sep 17 00:00:00 2001
From: hoppe wang <wanghp000@gmail.com>
Date: Fri, 13 Jan 2023 17:39:42 +0800
Subject: [PATCH 63/72] fix: AB#497

---
 .../components/layout/main-navigation/main-navigation.i18n.yml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/components/layout/main-navigation/main-navigation.i18n.yml b/src/app/components/layout/main-navigation/main-navigation.i18n.yml
index 9c65bb4f0c..a9dd0f82ae 100644
--- a/src/app/components/layout/main-navigation/main-navigation.i18n.yml
+++ b/src/app/components/layout/main-navigation/main-navigation.i18n.yml
@@ -1,5 +1,5 @@
 main-navigation:
-  label: Main navigation
+  label: Main sidebar
   dashboard: Dash
   jobs: Jobs
   jobschedules: Job schedules

From 77adce9f5f0a1c0bf723862fed9d824f0af6d6e0 Mon Sep 17 00:00:00 2001
From: hoppe wang <wanghp000@gmail.com>
Date: Fri, 13 Jan 2023 17:40:36 +0800
Subject: [PATCH 64/72] fix AB#498

---
 .../activity-monitor-footer-item.html            |  2 +-
 .../activity-monitor-item-action.html            |  2 +-
 .../activity-monitor-item.html                   | 14 +++++++-------
 .../activity-monitor-tree-view.html              |  2 +-
 src/@batch-flask/ui/banner/banner.html           |  8 ++++----
 .../ui/breadcrumbs/breadcrumb/breadcrumb.html    |  2 +-
 .../toggle-filter-button.html                    |  2 +-
 src/@batch-flask/ui/buttons/button.html          |  8 ++++----
 src/@batch-flask/ui/buttons/buttons.component.ts |  4 ++--
 .../ui/buttons/refresh-btn/refresh-btn.html      |  8 ++++----
 .../button/entity-command-button.html            |  2 +-
 .../file-explorer-tabs/file-explorer-tabs.html   |  4 ++--
 .../file-path-navigator/file-path-navigator.html |  2 +-
 .../file-table-view/file-table-view.html         |  8 ++++----
 .../file-tree-view-row/file-tree-view-row.html   |  4 ++--
 .../file-tree-view/file-tree-view.html           |  4 ++--
 .../file-viewer-header/file-viewer-header.html   |  6 +++---
 .../log-file-viewer/log-file-viewer.html         |  2 +-
 .../ui/form/complex-form/footer/form-footer.html |  6 +++---
 .../ui/form/editable-table/editable-table.html   |  2 +-
 .../ui/form/form-picker/form-multi-picker.html   |  4 ++--
 .../ui/form/form-picker/form-picker.html         |  4 ++--
 .../ui/info-box/info-box.component.ts            |  2 +-
 src/@batch-flask/ui/keybindings/keybindings.html |  4 ++--
 .../entity-details-list.html                     |  2 +-
 .../persisted-notifications-dropdown.html        | 16 ++++++++--------
 .../ui/notifications/toast/toast.html            |  2 +-
 .../bool-property/bool-property.html             |  2 +-
 .../property-group/property-group.html           |  8 ++++----
 .../table-property/table-property.html           |  2 +-
 .../select/select-dropdown/select-dropdown.html  |  2 +-
 src/@batch-flask/ui/select/select.html           |  4 ++--
 .../ui/server-error/server-error.html            |  2 +-
 .../sidebar-bookmarks/sidebar-bookmarks.html     |  4 ++--
 .../table/table-row-render/table-row-render.html |  2 +-
 src/@batch-flask/ui/tags/tag-list/tag-list.html  |  2 +-
 src/@batch-flask/ui/tags/tags.html               |  8 ++++----
 .../auto-storage-account-picker.html             |  2 +-
 .../account/browse/account-dropdown.html         |  8 ++++----
 .../browse/account-list/account-list.html        |  4 ++--
 .../account/details/account-default.component.ts |  2 +-
 .../account-monitoring-section.html              |  4 ++--
 .../getting-started-card.html                    | 10 +++++-----
 .../aad-credentials-picker.html                  |  2 +-
 .../resource-permission-button.html              |  4 ++--
 .../programmatic-usage/programmatic-usage.html   |  2 +-
 .../programming-sample/programming-sample.html   |  2 +-
 .../storage-account-card.html                    |  2 +-
 .../account-monitoring-home.html                 |  4 ++--
 .../application/browse/application-list.html     |  2 +-
 .../details/application-default.component.ts     |  2 +-
 .../application/details/application-details.html |  2 +-
 .../details/application-package-table.html       |  2 +-
 .../details/application-packages.html            |  4 ++--
 .../certificate/browse/certificate-list.html     |  2 +-
 .../details/certificate-default.component.ts     |  2 +-
 .../certificate/details/certificate-details.html |  2 +-
 .../blob-container-picker.html                   |  2 +-
 .../select-account-dialog.html                   |  4 ++--
 src/app/components/common/location/location.html |  2 +-
 .../resource-files-properties.html               |  8 ++++----
 .../resourcefile-cloud-file-dialog.html          |  8 ++++----
 .../resourcefile-container-source.html           |  2 +-
 .../resourcefile-picker-row.html                 |  8 ++++----
 .../resourcefile-picker/resourcefile-picker.html |  4 ++--
 .../storage-account-picker.html                  |  2 +-
 .../action/delete/delete-container-dialog.html   |  2 +-
 .../data/browse/data-container-list.html         |  2 +-
 .../data/details/data-default.component.ts       |  2 +-
 .../cloud-file-picker/cloud-file-picker.html     |  2 +-
 .../file-group-picker/file-group-picker.html     |  2 +-
 .../shared/file-group-sas/file-group-sas.html    |  2 +-
 .../file-or-directory-picker.html                |  2 +-
 .../application-action/choose-action.html        |  2 +-
 .../recent-template-list.html                    |  2 +-
 .../local-template-drop-zone.html                |  4 ++--
 .../local-template-explorer.html                 |  2 +-
 .../job-schedule/browse/job-schedule-list.html   |  2 +-
 .../details/job-schedule-default.component.ts    |  2 +-
 .../details/job-schedule-details.html            |  2 +-
 .../job/action/add/pool-picker/pool-picker.html  |  4 ++--
 .../components/job/base/job-state/job-state.html | 12 ++++++------
 src/app/components/job/browse/job-list.html      |  2 +-
 src/app/components/job/details/job-details.html  |  4 ++--
 .../job-progress-status/job-progress-status.html |  2 +-
 .../rpc-server-status/rpc-server-status.html     |  4 ++--
 .../timezone-dropdown/timezone-dropdown.html     |  2 +-
 src/app/components/layout/header/header.html     |  6 +++---
 .../layout/main-navigation/main-navigation.html  | 14 +++++++-------
 .../profile-button/profile-button.html           |  6 +++---
 .../layout/online-status/online-status.html      |  2 +-
 .../pinned-entity-dropdown/pinned-dropdown.html  |  8 ++++----
 .../node/browse/display/node-list-display.html   |  2 +-
 .../components/node/connect/node-connect.html    |  8 ++++----
 .../property-display/node-property-display.html  |  6 +++---
 .../connect/ssh-key-picker/ssh-key-picker.html   |  6 +++---
 .../node/details/node-default.component.ts       |  2 +-
 .../components/node/details/node-details.html    |  4 ++--
 .../autoscale-formula-picker.html                |  8 ++++----
 .../evaluate-autoscale-formula.html              |  2 +-
 .../components/pool/base/pool-nodes-preview.html |  2 +-
 .../pool/base/pool-os-icon/pool-os-icon.html     |  2 +-
 src/app/components/pool/browse/pool-list.html    |  6 +++---
 .../pool/details/pool-default.component.ts       |  2 +-
 .../components/pool/details/pool-details.html    |  2 +-
 .../heatmap/legend/nodes-heatmap-legend.html     |  2 +-
 .../pool/graphs/node-preview-card.html           |  2 +-
 src/app/components/settings/settings.html        |  2 +-
 .../task/base/task-state/task-state.html         |  2 +-
 src/app/components/task/browse/task-list.html    |  2 +-
 .../task/details/task-default.component.ts       |  2 +-
 .../task-dependency-browser.html                 |  2 +-
 .../details/task-node-info/task-node-info.html   |  4 ++--
 .../task-timeline/task-timeline-state.html       |  6 +++---
 .../components/tenant-picker/tenant-card.html    |  8 ++++----
 .../workspace-selector/workspace-dropdown.html   |  6 +++---
 116 files changed, 226 insertions(+), 226 deletions(-)

diff --git a/src/@batch-flask/ui/activity/activity-monitor-footer-item/activity-monitor-footer-item.html b/src/@batch-flask/ui/activity/activity-monitor-footer-item/activity-monitor-footer-item.html
index 9439b8a9aa..e12194a771 100644
--- a/src/@batch-flask/ui/activity/activity-monitor-footer-item/activity-monitor-footer-item.html
+++ b/src/@batch-flask/ui/activity/activity-monitor-footer-item/activity-monitor-footer-item.html
@@ -3,7 +3,7 @@
         <mat-progress-spinner [diameter]="18" [strokeWidth]="3" mode="indeterminate" color="accent" *ngIf="progress === -1"></mat-progress-spinner>
         <mat-progress-spinner [diameter]="18" [strokeWidth]="3" mode="determinate" color="accent" [value]="progress" *ngIf="progress !== -1"></mat-progress-spinner>
     </div>
-    <i class="fa fa-check" *ngIf="isComplete"></i>
+    <i class="fa fa-check" *ngIf="isComplete" aria-hidden="true"></i>
 </div>
 <span class="name">{{name}}</span>
 <span class="progress-percent">{{progressString}}</span>
diff --git a/src/@batch-flask/ui/activity/activity-monitor/activity-monitor-item/activity-monitor-item-action/activity-monitor-item-action.html b/src/@batch-flask/ui/activity/activity-monitor/activity-monitor-item/activity-monitor-item-action/activity-monitor-item-action.html
index 8cfd02b2b6..7f435962c4 100644
--- a/src/@batch-flask/ui/activity/activity-monitor/activity-monitor-item/activity-monitor-item-action/activity-monitor-item-action.html
+++ b/src/@batch-flask/ui/activity/activity-monitor/activity-monitor-item/activity-monitor-item-action/activity-monitor-item-action.html
@@ -1,3 +1,3 @@
 <div [ngClass]="{'action-container': true, 'selected': selected || hovered}" title="{{action.title}}" (click)="action.action()" (mouseover)="hover()" (mouseout)="unhover()">
-    <i class="fa {{action.faClass}}"></i>
+    <i class="fa {{action.faClass}}" aria-hidden="true"></i>
 </div>
diff --git a/src/@batch-flask/ui/activity/activity-monitor/activity-monitor-item/activity-monitor-item.html b/src/@batch-flask/ui/activity/activity-monitor/activity-monitor-item/activity-monitor-item.html
index 8a6addd016..f390f8175f 100644
--- a/src/@batch-flask/ui/activity/activity-monitor/activity-monitor-item/activity-monitor-item.html
+++ b/src/@batch-flask/ui/activity/activity-monitor/activity-monitor-item/activity-monitor-item.html
@@ -1,16 +1,16 @@
 <div class="activity-monitor-item-container" [ngClass]="{'focused': focused, 'hovered': !focused && hovered, 'flash': flash}">
     <div class="item-container" [ngStyle]="{'padding-left': paddingLeft}">
         <div class="icon-container progress-icon">
-            <i class="fa fa-ellipsis-h" *ngIf="status===statusOptions.Pending" title="Pending"></i>
-            <i class="fa fa-spinner fa-pulse" *ngIf="status===statusOptions.InProgress" title="Running"></i>
-            <i class="fa fa-check" *ngIf="status===statusOptions.Completed" title="Completed"></i>
-            <i class="fa fa-times" *ngIf="status===statusOptions.Cancelled" title="Cancelled"></i>
-            <i class="fa fa-exclamation-triangle" *ngIf="status===statusOptions.Failed" title="Failed" (click)="toggleShowError()"></i>
+            <i class="fa fa-ellipsis-h" *ngIf="status===statusOptions.Pending" title="Pending" aria-hidden="true"></i>
+            <i class="fa fa-spinner fa-pulse" *ngIf="status===statusOptions.InProgress" title="Running" aria-hidden="true"></i>
+            <i class="fa fa-check" *ngIf="status===statusOptions.Completed" title="Completed" aria-hidden="true"></i>
+            <i class="fa fa-times" *ngIf="status===statusOptions.Cancelled" title="Cancelled" aria-hidden="true"></i>
+            <i class="fa fa-exclamation-triangle" *ngIf="status===statusOptions.Failed" title="Failed" (click)="toggleShowError()" aria-hidden="true"></i>
         </div>
         <div class="icon-container">
             <div class="expand-icon" *ngIf="activity.subactivities.length" (click)="toggleExpand()">
-                <i class="fa fa-angle-right" title="Expand" *ngIf="!expanded"></i>
-                <i class="fa fa-angle-down" title="Collapse" *ngIf="expanded"></i>
+                <i class="fa fa-angle-right" title="Expand" *ngIf="!expanded" aria-hidden="true"></i>
+                <i class="fa fa-angle-down" title="Collapse" *ngIf="expanded" aria-hidden="true"></i>
             </div>
         </div>
         <div class="activity-info">
diff --git a/src/@batch-flask/ui/activity/activity-monitor/activity-monitor-tree-view/activity-monitor-tree-view.html b/src/@batch-flask/ui/activity/activity-monitor/activity-monitor-tree-view/activity-monitor-tree-view.html
index 105af8e807..b041b4da20 100644
--- a/src/@batch-flask/ui/activity/activity-monitor/activity-monitor-tree-view/activity-monitor-tree-view.html
+++ b/src/@batch-flask/ui/activity/activity-monitor/activity-monitor-tree-view/activity-monitor-tree-view.html
@@ -1,7 +1,7 @@
 <bl-toolbar>
     <div toolbarLabel>{{name}}</div>
     <bl-clickable toolbarAction class="clear-all" [title]="xButtonTitle" (do)="xButtonClicked()">
-        <i class="fa fa-times"></i>
+        <i class="fa fa-times" aria-hidden="true"></i>
     </bl-clickable>
 </bl-toolbar>
 <bl-focus-section *ngIf="activities.length > 0"
diff --git a/src/@batch-flask/ui/banner/banner.html b/src/@batch-flask/ui/banner/banner.html
index e59cfdc0d7..d934001817 100644
--- a/src/@batch-flask/ui/banner/banner.html
+++ b/src/@batch-flask/ui/banner/banner.html
@@ -13,17 +13,17 @@
             <bl-clickable class="btn" (do)="triggerFix()" [ngSwitch]="state" [class.disabled]="state !== errorStates.Error">
                 <span *ngSwitchCase="errorStates.Error">Fix: {{ fixMessage }}</span>
                 <span *ngSwitchCase="errorStates.Fixing">
-                    <i class="fa fa-spinner fa-spin"></i>Fixing
+                    <i class="fa fa-spinner fa-spin" aria-hidden="true"></i>Fixing
                 </span>
                 <span *ngSwitchCase="errorStates.Fixed">
-                    <i class="fa fa-check"></i>Fixed
+                    <i class="fa fa-check" aria-hidden="true"></i>Fixed
                 </span>
             </bl-clickable>
             <bl-clickable class="other-fixes-btn" *ngIf="otherFixes.length !== 0"
                 (mouseenter)="state === errorStates.Error && showOtherFixes = true"
                 (do)="state === errorStates.Error && showOtherFixes = !showOtherFixes"
                 [class.disabled]="state !== errorStates.Error">
-                <i class="fa fa-plus"></i>
+                <i class="fa fa-plus" aria-hidden="true"></i>
             </bl-clickable>
             <div *ngIf="showOtherFixes" class="other-fixes">
                 <bl-clickable *ngFor="let otherFix of otherFixes;trackBy: trackByFn" class="other-fix" (do)="triggerFix(otherFix)">
@@ -31,7 +31,7 @@
                 </bl-clickable>
             </div>
         </div>
-        <i class="caret fa" [class.fa-caret-left]="!showDetails" [class.fa-caret-down]="showDetails" *ngIf="details.children.length !== 0"></i>
+        <i class="caret fa" [class.fa-caret-left]="!showDetails" [class.fa-caret-down]="showDetails" *ngIf="details.children.length !== 0" aria-hidden="true"></i>
     </bl-clickable>
     <div class="details-container" [hidden]="!showDetails || details.children.length == 0" #details>
         <ng-content select="[details]"></ng-content>
diff --git a/src/@batch-flask/ui/breadcrumbs/breadcrumb/breadcrumb.html b/src/@batch-flask/ui/breadcrumbs/breadcrumb/breadcrumb.html
index df0daaf037..cc9a2318d4 100644
--- a/src/@batch-flask/ui/breadcrumbs/breadcrumb/breadcrumb.html
+++ b/src/@batch-flask/ui/breadcrumbs/breadcrumb/breadcrumb.html
@@ -1,2 +1,2 @@
-<span class="crumb-icon" *ngIf="icon"><i class="fa fa-{{icon}}"></i></span>
+<span class="crumb-icon" *ngIf="icon"><i class="fa fa-{{icon}}" aria-hidden="true"></i></span>
 <span class="crumb-content" [class.invert-ellipsis]="crumb.data.invertName">{{crumb.data.name}}</span>
diff --git a/src/@batch-flask/ui/browse-layout/toggle-filter-button/toggle-filter-button.html b/src/@batch-flask/ui/browse-layout/toggle-filter-button/toggle-filter-button.html
index 1381310095..1e7991246c 100644
--- a/src/@batch-flask/ui/browse-layout/toggle-filter-button/toggle-filter-button.html
+++ b/src/@batch-flask/ui/browse-layout/toggle-filter-button/toggle-filter-button.html
@@ -1,5 +1,5 @@
 <bl-clickable class="toggle-advanced-filter" [title]="title" (do)="toggle()">
-    <i class="fa fa-filter"></i>
+    <i class="fa fa-filter" aria-hidden="true"></i>
     <div class="filtering" *ngIf="hasAdvancedFilter">
         *
     </div>
diff --git a/src/@batch-flask/ui/buttons/button.html b/src/@batch-flask/ui/buttons/button.html
index 858330a355..8d582978db 100644
--- a/src/@batch-flask/ui/buttons/button.html
+++ b/src/@batch-flask/ui/buttons/button.html
@@ -1,13 +1,13 @@
 <div class="action-btn" [ngClass]="type" title="{{tooltipTitle}}">
     <div [class.hide]="status !== SubmitStatus.Idle" class="label">
-        <i [class]="icon"></i>
+        <i [class]="icon" aria-hidden="true"></i>
         <ng-content></ng-content>
     </div>
     <div class="overlay" [ngSwitch]="status">
-        <i class="fa fa-spinner fa-spin" *ngSwitchCase="SubmitStatus.Submitting"></i>
-        <i class="fa fa-warning" *ngSwitchCase="SubmitStatus.Failed"></i>
+        <i class="fa fa-spinner fa-spin" *ngSwitchCase="SubmitStatus.Submitting" aria-hidden="true"></i>
+        <i class="fa fa-warning" *ngSwitchCase="SubmitStatus.Failed" aria-hidden="true"></i>
         <span class="success-container" *ngSwitchCase="SubmitStatus.Succeeded">
-            <i class="fa fa-check" [@animateSucessIcon]="status === SubmitStatus.Succeeded"></i>
+            <i class="fa fa-check" [@animateSucessIcon]="status === SubmitStatus.Succeeded" aria-hidden="true"></i>
         </span>
     </div>
 </div>
diff --git a/src/@batch-flask/ui/buttons/buttons.component.ts b/src/@batch-flask/ui/buttons/buttons.component.ts
index ee58d56cde..10b096ed53 100644
--- a/src/@batch-flask/ui/buttons/buttons.component.ts
+++ b/src/@batch-flask/ui/buttons/buttons.component.ts
@@ -15,7 +15,7 @@ export class BaseButton {
     template: `
         <bl-button color="light" type="wide" [action]="action">
             <ng-content *ngIf="!loading"></ng-content>
-            <i class="fa fa-spinner fa-spin" *ngIf="loading"></i>
+            <i class="fa fa-spinner fa-spin" *ngIf="loading" aria-hidden="true"></i>
         </bl-button>
     `,
 })
@@ -28,7 +28,7 @@ export class LoadingButtonComponent extends BaseButton {
     selector: "bl-clear-list-selection",
     template: `
         <bl-button color="accent" [action]="onClick" matTooltip="Clear selection">
-            <i class="fa fa-check-square-o"></i>
+            <i class="fa fa-check-square-o" aria-hidden="true"></i>
         </bl-button>
     `,
 })
diff --git a/src/@batch-flask/ui/buttons/refresh-btn/refresh-btn.html b/src/@batch-flask/ui/buttons/refresh-btn/refresh-btn.html
index 21dac1198d..c04e6c629c 100644
--- a/src/@batch-flask/ui/buttons/refresh-btn/refresh-btn.html
+++ b/src/@batch-flask/ui/buttons/refresh-btn/refresh-btn.html
@@ -1,11 +1,11 @@
 <bl-button color="light" [type]="type" [title]="title" [action]="onClick" [disabled]="status !== statuses.Idle" [skipSuccess]="true"
     [tooltipPosition]="tooltipPosition">
     <span class="icon-container" [ngSwitch]="status">
-        <i class="fa fa-refresh shake-hover"    *ngSwitchCase="statuses.Idle"></i>
-        <i class="fa fa-refresh fa-spin"        *ngSwitchCase="statuses.Refreshing"></i>
+        <i class="fa fa-refresh shake-hover"    *ngSwitchCase="statuses.Idle" aria-hidden="true"></i>
+        <i class="fa fa-refresh fa-spin"        *ngSwitchCase="statuses.Refreshing" aria-hidden="true"></i>
         <span class="success-container"         *ngSwitchCase="statuses.Succeeded">
-            <i class="fa fa-check" [@animateSucessIcon]="status === statuses.Succeeded"></i>
+            <i class="fa fa-check" [@animateSucessIcon]="status === statuses.Succeeded" aria-hidden="true"></i>
         </span>
-        <i class="fa fa-warning"                *ngSwitchCase="statuses.Failed"></i>
+        <i class="fa fa-warning"                *ngSwitchCase="statuses.Failed" aria-hidden="true"></i>
     </span>
 </bl-button>
diff --git a/src/@batch-flask/ui/entity-commands-list/button/entity-command-button.html b/src/@batch-flask/ui/entity-commands-list/button/entity-command-button.html
index 6f63b22f42..c2edf408e0 100644
--- a/src/@batch-flask/ui/entity-commands-list/button/entity-command-button.html
+++ b/src/@batch-flask/ui/entity-commands-list/button/entity-command-button.html
@@ -5,5 +5,5 @@
     [permission]="command.permission"
     tooltipPosition="above"
     color="light">
-        <i [class]="icon"></i>
+        <i [class]="icon" aria-hidden="true"></i>
 </bl-button>
diff --git a/src/@batch-flask/ui/file/file-explorer/file-explorer-tabs/file-explorer-tabs.html b/src/@batch-flask/ui/file/file-explorer/file-explorer-tabs/file-explorer-tabs.html
index 119b4128de..e6120d39e3 100644
--- a/src/@batch-flask/ui/file/file-explorer/file-explorer-tabs/file-explorer-tabs.html
+++ b/src/@batch-flask/ui/file/file-explorer/file-explorer-tabs/file-explorer-tabs.html
@@ -1,6 +1,6 @@
 <div class="tablist" role="tablist">
     <bl-clickable role="tab" class="tab main" [class.active]="activePath === null" aria-label="File viewer" title="File viewer" (do)="activateTab(null)">
-        <i class="fa fa-folder"></i>
+        <i class="fa fa-folder" aria-hidden="true"></i>
     </bl-clickable>
     <bl-clickable *ngFor="let tab of tabs;trackBy: trackByFn"
         class="tab"
@@ -11,6 +11,6 @@
         (mouseup)="handleMouseUp($event, tab)">
 
         <span class="name">{{tab.displayName}}</span>
-        <bl-clickable class="tab-close" (do)="closeTab(tab, $event)" title="Close tab" aria-label="Close tab"><i class="fa fa-times close-icon"></i></bl-clickable>
+        <bl-clickable class="tab-close" (do)="closeTab(tab, $event)" title="Close tab" aria-label="Close tab"><i class="fa fa-times close-icon" aria-hidden="true"></i></bl-clickable>
     </bl-clickable>
 </div>
diff --git a/src/@batch-flask/ui/file/file-explorer/file-table-view/file-path-navigator/file-path-navigator.html b/src/@batch-flask/ui/file/file-explorer/file-table-view/file-path-navigator/file-path-navigator.html
index 39b4aa5c33..85d5aa5886 100644
--- a/src/@batch-flask/ui/file/file-explorer/file-table-view/file-path-navigator/file-path-navigator.html
+++ b/src/@batch-flask/ui/file/file-explorer/file-table-view/file-path-navigator/file-path-navigator.html
@@ -7,7 +7,7 @@
         <span class="file-icon">
             <i class="fa"
                 [class.fa-folder]="path.isDirectory"
-                [class.fa-file]="!path.isDirectory"></i>
+                [class.fa-file]="!path.isDirectory" aria-hidden="true"></i>
         </span>
         {{path.name}}
     </mat-option>
diff --git a/src/@batch-flask/ui/file/file-explorer/file-table-view/file-table-view.html b/src/@batch-flask/ui/file/file-explorer/file-table-view/file-table-view.html
index e9a18456da..6d4047ba89 100644
--- a/src/@batch-flask/ui/file/file-explorer/file-table-view/file-table-view.html
+++ b/src/@batch-flask/ui/file/file-explorer/file-table-view/file-table-view.html
@@ -1,6 +1,6 @@
 <div class="file-table-view-header">
     <bl-clickable (do)="goBack()" title="Go back" aria-label="Go back" class="go-back">
-        <i class="fa fa-arrow-circle-left"></i>
+        <i class="fa fa-arrow-circle-left" aria-hidden="true"></i>
     </bl-clickable>
 
     <div class="current-path">
@@ -15,7 +15,7 @@
                     <div *blHeadCellDef>Name</div>
                     <div *blCellDef="let treeNode">
                         <span class="icon">
-                            <i class="fa" [class.fa-folder]="treeNode.isDirectory" [class.fa-file]="!treeNode.isDirectory"></i>
+                            <i class="fa" [class.fa-folder]="treeNode.isDirectory" [class.fa-file]="!treeNode.isDirectory" aria-hidden="true"></i>
                         </span>
                         <span>{{treeNode.name}}</span>
                     </div>
@@ -31,13 +31,13 @@
             </bl-table>
 
             <bl-no-item [itemCount]="treeNode.children.size">
-                <i icon class="fa fa-file small"></i>
+                <i icon class="fa fa-file small" aria-hidden="true"></i>
                 <span no-filter>There are no files in this directory</span>
             </bl-no-item>
         </div>
     </bl-loading>
     <div class="flex-separator"></div>
     <div class="drop-hint" *ngIf="canDropExternalFiles">
-        <i class="fa fa-cloud-upload"></i> Drag and drop local files here to upload.
+        <i class="fa fa-cloud-upload" aria-hidden="true"></i> Drag and drop local files here to upload.
     </div>
 </div>
diff --git a/src/@batch-flask/ui/file/file-explorer/file-tree-view/file-tree-view-row/file-tree-view-row.html b/src/@batch-flask/ui/file/file-explorer/file-tree-view/file-tree-view-row/file-tree-view-row.html
index bc796eb638..a6bb6a9d57 100644
--- a/src/@batch-flask/ui/file/file-explorer/file-tree-view/file-tree-view-row/file-tree-view-row.html
+++ b/src/@batch-flask/ui/file/file-explorer/file-tree-view/file-tree-view-row/file-tree-view-row.html
@@ -1,10 +1,10 @@
 <span class="caret" (click)="handleCaretClick($event)">
-    <i class="fa" [class.fa-caret-down]="treeRow.expanded" [class.fa-caret-right]="!treeRow.expanded" *ngIf="treeRow.isDirectory"></i>
+    <i class="fa" [class.fa-caret-down]="treeRow.expanded" [class.fa-caret-right]="!treeRow.expanded" *ngIf="treeRow.isDirectory" aria-hidden="true"></i>
 </span>
 <span class="file-icon">
     <i class="fa"
         [class.fa-folder]="treeRow.isDirectory && !treeRow.expanded"
         [class.fa-folder-open]="treeRow.isDirectory &&treeRow.expanded"
-        [class.fa-file]="!treeRow.isDirectory"></i>
+        [class.fa-file]="!treeRow.isDirectory" aria-hidden="true"></i>
 </span>
 <span class="label" [title]="title">{{treeRow.name}}</span>
diff --git a/src/@batch-flask/ui/file/file-explorer/file-tree-view/file-tree-view.html b/src/@batch-flask/ui/file/file-explorer/file-tree-view/file-tree-view.html
index 0ffb662255..0981b13732 100644
--- a/src/@batch-flask/ui/file/file-explorer/file-tree-view/file-tree-view.html
+++ b/src/@batch-flask/ui/file/file-explorer/file-tree-view/file-tree-view.html
@@ -1,10 +1,10 @@
 <bl-toolbar class="tree-view-header">
     <bl-clickable toolbarAction class="caret" (do)="toggleExpandTreeView()" [attr.aria-expanded]="expanded" attr.aria-owns="{{id}}-content" aria-label="Toggle tree view">
-        <i class="fa" [class.fa-caret-down]="expanded" [class.fa-caret-right]="!expanded"></i>
+        <i class="fa" [class.fa-caret-down]="expanded" [class.fa-caret-right]="!expanded" aria-hidden="true"></i>
     </bl-clickable>
     <bl-clickable toolbarLabel id="{{id}}_name" class="name" (do)="handleClickTreeViewHeader()">{{name}}</bl-clickable>
     <span toolbarError *ngIf="fileNavigator.error" [title]="fileNavigator.error.code">
-        <i class="fa fa-warning"></i>
+        <i class="fa fa-warning" aria-hidden="true"></i>
     </span>
     <bl-clickable toolbarAction (do)="refresh()" [disabled]="refreshing" class="refresh" [attr.aria-label]="'common.refresh' | i18n">
         <i class="fa fa-refresh action" [attr.title]="'common.refresh' | i18n" *ngIf="!refreshing" aria-hidden="true"></i>
diff --git a/src/@batch-flask/ui/file/file-viewer/file-viewer-container/file-viewer-header/file-viewer-header.html b/src/@batch-flask/ui/file/file-viewer/file-viewer-container/file-viewer-header/file-viewer-header.html
index a4b6c82865..30625462aa 100644
--- a/src/@batch-flask/ui/file/file-viewer/file-viewer-container/file-viewer-header/file-viewer-header.html
+++ b/src/@batch-flask/ui/file/file-viewer/file-viewer-container/file-viewer-header/file-viewer-header.html
@@ -15,17 +15,17 @@
     </bl-download-button>
     <bl-button class="open-in-default-app" color="light" [action]="openDefaultEditor" *ngIf="!actionDisabled"
         title="Open in default application" tooltipPosition="above">
-        <i class="fa fa-external-link"></i>
+        <i class="fa fa-external-link" aria-hidden="true"></i>
     </bl-button>
     <bl-button class="save" color="light" [action]="save" title="Save" tooltipPosition="above" *ngIf="canSave"
         [disabled]="actionDisabled">
-        <i class="fa fa-save"></i>
+        <i class="fa fa-save" aria-hidden="true"></i>
         <span class="modified-icon" *ngIf="fileViewer?.modified | async">*</span>
     </bl-button>
     <ng-container *ngIf="fileViewer?.commands && !actionDisabled">
         <bl-button *ngFor="let command of fileViewer?.commands;trackBy: trackCommand" [color]="command.color"  [disabled]="actionDisabled"
             [action]="command.execute" [title]="command.label">
-            <i class="{{command.icon}}"></i>
+            <i class="{{command.icon}}" aria-hidden="true"></i>
         </bl-button>
     </ng-container>
 </div>
diff --git a/src/@batch-flask/ui/file/file-viewer/log-file-viewer/log-file-viewer.html b/src/@batch-flask/ui/file/file-viewer/log-file-viewer/log-file-viewer.html
index c38c632ca0..ffcb9ddefc 100644
--- a/src/@batch-flask/ui/file/file-viewer/log-file-viewer/log-file-viewer.html
+++ b/src/@batch-flask/ui/file/file-viewer/log-file-viewer/log-file-viewer.html
@@ -1,7 +1,7 @@
 <bl-loading [status]="loadingStatus">
     <div class="log-console">
         <div class="follow-log-btn" [class.following]="followingLog" (click)="toggleFollowLog()">
-            <i class="fa fa-circle"></i>
+            <i class="fa fa-circle" aria-hidden="true"></i>
             <span>Follow log</span>
         </div>
         <div class="log-container">
diff --git a/src/@batch-flask/ui/form/complex-form/footer/form-footer.html b/src/@batch-flask/ui/form/complex-form/footer/form-footer.html
index 3c6f20c9ec..46fef9511b 100644
--- a/src/@batch-flask/ui/form/complex-form/footer/form-footer.html
+++ b/src/@batch-flask/ui/form/complex-form/footer/form-footer.html
@@ -4,14 +4,14 @@
         [disabled]="classicFormDisabled"
         [title]="'form-footer.buttons.normalForm' |i18n"
         (do)="toggleJsonEditor(false)">
-        <i class="fa fa-commenting"></i>
+        <i class="fa fa-commenting" aria-hidden="true"></i>
     </bl-button>
     <bl-button type="square"
         [attr.aria-pressed]="showJsonEditor"
         [disabled]="showJsonEditor"
         [title]="'form-footer.buttons.jsonEditor' |i18n"
         (do)="toggleJsonEditor(true)">
-        <i class="fa fa-code"></i>
+        <i class="fa fa-code" aria-hidden="true"></i>
     </bl-button>
 </div>
 <div class="toggle-error-btn" *ngIf="error">
@@ -24,7 +24,7 @@
 </div>
 <div class="summary">
     <div *ngIf="waitingForAsyncTask && asyncTasks" class="waiting-for-async-task-message">
-        <i class="fa fa-spinner fa-spin"></i>
+        <i class="fa fa-spinner fa-spin" aria-hidden="true"></i>
         <span class="main">Waiting for </span>
         <span class="task">{{asyncTasks[0].name}}</span>
         <span class="main" *ngIf="asyncTasks.length > 1" [matTooltip]="asyncTaskTooltip">and {{asyncTasks.length - 1}} tasks</span>
diff --git a/src/@batch-flask/ui/form/editable-table/editable-table.html b/src/@batch-flask/ui/form/editable-table/editable-table.html
index 9c47c6baa1..01d7075fe8 100644
--- a/src/@batch-flask/ui/form/editable-table/editable-table.html
+++ b/src/@batch-flask/ui/form/editable-table/editable-table.html
@@ -25,7 +25,7 @@
                 <td class="action-column">
                     <bl-clickable *ngIf="!isLast" class="delete-item-btn" [attr.aria-label]="'editable-table.deleteRow' | i18n"
                         (do)="deleteItem(i)">
-                        <i class="fa fa-times"></i>
+                        <i class="fa fa-times" aria-hidden="true"></i>
                     </bl-clickable>
                 </td>
             </tr>
diff --git a/src/@batch-flask/ui/form/form-picker/form-multi-picker.html b/src/@batch-flask/ui/form/form-picker/form-multi-picker.html
index 392dbd2c65..78feeb1036 100644
--- a/src/@batch-flask/ui/form/form-picker/form-multi-picker.html
+++ b/src/@batch-flask/ui/form/form-picker/form-multi-picker.html
@@ -1,13 +1,13 @@
 <div *ngFor="let value of values;trackBy: trackByFn; let i=index;" class="picked-item">
     <button #button class="form-picker" (click)="openPicker($event, i)" [class.has-value]="value">
         <span *ngIf="!value" class="no-value-content">
-            <i class="fa fa-plus"></i>{{addTitle}}
+            <i class="fa fa-plus" aria-hidden="true"></i>{{addTitle}}
         </span>
         <span *ngIf="value" class="content">
             <div class="details">
                 <ng-template [ngTemplateOutlet]="itemTemplate.template"  [ngTemplateOutletContext]="{$implicit: value}"></ng-template>
             </div>
-            <bl-button type="round" color="light" class="clear-btn" (click)="clearValue($event, i)"><i class="fa fa-times"></i></bl-button>
+            <bl-button type="round" color="light" class="clear-btn" (click)="clearValue($event, i)"><i class="fa fa-times" aria-hidden="true"></i></bl-button>
         </span>
     </button>
 </div>
diff --git a/src/@batch-flask/ui/form/form-picker/form-picker.html b/src/@batch-flask/ui/form/form-picker/form-picker.html
index 28ef763ecd..934f3627b5 100644
--- a/src/@batch-flask/ui/form/form-picker/form-picker.html
+++ b/src/@batch-flask/ui/form/form-picker/form-picker.html
@@ -1,13 +1,13 @@
 <button #button class="form-picker" (click)="openPicker()" [class.has-value]="hasValue">
     <div *ngIf="!hasValue" class="no-value-content">
-        <i class="fa fa-plus"></i> <ng-content select="[no-value-title]"></ng-content>
+        <i class="fa fa-plus" aria-hidden="true"></i> <ng-content select="[no-value-title]"></ng-content>
     </div>
     <div *ngIf="hasValue" class="content">
         <div class="details">
             <div class="title"><ng-content select="[value-title]"></ng-content></div>
             <div class="subtitle"><ng-content select="[value-subtitle]"></ng-content></div>
         </div>
-        <bl-button class="clear-btn"  type="round" color="light" (click)="clearPicker($event)"><i class="fa fa-times"></i></bl-button>
+        <bl-button class="clear-btn"  type="round" color="light" (click)="clearPicker($event)"><i class="fa fa-times" aria-hidden="true"></i></bl-button>
     </div>
 </button>
 <bl-form-page #page [title]="name" [formGroup]="nestedValue" (submit)="nestedFormSubmit()" (cancel)="nestedFormCanceled()">
diff --git a/src/@batch-flask/ui/info-box/info-box.component.ts b/src/@batch-flask/ui/info-box/info-box.component.ts
index 4ced60d5dc..ef276f0549 100644
--- a/src/@batch-flask/ui/info-box/info-box.component.ts
+++ b/src/@batch-flask/ui/info-box/info-box.component.ts
@@ -4,7 +4,7 @@ import { Component, Input } from "@angular/core";
     selector: "bl-info-box",
     template: `
         <div class="infobox">
-            <div class="infobox-image"><i class="fa fa-info-circle fa-3"></i></div>
+            <div class="infobox-image"><i class="fa fa-info-circle fa-3" aria-hidden="true"></i></div>
             <div class="infobox-text">{{message}}</div>
         </div>`,
 })
diff --git a/src/@batch-flask/ui/keybindings/keybindings.html b/src/@batch-flask/ui/keybindings/keybindings.html
index 4cecd09484..37754f16c9 100644
--- a/src/@batch-flask/ui/keybindings/keybindings.html
+++ b/src/@batch-flask/ui/keybindings/keybindings.html
@@ -7,7 +7,7 @@
         <div blFormFieldSuffix>
             <bl-clickable (do)="toggleKeybindingSearch()" class="keybinding-listener-btn"
                 [class.active]="searchByKeyBinding" title="Record keys">
-                <i class="fa fa-keyboard-o"></i>
+                <i class="fa fa-keyboard-o" aria-hidden="true"></i>
             </bl-clickable>
         </div>
     </bl-form-field>
@@ -32,7 +32,7 @@
                     Default
                 </ng-container>
                 <ng-template #userBinding>
-                    User <bl-clickable (do)="removeUserBinding(command.id)" title="Reset to default"><i class="fa fa-undo"></i></bl-clickable>
+                    User <bl-clickable (do)="removeUserBinding(command.id)" title="Reset to default"><i class="fa fa-undo" aria-hidden="true"></i></bl-clickable>
                 </ng-template>
             </div>
         </bl-column>
diff --git a/src/@batch-flask/ui/list-and-show-layout/entity-details-list.html b/src/@batch-flask/ui/list-and-show-layout/entity-details-list.html
index 784fbc9aaf..344305bc83 100644
--- a/src/@batch-flask/ui/list-and-show-layout/entity-details-list.html
+++ b/src/@batch-flask/ui/list-and-show-layout/entity-details-list.html
@@ -10,7 +10,7 @@
             matTooltipPosition="above"
             [routerLink]="baseLink"
             [queryParams]="{filter: true}">
-            <i class="fa fa-filter"></i>
+            <i class="fa fa-filter" aria-hidden="true"></i>
         </bl-clickable>
     </div>
     <div class="actions">
diff --git a/src/@batch-flask/ui/notifications/persisted-dropdown/persisted-notifications-dropdown.html b/src/@batch-flask/ui/notifications/persisted-dropdown/persisted-notifications-dropdown.html
index 6836998967..d4a2a789e7 100644
--- a/src/@batch-flask/ui/notifications/persisted-dropdown/persisted-notifications-dropdown.html
+++ b/src/@batch-flask/ui/notifications/persisted-dropdown/persisted-notifications-dropdown.html
@@ -1,15 +1,15 @@
 <bl-dropdown [footer]="true" align="right">
     <div bl-dropdown-btn>
-        <i class="fa fa-envelope-o"></i>
+        <i class="fa fa-envelope-o" aria-hidden="true"></i>
         <span class="count" *ngIf="notifications.size > 0">{{notifications.size}}</span>
     </div>
     <div bl-dropdown-content>
         <div *ngFor="let notification of notifications;trackBy: trackNotification" class="dropdown-item">
             <div class="icon" [ngSwitch]="notification.level">
-                <i class="fa fa-info-circle" *ngSwitchCase="NotificationLevel.info"></i>
-                <i class="fa fa-times" *ngSwitchCase="NotificationLevel.error"></i>
-                <i class="fa fa-check" *ngSwitchCase="NotificationLevel.success"></i>
-                <i class="fa fa-exclamation-triangle" *ngSwitchCase="NotificationLevel.warn"></i>
+                <i class="fa fa-info-circle" *ngSwitchCase="NotificationLevel.info" aria-hidden="true"></i>
+                <i class="fa fa-times" *ngSwitchCase="NotificationLevel.error" aria-hidden="true"></i>
+                <i class="fa fa-check" *ngSwitchCase="NotificationLevel.success" aria-hidden="true"></i>
+                <i class="fa fa-exclamation-triangle" *ngSwitchCase="NotificationLevel.warn" aria-hidden="true"></i>
             </div>
             <div class="details">
                 <div class="title">{{notification.title}}</div>
@@ -21,16 +21,16 @@
                 </bl-clickable>
             </div>
             <bl-clickable (do)="dismiss($event, notification)">
-                <i class="dismiss fa fa-times"></i>
+                <i class="dismiss fa fa-times" aria-hidden="true"></i>
             </bl-clickable>
         </div>
         <bl-clickable class="dropdown-item clear-all" *ngIf="notifications.size > 0" (click)="dismissAll()">
-            <i class="fa fa-trash"></i>
+            <i class="fa fa-trash" aria-hidden="true"></i>
             <span>Clear all</span>
         </bl-clickable>
         <div class="dropdown-item" *ngIf="notifications.size === 0">
             <div class="no-notifications">
-                <i class="fa fa-envelope-o"></i>
+                <i class="fa fa-envelope-o" aria-hidden="true"></i>
                 <span>No new notifications</span>
             </div>
         </div>
diff --git a/src/@batch-flask/ui/notifications/toast/toast.html b/src/@batch-flask/ui/notifications/toast/toast.html
index 2d900c89a4..c3a5600362 100644
--- a/src/@batch-flask/ui/notifications/toast/toast.html
+++ b/src/@batch-flask/ui/notifications/toast/toast.html
@@ -7,5 +7,5 @@
     </bl-clickable>
 </div>
 <bl-clickable class="dismiss-btn" (do)="dismiss()">
-    <i class="fa fa-times"></i>
+    <i class="fa fa-times" aria-hidden="true"></i>
 </bl-clickable>
diff --git a/src/@batch-flask/ui/property-list/bool-property/bool-property.html b/src/@batch-flask/ui/property-list/bool-property/bool-property.html
index 6b2a95aa44..d685b12619 100644
--- a/src/@batch-flask/ui/property-list/bool-property/bool-property.html
+++ b/src/@batch-flask/ui/property-list/bool-property/bool-property.html
@@ -1,7 +1,7 @@
 <bl-property-field>
     <div propertyLabel>{{label}}</div>
     <bl-property-content>
-        <i class="fa" [class.fa-toggle-on]="value" [class.fa-toggle-off]="!value"></i>
+        <i class="fa" [class.fa-toggle-on]="value" [class.fa-toggle-off]="!value" aria-hidden="true"></i>
         {{ text }}
     </bl-property-content>
 </bl-property-field>
diff --git a/src/@batch-flask/ui/property-list/property-group/property-group.html b/src/@batch-flask/ui/property-list/property-group/property-group.html
index 5b14a69d95..10f9d4f5f7 100644
--- a/src/@batch-flask/ui/property-list/property-group/property-group.html
+++ b/src/@batch-flask/ui/property-list/property-group/property-group.html
@@ -1,17 +1,17 @@
 <bl-clickable class="group-header" (do)="toogleCollapsed()" *ngIf="label" [attr.aria-expanded]="!collapsed" [attr.aria-controls]="contentId">
     <div class="collapse-icon" *ngIf="collapsable" aria-hidden="true">
-        <i class="fa fa-caret-right" *ngIf="collapsed"></i>
-        <i class="fa fa-caret-down" *ngIf="!collapsed"></i>
+        <i class="fa fa-caret-right" *ngIf="collapsed" aria-hidden="true"></i>
+        <i class="fa fa-caret-down" *ngIf="!collapsed" aria-hidden="true"></i>
     </div>
     <h4 class="noselect">{{label}}</h4>
     <span *ngIf="collapsed">
         <ng-content select="[collapsed-preview]"></ng-content>
     </span>
-    <bl-button color="light" type="round" [action]="triggerEdit" *ngIf="edit" title="Edit"><i class="fa fa-pencil"></i></bl-button>
+    <bl-button color="light" type="round" [action]="triggerEdit" *ngIf="edit" title="Edit"><i class="fa fa-pencil" aria-hidden="true"></i></bl-button>
 </bl-clickable>
 <div class="group-content" *ngIf="!collapsed" [id]="contentId">
     <div class="warning-message" *ngIf="warningMessage" aria-live="polite">
-        <i class="fa fa-warning"></i>
+        <i class="fa fa-warning" aria-hidden="true"></i>
         <span>{{warningMessage}}</span>
     </div>
     <ng-content></ng-content>
diff --git a/src/@batch-flask/ui/property-list/table-property/table-property.html b/src/@batch-flask/ui/property-list/table-property/table-property.html
index e5626ccb39..1b6a87629a 100644
--- a/src/@batch-flask/ui/property-list/table-property/table-property.html
+++ b/src/@batch-flask/ui/property-list/table-property/table-property.html
@@ -21,7 +21,7 @@
                 [ngSwitch]="expanded"
                 (click)="toggleExpand($event)"
                 (keydown)="toggleExpand($event)">
-                <span *ngSwitchCase="true"><i class='fa fa-caret-up'></i></span>
+                <span *ngSwitchCase="true"><i class='fa fa-caret-up' aria-hidden="true"></i></span>
                 <span *ngSwitchCase="false">{{
                     "Show " + (rows.length - defaultDisplay) + " more"
                 }}</span>
diff --git a/src/@batch-flask/ui/select/select-dropdown/select-dropdown.html b/src/@batch-flask/ui/select/select-dropdown/select-dropdown.html
index f69c50fadc..7ea54ed54c 100644
--- a/src/@batch-flask/ui/select/select-dropdown/select-dropdown.html
+++ b/src/@batch-flask/ui/select/select-dropdown/select-dropdown.html
@@ -9,7 +9,7 @@
     (mousedown)="handleClickOption($event, option)">
 
     <div class="checkbox" *ngIf="multiple" aria-hidden="true">
-        <i class="fa fa-check" *ngIf="selected.has(option.value)"></i>
+        <i class="fa fa-check" *ngIf="selected.has(option.value)" aria-hidden="true"></i>
     </div>
     <div class="option-content">
         <ng-container *ngIf="select.optionTemplate">
diff --git a/src/@batch-flask/ui/select/select.html b/src/@batch-flask/ui/select/select.html
index 88cbe72e35..050a3a9a5d 100644
--- a/src/@batch-flask/ui/select/select.html
+++ b/src/@batch-flask/ui/select/select.html
@@ -27,8 +27,8 @@
             </ng-container>
         </div>
         <div class="caret">
-            <i class="fa fa-caret-down" aria-hidden="true" *ngIf="!dropdownOpen"></i>
-            <i class="fa fa-caret-up" aria-hidden="true" *ngIf="dropdownOpen"></i>
+            <i class="fa fa-caret-down" aria-hidden="true"></i>
+            <i class="fa fa-caret-up" aria-hidden="true"></i>
         </div>
    </div>
    <ng-container *ngIf="dropdownOpen && filterable">
diff --git a/src/@batch-flask/ui/server-error/server-error.html b/src/@batch-flask/ui/server-error/server-error.html
index 3b5e3a4e99..8f061820c6 100644
--- a/src/@batch-flask/ui/server-error/server-error.html
+++ b/src/@batch-flask/ui/server-error/server-error.html
@@ -12,7 +12,7 @@ <h4>{{error.code}}</h4>
                     role="button"
                     title="{{'server-error.debug-button-label' | i18n}}"
                 >
-                    <i class="fa fa-bug"></i>
+                    <i class="fa fa-bug" aria-hidden="true"></i>
                 </bl-clickable>
             </div>
         </div>
diff --git a/src/@batch-flask/ui/sidebar/sidebar-bookmarks/sidebar-bookmarks.html b/src/@batch-flask/ui/sidebar/sidebar-bookmarks/sidebar-bookmarks.html
index 6dcd4835fd..6524dee8b7 100644
--- a/src/@batch-flask/ui/sidebar/sidebar-bookmarks/sidebar-bookmarks.html
+++ b/src/@batch-flask/ui/sidebar/sidebar-bookmarks/sidebar-bookmarks.html
@@ -1,7 +1,7 @@
 <bl-dropdown [footer]="false" align="right">
     <div bl-dropdown-btn
         [attr.button-title]="'sidebar-bookmarks.dropdown-button-title' | i18n">
-        <i class="fa fa-wpforms"></i>
+        <i class="fa fa-wpforms" aria-hidden="true"></i>
         <span class="count" *ngIf="references.length > 0">{{references.length}}</span>
     </div>
     <div bl-dropdown-content class="bookmarks-container">
@@ -12,7 +12,7 @@
             (contextmenu)="onContextMenu(reference)">
 
             <span>{{referenceTitle(reference)}}</span>
-            <i class="fa fa-times" (click)="destroyBookmark(reference)"></i>
+            <i class="fa fa-times" (click)="destroyBookmark(reference)" aria-hidden="true"></i>
         </div>
 
         <div *ngIf="references.length === 0" class="dropdown-item no-bookmarks">
diff --git a/src/@batch-flask/ui/table/table-row-render/table-row-render.html b/src/@batch-flask/ui/table/table-row-render/table-row-render.html
index de6ec823b8..91a5c98e4c 100644
--- a/src/@batch-flask/ui/table/table-row-render/table-row-render.html
+++ b/src/@batch-flask/ui/table/table-row-render/table-row-render.html
@@ -1,6 +1,6 @@
 <td class="checkbox-cell" (click)="handleClick($event, false)" *ngIf="tableConfig.showCheckbox">
     <div class="checkbox">
-        <i class="fa fa-check" *ngIf="selected"></i>
+        <i class="fa fa-check" *ngIf="selected" aria-hidden="true"></i>
     </div>
 </td>
 
diff --git a/src/@batch-flask/ui/tags/tag-list/tag-list.html b/src/@batch-flask/ui/tags/tag-list/tag-list.html
index e15e1bb472..ef90d471fa 100644
--- a/src/@batch-flask/ui/tags/tag-list/tag-list.html
+++ b/src/@batch-flask/ui/tags/tag-list/tag-list.html
@@ -1,5 +1,5 @@
 <span class="tag" *ngFor="let tag of displayTags;trackBy: trackTag">{{tag}}</span>
 <span class="expand-tags" *ngIf="tags.size > maxTags" [matTooltip]="tags.join(', ')">
-    <i class="fa fa-ellipsis-h"></i>
+    <i class="fa fa-ellipsis-h" aria-hidden="true"></i>
 </span>
 <div class="no-tags" *ngIf="tags.size === 0">{{noTagsMessage}}</div>
diff --git a/src/@batch-flask/ui/tags/tags.html b/src/@batch-flask/ui/tags/tags.html
index ddf9289a8a..1da3f02b5a 100644
--- a/src/@batch-flask/ui/tags/tags.html
+++ b/src/@batch-flask/ui/tags/tags.html
@@ -1,7 +1,7 @@
 <div class="display" *ngIf="!isEditing && !saving" >
     <bl-tag-list [tags]="tags" [maxTags]="maxTags" [noTagsMessage]="noTagsMessage"></bl-tag-list>
     <bl-clickable #editButton class="edit" matTooltip="Edit tags" (do)="edit()" *ngIf="editable">
-        <i class="fa fa-pencil"></i>
+        <i class="fa fa-pencil" aria-hidden="true"></i>
     </bl-clickable>
 </div>
 <div class="editor" *ngIf="isEditing || saving">
@@ -10,13 +10,13 @@
             <input blInput #editInput placeholder="Tags(Comma separated)" [(ngModel)]="tagEditString" [ngModelOptions]="{standalone: true}">
             <div blFormFieldSuffix>
                 <bl-clickable class="save" matTooltip="Save" (do)="triggerSave()" *ngIf="isEditing">
-                    <i class="fa fa-check"></i>
+                    <i class="fa fa-check" aria-hidden="true"></i>
                 </bl-clickable>
                 <bl-clickable class="cancel" matTooltip="Cancel" (do)="cancel()" *ngIf="isEditing">
-                    <i class="fa fa-times"></i>
+                    <i class="fa fa-times" aria-hidden="true"></i>
                 </bl-clickable>
                 <span class="saving" *ngIf="saving">
-                    <i class="fa fa-spinner fa-spin"></i>
+                    <i class="fa fa-spinner fa-spin" aria-hidden="true"></i>
                 </span>
             </div>
         </bl-form-field>
diff --git a/src/app/components/account/base/auto-storage-account-picker/auto-storage-account-picker.html b/src/app/components/account/base/auto-storage-account-picker/auto-storage-account-picker.html
index 32d32a587e..64b59fcc3b 100644
--- a/src/app/components/account/base/auto-storage-account-picker/auto-storage-account-picker.html
+++ b/src/app/components/account/base/auto-storage-account-picker/auto-storage-account-picker.html
@@ -57,7 +57,7 @@ <h3>
                     *ngIf="account.isClassic"
                     #classicTooltip="matTooltip"
                 >
-                    <span class="fa fa-warning"></span> {{'auto-storage-account-picker.fields.classic' | i18n}}
+                    <span class="fa fa-warning" aria-hidden="true"></span> {{'auto-storage-account-picker.fields.classic' | i18n}}
                 </span>
             </div>
         </bl-column>
diff --git a/src/app/components/account/browse/account-dropdown.html b/src/app/components/account/browse/account-dropdown.html
index e6c75a092a..6f83b0a4bf 100644
--- a/src/app/components/account/browse/account-dropdown.html
+++ b/src/app/components/account/browse/account-dropdown.html
@@ -3,9 +3,9 @@
         [class.invalid]="currentAccountValid === status.Invalid">
         {{selectedAccountAlias}}
 
-        <i *ngIf="currentAccountValid === status.Invalid" class="fa fa-warning"></i>
+        <i *ngIf="currentAccountValid === status.Invalid" class="fa fa-warning" aria-hidden="true"></i>
 
-        <i *ngIf="currentAccountValid === status.Loading" class="fa fa-spinner fa-spin"></i>
+        <i *ngIf="currentAccountValid === status.Loading" class="fa fa-spinner fa-spin" aria-hidden="true"></i>
     </div>
     <div bl-dropdown-content>
         <bl-clickable *ngFor="let account of accountService.accountFavorites | async; trackBy: trackByFn"
@@ -24,11 +24,11 @@
                 <div class="url">{{account.url}}</div>
             </div>
             <div *ngIf="account.id === selectedId" class="extra">
-                <i class="fa fa-check"></i>
+                <i class="fa fa-check" aria-hidden="true"></i>
             </div>
         </bl-clickable>
         <bl-clickable *ngIf="selectedId" class="dropdown-item" routerLink="accounts">
-            <i class="fa fa-cog fa-2x"></i>Manage accounts
+            <i class="fa fa-cog fa-2x" aria-hidden="true"></i>Manage accounts
         </bl-clickable>
     </div>
 </bl-dropdown>
diff --git a/src/app/components/account/browse/account-list/account-list.html b/src/app/components/account/browse/account-list/account-list.html
index dc9450d742..8c856d308b 100644
--- a/src/app/components/account/browse/account-list/account-list.html
+++ b/src/app/components/account/browse/account-list/account-list.html
@@ -16,9 +16,9 @@
     </ng-container>
     <ng-container *blQuickListRowState="let account">
         <div *ngIf="account.armEnabled" class="account-info">
-            <span class="auto-storage" *ngIf="account.autoStorage" title="Auto storage account: {{account.autoStorage.storageAccountId}}"><i class="fa fa-hdd-o"></i></span>
+            <span class="auto-storage" *ngIf="account.autoStorage" title="Auto storage account: {{account.autoStorage.storageAccountId}}"><i class="fa fa-hdd-o" aria-hidden="true"></i></span>
             <span class="auto-storage error" *ngIf="!account.autoStorage" title="This account has no auto storage account specified">
-                <i class="fa fa-hdd-o"></i>
+                <i class="fa fa-hdd-o" aria-hidden="true"></i>
             </span>
             <bl-location [location]="account.location"></bl-location>
         </div>
diff --git a/src/app/components/account/details/account-default.component.ts b/src/app/components/account/details/account-default.component.ts
index 97eb9f52e1..fc76bbc22c 100644
--- a/src/app/components/account/details/account-default.component.ts
+++ b/src/app/components/account/details/account-default.component.ts
@@ -9,7 +9,7 @@ import { BatchAccountCreateComponent } from "../action/create";
     selector: "bl-account-details-home",
     template: `
         <div class="no-entity-home">
-            <i class="fa fa-user"></i>
+            <i class="fa fa-user" aria-hidden="true"></i>
             <p>Please select an account from the list</p>
 
             <bl-button type="wide" class="add-account-btn" (do)="addBatchAccount()">
diff --git a/src/app/components/account/details/account-monitoring-section/account-monitoring-section.html b/src/app/components/account/details/account-monitoring-section/account-monitoring-section.html
index 5918a832ae..d20a287f27 100644
--- a/src/app/components/account/details/account-monitoring-section/account-monitoring-section.html
+++ b/src/app/components/account/details/account-monitoring-section/account-monitoring-section.html
@@ -4,10 +4,10 @@ <h1 class="section-title">{{'account-details.monitoring' | i18n }}</h1>
     <div>
         <mat-button-toggle-group formControlName="chartType">
             <mat-button-toggle [value]="ChartType.Line">
-                <i class="fa fa-line-chart"></i> Line
+                <i class="fa fa-line-chart" aria-hidden="true"></i> Line
             </mat-button-toggle>
             <mat-button-toggle [value]="ChartType.Bar">
-                <i class="fa fa-bar-chart"></i> Bar
+                <i class="fa fa-bar-chart" aria-hidden="true"></i> Bar
             </mat-button-toggle>
         </mat-button-toggle-group>
 
diff --git a/src/app/components/account/details/getting-started-card/getting-started-card.html b/src/app/components/account/details/getting-started-card/getting-started-card.html
index 746d8ffd72..83e151069d 100644
--- a/src/app/components/account/details/getting-started-card/getting-started-card.html
+++ b/src/app/components/account/details/getting-started-card/getting-started-card.html
@@ -1,31 +1,31 @@
 <bl-card>
     <div class="content">
         <div class="getting-started-item"   >
-            <div class="icon"><i class="fa fa-key"></i></div>
+            <div class="icon"><i class="fa fa-key" aria-hidden="true"></i></div>
             <div class="label">Get credentials</div>
             <div class="aad-link"><bl-clickable (do)="openPage('credentials', CredentialType.AAD)">Azure AD</bl-clickable></div>
             <div class="shared-key-link"><bl-clickable (do)="openPage('credentials', CredentialType.SharedKey)">Shared key</bl-clickable></div>
         </div>
         <div class="getting-started-item">
-            <div class="icon"><i class="fa fa-code"></i></div>
+            <div class="icon"><i class="fa fa-code" aria-hidden="true"></i></div>
             <div class="label">Sample for python</div>
             <div class="aad-link"><bl-clickable (do)="openPage('python', CredentialType.AAD)">Azure AD</bl-clickable></div>
             <div class="shared-key-link"><bl-clickable (do)="openPage('python', CredentialType.SharedKey)">Shared key</bl-clickable></div>
         </div>
         <div class="getting-started-item">
-            <div class="icon"><i class="fa fa-code"></i></div>
+            <div class="icon"><i class="fa fa-code" aria-hidden="true"></i></div>
             <div class="label">Sample for C#</div>
             <div class="aad-link"><bl-clickable (do)="openPage('csharp', CredentialType.AAD)">Azure AD</bl-clickable></div>
             <div class="shared-key-link"><bl-clickable (do)="openPage('csharp', CredentialType.SharedKey)">Shared key</bl-clickable></div>
         </div>
         <bl-clickable class="getting-started-item" (click)="gotoAztkDoc()">
-            <div class="icon"><i class="fa fa-code"></i></div>
+            <div class="icon"><i class="fa fa-code" aria-hidden="true"></i></div>
             <div class="label">Get AZTK secrets.yaml</div>
             <div class="aad-link"><bl-clickable (do)="openPage('aztk', CredentialType.AAD)">Azure AD</bl-clickable></div>
             <div class="shared-key-link"></div>
         </bl-clickable>
         <bl-clickable class="getting-started-item"(do)="gotoDoAzureParallelDoc()">
-            <div class="icon"><i class="fa fa-code"></i></div>
+            <div class="icon"><i class="fa fa-code" aria-hidden="true"></i></div>
             <div class="label">Get doAzureParallel secrets.json</div>
             <div class="aad-link"><bl-clickable (do)="openPage('doAzureParallel', CredentialType.AAD)">Azure AD</bl-clickable></div>
             <div class="shared-key-link"><bl-clickable (do)="openPage('doAzureParallel', CredentialType.SharedKey)">Shared key</bl-clickable></div>
diff --git a/src/app/components/account/details/programmatic-usage/aad-credentials-picker/aad-credentials-picker.html b/src/app/components/account/details/programmatic-usage/aad-credentials-picker/aad-credentials-picker.html
index 23dfcbd7b3..f7508de578 100644
--- a/src/app/components/account/details/programmatic-usage/aad-credentials-picker/aad-credentials-picker.html
+++ b/src/app/components/account/details/programmatic-usage/aad-credentials-picker/aad-credentials-picker.html
@@ -24,7 +24,7 @@ <h1>AAD Credentials</h1>
                 <bl-text-property label="Tenant Id" [value]="tenantId"></bl-text-property>
                 <bl-text-property label="Client Id" [value]="pickedApplication.id"></bl-text-property>
                 <div class="danger" aria-live="polite">
-                    <i class="fa fa-warning"></i>Save this key, you will not see it again after closing this dialog.
+                    <i class="fa fa-warning" aria-hidden="true"></i>Save this key, you will not see it again after closing this dialog.
                 </div>
                 <bl-text-property label="Secret" [value]="pickedSecret.value"></bl-text-property>
             </bl-property-group>
diff --git a/src/app/components/account/details/programmatic-usage/aad-credentials-picker/resource-permission-button/resource-permission-button.html b/src/app/components/account/details/programmatic-usage/aad-credentials-picker/resource-permission-button/resource-permission-button.html
index f1ce8958d6..afc21c77c9 100644
--- a/src/app/components/account/details/programmatic-usage/aad-credentials-picker/resource-permission-button/resource-permission-button.html
+++ b/src/app/components/account/details/programmatic-usage/aad-credentials-picker/resource-permission-button/resource-permission-button.html
@@ -5,7 +5,7 @@
     [disabled]="loading"
     attr.aria-labelledby="{{labelledBy}} {{id}}-label">
     <ng-container *ngIf="loading">
-        <i class="fa fa-spinner fa-spin"></i> {{'common.loading' | i18n}}
+        <i class="fa fa-spinner fa-spin" aria-hidden="true"></i> {{'common.loading' | i18n}}
     </ng-container>
     <ng-container *ngIf="!loading">
         {{currentRole?.properties.roleName || 'resource-permission-button.none' | i18n}}
@@ -20,7 +20,7 @@
     </button>
     <button mat-menu-item (click)="changeRole(null)">
         <span class="danger">
-            <i class="fa fa-warning"></i> {{'resource-permission-button.removeAccess' | i18n}}
+            <i class="fa fa-warning" aria-hidden="true"></i> {{'resource-permission-button.removeAccess' | i18n}}
         </span>
     </button>
 </mat-menu>
diff --git a/src/app/components/account/details/programmatic-usage/programmatic-usage.html b/src/app/components/account/details/programmatic-usage/programmatic-usage.html
index 058ba4e8c7..791a27f9e3 100644
--- a/src/app/components/account/details/programmatic-usage/programmatic-usage.html
+++ b/src/app/components/account/details/programmatic-usage/programmatic-usage.html
@@ -19,7 +19,7 @@ <h1>
             </div>
             <div *ngIf="pickedCredentialType === CredentialType.AAD && !aadCredentials" class="aad-needs-setup-creds" aria-live="polite"
                 matTooltip="Pick an application and generate a key to have the templates filled with the correct informations">
-                <i class="fa fa-warning"></i>{{'programmatic-usage.setup' | i18n}}
+                <i class="fa fa-warning" aria-hidden="true"></i>{{'programmatic-usage.setup' | i18n}}
             </div>
 
         </div>
diff --git a/src/app/components/account/details/programmatic-usage/programming-sample/programming-sample.html b/src/app/components/account/details/programmatic-usage/programming-sample/programming-sample.html
index a7dcca586a..3d1ea637aa 100644
--- a/src/app/components/account/details/programmatic-usage/programming-sample/programming-sample.html
+++ b/src/app/components/account/details/programmatic-usage/programming-sample/programming-sample.html
@@ -1,6 +1,6 @@
 <div class="description">
     <div *ngIf="credentialType === CredentialType.AAD && !aadCredentials" class="aad-needs-setup-creds" aria-live="polite">
-        <i class="fa fa-warning"></i>
+        <i class="fa fa-warning" aria-hidden="true"></i>
         {{'programming-sample.aad-setup-warning' | i18n}}
     </div>
     <bl-property-group label="" class="wide" class="prerequisites">
diff --git a/src/app/components/account/details/storage-account-card/storage-account-card.html b/src/app/components/account/details/storage-account-card/storage-account-card.html
index d86f0efe0f..d524327ff7 100644
--- a/src/app/components/account/details/storage-account-card/storage-account-card.html
+++ b/src/app/components/account/details/storage-account-card/storage-account-card.html
@@ -1,7 +1,7 @@
 <div class="storage-account-card">
     <div class="content">
         <div class="icon">
-            <span class="fa fa-hdd-o"></span>
+            <span class="fa fa-hdd-o" aria-hidden="true"></span>
         </div>
         <div class="details">
             <h2 class="title">Storage account</h2>
diff --git a/src/app/components/account/monitoring/account-monitoring-home/account-monitoring-home.html b/src/app/components/account/monitoring/account-monitoring-home/account-monitoring-home.html
index feb741e43b..b4fd8aa579 100644
--- a/src/app/components/account/monitoring/account-monitoring-home/account-monitoring-home.html
+++ b/src/app/components/account/monitoring/account-monitoring-home/account-monitoring-home.html
@@ -1,10 +1,10 @@
 <div [formGroup]="settings" class="chart-settings">
     <mat-button-toggle-group formControlName="chartType">
         <mat-button-toggle [value]="ChartType.Line">
-            <i class="fa fa-line-chart"></i> Line
+            <i class="fa fa-line-chart" aria-hidden="true"></i> Line
         </mat-button-toggle>
         <mat-button-toggle [value]="ChartType.Bar">
-            <i class="fa fa-bar-chart"></i> Bar
+            <i class="fa fa-bar-chart" aria-hidden="true"></i> Bar
         </mat-button-toggle>
     </mat-button-toggle-group>
 
diff --git a/src/app/components/application/browse/application-list.html b/src/app/components/application/browse/application-list.html
index 9cf7ff8706..edbe5cc3d2 100644
--- a/src/app/components/application/browse/application-list.html
+++ b/src/app/components/application/browse/application-list.html
@@ -49,7 +49,7 @@
 <bl-server-error class="error-in-list" [error]="data.error | async" *ngIf="status === LoadingStatus.Error"></bl-server-error>
 
 <bl-no-item [itemCount]="displayedApplications.size" [filter]="filter" [status]="status">
-    <i icon class="fa fa-file-archive-o small"></i>
+    <i icon class="fa fa-file-archive-o small" aria-hidden="true"></i>
     <span no-filter>No applications</span>
     <span with-filter>Current filter returned no applications</span>
 </bl-no-item>
diff --git a/src/app/components/application/details/application-default.component.ts b/src/app/components/application/details/application-default.component.ts
index 6c4cdbf4a7..73230745f6 100644
--- a/src/app/components/application/details/application-default.component.ts
+++ b/src/app/components/application/details/application-default.component.ts
@@ -5,7 +5,7 @@ import { Component } from "@angular/core";
     template: `
         <bl-application-error-display></bl-application-error-display>
         <div class="no-entity-home">
-            <i class="fa fa-file-archive-o large"></i>
+            <i class="fa fa-file-archive-o large" aria-hidden="true"></i>
             <p>Please select an application from the list</p>
         </div>
     `,
diff --git a/src/app/components/application/details/application-details.html b/src/app/components/application/details/application-details.html
index 37c8bf9f6d..41e3a0fb14 100644
--- a/src/app/components/application/details/application-details.html
+++ b/src/app/components/application/details/application-details.html
@@ -3,7 +3,7 @@
         <bl-summary-card>
             <div summaryTitle>{{application.name}}</div>
             <div summarySubtitle>
-                <i class="fa" [ngClass]="application.properties.allowUpdates ? 'fa-unlock-alt' : 'fa-lock'"></i>
+                <i class="fa" [ngClass]="application.properties.allowUpdates ? 'fa-unlock-alt' : 'fa-lock'" aria-hidden="true"></i>
                 {{application.properties.displayName}}
                 <span *ngIf="application.properties.allowUpdates">
                     <b>(unlocked)</b>
diff --git a/src/app/components/application/details/application-package-table.html b/src/app/components/application/details/application-package-table.html
index 2a60d1db33..851988335a 100644
--- a/src/app/components/application/details/application-package-table.html
+++ b/src/app/components/application/details/application-package-table.html
@@ -22,7 +22,7 @@
 </bl-loading>
 
 <bl-no-item [itemCount]="displayedPackages.size" [filter]="filter" [status]="data.status | async">
-    <i icon class="fa fa-file-archive-o"></i>
+    <i icon class="fa fa-file-archive-o" aria-hidden="true"></i>
     <span no-filter>This application contains no package versions</span>
     <span with-filter>Current filter returned no matches</span>
 </bl-no-item>
diff --git a/src/app/components/application/details/application-packages.html b/src/app/components/application/details/application-packages.html
index 8a7dff0a47..0240c26e68 100644
--- a/src/app/components/application/details/application-packages.html
+++ b/src/app/components/application/details/application-packages.html
@@ -10,11 +10,11 @@
         -->
         <bl-button color="danger" type="plain" title="Delete selected" [action]="deleteSelection" [disabled]="!deleteEnabled"
             tooltipPosition="left">
-            <i class="fa fa-trash spin-hover"></i>
+            <i class="fa fa-trash spin-hover" aria-hidden="true"></i>
         </bl-button>
         <bl-button color="light" type="plain" title="Activate pending package" [action]="activateSelection" [disabled]="!activateEnabled"
             tooltipPosition="left">
-            <i class="fa fa-toggle-on spin-hover"></i>
+            <i class="fa fa-toggle-on spin-hover" aria-hidden="true"></i>
         </bl-button>
     </div>
 
diff --git a/src/app/components/certificate/browse/certificate-list.html b/src/app/components/certificate/browse/certificate-list.html
index 999913be2d..a9c23f8532 100644
--- a/src/app/components/certificate/browse/certificate-list.html
+++ b/src/app/components/certificate/browse/certificate-list.html
@@ -35,7 +35,7 @@
 </bl-table>
 
 <bl-no-item [itemCount]="displayedCertificates.size" [filter]="filter" [status]="status">
-    <i icon class="fa fa-certificate"></i>
+    <i icon class="fa fa-certificate" aria-hidden="true"></i>
     <span no-filter>No certificates</span>
     <span with-filter>No certificates match this filter</span>
 </bl-no-item>
diff --git a/src/app/components/certificate/details/certificate-default.component.ts b/src/app/components/certificate/details/certificate-default.component.ts
index a4b9e7bb4f..42f3949c85 100644
--- a/src/app/components/certificate/details/certificate-default.component.ts
+++ b/src/app/components/certificate/details/certificate-default.component.ts
@@ -4,7 +4,7 @@ import { ChangeDetectionStrategy, Component } from "@angular/core";
     selector: "bl-certificate-details-home",
     template: `
         <div class="no-entity-home">
-            <i class="fa fa-certificate large"></i>
+            <i class="fa fa-certificate large" aria-hidden="true"></i>
             <p>Please select a certificate from the list</p>
         </div>
     `,
diff --git a/src/app/components/certificate/details/certificate-details.html b/src/app/components/certificate/details/certificate-details.html
index 4a5d5b86e4..1dee63fee6 100644
--- a/src/app/components/certificate/details/certificate-details.html
+++ b/src/app/components/certificate/details/certificate-details.html
@@ -3,7 +3,7 @@
         <bl-summary-card>
             <div summaryTitle>{{decorator.thumbprint}}</div>
             <div summarySubtitle>
-                <i class="fa" [ngClass]="decorator.stateIcon"></i> {{decorator.state}}
+                <i class="fa" [ngClass]="decorator.stateIcon" aria-hidden="true"></i> {{decorator.state}}
             </div>
             <bl-button-group summaryActions>
                 <bl-refresh-btn [refresh]="refresh"></bl-refresh-btn>
diff --git a/src/app/components/common/blob-container-picker/blob-container-picker.html b/src/app/components/common/blob-container-picker/blob-container-picker.html
index 4cbe2277f8..48846d134b 100644
--- a/src/app/components/common/blob-container-picker/blob-container-picker.html
+++ b/src/app/components/common/blob-container-picker/blob-container-picker.html
@@ -7,7 +7,7 @@
 
 <mat-autocomplete #auto="matAutocomplete">
     <mat-option [disabled]="true" *ngIf="(containersData.status | async) === LoadingStatus.Loading">
-        <i class="fa fa-spinner fa-spin"></i> {{'blob-container-picker.loading' | i18n}}
+        <i class="fa fa-spinner fa-spin" aria-hidden="true"></i> {{'blob-container-picker.loading' | i18n}}
     </mat-option>
     <mat-option *ngFor="let container of containers;trackBy: trackContainer" [value]="container.name">
         {{ container.name }}
diff --git a/src/app/components/common/guards/select-acccount-dialog/select-account-dialog.html b/src/app/components/common/guards/select-acccount-dialog/select-account-dialog.html
index 7b6aab043d..32b4c6a92d 100644
--- a/src/app/components/common/guards/select-acccount-dialog/select-account-dialog.html
+++ b/src/app/components/common/guards/select-acccount-dialog/select-account-dialog.html
@@ -15,9 +15,9 @@
     </ng-container>
     <ng-container *blQuickListRowState="let account">
         <div *ngIf="account.armEnabled" class="account-info">
-            <span class="auto-storage" *ngIf="account.autoStorage" title="Auto storage account: {{account.autoStorage.storageAccountId}}"><i class="fa fa-hdd-o"></i></span>
+            <span class="auto-storage" *ngIf="account.autoStorage" title="Auto storage account: {{account.autoStorage.storageAccountId}}"><i class="fa fa-hdd-o" aria-hidden="true"></i></span>
             <span class="auto-storage error" *ngIf="!account.autoStorage" title="This account has no auto storage account specified">
-                <i class="fa fa-hdd-o"></i>
+                <i class="fa fa-hdd-o" aria-hidden="true"></i>
             </span>
             <bl-location [location]="account.location"></bl-location>
         </div>
diff --git a/src/app/components/common/location/location.html b/src/app/components/common/location/location.html
index 6686656100..dcdfcdbee0 100644
--- a/src/app/components/common/location/location.html
+++ b/src/app/components/common/location/location.html
@@ -1,4 +1,4 @@
 <span class="flag">
-    <span class="fa fa-globe"></span>
+    <span class="fa fa-globe" aria-hidden="true"></span>
 </span>
 <span class="name">{{location}}</span>
diff --git a/src/app/components/common/resource-files-properties/resource-files-properties.html b/src/app/components/common/resource-files-properties/resource-files-properties.html
index 17e2d761a3..3fb5987616 100644
--- a/src/app/components/common/resource-files-properties/resource-files-properties.html
+++ b/src/app/components/common/resource-files-properties/resource-files-properties.html
@@ -8,23 +8,23 @@
         <bl-tp-cell [value]="file.httpUrl || file.storageContainerUrl || file.autoStorageContainerName"
             [useContent]="true">
             <ng-container *ngIf="file.httpUrl">
-                <i class="fa fa-file"></i>
+                <i class="fa fa-file" aria-hidden="true"></i>
                 {{file.httpUrl}}
             </ng-container>
             <div *ngIf="file.autoStorageContainerName" title="Auto storage container">
-                <i class="fa fa-folder"></i>
+                <i class="fa fa-folder" aria-hidden="true"></i>
                 {{file.storageContainerUrl || file.autoStorageContainerName}}
                 <ng-container *ngIf="file.blobPrefix">({{file.blobPrefix}}/**/*)</ng-container>
             </div>
             <div *ngIf="file.storageContainerUrl" title="Storage container url">
-                <i class="fa fa-folder"></i>
+                <i class="fa fa-folder" aria-hidden="true"></i>
                 {{file.storageContainerUrl || file.autoStorageContainerName}}
                 <ng-container *ngIf="file.blobPrefix">({{file.blobPrefix}}/**/*)</ng-container>
             </div>
         </bl-tp-cell>
         <bl-tp-cell [value]="file.filePath"></bl-tp-cell>
         <bl-tp-plain-cell class="open-file-cell" (do)="openResourceFile(file)" *ngIf="file.httpUrl">
-            <i class="fa fa-external-link"></i>
+            <i class="fa fa-external-link" aria-hidden="true"></i>
         </bl-tp-plain-cell>
     </bl-table-property-row>
 </bl-table-property>
diff --git a/src/app/components/common/resourcefile-picker/resourcefile-cloud-file-dialog/resourcefile-cloud-file-dialog.html b/src/app/components/common/resourcefile-picker/resourcefile-cloud-file-dialog/resourcefile-cloud-file-dialog.html
index 6be696acc8..fd2c615b07 100644
--- a/src/app/components/common/resourcefile-picker/resourcefile-cloud-file-dialog/resourcefile-cloud-file-dialog.html
+++ b/src/app/components/common/resourcefile-picker/resourcefile-cloud-file-dialog/resourcefile-cloud-file-dialog.html
@@ -38,17 +38,17 @@
             <div blFormFieldPrefix>
                 <ng-container *ngIf="currentSelection">
                     <ng-container *ngIf="currentSelection.httpUrl">
-                        <i class="fa fa-file"></i>
+                        <i class="fa fa-file" aria-hidden="true"></i>
                     </ng-container>
                     <ng-container *ngIf="currentSelection.autoStorageContainerName">
-                        <i class="fa fa-folder"></i>
+                        <i class="fa fa-folder" aria-hidden="true"></i>
                     </ng-container>
                     <ng-container *ngIf="currentSelection.storageContainerUrl">
-                        <i class="fa fa-folder"></i>>
+                        <i class="fa fa-folder" aria-hidden="true"></i>>
                     </ng-container>
                 </ng-container>
                 <ng-container *ngIf="!currentSelection">
-                    <i class="fa fa-spin fa-spinner"></i>
+                    <i class="fa fa-spin fa-spinner" aria-hidden="true"></i>
                 </ng-container>
             </div>
             <input blInput formControlName="path">
diff --git a/src/app/components/common/resourcefile-picker/resourcefile-container-source/resourcefile-container-source.html b/src/app/components/common/resourcefile-picker/resourcefile-container-source/resourcefile-container-source.html
index 006c0f477c..6b37083c88 100644
--- a/src/app/components/common/resourcefile-picker/resourcefile-container-source/resourcefile-container-source.html
+++ b/src/app/components/common/resourcefile-picker/resourcefile-container-source/resourcefile-container-source.html
@@ -2,5 +2,5 @@
 <span class="container" [title]="'models.container' | i18n">{{containerName}}</span>
 <span class="prefix" title="Prefix" *ngIf="prefix">({{'resourcefile-picker.blobPrefix' | i18n }}: {{prefix}})</span>
 <bl-clickable (do)="openEditDialog()">
-    <i class="fa fa-pencil"></i>
+    <i class="fa fa-pencil" aria-hidden="true"></i>
 </bl-clickable>
diff --git a/src/app/components/common/resourcefile-picker/resourcefile-picker-row/resourcefile-picker-row.html b/src/app/components/common/resourcefile-picker/resourcefile-picker-row/resourcefile-picker-row.html
index 477251fd95..43774889c7 100644
--- a/src/app/components/common/resourcefile-picker/resourcefile-picker-row/resourcefile-picker-row.html
+++ b/src/app/components/common/resourcefile-picker/resourcefile-picker-row/resourcefile-picker-row.html
@@ -1,8 +1,8 @@
 <ng-container [formGroup]="form">
     <div class="type" [ngSwitch]="type">
-        <i class="fa fa-file" *ngSwitchCase="ResourceFileType.Url"></i>
-        <i class="fa fa-folder" *ngSwitchCase="ResourceFileType.Container"></i>
-        <i class="fa fa-question-circle" *ngSwitchDefault></i>
+        <i class="fa fa-file" *ngSwitchCase="ResourceFileType.Url" aria-hidden="true"></i>
+        <i class="fa fa-folder" *ngSwitchCase="ResourceFileType.Container" aria-hidden="true"></i>
+        <i class="fa fa-question-circle" *ngSwitchDefault aria-hidden="true"></i>
     </div>
     <div class="source" [ngSwitch]="type">
         <input blInput placeholder="Url" formControlName="httpUrl" *ngSwitchCase="ResourceFileType.Url">
@@ -14,6 +14,6 @@
         <input blInput placeholder="Local path" formControlName="filePath">
     </div>
     <div class="actions">
-        <bl-button type="square" color="danger" (do)="delete.emit()"><i class="fa fa-times"></i></bl-button>
+        <bl-button type="square" color="danger" (do)="delete.emit()"><i class="fa fa-times" aria-hidden="true"></i></bl-button>
     </div>
 </ng-container>
diff --git a/src/app/components/common/resourcefile-picker/resourcefile-picker.html b/src/app/components/common/resourcefile-picker/resourcefile-picker.html
index 015c904f34..aa04094cef 100644
--- a/src/app/components/common/resourcefile-picker/resourcefile-picker.html
+++ b/src/app/components/common/resourcefile-picker/resourcefile-picker.html
@@ -12,11 +12,11 @@
 <span class="help">{{'resourcefile-picker.add.dragAndDrop' | i18n}}</span>
 <div class="uploading-files" *ngIf="uploadingFiles.length > 0">
     <div class="file" *ngFor="let file of uploadingFiles;trackBy: trackUploadingFile">
-        <i class="fa fa-spinner fa-spin"></i>
+        <i class="fa fa-spinner fa-spin" aria-hidden="true"></i>
         {{file}}
     </div>
 </div>
 <div *ngIf="isDraging" class="drop-overlay">
-    <i class="fa fa-upload"></i>
+    <i class="fa fa-upload" aria-hidden="true"></i>
     <span class="message">{{'resourcefile-picker.add.uploadFile' | i18n}}</span>
 </div>
diff --git a/src/app/components/common/storage-account-picker/storage-account-picker.html b/src/app/components/common/storage-account-picker/storage-account-picker.html
index 646a0cdb78..4e7024fa12 100644
--- a/src/app/components/common/storage-account-picker/storage-account-picker.html
+++ b/src/app/components/common/storage-account-picker/storage-account-picker.html
@@ -10,6 +10,6 @@
     </bl-option>
 
     <bl-option [disabled]="true" *ngIf="loading">
-        <i class="fa fa-spinner fa-spin"></i> {{'common.loading' | i18n}}
+        <i class="fa fa-spinner fa-spin" aria-hidden="true"></i> {{'common.loading' | i18n}}
     </bl-option>
 </bl-select>
diff --git a/src/app/components/data/action/delete/delete-container-dialog.html b/src/app/components/data/action/delete/delete-container-dialog.html
index 17f5d50273..a152dab328 100644
--- a/src/app/components/data/action/delete/delete-container-dialog.html
+++ b/src/app/components/data/action/delete/delete-container-dialog.html
@@ -8,7 +8,7 @@
             </li>
         </ul>
         <div class="warning-message" aria-live="polite">
-            <i class="fa fa-warning"></i>&nbsp;
+            <i class="fa fa-warning" aria-hidden="true"></i>&nbsp;
             <span>{{"delete-container-dialog.warning" | i18n}}</span>
         </div>
     </div>
diff --git a/src/app/components/data/browse/data-container-list.html b/src/app/components/data/browse/data-container-list.html
index e8447d68a9..a1748f22fe 100644
--- a/src/app/components/data/browse/data-container-list.html
+++ b/src/app/components/data/browse/data-container-list.html
@@ -43,7 +43,7 @@
     </bl-table>
 </ng-container>
 <bl-no-item [itemCount]="containers.size" [filter]="filter" [status]="status">
-    <i icon class="fa fa-cloud-upload small"></i>
+    <i icon class="fa fa-cloud-upload small" aria-hidden="true"></i>
     <span no-filter>No {{entityType}}</span>
     <span with-filter>No {{entityType}} match this filter</span>
 </bl-no-item>
diff --git a/src/app/components/data/details/data-default.component.ts b/src/app/components/data/details/data-default.component.ts
index 7102f0a2c8..bc7d0f77e8 100644
--- a/src/app/components/data/details/data-default.component.ts
+++ b/src/app/components/data/details/data-default.component.ts
@@ -4,7 +4,7 @@ import { ArmResourceUtils } from "app/utils";
     selector: "bl-application-default",
     template: `
         <div class="no-entity-home">
-            <i class="fa fa-cloud-upload large"></i>
+            <i class="fa fa-cloud-upload large" aria-hidden="true"></i>
             <p>Please select a file group from the list</p>
         </div>
     `,
diff --git a/src/app/components/data/shared/cloud-file-picker/cloud-file-picker.html b/src/app/components/data/shared/cloud-file-picker/cloud-file-picker.html
index ddfc12940a..fdd3eb021b 100644
--- a/src/app/components/data/shared/cloud-file-picker/cloud-file-picker.html
+++ b/src/app/components/data/shared/cloud-file-picker/cloud-file-picker.html
@@ -1,6 +1,6 @@
 <bl-form-field>
     <input type="text" blInput [formControl]="value" [placeholder]="label">
-    <bl-button blFormFieldSuffix [action]="openFilePickerDialog" [disabled]="!containerId" title="Select file"><i class="fa fa-file"></i></bl-button>
+    <bl-button blFormFieldSuffix [action]="openFilePickerDialog" [disabled]="!containerId" title="Select file"><i class="fa fa-file" aria-hidden="true"></i></bl-button>
     <bl-hint class="warning" *ngIf="warning">
         The file does not seem to exist in the selected file group. Click the 'Select file' button and find the file location manually.
     </bl-hint>
diff --git a/src/app/components/data/shared/file-group-picker/file-group-picker.html b/src/app/components/data/shared/file-group-picker/file-group-picker.html
index e6dc80d684..17ed904e7a 100644
--- a/src/app/components/data/shared/file-group-picker/file-group-picker.html
+++ b/src/app/components/data/shared/file-group-picker/file-group-picker.html
@@ -4,7 +4,7 @@
             {{'file-group-picker.warning' | i18n}}
     </bl-hint>
     <div blFormFieldSuffix *ngIf="uploadProgress !== null" [title]="'file-group-picker.uploading'">
-        <i class="fa fa-spinner fa-spin"></i>  {{uploadProgress}} %
+        <i class="fa fa-spinner fa-spin" aria-hidden="true"></i>  {{uploadProgress}} %
     </div>
     <bl-hint *ngIf="hint" align="end">
         {{hint}}
diff --git a/src/app/components/data/shared/file-group-sas/file-group-sas.html b/src/app/components/data/shared/file-group-sas/file-group-sas.html
index 5136879122..e7a39aba26 100644
--- a/src/app/components/data/shared/file-group-sas/file-group-sas.html
+++ b/src/app/components/data/shared/file-group-sas/file-group-sas.html
@@ -1,6 +1,6 @@
 <bl-form-field>
     <input type="text" blInput  [formControl]="value" [placeholder]="label">
-    <bl-button type="round" [action]="generateSasToken" [disabled]="!containerId" title="Generate SAS"><i class="fa fa-refresh"></i></bl-button>
+    <bl-button type="round" [action]="generateSasToken" [disabled]="!containerId" title="Generate SAS"><i class="fa fa-refresh" aria-hidden="true"></i></bl-button>
     <bl-hint *ngIf="hint" align="end">
         {{hint}}
     </bl-hint>
diff --git a/src/app/components/data/shared/file-or-directory-picker/file-or-directory-picker.html b/src/app/components/data/shared/file-or-directory-picker/file-or-directory-picker.html
index 0320d0bc5c..be90d99e52 100644
--- a/src/app/components/data/shared/file-or-directory-picker/file-or-directory-picker.html
+++ b/src/app/components/data/shared/file-or-directory-picker/file-or-directory-picker.html
@@ -6,6 +6,6 @@
 </div>
 <div class="help">{{dragMessage}}</div>
 <div *ngIf="isDraging" class="drop-overlay">
-    <i class="fa fa-upload"></i>
+    <i class="fa fa-upload" aria-hidden="true"></i>
     <span class="message">Drop files or folders here</span>
 </div>
diff --git a/src/app/components/gallery/application-action/choose-action.html b/src/app/components/gallery/application-action/choose-action.html
index 6b3a7f0ef7..485e7c6d07 100644
--- a/src/app/components/gallery/application-action/choose-action.html
+++ b/src/app/components/gallery/application-action/choose-action.html
@@ -6,7 +6,7 @@
         </bl-clickable>
         <bl-clickable class="view-on-github" (do)="viewOnGithub(action)"
                       title="View template on GitHub">
-            <i class="fa fa-external-link"></i>
+            <i class="fa fa-external-link" aria-hidden="true"></i>
         </bl-clickable>
     </bl-card>
 </div>
diff --git a/src/app/components/gallery/home/recent-template-list/recent-template-list.html b/src/app/components/gallery/home/recent-template-list/recent-template-list.html
index fbcf1e78ce..62b44f5893 100644
--- a/src/app/components/gallery/home/recent-template-list/recent-template-list.html
+++ b/src/app/components/gallery/home/recent-template-list/recent-template-list.html
@@ -5,7 +5,7 @@
             <span class="mode">({{formatMode(recent.mode)}})
                 <bl-clickable class="download">
                     <span (click)="createParameterFile(recent)" title="Export template parameter file">
-                        <i class="fa fa-download"></i>
+                        <i class="fa fa-download" aria-hidden="true"></i>
                     </span>
                 </bl-clickable>
             </span>
diff --git a/src/app/components/gallery/local-template-explorer/local-template-drop-zone/local-template-drop-zone.html b/src/app/components/gallery/local-template-explorer/local-template-drop-zone/local-template-drop-zone.html
index 02702a8655..80b335d26e 100644
--- a/src/app/components/gallery/local-template-explorer/local-template-drop-zone/local-template-drop-zone.html
+++ b/src/app/components/gallery/local-template-explorer/local-template-drop-zone/local-template-drop-zone.html
@@ -1,9 +1,9 @@
 <ng-content></ng-content>
 <div class="drop-overlay" *ngIf="isDraging">
-    <i class="fa fa-upload"></i>
+    <i class="fa fa-upload" aria-hidden="true"></i>
     <span class="message">Drop JSON template here</span>
 </div>
 <div class="drop-overlay" *ngIf="loading">
-    <i class="fa fa-spinner fa-spin"></i>
+    <i class="fa fa-spinner fa-spin" aria-hidden="true"></i>
     <span class="message">{{'commmon.loading' | i18n }}</span>
 </div>
diff --git a/src/app/components/gallery/local-template-explorer/local-template-explorer.html b/src/app/components/gallery/local-template-explorer/local-template-explorer.html
index f5969a8edb..38f69bbfb8 100644
--- a/src/app/components/gallery/local-template-explorer/local-template-explorer.html
+++ b/src/app/components/gallery/local-template-explorer/local-template-explorer.html
@@ -4,7 +4,7 @@ <h1>
             Local template library
         </h1>
         <bl-button type="wide" (do)="manageSources()" class="manage-sources action">
-            <i class="fa fa-cog" title="Manage sources"></i> Configure workspace
+            <i class="fa fa-cog" title="Manage sources" aria-hidden="true"></i> Configure workspace
         </bl-button>
     </div>
     <div class="file-explorer-container">
diff --git a/src/app/components/job-schedule/browse/job-schedule-list.html b/src/app/components/job-schedule/browse/job-schedule-list.html
index 70aac9ce3b..ce38445b60 100644
--- a/src/app/components/job-schedule/browse/job-schedule-list.html
+++ b/src/app/components/job-schedule/browse/job-schedule-list.html
@@ -40,7 +40,7 @@
 </bl-table>
 
 <bl-no-item [itemCount]="jobSchedules.size" [filter]="filter" [status]="status">
-    <i icon class="fa fa-calendar"></i>
+    <i icon class="fa fa-calendar" aria-hidden="true"></i>
     <span no-filter>No job schedules</span>
     <span with-filter>No job schedules match this filter</span>
 </bl-no-item>
diff --git a/src/app/components/job-schedule/details/job-schedule-default.component.ts b/src/app/components/job-schedule/details/job-schedule-default.component.ts
index a5027d3885..887cd4efe8 100644
--- a/src/app/components/job-schedule/details/job-schedule-default.component.ts
+++ b/src/app/components/job-schedule/details/job-schedule-default.component.ts
@@ -4,7 +4,7 @@ import { ChangeDetectionStrategy, Component } from "@angular/core";
     selector: "bl-job-schedule-details-home",
     template: `
         <div class="no-entity-home">
-            <i class="fa fa-calendar large"></i>
+            <i class="fa fa-calendar large" aria-hidden="true"></i>
             <p>Please select a job schedule from the list</p>
         </div>
     `,
diff --git a/src/app/components/job-schedule/details/job-schedule-details.html b/src/app/components/job-schedule/details/job-schedule-details.html
index 52291c768c..4b752655c1 100644
--- a/src/app/components/job-schedule/details/job-schedule-details.html
+++ b/src/app/components/job-schedule/details/job-schedule-details.html
@@ -3,7 +3,7 @@
         <bl-summary-card>
             <div summaryTitle>{{jobSchedule.id}}</div>
             <div summarySubtitle>
-                <i class="fa" [ngClass]="decorator.stateIcon"></i> {{jobSchedule.state}}
+                <i class="fa" [ngClass]="decorator.stateIcon" aria-hidden="true"></i> {{jobSchedule.state}}
             </div>
             <bl-tags summaryTags [tags]="jobSchedule.tags" [editable]="jobSchedule.editable" [save]="updateTags" noTagsMessage="No tags."></bl-tags>
             <bl-button-group summaryActions>
diff --git a/src/app/components/job/action/add/pool-picker/pool-picker.html b/src/app/components/job/action/add/pool-picker/pool-picker.html
index 8a4b9edb34..aa28cc0d89 100644
--- a/src/app/components/job/action/add/pool-picker/pool-picker.html
+++ b/src/app/components/job/action/add/pool-picker/pool-picker.html
@@ -24,11 +24,11 @@
             <div class="title" [title]="pool.id">{{pool.id}}</div >
             <div class="details">
                 <div title="Pool has {{pool.targetNodes}} nodes" class="metric">
-                    <i class="fa fa-tv"></i>
+                    <i class="fa fa-tv" aria-hidden="true"></i>
                     <span attr.aria-label="{{pool.targetNodes}} nodes">{{pool.targetNodes}}</span>
                 </div>
                 <div title="Pool has {{poolCoreCount(pool)}} cores" class="metric">
-                    <i class="fa fa-microchip"></i>
+                    <i class="fa fa-microchip" aria-hidden="true"></i>
                     <span attr.aria-label="{{pool.targetNodes}} cores">{{poolCoreCount(pool)}}</span>
                 </div>
                 <div class="pool-tags">
diff --git a/src/app/components/job/base/job-state/job-state.html b/src/app/components/job/base/job-state/job-state.html
index fa8479753e..1bde5628f7 100644
--- a/src/app/components/job/base/job-state/job-state.html
+++ b/src/app/components/job/base/job-state/job-state.html
@@ -1,13 +1,13 @@
 <div class="state-container" [matTooltip]="message">
     <div class="state-icon" [ngSwitch]="job.state">
-            <i  *ngSwitchCase="JobState.active" class="fa fa-play-circle"></i>
-            <i  *ngSwitchCase="JobState.deleting" class="fa fa-trash flash-opacity"></i>
-            <i  *ngSwitchCase="JobState.terminating" class="fa fa-stop-circle flash-opacity"></i>
-            <i  *ngSwitchCase="JobState.disabled" class="fa fa-pause-circle"></i>
-            <i  *ngSwitchCase="JobState.disabling" class="fa fa-pause-circle"></i>
+            <i  *ngSwitchCase="JobState.active" class="fa fa-play-circle" aria-hidden="true"></i>
+            <i  *ngSwitchCase="JobState.deleting" class="fa fa-trash flash-opacity" aria-hidden="true"></i>
+            <i  *ngSwitchCase="JobState.terminating" class="fa fa-stop-circle flash-opacity" aria-hidden="true"></i>
+            <i  *ngSwitchCase="JobState.disabled" class="fa fa-pause-circle" aria-hidden="true"></i>
+            <i  *ngSwitchCase="JobState.disabling" class="fa fa-pause-circle" aria-hidden="true"></i>
             <i class="fa" *ngSwitchCase="JobState.completed"
                 [class.fa-warning]="!isSuccess"
-                [class.fa-check-circle]="isSuccess"></i>
+                [class.fa-check-circle]="isSuccess" aria-hidden="true"></i>
         </div>
         <span class="state">{{job.state}}</span>
         <span class="error-code" *ngIf="job.executionInfo?.terminateReason">&nbsp;({{job.executionInfo.terminateReason}})</span>
diff --git a/src/app/components/job/browse/job-list.html b/src/app/components/job/browse/job-list.html
index 38b9576505..b61d2088df 100644
--- a/src/app/components/job/browse/job-list.html
+++ b/src/app/components/job/browse/job-list.html
@@ -40,7 +40,7 @@
     </bl-column>
 </bl-table>
 <bl-no-item [itemCount]="jobs.size" [filter]="filter" [status]="status">
-    <i icon class="fa fa-tasks"></i>
+    <i icon class="fa fa-tasks" aria-hidden="true"></i>
     <span no-filter>No jobs</span>
     <span with-filter>No jobs match this filter</span>
 </bl-no-item>
diff --git a/src/app/components/job/details/job-details.html b/src/app/components/job/details/job-details.html
index efaf798217..f0fd2138d2 100644
--- a/src/app/components/job/details/job-details.html
+++ b/src/app/components/job/details/job-details.html
@@ -13,8 +13,8 @@
             </bl-button-group>
             <div summaryTile *blFeatureOn="'job.statistics'">
                 <a class="job-graphs-link" [routerLink]="['/jobs', job.id, 'graphs']">
-                    <i class="fa fa-line-chart"></i>
-                    <i class="fa fa-area-chart"></i>
+                    <i class="fa fa-line-chart" aria-hidden="true"></i>
+                    <i class="fa fa-area-chart" aria-hidden="true"></i>
                     <div>Job statistics</div>
                 </a>
             </div>
diff --git a/src/app/components/job/details/job-progress-status/job-progress-status.html b/src/app/components/job/details/job-progress-status/job-progress-status.html
index c29f83069a..e16c16713d 100644
--- a/src/app/components/job/details/job-progress-status/job-progress-status.html
+++ b/src/app/components/job/details/job-progress-status/job-progress-status.html
@@ -23,7 +23,7 @@
 </div>
 <div class="warning-container" aria-live="polite">
     <div class="unaccurate-data" *ngIf="taskCountTooHigh">
-        <i class="fa fa-warning"></i>{{'job-progress-status.inaccurate' | i18n}}
+        <i class="fa fa-warning" aria-hidden="true"></i>{{'job-progress-status.inaccurate' | i18n}}
     </div>
 </div>
 <div class="progress-container">
diff --git a/src/app/components/layout/footer/rpc-server-status/rpc-server-status.html b/src/app/components/layout/footer/rpc-server-status/rpc-server-status.html
index 3cb62e070c..2ba555db1b 100644
--- a/src/app/components/layout/footer/rpc-server-status/rpc-server-status.html
+++ b/src/app/components/layout/footer/rpc-server-status/rpc-server-status.html
@@ -1,8 +1,8 @@
 <bl-clickable (do)="showContextMenu()" [matTooltip]="title">
     <div *ngIf="connected">
-        <i class="fa fa-link"></i>
+        <i class="fa fa-link" aria-hidden="true"></i>
     </div>
     <div *ngIf="!connected">
-        <i class="fa fa-exclamation-triangle"></i> Python backend disconnected
+        <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> Python backend disconnected
     </div>
 </bl-clickable>
diff --git a/src/app/components/layout/footer/timezone-dropdown/timezone-dropdown.html b/src/app/components/layout/footer/timezone-dropdown/timezone-dropdown.html
index f4ec42c75d..ae0dfb2d26 100644
--- a/src/app/components/layout/footer/timezone-dropdown/timezone-dropdown.html
+++ b/src/app/components/layout/footer/timezone-dropdown/timezone-dropdown.html
@@ -2,7 +2,7 @@
 
 <bl-dropdown [footer]="true" align="left" (dblClick)="handleDblClick()">
     <div bl-dropdown-btn [title]="'timezone-dropdown.tooltip' | i18n">
-        <i class="fa fa-clock-o"></i>{{current?.offsetNameShort}}
+        <i class="fa fa-clock-o" aria-hidden="true"></i>{{current?.offsetNameShort}}
     </div>
     <div bl-dropdown-content>
         <bl-clickable *ngFor="let timezone of timezones; trackBy: trackTimezone"
diff --git a/src/app/components/layout/header/header.html b/src/app/components/layout/header/header.html
index 9ade791132..c00590bc51 100644
--- a/src/app/components/layout/header/header.html
+++ b/src/app/components/layout/header/header.html
@@ -1,13 +1,13 @@
 <div class="back-nav">
     <button class="back" (click)="goBack()" title="Back">
-        <i class="fa fa-angle-left"></i>
+        <i class="fa fa-angle-left" aria-hidden="true"></i>
     </button>
     <button class="forward" (click)="goForward()" title="Forward">
-        <i class="fa fa-angle-right"></i>
+        <i class="fa fa-angle-right" aria-hidden="true"></i>
     </button>
 </div>
 <a class="menu-item logo" href="#" [routerLink]="['']" title="Batch Explorer - Home">
-    <i class="fa fa-flask"></i>Batch Explorer
+    <i class="fa fa-flask" aria-hidden="true"></i>Batch Explorer
 </a>
 <bl-breadcrumb-group>
 </bl-breadcrumb-group>
diff --git a/src/app/components/layout/main-navigation/main-navigation.html b/src/app/components/layout/main-navigation/main-navigation.html
index c7f9948f16..0796d1c0e0 100644
--- a/src/app/components/layout/main-navigation/main-navigation.html
+++ b/src/app/components/layout/main-navigation/main-navigation.html
@@ -1,35 +1,35 @@
 <ul class="top">
     <bl-clickable routerLink="/accounts" routerLinkActive="active" title="Dashboard">
-        <i class="fa fa-th fa-lg"></i><div class="label">{{'main-navigation.dashboard' | i18n}}</div>
+        <i class="fa fa-th fa-lg" aria-hidden="true"></i><div class="label">{{'main-navigation.dashboard' | i18n}}</div>
     </bl-clickable>
     <div *blHiddenIfNoAccount>
         <bl-clickable *blFeatureOn="'job'" routerLink="/jobs" routerLinkActive="active">
-            <i class="fa fa-tasks fa-lg"></i><div class="label">{{'main-navigation.jobs' | i18n}}</div>
+            <i class="fa fa-tasks fa-lg" aria-hidden="true"></i><div class="label">{{'main-navigation.jobs' | i18n}}</div>
         </bl-clickable>
     </div>
     <ng-container *blHiddenIfNoAccount>
         <bl-clickable *blFeatureOn="'schedule'" routerLink="/jobschedules" routerLinkActive="active" title="Job schedules">
-            <i class="fa fa-calendar fa-lg"></i><div class="label">{{'main-navigation.jobschedules' | i18n}}</div>
+            <i class="fa fa-calendar fa-lg" aria-hidden="true"></i><div class="label">{{'main-navigation.jobschedules' | i18n}}</div>
         </bl-clickable>
     </ng-container>
     <ng-container *blHiddenIfNoAccount>
         <bl-clickable *blFeatureOn="'pool'" routerLink="/pools" routerLinkActive="active">
-            <i class="fa fa-database fa-lg"></i><div class="label">{{'main-navigation.pools' | i18n}}</div>
+            <i class="fa fa-database fa-lg" aria-hidden="true"></i><div class="label">{{'main-navigation.pools' | i18n}}</div>
         </bl-clickable>
     </ng-container>
     <ng-container *blHiddenIfNoAccount>
         <bl-clickable *blFeatureOn="'package'" routerLink="/applications" routerLinkActive="active" title="Application packages">
-            <i class="fa fa-file-archive-o fa-lg"></i><div class="label">{{'main-navigation.packages' | i18n}}</div>
+            <i class="fa fa-file-archive-o fa-lg" aria-hidden="true"></i><div class="label">{{'main-navigation.packages' | i18n}}</div>
         </bl-clickable>
     </ng-container>
     <ng-container *blHiddenIfNoAccount>
         <bl-clickable *blFeatureOn="'certificate'" routerLink="/certificates" routerLinkActive="active" title="Certificates">
-            <i class="fa fa-certificate fa-lg"></i><div class="label">{{'main-navigation.certificates' | i18n}}</div>
+            <i class="fa fa-certificate fa-lg" aria-hidden="true"></i><div class="label">{{'main-navigation.certificates' | i18n}}</div>
         </bl-clickable>
     </ng-container>
     <ng-container *blHiddenIfNoAccount>
         <bl-clickable *blFeatureOn="'data'" routerLink="/data" routerLinkActive="active" title="File groups">
-            <i class="fa fa-cloud-upload fa-lg"></i><div class="label">{{'main-navigation.data' | i18n}}</div>
+            <i class="fa fa-cloud-upload fa-lg" aria-hidden="true"></i><div class="label">{{'main-navigation.data' | i18n}}</div>
         </bl-clickable>
     </ng-container>
     <ng-container *blHiddenIfNoAccount>
diff --git a/src/app/components/layout/main-navigation/profile-button/profile-button.html b/src/app/components/layout/main-navigation/profile-button/profile-button.html
index cccd7dddcb..cda89d8f81 100644
--- a/src/app/components/layout/main-navigation/profile-button/profile-button.html
+++ b/src/app/components/layout/main-navigation/profile-button/profile-button.html
@@ -1,13 +1,13 @@
 <bl-clickable (do)="openSettingsContextMenu()" [matTooltip]="currentUserName" class="profile" matTooltipPosition="right">
-    <i class="fa fa-user fa-lg"></i><div class="label">{{'profile-button.profile' | i18n}}</div>
+    <i class="fa fa-user fa-lg" aria-hidden="true"></i><div class="label">{{'profile-button.profile' | i18n}}</div>
     <ng-container [ngSwitch]="updateStatus">
         <div *ngSwitchCase="UpdateStatus.Checking" class="notification-overlay checking" >
-            <i class="fa fa-circle-o-notch fa-spin"></i>
+            <i class="fa fa-circle-o-notch fa-spin" aria-hidden="true"></i>
         </div>
         <div *ngSwitchCase="UpdateStatus.Downloading" class="notification-overlay downloading">
             <mat-progress-spinner [value]="downloadProgress" [diameter]="24">
             </mat-progress-spinner>
-            <i class="fa fa-arrow-circle-o-down"></i>
+            <i class="fa fa-arrow-circle-o-down" aria-hidden="true"></i>
         </div>
         <div *ngSwitchCase="UpdateStatus.Ready" class="notification-overlay ready">1</div>
     </ng-container>
diff --git a/src/app/components/layout/online-status/online-status.html b/src/app/components/layout/online-status/online-status.html
index b07438cfae..064de49a63 100644
--- a/src/app/components/layout/online-status/online-status.html
+++ b/src/app/components/layout/online-status/online-status.html
@@ -1,3 +1,3 @@
 <div *ngIf="offline" class="offline-warning" [matTooltip]="disconnectedMessage">
-    <i class="fa fa-exclamation-triangle"></i> Not connected
+    <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> Not connected
 </div>
diff --git a/src/app/components/layout/pinned-entity-dropdown/pinned-dropdown.html b/src/app/components/layout/pinned-entity-dropdown/pinned-dropdown.html
index 3c471a6dcf..d6538a96f1 100644
--- a/src/app/components/layout/pinned-entity-dropdown/pinned-dropdown.html
+++ b/src/app/components/layout/pinned-entity-dropdown/pinned-dropdown.html
@@ -1,6 +1,6 @@
 <bl-dropdown [footer]="false" align="right">
     <div bl-dropdown-btn>
-        <i class="fa fa-star"></i> {{title}}
+        <i class="fa fa-star" aria-hidden="true"></i> {{title}}
     </div>
     <div bl-dropdown-content>
         <div *ngFor="let favorite of favorites | async;trackBy: trackPinnned"
@@ -13,13 +13,13 @@
             <bl-clickable class="dropdown-item favorite-item" (do)="gotoFavorite(favorite)">
                 <span>
                     <i class="entity-type fa" [ngClass]="entityIcon(favorite)"
-                    [title]="entityType(favorite)"></i>
+                    [title]="entityType(favorite)" aria-hidden="true"></i>
                     {{favorite.name || favorite.id}}
-                    <i *ngIf="favorite.url === currentUrl" class="extra fa fa-check"></i>
+                    <i *ngIf="favorite.url === currentUrl" class="extra fa fa-check" aria-hidden="true"></i>
                 </span>
             </bl-clickable>
             <bl-clickable class="dropdown-item delete" (do)="removeFavorite(favorite)">
-                <i class="fa fa-times" ></i>
+                <i class="fa fa-times"  aria-hidden="true"></i>
             </bl-clickable>
         </div>
     </div>
diff --git a/src/app/components/node/browse/display/node-list-display.html b/src/app/components/node/browse/display/node-list-display.html
index 2abd4ad2dc..7555dc27da 100644
--- a/src/app/components/node/browse/display/node-list-display.html
+++ b/src/app/components/node/browse/display/node-list-display.html
@@ -40,7 +40,7 @@
 </bl-table>
 
 <bl-no-item [itemCount]="nodes.size" [status]="status">
-    <i icon class="fa fa-tv"></i>
+    <i icon class="fa fa-tv" aria-hidden="true"></i>
     <span no-filter>No nodes</span>
     <span with-filter>No nodes match this filter</span>
 </bl-no-item>
diff --git a/src/app/components/node/connect/node-connect.html b/src/app/components/node/connect/node-connect.html
index 4cc69b31af..2d50f35e15 100644
--- a/src/app/components/node/connect/node-connect.html
+++ b/src/app/components/node/connect/node-connect.html
@@ -19,19 +19,19 @@ <h1>Connect to node</h1>
         <div class="credentials-source">
             <bl-button type="wide" [skipSuccess]="true" [action]="autoConnect" [disabled]="!connectionSettings">
                 <div class="button-icon-frame">
-                    <i *ngIf="!loading" class="fa fa-plug"></i>
-                    <i *ngIf="loading" class="fa fa-spinner fa-pulse"></i>
+                    <i *ngIf="!loading" class="fa fa-plug" aria-hidden="true"></i>
+                    <i *ngIf="loading" class="fa fa-spinner fa-pulse" aria-hidden="true"></i>
                 </div>
                 <div class="button-label">Connect</div>
             </bl-button>
             <bl-button type="wide" [action]="addOrUpdateUser">
                 <div class="button-icon-frame">
-                    <i class="fa fa-plus"></i>
+                    <i class="fa fa-plus" aria-hidden="true"></i>
                 </div>
                 <div class="button-label">Add/update user</div>
             </bl-button>
         </div>
     </div>
     <bl-server-error *ngIf="error" [error]="error"></bl-server-error>
-    <bl-clickable class="close-button" type="plain" (do)="close()"><i class="fa fa-times fa-lg"></i></bl-clickable>
+    <bl-clickable class="close-button" type="plain" (do)="close()"><i class="fa fa-times fa-lg" aria-hidden="true"></i></bl-clickable>
 </div>
diff --git a/src/app/components/node/connect/property-display/node-property-display.html b/src/app/components/node/connect/property-display/node-property-display.html
index aafd1be12f..93158f329f 100644
--- a/src/app/components/node/connect/property-display/node-property-display.html
+++ b/src/app/components/node/connect/property-display/node-property-display.html
@@ -45,7 +45,7 @@
                         Pick a ssh public key or switch to password auth
                     </ng-container>
                 </span>
-                <i class="fa fa-wrench"></i>
+                <i class="fa fa-wrench" aria-hidden="true"></i>
             </bl-clickable>
         </bl-property-content>
     </bl-property-field>
@@ -66,10 +66,10 @@
                         [type]="passwordVisible ? 'text' : 'password'"
                         placeholder="(Autogenerated)" />
 
-                    <i class="set-visible fa" [class.fa-eye]="!passwordVisisble" [class.fa-eye-slash]="passwordVisisble" (click)="togglePasswordVisible()"></i>
+                    <i class="set-visible fa" [class.fa-eye]="!passwordVisisble" [class.fa-eye-slash]="passwordVisisble" (click)="togglePasswordVisible()" aria-hidden="true"></i>
                 </div>
                 <div class="input-suffix">
-                    <bl-clickable (click)="regeneratePassword()" title="Regenereate password"><i class="fa fa-refresh" [class.fa-spin]="regeneratingPassword"></i></bl-clickable>
+                    <bl-clickable (click)="regeneratePassword()" title="Regenereate password"><i class="fa fa-refresh" [class.fa-spin]="regeneratingPassword" aria-hidden="true"></i></bl-clickable>
                 </div>
             </div>
             <span class="clipboard-info" [class.flash]="passwordCopied">{{passwordCopyText}}</span>
diff --git a/src/app/components/node/connect/ssh-key-picker/ssh-key-picker.html b/src/app/components/node/connect/ssh-key-picker/ssh-key-picker.html
index e4aa5da3f5..2ed6aca471 100644
--- a/src/app/components/node/connect/ssh-key-picker/ssh-key-picker.html
+++ b/src/app/components/node/connect/ssh-key-picker/ssh-key-picker.html
@@ -6,7 +6,7 @@
         <bl-toolbar>
             <div toolbarLabel> Saved public keys </div>
             <bl-clickable toolbarAction (do)="addKey()" class="action add-key-btn">
-                <i class="fa fa-save" title="Save"></i>
+                <i class="fa fa-save" title="Save" aria-hidden="true"></i>
             </bl-clickable>
         </bl-toolbar>
         <div class="saved-key-list">
@@ -15,12 +15,12 @@
             </div>
             <div class="saved-key" *ngFor="let key of savedSSHKeys;trackBy: trackSavedKey" (click)="selectKey(key)">
                 <span class="label">{{key.name}}</span>
-                <i class="fa fa-times" title="Delete" (click)="deleteKey(key)"></i>
+                <i class="fa fa-times" title="Delete" (click)="deleteKey(key)" aria-hidden="true"></i>
             </div>
 
             <div class="no-saved-key" *ngIf="savedSSHKeys.size === 0">
                 <div>
-                    <i class="fa fa-key"></i>
+                    <i class="fa fa-key" aria-hidden="true"></i>
                 </div>
                 No saved public keys
             </div>
diff --git a/src/app/components/node/details/node-default.component.ts b/src/app/components/node/details/node-default.component.ts
index 103a8e6f46..7e987964a2 100644
--- a/src/app/components/node/details/node-default.component.ts
+++ b/src/app/components/node/details/node-default.component.ts
@@ -4,7 +4,7 @@ import { Component } from "@angular/core";
     selector: "bl-no-node-selected",
     template: `
         <div class="no-entity-home">
-            <i class="fa fa-database"></i>
+            <i class="fa fa-database" aria-hidden="true"></i>
             <p>Please select a node from the list</p>
         </div>
     `,
diff --git a/src/app/components/node/details/node-details.html b/src/app/components/node/details/node-details.html
index 738a999b90..c68d803e96 100644
--- a/src/app/components/node/details/node-details.html
+++ b/src/app/components/node/details/node-details.html
@@ -9,8 +9,8 @@
                 <bl-commands-list [commands]="commands" [entity]="node"></bl-commands-list>
                 <bl-button color="light" [action]="uploadNodeLogs" title="Upload batch logs" [disabled]="pool.cloudServiceConfiguration">
                     <span class="upload-node-logs fa-stacked">
-                        <i class="fa fa-upload fa-stack-1x"></i>
-                        <i class="fa fa-bug fa-stack-1x"></i>
+                        <i class="fa fa-upload fa-stack-1x" aria-hidden="true"></i>
+                        <i class="fa fa-bug fa-stack-1x" aria-hidden="true"></i>
                     </span>
                 </bl-button>
             </bl-button-group>
diff --git a/src/app/components/pool/action/scale/autoscale-formula-picker/autoscale-formula-picker.html b/src/app/components/pool/action/scale/autoscale-formula-picker/autoscale-formula-picker.html
index 5d1dd1e448..5ca8659208 100644
--- a/src/app/components/pool/action/scale/autoscale-formula-picker/autoscale-formula-picker.html
+++ b/src/app/components/pool/action/scale/autoscale-formula-picker/autoscale-formula-picker.html
@@ -14,19 +14,19 @@
             <bl-toolbar>
                 <div toolbarLabel> Saved formulas </div>
                 <bl-clickable toolbarAction (do)="addFormula()" class="save-btn action">
-                    <i class="fa fa-save" title="Save"></i>
+                    <i class="fa fa-save" title="Save" aria-hidden="true"></i>
                 </bl-clickable>
             </bl-toolbar>
             <div class="formula-list">
                 <bl-clickable class="formula" *ngFor="let formula of savedAutoscaleFormulas;trackBy: trackFormula" (do)="selectFormula(formula)">
                     <span class="label">{{formula.name}}</span>
                     <bl-clickable (do)="deleteFormula(formula)" class="delete-btn" title="Delete" >
-                        <i class="fa fa-times"></i>
+                        <i class="fa fa-times" aria-hidden="true"></i>
                     </bl-clickable>
                 </bl-clickable>
                 <div class="no-formula" *ngIf="savedAutoscaleFormulas.size === 0">
                     <div>
-                        <i class="fa fa-file-code-o"></i>
+                        <i class="fa fa-file-code-o" aria-hidden="true"></i>
                     </div>
                     No saved autoscale formulas
                 </div>
@@ -42,7 +42,7 @@
                 </bl-clickable>
                 <div class="no-formula" *ngIf="predefinedFormula.length === 0">
                     <div>
-                        <i class="fa fa-file-code-o"></i>
+                        <i class="fa fa-file-code-o" aria-hidden="true"></i>
                     </div>
                     No sample formulas
                 </div>
diff --git a/src/app/components/pool/action/scale/autoscale-formula-picker/evaluate-autoscale-formula/evaluate-autoscale-formula.html b/src/app/components/pool/action/scale/autoscale-formula-picker/evaluate-autoscale-formula/evaluate-autoscale-formula.html
index ec2bdcdbb7..96a08aee15 100644
--- a/src/app/components/pool/action/scale/autoscale-formula-picker/evaluate-autoscale-formula/evaluate-autoscale-formula.html
+++ b/src/app/components/pool/action/scale/autoscale-formula-picker/evaluate-autoscale-formula/evaluate-autoscale-formula.html
@@ -1,7 +1,7 @@
 <bl-toolbar class="basic-header">
     <div toolbarLabel> Evaluate formula </div>
     <bl-clickable toolbarAction (do)="evaluateFormula()" class="evaluate-btn action" [disabled]="!canEvaluateFormula" [class.flash-opacity]="evaluating">
-        <i class="fa fa-calculator" title="Evaluate autoscale formula"></i>
+        <i class="fa fa-calculator" title="Evaluate autoscale formula" aria-hidden="true"></i>
     </bl-clickable>
 </bl-toolbar>
 <div>
diff --git a/src/app/components/pool/base/pool-nodes-preview.html b/src/app/components/pool/base/pool-nodes-preview.html
index 3f4ed1b163..8a43ebbdad 100644
--- a/src/app/components/pool/base/pool-nodes-preview.html
+++ b/src/app/components/pool/base/pool-nodes-preview.html
@@ -1,4 +1,4 @@
 <div matTooltip="{{tooltipMessage}}" matTooltipPosition="{{tooltipPosition}}">
-    <i class="fa fa-tv"></i>
+    <i class="fa fa-tv" aria-hidden="true"></i>
     <span>{{prettyStatus}}</span>
 </div>
diff --git a/src/app/components/pool/base/pool-os-icon/pool-os-icon.html b/src/app/components/pool/base/pool-os-icon/pool-os-icon.html
index a764d1e998..7a80836697 100644
--- a/src/app/components/pool/base/pool-os-icon/pool-os-icon.html
+++ b/src/app/components/pool/base/pool-os-icon/pool-os-icon.html
@@ -1 +1 @@
-<i class="fa {{icon}}" [matTooltip]="pool.osName" [matTooltipPosition]="tooltipPosition"></i>
+<i class="fa {{icon}}" [matTooltip]="pool.osName" [matTooltipPosition]="tooltipPosition" aria-hidden="true"></i>
diff --git a/src/app/components/pool/browse/pool-list.html b/src/app/components/pool/browse/pool-list.html
index d7c3632f54..b8f6287ce9 100644
--- a/src/app/components/pool/browse/pool-list.html
+++ b/src/app/components/pool/browse/pool-list.html
@@ -53,12 +53,12 @@
     </bl-column>
 
     <bl-column name="targetDedicatedNodes">
-        <div *blHeadCellDef>Dedicated <i class="fa fa-tv"></i></div>
+        <div *blHeadCellDef>Dedicated <i class="fa fa-tv" aria-hidden="true"></i></div>
         <div *blCellDef="let pool">{{pool.targetDedicatedNodes}}</div>
     </bl-column>
 
     <bl-column name="targetLowPriorityNodes">
-        <div *blHeadCellDef>Low pri <i class="fa fa-tv"></i></div>
+        <div *blHeadCellDef>Low pri <i class="fa fa-tv" aria-hidden="true"></i></div>
         <div *blCellDef="let pool">{{pool.targetLowPriorityNodes}}</div>
     </bl-column>
 
@@ -69,7 +69,7 @@
 </bl-table>
 
 <bl-no-item [itemCount]="pools.size" [filter]="filter" [status]="status">
-    <i icon class="fa fa-database small"></i>
+    <i icon class="fa fa-database small" aria-hidden="true"></i>
     <span no-filter>No pools</span>
     <span with-filter>No pools match this filter</span>
 </bl-no-item>
diff --git a/src/app/components/pool/details/pool-default.component.ts b/src/app/components/pool/details/pool-default.component.ts
index a98fd9e577..3945628a61 100644
--- a/src/app/components/pool/details/pool-default.component.ts
+++ b/src/app/components/pool/details/pool-default.component.ts
@@ -4,7 +4,7 @@ import { Component } from "@angular/core";
     selector: "bl-pool-details-home",
     template: `
         <div class="no-entity-home">
-            <i class="fa fa-database large"></i>
+            <i class="fa fa-database large" aria-hidden="true"></i>
             <p>Please select a pool from the list</p>
         </div>
     `,
diff --git a/src/app/components/pool/details/pool-details.html b/src/app/components/pool/details/pool-details.html
index 59ff8811c7..021f3a123e 100644
--- a/src/app/components/pool/details/pool-details.html
+++ b/src/app/components/pool/details/pool-details.html
@@ -53,7 +53,7 @@
                     <bl-tab-label>
                         {{'pool-details.graphs' | i18n}}
                         <bl-button class="open-pool-graphs-new-window" [title]="'pool-details.openInNewWindow' | i18n" [action]="openInNewWindow" type="plain">
-                            <i class="fa fa-window-restore"></i>
+                            <i class="fa fa-window-restore" aria-hidden="true"></i>
                         </bl-button>
                     </bl-tab-label>
                     <bl-pool-graphs [pool]="pool"></bl-pool-graphs>
diff --git a/src/app/components/pool/graphs/heatmap/legend/nodes-heatmap-legend.html b/src/app/components/pool/graphs/heatmap/legend/nodes-heatmap-legend.html
index a36a8794c3..fb6562f2ad 100644
--- a/src/app/components/pool/graphs/heatmap/legend/nodes-heatmap-legend.html
+++ b/src/app/components/pool/graphs/heatmap/legend/nodes-heatmap-legend.html
@@ -10,7 +10,7 @@
             <div [style.backgroundColor]="item.color" class="color"></div>
             <div class="label">{{item.label}} ({{stateCounter.getCountforCategory(item.category)}})</div>
             <div class="category-expansion">
-                <i class="fa" [class.fa-caret-down]="item.category === expandedCategory" [class.fa-caret-left]="item.category !== expandedCategory"></i>
+                <i class="fa" [class.fa-caret-down]="item.category === expandedCategory" [class.fa-caret-left]="item.category !== expandedCategory" aria-hidden="true"></i>
             </div>
         </bl-clickable>
         <div *ngIf="item.category === expandedCategory">
diff --git a/src/app/components/pool/graphs/node-preview-card.html b/src/app/components/pool/graphs/node-preview-card.html
index ceedd81b3f..521aa985e7 100644
--- a/src/app/components/pool/graphs/node-preview-card.html
+++ b/src/app/components/pool/graphs/node-preview-card.html
@@ -1,7 +1,7 @@
 <div>
     <div class="title">
         <a class="id" [routerLink]="['/pools', poolId, 'nodes', node.id]">{{node.id}}</a>
-        <i class="fa fa-times" (click)="close.emit()"></i>
+        <i class="fa fa-times" (click)="close.emit()" aria-hidden="true"></i>
     </div>
     <div class="state">{{node.state}}</div>
     <div class="actions">
diff --git a/src/app/components/settings/settings.html b/src/app/components/settings/settings.html
index 7ed749e7a7..6fa2070133 100644
--- a/src/app/components/settings/settings.html
+++ b/src/app/components/settings/settings.html
@@ -6,7 +6,7 @@ <h1>{{'settings.title' | i18n}}</h1>
     <div class="actions">
         <bl-button class="reset" [title]="'settings.reset' | i18n" (do)="reset()" tooltipPosition="below"
             [disabled]="!modified">
-            <i class="fa fa-undo"></i>
+            <i class="fa fa-undo" aria-hidden="true"></i>
         </bl-button>
     </div>
 </div>
diff --git a/src/app/components/task/base/task-state/task-state.html b/src/app/components/task/base/task-state/task-state.html
index ada457bfb2..ecf9d55fc8 100644
--- a/src/app/components/task/base/task-state/task-state.html
+++ b/src/app/components/task/base/task-state/task-state.html
@@ -2,7 +2,7 @@
     <i class="fa"
         aria-hidden="true"
         [class.fa-warning]="hasError"
-        [class.fa-check]="isSuccess"></i>
+        [class.fa-check]="isSuccess" aria-hidden="true"></i>
     <span class="state">{{task.state}}</span>
     <span *ngIf="errorCode">
         ({{errorCode}})
diff --git a/src/app/components/task/browse/task-list.html b/src/app/components/task/browse/task-list.html
index 21902f16e5..33ca723b12 100644
--- a/src/app/components/task/browse/task-list.html
+++ b/src/app/components/task/browse/task-list.html
@@ -63,7 +63,7 @@
     </bl-column>
 </bl-table>
 <bl-no-item [itemCount]="tasks.size" [status]="status">
-    <i icon class="fa fa-tasks"></i>
+    <i icon class="fa fa-tasks" aria-hidden="true"></i>
     <span no-filter>No tasks</span>
     <span with-filter>No tasks match this filter</span>
 </bl-no-item>
diff --git a/src/app/components/task/details/task-default.component.ts b/src/app/components/task/details/task-default.component.ts
index f38c82b8aa..e55f6fbc6f 100644
--- a/src/app/components/task/details/task-default.component.ts
+++ b/src/app/components/task/details/task-default.component.ts
@@ -4,7 +4,7 @@ import { Component } from "@angular/core";
     selector: "bl-no-task-selected",
     template: `
         <div class="no-entity-home">
-            <i class="fa fa-database"></i>
+            <i class="fa fa-database" aria-hidden="true"></i>
             <p>Please select a task from the list</p>
         </div>
     `,
diff --git a/src/app/components/task/details/task-dependency-browser/task-dependency-browser.html b/src/app/components/task/details/task-dependency-browser/task-dependency-browser.html
index ba7019322e..6304b9eeee 100644
--- a/src/app/components/task/details/task-dependency-browser/task-dependency-browser.html
+++ b/src/app/components/task/details/task-dependency-browser/task-dependency-browser.html
@@ -8,7 +8,7 @@
         <div *blHeadCellDef>State</div>
         <div *blCellDef="let dependency">
             <bl-task-state *ngIf="!dependency.loading && dependency.task" [task]="dependency.task"></bl-task-state>
-            <i *ngIf="dependency.loading" class="fa fa-spinner fa-spin cell-spinner"></i>
+            <i *ngIf="dependency.loading" class="fa fa-spinner fa-spin cell-spinner" aria-hidden="true"></i>
         </div>
     </bl-column>
 
diff --git a/src/app/components/task/details/task-node-info/task-node-info.html b/src/app/components/task/details/task-node-info/task-node-info.html
index b5c02c17d6..6ed9e747ed 100644
--- a/src/app/components/task/details/task-node-info/task-node-info.html
+++ b/src/app/components/task/details/task-node-info/task-node-info.html
@@ -4,7 +4,7 @@
     role="link"
     [title]="poolDescription"
     [routerLink]="poolStatus === EntityStatus.NotFound ? null : ['/pools', nodeInfo.poolId]">
-    <i class="fa fa-database"></i> {{nodeInfo.poolId}}
+    <i class="fa fa-database" aria-hidden="true"></i> {{nodeInfo.poolId}}
 </bl-button>
 <bl-button type="wide"
     class="node-link"
@@ -12,5 +12,5 @@
     role="link"
     [title]="nodeDescription"
     [routerLink]="nodeStatus === EntityStatus.NotFound ? null : ['/pools', nodeInfo.poolId, 'nodes', nodeInfo.nodeId] ">
-    <i class="fa fa-tv"></i> {{nodeInfo.nodeId}}
+    <i class="fa fa-tv" aria-hidden="true"></i> {{nodeInfo.nodeId}}
 </bl-button>
diff --git a/src/app/components/task/details/task-timeline/task-timeline-state.html b/src/app/components/task/details/task-timeline/task-timeline-state.html
index 6ba2e7e75f..40ccf93cd1 100644
--- a/src/app/components/task/details/task-timeline/task-timeline-state.html
+++ b/src/app/components/task/details/task-timeline/task-timeline-state.html
@@ -1,7 +1,7 @@
 <div class="tile" [title]="title">
-    <i class="fa fa-check" *ngIf="done && !error"></i>
-    <i class="fa fa-play" *ngIf="active && !error"></i>
-    <i class="fa fa-exclamation-triangle" *ngIf="error"></i>
+    <i class="fa fa-check" *ngIf="done && !error" aria-hidden="true"></i>
+    <i class="fa fa-play" *ngIf="active && !error" aria-hidden="true"></i>
+    <i class="fa fa-exclamation-triangle" *ngIf="error" aria-hidden="true"></i>
 </div>
 <div class="details">
     <div class="state-name"> {{stateName}} </div>
diff --git a/src/app/components/tenant-picker/tenant-card.html b/src/app/components/tenant-picker/tenant-card.html
index c900eeb1d7..25b6410a8a 100644
--- a/src/app/components/tenant-picker/tenant-card.html
+++ b/src/app/components/tenant-picker/tenant-card.html
@@ -38,7 +38,7 @@
         <div *ngIf="status === tenantStatus.failed" class="tenant-error"
             role="status">
             <span class="error-title">
-                <i class="fa fa-exclamation-triangle"></i>&nbsp;
+                <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>&nbsp;
                 {{authorization.message}}
             </span>
             <pre class="error-details">{{authorization.messageDetails}}</pre>
@@ -60,10 +60,10 @@
             matTooltipClass="tenant-card-tooltip-{{status}}"
             matTooltipPosition="after">
             <i *ngSwitchCase="tenantStatus.authorized"
-                class="fa fa-2x fa-check-circle"></i>
+                class="fa fa-2x fa-check-circle" aria-hidden="true"></i>
             <i *ngSwitchCase="tenantStatus.failed"
-                class="fa fa-2x fa-exclamation-circle"></i>
-            <i *ngSwitchDefault class="fa fa-2x fa-question-circle"></i>
+                class="fa fa-2x fa-exclamation-circle" aria-hidden="true"></i>
+            <i *ngSwitchDefault class="fa fa-2x fa-question-circle" aria-hidden="true"></i>
         </div>
     </div>
 </div>
diff --git a/src/app/components/workspace/workspace-selector/workspace-dropdown.html b/src/app/components/workspace/workspace-selector/workspace-dropdown.html
index 1328290b8b..47dfa60a61 100644
--- a/src/app/components/workspace/workspace-selector/workspace-dropdown.html
+++ b/src/app/components/workspace/workspace-selector/workspace-dropdown.html
@@ -2,7 +2,7 @@
     <div bl-dropdown-btn>
         <!-- add a default here for while it's loading? -->
         {{selectButtonText}}
-        <i *ngIf="loaded === false" class="fa fa-spinner fa-spin"></i>
+        <i *ngIf="loaded === false" class="fa fa-spinner fa-spin" aria-hidden="true"></i>
     </div>
     <div bl-dropdown-content>
         <div *ngFor="let workspace of workspaces | async; trackBy: trackByFn"
@@ -15,11 +15,11 @@
                 {{workspace.name}}
             </div>
             <div *ngIf="workspace.id === selectedWorkspaceId" class="extra">
-                <i class="fa fa-check"></i>
+                <i class="fa fa-check" aria-hidden="true"></i>
             </div>
         </div>
         <!-- <bl-clickable class="dropdown-item manage">
-            <i class="fa fa-cog fa-2x"></i> Manage workspaces
+            <i class="fa fa-cog fa-2x" aria-hidden="true"></i> Manage workspaces
         </bl-clickable> -->
     </div>
 </bl-dropdown>

From db72ae495b7d97b4a626460df5333e85101b577c Mon Sep 17 00:00:00 2001
From: hoppe wang <wanghp000@gmail.com>
Date: Fri, 13 Jan 2023 17:58:36 +0800
Subject: [PATCH 65/72] fix AB#499

---
 .../activity-monitor-item/activity-monitor-item.html            | 2 +-
 src/@batch-flask/ui/buttons/clickable/clickable.component.ts    | 2 ++
 src/@batch-flask/ui/quick-list/quick-list.component.ts          | 2 ++
 src/@batch-flask/ui/quotas/quota-display/quota-display.html     | 2 +-
 .../job/details/job-progress-status/job-progress-status.html    | 2 +-
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/@batch-flask/ui/activity/activity-monitor/activity-monitor-item/activity-monitor-item.html b/src/@batch-flask/ui/activity/activity-monitor/activity-monitor-item/activity-monitor-item.html
index f390f8175f..8baeae45b9 100644
--- a/src/@batch-flask/ui/activity/activity-monitor/activity-monitor-item/activity-monitor-item.html
+++ b/src/@batch-flask/ui/activity/activity-monitor/activity-monitor-item/activity-monitor-item.html
@@ -19,7 +19,7 @@
                 <span class="progress-percent">{{progressString}}</span>
             </div>
             <div class="progress-bar" *ngIf="!activity.isComplete">
-                <mat-progress-bar mode="determinate" [value]="progress" *ngIf="progress !== -1"></mat-progress-bar>
+                <mat-progress-bar aria-label="progress bar" mode="determinate" [value]="progress" *ngIf="progress !== -1"></mat-progress-bar>
             </div>
         </div>
         <div class="icon-container action-icon" *ngFor="let action of actions; let i = index; trackBy: actionTrackBy">
diff --git a/src/@batch-flask/ui/buttons/clickable/clickable.component.ts b/src/@batch-flask/ui/buttons/clickable/clickable.component.ts
index b7cdc2214b..157426396b 100644
--- a/src/@batch-flask/ui/buttons/clickable/clickable.component.ts
+++ b/src/@batch-flask/ui/buttons/clickable/clickable.component.ts
@@ -54,6 +54,8 @@ export class ClickableComponent implements OnChanges, OnDestroy {
 
     // Aria
     @Input() @HostBinding("attr.role") public role = "button";
+    @HostBinding("attr.aria-label") public readonly label = "button";
+
     @HostBinding("attr.aria-disabled") public get ariaDisabled() { return this.disabled; }
 
     public subtitle = "";
diff --git a/src/@batch-flask/ui/quick-list/quick-list.component.ts b/src/@batch-flask/ui/quick-list/quick-list.component.ts
index 58ab50c1eb..bf5dc1aaf3 100644
--- a/src/@batch-flask/ui/quick-list/quick-list.component.ts
+++ b/src/@batch-flask/ui/quick-list/quick-list.component.ts
@@ -43,6 +43,8 @@ export class QuickListComponent extends AbstractListBase {
 
     @HostBinding("attr.role") public readonly role = "listbox";
 
+    @HostBinding("attr.aria-label") public readonly label = "listbox";
+
     constructor(
         contextMenuService: ContextMenuService,
         router: Router,
diff --git a/src/@batch-flask/ui/quotas/quota-display/quota-display.html b/src/@batch-flask/ui/quotas/quota-display/quota-display.html
index 4dc12f98c1..fa37e014c6 100644
--- a/src/@batch-flask/ui/quotas/quota-display/quota-display.html
+++ b/src/@batch-flask/ui/quotas/quota-display/quota-display.html
@@ -5,6 +5,6 @@
     </div>
 </div>
 <div class="progress">
-    <mat-progress-bar [ngClass]="colorClass" [value]="percent" [bufferValue]="100">
+    <mat-progress-bar aria-label="progress bar" [ngClass]="colorClass" [value]="percent" [bufferValue]="100">
     </mat-progress-bar>
 </div>
diff --git a/src/app/components/job/details/job-progress-status/job-progress-status.html b/src/app/components/job/details/job-progress-status/job-progress-status.html
index e16c16713d..59b1606fac 100644
--- a/src/app/components/job/details/job-progress-status/job-progress-status.html
+++ b/src/app/components/job/details/job-progress-status/job-progress-status.html
@@ -28,7 +28,7 @@
 </div>
 <div class="progress-container">
     <div class="progress" *ngIf="progress" title="Job completion progress">
-        <mat-progress-bar class="progress-bar" color="primary" mode="buffer" [value]="progress.completed" [bufferValue]="progress.buffer">
+        <mat-progress-bar aria-label="progress bar" class="progress-bar" color="primary" mode="buffer" [value]="progress.completed" [bufferValue]="progress.buffer">
         </mat-progress-bar>
         <span class="progress-label">{{progress.completed}}%</span>
     </div>

From 0c537c18486ecc5976e786ce330ed8ea619a3557 Mon Sep 17 00:00:00 2001
From: hoppe wang <wanghp000@gmail.com>
Date: Fri, 13 Jan 2023 21:19:57 +0800
Subject: [PATCH 66/72] fix AB#500

---
 src/@batch-flask/ui/form/complex-form/footer/form-footer.html | 2 ++
 .../entity-configuration/entity-configuration.html            | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/@batch-flask/ui/form/complex-form/footer/form-footer.html b/src/@batch-flask/ui/form/complex-form/footer/form-footer.html
index 46fef9511b..0bff5dee2c 100644
--- a/src/@batch-flask/ui/form/complex-form/footer/form-footer.html
+++ b/src/@batch-flask/ui/form/complex-form/footer/form-footer.html
@@ -1,5 +1,6 @@
 <div class="toggle-mode" *ngIf="config.jsonEditor">
     <bl-button type="square"
+        role="tab"
         [attr.aria-pressed]="classicFormDisabled"
         [disabled]="classicFormDisabled"
         [title]="'form-footer.buttons.normalForm' |i18n"
@@ -7,6 +8,7 @@
         <i class="fa fa-commenting" aria-hidden="true"></i>
     </bl-button>
     <bl-button type="square"
+        role="tab"
         [attr.aria-pressed]="showJsonEditor"
         [disabled]="showJsonEditor"
         [title]="'form-footer.buttons.jsonEditor' |i18n"
diff --git a/src/@batch-flask/ui/property-list/entity-configuration/entity-configuration.html b/src/@batch-flask/ui/property-list/entity-configuration/entity-configuration.html
index 58a230fcff..808d2d766b 100644
--- a/src/@batch-flask/ui/property-list/entity-configuration/entity-configuration.html
+++ b/src/@batch-flask/ui/property-list/entity-configuration/entity-configuration.html
@@ -5,10 +5,10 @@
     <ng-content></ng-content>
 </div>
 <div class="toggle-mode" *ngIf="enableJsonView">
-    <bl-button type="square" [disabled]="!showJson" (do)="toggleShowJson(false)" [title]="'entity-configuration.viewClassic' | i18n">
+    <bl-button role="tab" type="square" [disabled]="!showJson" (do)="toggleShowJson(false)" [title]="'entity-configuration.viewClassic' | i18n">
         <i class="fa fa-list-ul" aria-hidden="true"></i>
     </bl-button>
-    <bl-button type="square" [disabled]="showJson" (do)="toggleShowJson(true)" [title]="'entity-configuration.viewAsJSON' | i18n">
+    <bl-button role="tab" type="square" [disabled]="showJson" (do)="toggleShowJson(true)" [title]="'entity-configuration.viewAsJSON' | i18n">
         <i class="fa fa-code" aria-hidden="true"></i>
     </bl-button>
 </div>

From 098f128e4b5140c86bf41db068d9187e9550dc8d Mon Sep 17 00:00:00 2001
From: hoppe wang <wanghp000@gmail.com>
Date: Thu, 19 Jan 2023 15:44:34 +0800
Subject: [PATCH 67/72] fix AB#498 AB#499 part2

---
 .../activity-monitor-item.component.spec.ts   |  9 +++++----
 .../activity-monitor-item.html                | 20 +++++++++----------
 .../activity-monitor-item.i18n.yml            |  2 ++
 ...tivity-monitor-tree-view.component.spec.ts |  7 ++++---
 .../activity-monitor.component.spec.ts        |  9 +++++----
 .../ui/activity/activity.module.ts            |  2 ++
 src/@batch-flask/ui/buttons/button.html       |  8 ++++----
 .../buttons/clickable/clickable.component.ts  |  1 -
 .../ui/buttons/refresh-btn/refresh-btn.html   | 10 +++++-----
 src/@batch-flask/ui/common.i18n.yml           |  1 +
 .../persisted-notifications-dropdown.html     | 10 +++++-----
 .../property-group/property-group.html        |  4 ++--
 .../quick-list/quick-list.component.spec.ts   |  2 ++
 .../ui/quick-list/quick-list.component.ts     |  8 ++++++--
 .../ui/quick-list/quick-list.module.ts        |  2 ++
 .../quotas/quota-display/quota-display.html   |  2 +-
 .../quota-display/quota-display.i18n.yml      |  2 ++
 src/@batch-flask/ui/quotas/quotas.module.ts   |  3 ++-
 src/@batch-flask/ui/select/select.html        |  6 +++---
 .../resourcefile-picker-row.html              |  8 ++++----
 .../job/base/job-state/job-state.html         | 14 ++++++-------
 .../job-progress-status.html                  |  2 +-
 .../job-progress-status.i18n.yml              |  1 +
 .../pinned-dropdown.html                      |  6 +++---
 .../components/node/connect/node-connect.html |  6 +++---
 .../components/node/details/node-details.html |  6 +++---
 .../task-timeline/task-timeline-state.html    |  8 ++++----
 .../components/tenant-picker/tenant-card.html |  9 +++++----
 28 files changed, 94 insertions(+), 74 deletions(-)
 create mode 100644 src/@batch-flask/ui/activity/activity-monitor/activity-monitor-item/activity-monitor-item.i18n.yml
 create mode 100644 src/@batch-flask/ui/quotas/quota-display/quota-display.i18n.yml

diff --git a/src/@batch-flask/ui/activity/activity-monitor/activity-monitor-item/activity-monitor-item.component.spec.ts b/src/@batch-flask/ui/activity/activity-monitor/activity-monitor-item/activity-monitor-item.component.spec.ts
index 8fe763fb43..7c6f6c2a8e 100644
--- a/src/@batch-flask/ui/activity/activity-monitor/activity-monitor-item/activity-monitor-item.component.spec.ts
+++ b/src/@batch-flask/ui/activity/activity-monitor/activity-monitor-item/activity-monitor-item.component.spec.ts
@@ -1,8 +1,8 @@
 import { Component, DebugElement } from "@angular/core";
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { By } from "@angular/platform-browser";
-import { MaterialModule } from "@batch-flask/core";
-import { ActivityService, ActivityStatus, ButtonsModule } from "@batch-flask/ui";
+import { I18nService, MaterialModule } from "@batch-flask/core";
+import { ActivityService, ActivityStatus, ButtonsModule, I18nUIModule } from "@batch-flask/ui";
 import { BehaviorSubject, Observable } from "rxjs";
 import { ActivityMonitorItemActionComponent } from "./activity-monitor-item-action";
 import { ActivityMonitorItemComponent } from "./activity-monitor-item.component";
@@ -74,12 +74,13 @@ describe("ActivityMonitorItemComponent", () => {
         };
 
         TestBed.configureTestingModule({
-            imports: [ButtonsModule, MaterialModule],
+            imports: [ButtonsModule, MaterialModule, I18nUIModule],
             declarations: [
-                ActivityMonitorItemComponent, ActivityMonitorItemActionComponent, TestComponent,
+                ActivityMonitorItemComponent, ActivityMonitorItemActionComponent, TestComponent
             ],
             providers: [
                 { provide: ActivityService, useValue: activityServiceSpy },
+                { provide: I18nService, useValue: { translate: () => "" } },
             ],
         });
 
diff --git a/src/@batch-flask/ui/activity/activity-monitor/activity-monitor-item/activity-monitor-item.html b/src/@batch-flask/ui/activity/activity-monitor/activity-monitor-item/activity-monitor-item.html
index 8baeae45b9..1420225abe 100644
--- a/src/@batch-flask/ui/activity/activity-monitor/activity-monitor-item/activity-monitor-item.html
+++ b/src/@batch-flask/ui/activity/activity-monitor/activity-monitor-item/activity-monitor-item.html
@@ -1,16 +1,16 @@
 <div class="activity-monitor-item-container" [ngClass]="{'focused': focused, 'hovered': !focused && hovered, 'flash': flash}">
     <div class="item-container" [ngStyle]="{'padding-left': paddingLeft}">
-        <div class="icon-container progress-icon">
-            <i class="fa fa-ellipsis-h" *ngIf="status===statusOptions.Pending" title="Pending" aria-hidden="true"></i>
-            <i class="fa fa-spinner fa-pulse" *ngIf="status===statusOptions.InProgress" title="Running" aria-hidden="true"></i>
-            <i class="fa fa-check" *ngIf="status===statusOptions.Completed" title="Completed" aria-hidden="true"></i>
-            <i class="fa fa-times" *ngIf="status===statusOptions.Cancelled" title="Cancelled" aria-hidden="true"></i>
-            <i class="fa fa-exclamation-triangle" *ngIf="status===statusOptions.Failed" title="Failed" (click)="toggleShowError()" aria-hidden="true"></i>
+        <div class="icon-container progress-icon" aria-hidden="true">
+            <i class="fa fa-ellipsis-h" *ngIf="status===statusOptions.Pending" title="Pending"></i>
+            <i class="fa fa-spinner fa-pulse" *ngIf="status===statusOptions.InProgress" title="Running"></i>
+            <i class="fa fa-check" *ngIf="status===statusOptions.Completed" title="Completed"></i>
+            <i class="fa fa-times" *ngIf="status===statusOptions.Cancelled" title="Cancelled"></i>
+            <i class="fa fa-exclamation-triangle" *ngIf="status===statusOptions.Failed" title="Failed" (click)="toggleShowError()"></i>
         </div>
         <div class="icon-container">
-            <div class="expand-icon" *ngIf="activity.subactivities.length" (click)="toggleExpand()">
-                <i class="fa fa-angle-right" title="Expand" *ngIf="!expanded" aria-hidden="true"></i>
-                <i class="fa fa-angle-down" title="Collapse" *ngIf="expanded" aria-hidden="true"></i>
+            <div class="expand-icon" *ngIf="activity.subactivities.length" (click)="toggleExpand()" aria-hidden="true">
+                <i class="fa fa-angle-right" title="Expand" *ngIf="!expanded"></i>
+                <i class="fa fa-angle-down" title="Collapse" *ngIf="expanded"></i>
             </div>
         </div>
         <div class="activity-info">
@@ -19,7 +19,7 @@
                 <span class="progress-percent">{{progressString}}</span>
             </div>
             <div class="progress-bar" *ngIf="!activity.isComplete">
-                <mat-progress-bar aria-label="progress bar" mode="determinate" [value]="progress" *ngIf="progress !== -1"></mat-progress-bar>
+                <mat-progress-bar role="progressbar" title="{{'activity-monitor-item.progressBar' | i18n}}" mode="determinate" [value]="progress" *ngIf="progress !== -1"></mat-progress-bar>
             </div>
         </div>
         <div class="icon-container action-icon" *ngFor="let action of actions; let i = index; trackBy: actionTrackBy">
diff --git a/src/@batch-flask/ui/activity/activity-monitor/activity-monitor-item/activity-monitor-item.i18n.yml b/src/@batch-flask/ui/activity/activity-monitor/activity-monitor-item/activity-monitor-item.i18n.yml
new file mode 100644
index 0000000000..b8f1b925db
--- /dev/null
+++ b/src/@batch-flask/ui/activity/activity-monitor/activity-monitor-item/activity-monitor-item.i18n.yml
@@ -0,0 +1,2 @@
+activity-monitor-item:
+  progressBar: Item progress
diff --git a/src/@batch-flask/ui/activity/activity-monitor/activity-monitor-tree-view/activity-monitor-tree-view.component.spec.ts b/src/@batch-flask/ui/activity/activity-monitor/activity-monitor-tree-view/activity-monitor-tree-view.component.spec.ts
index 5ae9a4cdd4..385d6e9764 100644
--- a/src/@batch-flask/ui/activity/activity-monitor/activity-monitor-tree-view/activity-monitor-tree-view.component.spec.ts
+++ b/src/@batch-flask/ui/activity/activity-monitor/activity-monitor-tree-view/activity-monitor-tree-view.component.spec.ts
@@ -1,8 +1,8 @@
 import { Component, DebugElement } from "@angular/core";
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { By } from "@angular/platform-browser";
-import { MaterialModule } from "@batch-flask/core";
-import { ActivityService, ActivityStatus, ButtonsModule, ToolbarModule } from "@batch-flask/ui";
+import { I18nService, MaterialModule } from "@batch-flask/core";
+import { ActivityService, ActivityStatus, ButtonsModule, I18nUIModule, ToolbarModule } from "@batch-flask/ui";
 import { FocusSectionModule } from "@batch-flask/ui/focus-section";
 import { VirtualScrollModule } from "@batch-flask/ui/virtual-scroll";
 import { AsyncSubject, BehaviorSubject, Observable } from "rxjs";
@@ -66,13 +66,14 @@ describe("ActivityMonitorTreeViewComponent", () => {
         };
 
         TestBed.configureTestingModule({
-            imports: [ButtonsModule, MaterialModule, FocusSectionModule, VirtualScrollModule, ToolbarModule],
+            imports: [ButtonsModule, MaterialModule, FocusSectionModule, VirtualScrollModule, ToolbarModule, I18nUIModule],
             declarations: [
                 TestComponent, ActivityMonitorTreeViewComponent,
                 ActivityMonitorItemComponent, ActivityMonitorItemActionComponent,
             ],
             providers: [
                 { provide: ActivityService, useValue: activityServiceSpy },
+                { provide: I18nService, useValue: { translate: () => "" } }
             ],
         });
 
diff --git a/src/@batch-flask/ui/activity/activity-monitor/activity-monitor.component.spec.ts b/src/@batch-flask/ui/activity/activity-monitor/activity-monitor.component.spec.ts
index f2ccbe6c76..7588aa7d07 100644
--- a/src/@batch-flask/ui/activity/activity-monitor/activity-monitor.component.spec.ts
+++ b/src/@batch-flask/ui/activity/activity-monitor/activity-monitor.component.spec.ts
@@ -1,7 +1,7 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { ActivatedRoute } from "@angular/router";
-import { MaterialModule } from "@batch-flask/core";
-import { ButtonsModule, ToolbarModule } from "@batch-flask/ui";
+import { I18nService, MaterialModule } from "@batch-flask/core";
+import { ButtonsModule, I18nUIModule, ToolbarModule } from "@batch-flask/ui";
 import { FocusSectionModule } from "@batch-flask/ui/focus-section";
 import { VirtualScrollModule } from "@batch-flask/ui/virtual-scroll";
 import { AsyncSubject, BehaviorSubject } from "rxjs";
@@ -17,7 +17,7 @@ describe("ActivityMonitorComponent", () => {
     let component: ActivityMonitorComponent;
     let activityService: ActivityService;
     let activatedRouteSpy;
-    const activatedRouteSubject = new BehaviorSubject({id: 0});
+    const activatedRouteSubject = new BehaviorSubject({ id: 0 });
 
     beforeEach(() => {
         activatedRouteSpy = {
@@ -25,7 +25,7 @@ describe("ActivityMonitorComponent", () => {
         };
 
         TestBed.configureTestingModule({
-            imports: [ButtonsModule, MaterialModule, FocusSectionModule, VirtualScrollModule, ToolbarModule],
+            imports: [ButtonsModule, MaterialModule, FocusSectionModule, VirtualScrollModule, ToolbarModule, I18nUIModule],
             declarations: [
                 ActivityMonitorComponent, ActivityMonitorTreeViewComponent,
                 ActivityMonitorItemComponent, ActivityMonitorItemActionComponent,
@@ -33,6 +33,7 @@ describe("ActivityMonitorComponent", () => {
             providers: [
                 { provide: ActivatedRoute, useValue: activatedRouteSpy },
                 ActivityService,
+                I18nService
             ],
         });
 
diff --git a/src/@batch-flask/ui/activity/activity.module.ts b/src/@batch-flask/ui/activity/activity.module.ts
index 55997d864b..62e5a71716 100644
--- a/src/@batch-flask/ui/activity/activity.module.ts
+++ b/src/@batch-flask/ui/activity/activity.module.ts
@@ -8,6 +8,7 @@ import { FocusSectionModule } from "@batch-flask/ui/focus-section";
 import { NotificationModule } from "@batch-flask/ui/notifications";
 import { ToolbarModule } from "@batch-flask/ui/toolbar";
 import { VirtualScrollModule } from "@batch-flask/ui/virtual-scroll";
+import { I18nUIModule } from "@batch-flask/ui/i18n";
 import {
     ActivityMonitorComponent,
     ActivityMonitorItemActionComponent,
@@ -28,6 +29,7 @@ import { ActivityMonitorFooterItemComponent } from "./activity-monitor-footer-it
         NotificationModule,
         VirtualScrollModule,
         ToolbarModule,
+        I18nUIModule
     ],
     declarations: [
         ActivityMonitorFooterComponent,
diff --git a/src/@batch-flask/ui/buttons/button.html b/src/@batch-flask/ui/buttons/button.html
index 8d582978db..282a6c57b2 100644
--- a/src/@batch-flask/ui/buttons/button.html
+++ b/src/@batch-flask/ui/buttons/button.html
@@ -3,11 +3,11 @@
         <i [class]="icon" aria-hidden="true"></i>
         <ng-content></ng-content>
     </div>
-    <div class="overlay" [ngSwitch]="status">
-        <i class="fa fa-spinner fa-spin" *ngSwitchCase="SubmitStatus.Submitting" aria-hidden="true"></i>
-        <i class="fa fa-warning" *ngSwitchCase="SubmitStatus.Failed" aria-hidden="true"></i>
+    <div class="overlay" [ngSwitch]="status" aria-hidden="true">
+        <i class="fa fa-spinner fa-spin" *ngSwitchCase="SubmitStatus.Submitting"></i>
+        <i class="fa fa-warning" *ngSwitchCase="SubmitStatus.Failed"></i>
         <span class="success-container" *ngSwitchCase="SubmitStatus.Succeeded">
-            <i class="fa fa-check" [@animateSucessIcon]="status === SubmitStatus.Succeeded" aria-hidden="true"></i>
+            <i class="fa fa-check" [@animateSucessIcon]="status === SubmitStatus.Succeeded"></i>
         </span>
     </div>
 </div>
diff --git a/src/@batch-flask/ui/buttons/clickable/clickable.component.ts b/src/@batch-flask/ui/buttons/clickable/clickable.component.ts
index 157426396b..56fcd60146 100644
--- a/src/@batch-flask/ui/buttons/clickable/clickable.component.ts
+++ b/src/@batch-flask/ui/buttons/clickable/clickable.component.ts
@@ -54,7 +54,6 @@ export class ClickableComponent implements OnChanges, OnDestroy {
 
     // Aria
     @Input() @HostBinding("attr.role") public role = "button";
-    @HostBinding("attr.aria-label") public readonly label = "button";
 
     @HostBinding("attr.aria-disabled") public get ariaDisabled() { return this.disabled; }
 
diff --git a/src/@batch-flask/ui/buttons/refresh-btn/refresh-btn.html b/src/@batch-flask/ui/buttons/refresh-btn/refresh-btn.html
index c04e6c629c..f445f84b26 100644
--- a/src/@batch-flask/ui/buttons/refresh-btn/refresh-btn.html
+++ b/src/@batch-flask/ui/buttons/refresh-btn/refresh-btn.html
@@ -1,11 +1,11 @@
 <bl-button color="light" [type]="type" [title]="title" [action]="onClick" [disabled]="status !== statuses.Idle" [skipSuccess]="true"
-    [tooltipPosition]="tooltipPosition">
+    [tooltipPosition]="tooltipPosition" aria-hidden="true">
     <span class="icon-container" [ngSwitch]="status">
-        <i class="fa fa-refresh shake-hover"    *ngSwitchCase="statuses.Idle" aria-hidden="true"></i>
-        <i class="fa fa-refresh fa-spin"        *ngSwitchCase="statuses.Refreshing" aria-hidden="true"></i>
+        <i class="fa fa-refresh shake-hover"    *ngSwitchCase="statuses.Idle"></i>
+        <i class="fa fa-refresh fa-spin"        *ngSwitchCase="statuses.Refreshing"></i>
         <span class="success-container"         *ngSwitchCase="statuses.Succeeded">
-            <i class="fa fa-check" [@animateSucessIcon]="status === statuses.Succeeded" aria-hidden="true"></i>
+            <i class="fa fa-check" [@animateSucessIcon]="status === statuses.Succeeded"></i>
         </span>
-        <i class="fa fa-warning"                *ngSwitchCase="statuses.Failed" aria-hidden="true"></i>
+        <i class="fa fa-warning"                *ngSwitchCase="statuses.Failed"></i>
     </span>
 </bl-button>
diff --git a/src/@batch-flask/ui/common.i18n.yml b/src/@batch-flask/ui/common.i18n.yml
index 16fe86347d..cb9605394e 100644
--- a/src/@batch-flask/ui/common.i18n.yml
+++ b/src/@batch-flask/ui/common.i18n.yml
@@ -13,3 +13,4 @@ common:
   required: Required
   updated: Updated
   yes: "Yes"
+  listbox: Listbox
diff --git a/src/@batch-flask/ui/notifications/persisted-dropdown/persisted-notifications-dropdown.html b/src/@batch-flask/ui/notifications/persisted-dropdown/persisted-notifications-dropdown.html
index d4a2a789e7..1b99195f46 100644
--- a/src/@batch-flask/ui/notifications/persisted-dropdown/persisted-notifications-dropdown.html
+++ b/src/@batch-flask/ui/notifications/persisted-dropdown/persisted-notifications-dropdown.html
@@ -5,11 +5,11 @@
     </div>
     <div bl-dropdown-content>
         <div *ngFor="let notification of notifications;trackBy: trackNotification" class="dropdown-item">
-            <div class="icon" [ngSwitch]="notification.level">
-                <i class="fa fa-info-circle" *ngSwitchCase="NotificationLevel.info" aria-hidden="true"></i>
-                <i class="fa fa-times" *ngSwitchCase="NotificationLevel.error" aria-hidden="true"></i>
-                <i class="fa fa-check" *ngSwitchCase="NotificationLevel.success" aria-hidden="true"></i>
-                <i class="fa fa-exclamation-triangle" *ngSwitchCase="NotificationLevel.warn" aria-hidden="true"></i>
+            <div class="icon" [ngSwitch]="notification.level" aria-hidden="true">
+                <i class="fa fa-info-circle" *ngSwitchCase="NotificationLevel.info"></i>
+                <i class="fa fa-times" *ngSwitchCase="NotificationLevel.error"></i>
+                <i class="fa fa-check" *ngSwitchCase="NotificationLevel.success"></i>
+                <i class="fa fa-exclamation-triangle" *ngSwitchCase="NotificationLevel.warn"></i>
             </div>
             <div class="details">
                 <div class="title">{{notification.title}}</div>
diff --git a/src/@batch-flask/ui/property-list/property-group/property-group.html b/src/@batch-flask/ui/property-list/property-group/property-group.html
index 10f9d4f5f7..a8944f5fc5 100644
--- a/src/@batch-flask/ui/property-list/property-group/property-group.html
+++ b/src/@batch-flask/ui/property-list/property-group/property-group.html
@@ -1,7 +1,7 @@
 <bl-clickable class="group-header" (do)="toogleCollapsed()" *ngIf="label" [attr.aria-expanded]="!collapsed" [attr.aria-controls]="contentId">
     <div class="collapse-icon" *ngIf="collapsable" aria-hidden="true">
-        <i class="fa fa-caret-right" *ngIf="collapsed" aria-hidden="true"></i>
-        <i class="fa fa-caret-down" *ngIf="!collapsed" aria-hidden="true"></i>
+        <i class="fa fa-caret-right" *ngIf="collapsed"></i>
+        <i class="fa fa-caret-down" *ngIf="!collapsed"></i>
     </div>
     <h4 class="noselect">{{label}}</h4>
     <span *ngIf="collapsed">
diff --git a/src/@batch-flask/ui/quick-list/quick-list.component.spec.ts b/src/@batch-flask/ui/quick-list/quick-list.component.spec.ts
index 48697bbedc..76a01a3c72 100644
--- a/src/@batch-flask/ui/quick-list/quick-list.component.spec.ts
+++ b/src/@batch-flask/ui/quick-list/quick-list.component.spec.ts
@@ -2,6 +2,7 @@ import { Component, DebugElement, NO_ERRORS_SCHEMA } from "@angular/core";
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { By } from "@angular/platform-browser";
 import { RouterTestingModule } from "@angular/router/testing";
+import { I18nService } from "@batch-flask/core";
 import { ListSelection } from "@batch-flask/core/list";
 import { AbstractListBaseConfig } from "@batch-flask/ui/abstract-list";
 import { BreadcrumbModule } from "@batch-flask/ui/breadcrumbs";
@@ -78,6 +79,7 @@ describe("QuickListComponent", () => {
             ],
             providers: [
                 { provide: ContextMenuService, useValue: contextMenuServiceSpy },
+                { provide: I18nService, useValue: { translate: () => "" } }
             ],
             schemas: [NO_ERRORS_SCHEMA],
         });
diff --git a/src/@batch-flask/ui/quick-list/quick-list.component.ts b/src/@batch-flask/ui/quick-list/quick-list.component.ts
index bf5dc1aaf3..bf3d49c2b6 100644
--- a/src/@batch-flask/ui/quick-list/quick-list.component.ts
+++ b/src/@batch-flask/ui/quick-list/quick-list.component.ts
@@ -20,6 +20,7 @@ import {
     QuickListRowStatusDirective,
     QuickListRowTitleDirective,
 } from "./quick-list-row-def";
+import { I18nService } from "@batch-flask/core";
 
 import "./quick-list.scss";
 
@@ -43,7 +44,9 @@ export class QuickListComponent extends AbstractListBase {
 
     @HostBinding("attr.role") public readonly role = "listbox";
 
-    @HostBinding("attr.aria-label") public readonly label = "listbox";
+    @HostBinding("attr.aria-label") public get ariaLabel() {
+        return this.i18n.translate("common.listbox");
+    }
 
     constructor(
         contextMenuService: ContextMenuService,
@@ -51,7 +54,8 @@ export class QuickListComponent extends AbstractListBase {
         elementRef: ElementRef,
         breadcrumbService: BreadcrumbService,
         contextService: ContextService,
-        changeDetector: ChangeDetectorRef) {
+        changeDetector: ChangeDetectorRef,
+        private i18n: I18nService) {
         super(contextMenuService, router, breadcrumbService, elementRef, contextService, changeDetector);
     }
 }
diff --git a/src/@batch-flask/ui/quick-list/quick-list.module.ts b/src/@batch-flask/ui/quick-list/quick-list.module.ts
index a718f0891f..f315d79961 100644
--- a/src/@batch-flask/ui/quick-list/quick-list.module.ts
+++ b/src/@batch-flask/ui/quick-list/quick-list.module.ts
@@ -6,6 +6,7 @@ import { MaterialModule } from "@batch-flask/core";
 import { AbstractListModule } from "@batch-flask/ui/abstract-list";
 import { LoadingModule } from "@batch-flask/ui/loading";
 import { VirtualScrollModule } from "@batch-flask/ui/virtual-scroll";
+import { I18nUIModule } from "../i18n";
 import { NoItemComponent } from "./no-item.component";
 import { QuickListItemStatusComponent } from "./quick-list-item-status";
 import {
@@ -39,6 +40,7 @@ const publicComponents = [
         VirtualScrollModule,
         LoadingModule,
         AbstractListModule,
+        I18nUIModule
     ],
 })
 export class QuickListModule {
diff --git a/src/@batch-flask/ui/quotas/quota-display/quota-display.html b/src/@batch-flask/ui/quotas/quota-display/quota-display.html
index fa37e014c6..6e707257f5 100644
--- a/src/@batch-flask/ui/quotas/quota-display/quota-display.html
+++ b/src/@batch-flask/ui/quotas/quota-display/quota-display.html
@@ -5,6 +5,6 @@
     </div>
 </div>
 <div class="progress">
-    <mat-progress-bar aria-label="progress bar" [ngClass]="colorClass" [value]="percent" [bufferValue]="100">
+    <mat-progress-bar role="progressbar" title="{{'quota-display.progressBar' | i18n}}" [ngClass]="colorClass" [value]="percent" [bufferValue]="100">
     </mat-progress-bar>
 </div>
diff --git a/src/@batch-flask/ui/quotas/quota-display/quota-display.i18n.yml b/src/@batch-flask/ui/quotas/quota-display/quota-display.i18n.yml
new file mode 100644
index 0000000000..afbc0bf4eb
--- /dev/null
+++ b/src/@batch-flask/ui/quotas/quota-display/quota-display.i18n.yml
@@ -0,0 +1,2 @@
+quota-display:
+  progressBar: Quota usage
diff --git a/src/@batch-flask/ui/quotas/quotas.module.ts b/src/@batch-flask/ui/quotas/quotas.module.ts
index b7eb34c38a..34f6da8348 100644
--- a/src/@batch-flask/ui/quotas/quotas.module.ts
+++ b/src/@batch-flask/ui/quotas/quotas.module.ts
@@ -2,12 +2,13 @@ import { CommonModule } from "@angular/common";
 import { NgModule } from "@angular/core";
 import { MatProgressBarModule } from "@angular/material/progress-bar";
 import { QuotaDisplayComponent } from "./quota-display";
+import { I18nUIModule } from "@batch-flask/ui/i18n";
 
 const privateComponents = [];
 const publicComponents = [QuotaDisplayComponent];
 
 @NgModule({
-    imports: [CommonModule, MatProgressBarModule],
+    imports: [CommonModule, MatProgressBarModule, I18nUIModule],
     declarations: [...privateComponents, publicComponents],
     exports: publicComponents,
 })
diff --git a/src/@batch-flask/ui/select/select.html b/src/@batch-flask/ui/select/select.html
index 050a3a9a5d..052e3f91a9 100644
--- a/src/@batch-flask/ui/select/select.html
+++ b/src/@batch-flask/ui/select/select.html
@@ -26,9 +26,9 @@
                 </ng-container>
             </ng-container>
         </div>
-        <div class="caret">
-            <i class="fa fa-caret-down" aria-hidden="true"></i>
-            <i class="fa fa-caret-up" aria-hidden="true"></i>
+        <div class="caret" aria-hidden="true">
+            <i class="fa fa-caret-down" *ngIf="!dropdownOpen"></i>
+            <i class="fa fa-caret-up" *ngIf="dropdownOpen"></i>
         </div>
    </div>
    <ng-container *ngIf="dropdownOpen && filterable">
diff --git a/src/app/components/common/resourcefile-picker/resourcefile-picker-row/resourcefile-picker-row.html b/src/app/components/common/resourcefile-picker/resourcefile-picker-row/resourcefile-picker-row.html
index 43774889c7..1e6ffb4608 100644
--- a/src/app/components/common/resourcefile-picker/resourcefile-picker-row/resourcefile-picker-row.html
+++ b/src/app/components/common/resourcefile-picker/resourcefile-picker-row/resourcefile-picker-row.html
@@ -1,8 +1,8 @@
 <ng-container [formGroup]="form">
-    <div class="type" [ngSwitch]="type">
-        <i class="fa fa-file" *ngSwitchCase="ResourceFileType.Url" aria-hidden="true"></i>
-        <i class="fa fa-folder" *ngSwitchCase="ResourceFileType.Container" aria-hidden="true"></i>
-        <i class="fa fa-question-circle" *ngSwitchDefault aria-hidden="true"></i>
+    <div class="type" [ngSwitch]="type" aria-hidden="true">
+        <i class="fa fa-file" *ngSwitchCase="ResourceFileType.Url"></i>
+        <i class="fa fa-folder" *ngSwitchCase="ResourceFileType.Container"></i>
+        <i class="fa fa-question-circle" *ngSwitchDefault></i>
     </div>
     <div class="source" [ngSwitch]="type">
         <input blInput placeholder="Url" formControlName="httpUrl" *ngSwitchCase="ResourceFileType.Url">
diff --git a/src/app/components/job/base/job-state/job-state.html b/src/app/components/job/base/job-state/job-state.html
index 1bde5628f7..04e0722204 100644
--- a/src/app/components/job/base/job-state/job-state.html
+++ b/src/app/components/job/base/job-state/job-state.html
@@ -1,13 +1,13 @@
 <div class="state-container" [matTooltip]="message">
-    <div class="state-icon" [ngSwitch]="job.state">
-            <i  *ngSwitchCase="JobState.active" class="fa fa-play-circle" aria-hidden="true"></i>
-            <i  *ngSwitchCase="JobState.deleting" class="fa fa-trash flash-opacity" aria-hidden="true"></i>
-            <i  *ngSwitchCase="JobState.terminating" class="fa fa-stop-circle flash-opacity" aria-hidden="true"></i>
-            <i  *ngSwitchCase="JobState.disabled" class="fa fa-pause-circle" aria-hidden="true"></i>
-            <i  *ngSwitchCase="JobState.disabling" class="fa fa-pause-circle" aria-hidden="true"></i>
+    <div class="state-icon" [ngSwitch]="job.state" aria-hidden="true">
+            <i  *ngSwitchCase="JobState.active" class="fa fa-play-circle"></i>
+            <i  *ngSwitchCase="JobState.deleting" class="fa fa-trash flash-opacity"></i>
+            <i  *ngSwitchCase="JobState.terminating" class="fa fa-stop-circle flash-opacity"></i>
+            <i  *ngSwitchCase="JobState.disabled" class="fa fa-pause-circle"></i>
+            <i  *ngSwitchCase="JobState.disabling" class="fa fa-pause-circle"></i>
             <i class="fa" *ngSwitchCase="JobState.completed"
                 [class.fa-warning]="!isSuccess"
-                [class.fa-check-circle]="isSuccess" aria-hidden="true"></i>
+                [class.fa-check-circle]="isSuccess"></i>
         </div>
         <span class="state">{{job.state}}</span>
         <span class="error-code" *ngIf="job.executionInfo?.terminateReason">&nbsp;({{job.executionInfo.terminateReason}})</span>
diff --git a/src/app/components/job/details/job-progress-status/job-progress-status.html b/src/app/components/job/details/job-progress-status/job-progress-status.html
index 59b1606fac..d01c44388f 100644
--- a/src/app/components/job/details/job-progress-status/job-progress-status.html
+++ b/src/app/components/job/details/job-progress-status/job-progress-status.html
@@ -28,7 +28,7 @@
 </div>
 <div class="progress-container">
     <div class="progress" *ngIf="progress" title="Job completion progress">
-        <mat-progress-bar aria-label="progress bar" class="progress-bar" color="primary" mode="buffer" [value]="progress.completed" [bufferValue]="progress.buffer">
+        <mat-progress-bar role="progressbar" title="{{'job-progress-status.progressBar' | i18n}}" class="progress-bar" color="primary" mode="buffer" [value]="progress.completed" [bufferValue]="progress.buffer">
         </mat-progress-bar>
         <span class="progress-label">{{progress.completed}}%</span>
     </div>
diff --git a/src/app/components/job/details/job-progress-status/job-progress-status.i18n.yml b/src/app/components/job/details/job-progress-status/job-progress-status.i18n.yml
index 15b0e30145..61b627517b 100644
--- a/src/app/components/job/details/job-progress-status/job-progress-status.i18n.yml
+++ b/src/app/components/job/details/job-progress-status/job-progress-status.i18n.yml
@@ -1,2 +1,3 @@
 job-progress-status:
   inaccurate: Task count might not be accurate in real time
+  progressBar: Job progress
diff --git a/src/app/components/layout/pinned-entity-dropdown/pinned-dropdown.html b/src/app/components/layout/pinned-entity-dropdown/pinned-dropdown.html
index d6538a96f1..7b126b3eb6 100644
--- a/src/app/components/layout/pinned-entity-dropdown/pinned-dropdown.html
+++ b/src/app/components/layout/pinned-entity-dropdown/pinned-dropdown.html
@@ -11,11 +11,11 @@
             (contextmenu)="onContextMenu(favorite)">
 
             <bl-clickable class="dropdown-item favorite-item" (do)="gotoFavorite(favorite)">
-                <span>
+                <span aria-hidden="true">
                     <i class="entity-type fa" [ngClass]="entityIcon(favorite)"
-                    [title]="entityType(favorite)" aria-hidden="true"></i>
+                    [title]="entityType(favorite)"></i>
                     {{favorite.name || favorite.id}}
-                    <i *ngIf="favorite.url === currentUrl" class="extra fa fa-check" aria-hidden="true"></i>
+                    <i *ngIf="favorite.url === currentUrl" class="extra fa fa-check"></i>
                 </span>
             </bl-clickable>
             <bl-clickable class="dropdown-item delete" (do)="removeFavorite(favorite)">
diff --git a/src/app/components/node/connect/node-connect.html b/src/app/components/node/connect/node-connect.html
index 2d50f35e15..15acab5a69 100644
--- a/src/app/components/node/connect/node-connect.html
+++ b/src/app/components/node/connect/node-connect.html
@@ -18,9 +18,9 @@ <h1>Connect to node</h1>
         </div>
         <div class="credentials-source">
             <bl-button type="wide" [skipSuccess]="true" [action]="autoConnect" [disabled]="!connectionSettings">
-                <div class="button-icon-frame">
-                    <i *ngIf="!loading" class="fa fa-plug" aria-hidden="true"></i>
-                    <i *ngIf="loading" class="fa fa-spinner fa-pulse" aria-hidden="true"></i>
+                <div class="button-icon-frame" aria-hidden="true">
+                    <i *ngIf="!loading" class="fa fa-plug"></i>
+                    <i *ngIf="loading" class="fa fa-spinner fa-pulse"></i>
                 </div>
                 <div class="button-label">Connect</div>
             </bl-button>
diff --git a/src/app/components/node/details/node-details.html b/src/app/components/node/details/node-details.html
index c68d803e96..636fcf97ab 100644
--- a/src/app/components/node/details/node-details.html
+++ b/src/app/components/node/details/node-details.html
@@ -8,9 +8,9 @@
                 <bl-refresh-btn [refresh]="refresh"></bl-refresh-btn>
                 <bl-commands-list [commands]="commands" [entity]="node"></bl-commands-list>
                 <bl-button color="light" [action]="uploadNodeLogs" title="Upload batch logs" [disabled]="pool.cloudServiceConfiguration">
-                    <span class="upload-node-logs fa-stacked">
-                        <i class="fa fa-upload fa-stack-1x" aria-hidden="true"></i>
-                        <i class="fa fa-bug fa-stack-1x" aria-hidden="true"></i>
+                    <span class="upload-node-logs fa-stacked" aria-hidden="true">
+                        <i class="fa fa-upload fa-stack-1x"></i>
+                        <i class="fa fa-bug fa-stack-1x"></i>
                     </span>
                 </bl-button>
             </bl-button-group>
diff --git a/src/app/components/task/details/task-timeline/task-timeline-state.html b/src/app/components/task/details/task-timeline/task-timeline-state.html
index 40ccf93cd1..9fccc77f43 100644
--- a/src/app/components/task/details/task-timeline/task-timeline-state.html
+++ b/src/app/components/task/details/task-timeline/task-timeline-state.html
@@ -1,7 +1,7 @@
-<div class="tile" [title]="title">
-    <i class="fa fa-check" *ngIf="done && !error" aria-hidden="true"></i>
-    <i class="fa fa-play" *ngIf="active && !error" aria-hidden="true"></i>
-    <i class="fa fa-exclamation-triangle" *ngIf="error" aria-hidden="true"></i>
+<div class="tile" [title]="title" aria-hidden="true">
+    <i class="fa fa-check" *ngIf="done && !error"></i>
+    <i class="fa fa-play" *ngIf="active && !error"></i>
+    <i class="fa fa-exclamation-triangle" *ngIf="error"></i>
 </div>
 <div class="details">
     <div class="state-name"> {{stateName}} </div>
diff --git a/src/app/components/tenant-picker/tenant-card.html b/src/app/components/tenant-picker/tenant-card.html
index 25b6410a8a..c01813e2a6 100644
--- a/src/app/components/tenant-picker/tenant-card.html
+++ b/src/app/components/tenant-picker/tenant-card.html
@@ -58,12 +58,13 @@
             tabIndex="0"
             matTooltip="{{statusText()}}"
             matTooltipClass="tenant-card-tooltip-{{status}}"
-            matTooltipPosition="after">
+            matTooltipPosition="after"
+            aria-hidden="true">
             <i *ngSwitchCase="tenantStatus.authorized"
-                class="fa fa-2x fa-check-circle" aria-hidden="true"></i>
+                class="fa fa-2x fa-check-circle"></i>
             <i *ngSwitchCase="tenantStatus.failed"
-                class="fa fa-2x fa-exclamation-circle" aria-hidden="true"></i>
-            <i *ngSwitchDefault class="fa fa-2x fa-question-circle" aria-hidden="true"></i>
+                class="fa fa-2x fa-exclamation-circle"></i>
+            <i *ngSwitchDefault class="fa fa-2x fa-question-circle"></i>
         </div>
     </div>
 </div>

From 4d69b51874f76e6422742ccf7536075a0ac6ec7a Mon Sep 17 00:00:00 2001
From: rechen <rechen@microsoft.com>
Date: Fri, 13 Jan 2023 17:40:04 -0800
Subject: [PATCH 68/72] AB#705 Fix luminosity contrast by applying double
 border - Remove fixed height

---
 src/@batch-flask/ui/buttons/button.scss | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/@batch-flask/ui/buttons/button.scss b/src/@batch-flask/ui/buttons/button.scss
index 90d496394b..466ae8aada 100644
--- a/src/@batch-flask/ui/buttons/button.scss
+++ b/src/@batch-flask/ui/buttons/button.scss
@@ -6,7 +6,6 @@ bl-button-group {
 
 bl-button {
     display: inline-block;
-    height: $action-btn-size;
     outline: none;
     cursor: pointer;
     text-align: center;
@@ -42,12 +41,16 @@ bl-button {
     }
 
     &[type="wide"] {
+        border: 2px solid transparent;
+
         &.focus-outline.focus-visible, &.focus-visible {
-            outline-color: rgb(39, 185, 211);
+            border-color: $primary-color-dark;
+            outline-color: white;
             outline-width: 2.5px;
             outline-style: solid;
-            outline-offset: -1px;
+            outline-offset: -4.5px;
             opacity: 1;
+            text-align: center;
         }
     }
 

From 04e4469cc812d9b77cc9ab6639e66b232ba7e92b Mon Sep 17 00:00:00 2001
From: rechen <rechen@microsoft.com>
Date: Sun, 29 Jan 2023 17:40:27 -0800
Subject: [PATCH 69/72] AB#490 Add select/unselect state for prep and release
 task toggle

---
 .../job-hook-task-browser/job-hook-task-browser.html        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/app/components/job/job-hook-task/job-hook-task-browser/job-hook-task-browser.html b/src/app/components/job/job-hook-task/job-hook-task-browser/job-hook-task-browser.html
index 3af7dbf5e8..7620e5f9bf 100644
--- a/src/app/components/job/job-hook-task/job-hook-task-browser/job-hook-task-browser.html
+++ b/src/app/components/job/job-hook-task/job-hook-task-browser/job-hook-task-browser.html
@@ -2,13 +2,17 @@
     <div style="padding: 10px; flex: 1">
         <mat-checkbox [formControl]="onlyFailedControl" color="primary">Only failed</mat-checkbox>
     </div>
-    <div class="type-toggle">
+    <div role="radiogroup" aria-required="true" class="type-toggle">
         <bl-clickable class="option" (do)="updateType(HookTaskType.PreparationTask)"
+            role="radio"
+            [attr.aria-checked]="type === HookTaskType.PreparationTask"
             [attr.aria-selected]="type === HookTaskType.PreparationTask"
             [class.active]="type === HookTaskType.PreparationTask">
             Preparation tasks
         </bl-clickable>
         <bl-clickable class="option" (do)="updateType(HookTaskType.ReleaseTask)"
+            role="radio"
+            [attr.aria-checked]="type === HookTaskType.ReleaseTask"
             [attr.aria-selected]="type === HookTaskType.ReleaseTask"
             [class.active]="type === HookTaskType.ReleaseTask"
             [attr.aria-disabled]="!hasReleaseTask"

From c95cdae145756c96181cee9cd57a2e16feddef58 Mon Sep 17 00:00:00 2001
From: rechen <rechen@microsoft.com>
Date: Sun, 29 Jan 2023 21:16:38 -0800
Subject: [PATCH 70/72] AB#480 Screen reader should read no files and errors
 for file tree views

---
 .../ui/file/file-explorer/file-tree-view/file-tree-view.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/@batch-flask/ui/file/file-explorer/file-tree-view/file-tree-view.html b/src/@batch-flask/ui/file/file-explorer/file-tree-view/file-tree-view.html
index 0981b13732..b73d6de743 100644
--- a/src/@batch-flask/ui/file/file-explorer/file-tree-view/file-tree-view.html
+++ b/src/@batch-flask/ui/file/file-explorer/file-tree-view/file-tree-view.html
@@ -27,14 +27,15 @@
     (keydown)="handleKeyboardNavigation($event)"
     (contextmenu)="showContextMenu($event)">
 
+    <p *ngIf="treeRows.length === 0" tabindex="0" class="tree-view-empty">{{'file-explorer.noFiles' | i18n }}</p>
+    <p *ngIf="fileNavigator.error" tabindex="0" class="tree-view-error">{{fileNavigator.error.message}}</p>
+
     <div class="tree-rows-container"
         [class.drop-target]="dropTargetPath === ''"
         (dragenter)="dragEnterRow($event)"
         (dragleave)="dragLeaveRow($event)"
         (dragover)="handleDragHover($event)"
         (drop)="handleDropOnRow($event)">
-        <div *ngIf="treeRows.length === 0" class="tree-view-empty">{{'file-explorer.noFiles' | i18n }}</div>
-        <div *ngIf="fileNavigator.error" class="tree-view-error">{{fileNavigator.error.message}}</div>
 
         <bl-file-tree-view-row *ngFor="let treeRow of treeRows; let  i = index; trackBy: treeRowTrackBy"
             id="{{id}}-row-{{i}}"

From aa6ea78ee726174b082a3408941fbec72b457cd0 Mon Sep 17 00:00:00 2001
From: Shiran Pasternak <shiran.pasternak@microsoft.com>
Date: Mon, 30 Jan 2023 14:18:16 -0500
Subject: [PATCH 71/72] Gets BatchExplorer version directly through NPM

---
 scripts/azpipelines/update-build-name.ps1 | 2 +-
 scripts/package/get-version.ts            | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)
 delete mode 100644 scripts/package/get-version.ts

diff --git a/scripts/azpipelines/update-build-name.ps1 b/scripts/azpipelines/update-build-name.ps1
index d3e7f752a5..bc40d40121 100644
--- a/scripts/azpipelines/update-build-name.ps1
+++ b/scripts/azpipelines/update-build-name.ps1
@@ -1,4 +1,4 @@
-$version = npm run -s ts "scripts/package/get-version.ts"
+$version = $(npm pkg get version) -replace '"', ""
 
 Write-Host "Updating build number to $version"
 Write-Host "##vso[build.updatebuildnumber]$version"
diff --git a/scripts/package/get-version.ts b/scripts/package/get-version.ts
deleted file mode 100644
index 0a387db215..0000000000
--- a/scripts/package/get-version.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { version } from "./package-utils";
-// eslint-disable no-console
-console.log(version);

From dd628073d46ee2ee1aa8755cfe05dc777ab43ecf Mon Sep 17 00:00:00 2001
From: Rena <cRui861@users.noreply.github.com>
Date: Thu, 2 Feb 2023 11:37:22 -0800
Subject: [PATCH 72/72] Prepare for release 2.16.0 (#2643)

* Updated changelog and version.

* Fixes 3rd party notices script

---------

Co-authored-by: rechen <rechen@microsoft.com>
Co-authored-by: Shiran Pasternak <shiran.pasternak@microsoft.com>
---
 CHANGELOG.md                         |  16 +
 ThirdPartyNotices.txt                | 619 ++++++++++++++++-----------
 scripts/lca/default-licenses/mit.txt |   8 +
 scripts/lca/generate-third-party.ts  |  94 ++--
 4 files changed, 441 insertions(+), 296 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae7cd7beb8..efbba5f4b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+# 2.16.0
+
+[All items](https://github.com/Azure/BatchExplorer/milestone/50?closed=1)
+
+### Features
+
+* Usability and accessibility improvements [\#2634](https://github.com/Azure/BatchExplorer/issues/2634)
+* Link to Italy Accessibility Declarations [\#2638](https://github.com/Azure/BatchExplorer/issues/2638)
+* Deprecation warnings for certain images [\#2635](https://github.com/Azure/BatchExplorer/issues/2635)
+* Migrates to new Azure Storage SDK [\#2637](https://github.com/Azure/BatchExplorer/issues/2637)
+* Security updates [\#2639](https://github.com/Azure/BatchExplorer/issues/2639)
+
+### Bugs
+
+* Storage container Create button in the data menu was broken [\#2636](https://github.com/Azure/BatchExplorer/issues/2636)
+
 # 2.15.0
 
 [All items](https://github.com/Azure/BatchExplorer/milestone/49?closed=1)
diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index a58bda8cd7..d4a1da3b7f 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -7,61 +7,60 @@ Microsoft licenses the Third Party IP to you under the licensing terms for the M
 Microsoft reserves all other rights not expressly granted under this agreement, whether by implication, estoppel or otherwise.
 
 
-0. @angular/animations(https://github.com/angular/angular) - MIT
-1. @angular/cdk(https://github.com/angular/components#readme) - MIT
-2. @angular/common(https://github.com/angular/angular) - MIT
-3. @angular/compiler(https://github.com/angular/angular) - MIT
-4. @angular/core(https://github.com/angular/angular) - MIT
-5. @angular/forms(https://github.com/angular/angular) - MIT
-6. @angular/material(https://github.com/angular/components#readme) - MIT
-7. @angular/platform-browser(https://github.com/angular/angular) - MIT
-8. @angular/platform-browser-dynamic(https://github.com/angular/angular) - MIT
-9. @angular/platform-server(https://github.com/angular/angular) - MIT
-10. @angular/router(https://github.com/angular/angular/tree/master/packages/router) - MIT
-11. @azure/msal-node(https://github.com/AzureAD/microsoft-authentication-library-for-js) - MIT
-12. @azure/storage-blob(https://github.com/Azure/azure-sdk-for-js#readme) - MIT
-13. applicationinsights(https://github.com/microsoft/ApplicationInsights-node.js#readme) - MIT
-14. azure-storage(http://github.com/Azure/azure-storage-node) - Apache-2.0
-15. chart.js(https://www.chartjs.org) - MIT
-16. chokidar(https://github.com/paulmillr/chokidar) - MIT
-17. commander(https://github.com/tj/commander.js) - MIT
-18. d3(https://d3js.org) - BSD-3-Clause
-19. decode-uri-component(https://github.com/SamVerschueren/decode-uri-component#readme) - MIT
-20. download(https://github.com/kevva/download#readme) - MIT
-21. electron-updater(https://github.com/electron-userland/electron-builder) - MIT
-22. element-resize-detector(https://github.com/wnr/element-resize-detector) - MIT
-23. extract-zip(https://github.com/maxogden/extract-zip#readme) - BSD-2-Clause
-24. focus-visible(https://github.com/WICG/focus-visible) - W3C
-25. font-awesome(http://fontawesome.io/) - (OFL-1.1 AND MIT)
-26. get-proxy-settings(https://github.com/Azure/get-proxy-settings) - MIT
-27. glob(https://github.com/isaacs/node-glob) - ISC
-28. hammerjs(http://hammerjs.github.io/) - MIT
-29. https-proxy-agent(https://github.com/TooTallNate/node-https-proxy-agent#readme) - MIT
-30. immutable(https://facebook.github.com/immutable-js) - MIT
-31. inflection(https://github.com/dreamerslab/node.inflection#readme) - MIT
-32. js-yaml(https://github.com/nodeca/js-yaml) - MIT
-33. jschardet(https://github.com/aadsm/jschardet#readme) - LGPL-2.1+
-34. keytar(http://atom.github.io/node-keytar) - MIT
-35. load-json-file(https://github.com/sindresorhus/load-json-file#readme) - MIT
-36. luxon(https://github.com/moment/luxon#readme) - MIT
-37. make-dir(https://github.com/sindresorhus/make-dir#readme) - MIT
-38. node-abi(https://github.com/lgeiger/node-abi#readme) - MIT
-39. node-forge(https://github.com/digitalbazaar/forge) - (BSD-3-Clause OR GPL-2.0)
-40. patternomaly(https://github.com/ashiguruma/patternomaly#readme) - MIT
-41. reflect-metadata(http://rbuckton.github.io/reflect-metadata) - Apache-2.0
-42. rxjs(https://github.com/ReactiveX/RxJS) - Apache-2.0
-43. strip-json-comments(https://github.com/sindresorhus/strip-json-comments#readme) - MIT
-44. tinycolor2(https://github.com/bgrins/TinyColor#readme) - MIT
-45. winston(https://github.com/winstonjs/winston#readme) - MIT
-46. winston-daily-rotate-file(https://github.com/winstonjs/winston-daily-rotate-file#readme) - MIT
-47. write-file-webpack-plugin(https://github.com/gajus/write-file-webpack-plugin#readme) - BSD-3-Clause
-48. xml2js(https://github.com/Leonidas-from-XIV/node-xml2js) - MIT
-49. zone.js(https://github.com/angular/angular) - MIT
-50. websockets(https://github.com/aaugustin/websockets) - BSD-3-Clause
-51. azure-batch-cli-extensions(https://github.com/Azure/azure-batch-cli-extensions) - MIT
-52. node.js(https://nodejs.org/en/) - MIT
-53. python(https://www.python.org/) - PSF
-54. Electron(https://electronjs.org/) - electron
+1. @angular/animations (https://github.com/angular/angular) - MIT
+2. @angular/cdk (https://github.com/angular/components#readme) - MIT
+3. @angular/common (https://github.com/angular/angular) - MIT
+4. @angular/compiler (https://github.com/angular/angular) - MIT
+5. @angular/core (https://github.com/angular/angular) - MIT
+6. @angular/forms (https://github.com/angular/angular) - MIT
+7. @angular/material (https://github.com/angular/components#readme) - MIT
+8. @angular/platform-browser (https://github.com/angular/angular) - MIT
+9. @angular/platform-browser-dynamic (https://github.com/angular/angular) - MIT
+10. @angular/platform-server (https://github.com/angular/angular) - MIT
+11. @angular/router (https://github.com/angular/angular/tree/master/packages/router) - MIT
+12. @azure/msal-node (https://github.com/AzureAD/microsoft-authentication-library-for-js) - MIT
+13. @azure/storage-blob (https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/storage/storage-blob/) - MIT
+14. applicationinsights (https://github.com/microsoft/ApplicationInsights-node.js) - MIT
+15. chart.js (https://www.chartjs.org) - MIT
+16. chokidar (https://github.com/paulmillr/chokidar) - MIT
+17. commander (https://github.com/tj/commander.js) - MIT
+18. d3 (https://d3js.org) - ISC
+19. decode-uri-component (https://github.com/SamVerschueren/decode-uri-component) - MIT
+20. download (https://github.com/kevva/download) - MIT
+21. electron-updater (https://github.com/electron-userland/electron-builder) - MIT
+22. element-resize-detector (https://github.com/wnr/element-resize-detector) - MIT
+23. extract-zip (https://github.com/maxogden/extract-zip) - BSD-2-Clause
+24. focus-visible (https://github.com/WICG/focus-visible) - W3C
+25. font-awesome (http://fontawesome.io/) - (OFL-1.1 AND MIT)
+26. get-proxy-settings (https://github.com/Azure/get-proxy-settings) - MIT
+27. glob (https://github.com/isaacs/node-glob) - ISC
+28. hammerjs (http://hammerjs.github.io/) - MIT
+29. https-proxy-agent (https://github.com/TooTallNate/node-https-proxy-agent) - MIT
+30. immutable (https://facebook.github.com/immutable-js) - MIT
+31. inflection (https://github.com/dreamerslab/node.inflection) - MIT
+32. js-yaml (https://github.com/nodeca/js-yaml) - MIT
+33. jschardet (https://github.com/aadsm/jschardet) - LGPL-2.1+
+34. keytar (http://atom.github.io/node-keytar) - MIT
+35. load-json-file (https://github.com/sindresorhus/load-json-file) - MIT
+36. luxon (https://github.com/moment/luxon) - MIT
+37. make-dir (https://github.com/sindresorhus/make-dir) - MIT
+38. node-abi (https://github.com/lgeiger/node-abi#readme) - MIT
+39. node-forge (https://github.com/digitalbazaar/forge) - (BSD-3-Clause OR GPL-2.0)
+40. patternomaly (https://github.com/ashiguruma/patternomaly) - MIT
+41. reflect-metadata (http://rbuckton.github.io/reflect-metadata) - Apache-2.0
+42. rxjs (https://github.com/ReactiveX/RxJS) - Apache-2.0
+43. strip-json-comments (https://github.com/sindresorhus/strip-json-comments) - MIT
+44. tinycolor2 (https://github.com/bgrins/TinyColor) - MIT
+45. winston (https://github.com/winstonjs/winston) - MIT
+46. winston-daily-rotate-file (https://github.com/winstonjs/winston-daily-rotate-file#readme) - MIT
+47. write-file-webpack-plugin (https://github.com/gajus/write-file-webpack-plugin) - BSD-3-Clause
+48. xml2js (https://github.com/Leonidas-from-XIV/node-xml2js) - MIT
+49. zone.js (https://github.com/angular/angular) - MIT
+50. websockets (https://github.com/aaugustin/websockets) - BSD-3-Clause
+51. azure-batch-cli-extensions (https://github.com/Azure/azure-batch-cli-extensions) - MIT
+52. node.js (https://nodejs.org/en/) - MIT
+53. python (https://www.python.org/) - PSF
+54. Electron (https://electronjs.org/) - electron
 
 ============================================================
     Start license for @angular/animations
@@ -97,7 +96,7 @@ THE SOFTWARE.
 ------------------------------------------------------------
 The MIT License
 
-Copyright (c) 2022 Google LLC.
+Copyright (c) 2023 Google LLC.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -242,7 +241,7 @@ THE SOFTWARE.
 ------------------------------------------------------------
 The MIT License
 
-Copyright (c) 2022 Google LLC.
+Copyright (c) 2023 Google LLC.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -467,189 +466,6 @@ SOFTWARE.
     End license for applicationinsights
 ============================================================
 
-============================================================
-    Start license for azure-storage
-------------------------------------------------------------
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-------------------------------------------------------------
-    End license for azure-storage
-============================================================
-
 ============================================================
     Start license for chart.js
 ------------------------------------------------------------
@@ -729,7 +545,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ============================================================
     Start license for d3
 ------------------------------------------------------------
-Copyright 2010-2022 Mike Bostock
+Copyright 2010-2023 Mike Bostock
 
 Permission to use, copy, modify, and/or distribute this software for any purpose
 with or without fee is hereby granted, provided that the above copyright notice
@@ -752,7 +568,7 @@ THIS SOFTWARE.
 ------------------------------------------------------------
 The MIT License (MIT)
 
-Copyright (c) Sam Verschueren <sam.verschueren@gmail.com> (github.com/SamVerschueren)
+Copyright (c) 2017, Sam Verschueren <sam.verschueren@gmail.com> (github.com/SamVerschueren)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
@@ -1091,7 +907,7 @@ to represent the company, product, or service to which they refer.**
 ------------------------------------------------------------
 The ISC License
 
-Copyright (c) 2009-2022 Isaac Z. Schlueter and Contributors
+Copyright (c) 2009-2023 Isaac Z. Schlueter and Contributors
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
@@ -1141,6 +957,19 @@ THE SOFTWARE.
 ============================================================
     Start license for https-proxy-agent
 ------------------------------------------------------------
+The MIT License (MIT)
+Copyright © 2023
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+------------------------------------------------------------
+    End license for https-proxy-agent
+============================================================
+
 ============================================================
     Start license for immutable
 ------------------------------------------------------------
@@ -2677,8 +2506,7 @@ THE SOFTWARE.
 ============================================================
     Start license for websockets
 ------------------------------------------------------------
-Copyright (c) 2013-2021 Aymeric Augustin and contributors.
-All rights reserved.
+Copyright (c) Aymeric Augustin and contributors
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -2688,9 +2516,9 @@ modification, are permitted provided that the following conditions are met:
     * Redistributions in binary form must reproduce the above copyright notice,
       this list of conditions and the following disclaimer in the documentation
       and/or other materials provided with the distribution.
-    * Neither the name of websockets nor the names of its contributors may
-      be used to endorse or promote products derived from this software without
-      specific prior written permission.
+    * Neither the name of the copyright holder nor the names of its contributors
+      may be used to endorse or promote products derived from this software
+      without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -2788,7 +2616,7 @@ The externally maintained libraries used by Node.js are:
   """
     MIT License
 
-    Copyright (C) 2012-2020 by various contributors (see AUTHORS)
+    Copyright (C) 2012-2022 by various contributors (see AUTHORS)
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal
@@ -2840,6 +2668,18 @@ The externally maintained libraries used by Node.js are:
     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
   """
 
+- ittapi, located at deps/v8/third_party/ittapi, is licensed as follows:
+  """
+    Copyright (c) 2019 Intel Corporation. All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+    3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  """
+
 - ICU, located at deps/icu-small, is licensed as follows:
   """
     UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
@@ -3426,10 +3266,6 @@ The externally maintained libraries used by Node.js are:
 
       - pthread-fixes.c, copyright Google Inc. and Sony Mobile Communications AB.
         Three clause BSD license.
-
-      - android-ifaddrs.h, android-ifaddrs.c, copyright Berkeley Software Design
-        Inc, Kenneth MacKay and Emergya (Cloud4all, FP7/2007-2013, grant agreement
-        n° 289016). Three clause BSD license.
   """
 
 - llhttp, located at deps/llhttp, is licensed as follows:
@@ -3494,6 +3330,246 @@ The externally maintained libraries used by Node.js are:
     SOFTWARE.
   """
 
+- postject, located at test/fixtures/postject-copy, is licensed as follows:
+  """
+    Postject is licensed for use as follows:
+
+    """
+    MIT License
+
+    Copyright (c) 2022 Postman, Inc
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+    """
+
+    The Postject license applies to all parts of Postject that are not externally
+    maintained libraries.
+
+    The externally maintained libraries used by Postject are:
+
+    - LIEF, located at vendor/LIEF, is licensed as follows:
+      """
+                                         Apache License
+                                   Version 2.0, January 2004
+                                http://www.apache.org/licenses/
+
+           TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+           1. Definitions.
+
+              "License" shall mean the terms and conditions for use, reproduction,
+              and distribution as defined by Sections 1 through 9 of this document.
+
+              "Licensor" shall mean the copyright owner or entity authorized by
+              the copyright owner that is granting the License.
+
+              "Legal Entity" shall mean the union of the acting entity and all
+              other entities that control, are controlled by, or are under common
+              control with that entity. For the purposes of this definition,
+              "control" means (i) the power, direct or indirect, to cause the
+              direction or management of such entity, whether by contract or
+              otherwise, or (ii) ownership of fifty percent (50%) or more of the
+              outstanding shares, or (iii) beneficial ownership of such entity.
+
+              "You" (or "Your") shall mean an individual or Legal Entity
+              exercising permissions granted by this License.
+
+              "Source" form shall mean the preferred form for making modifications,
+              including but not limited to software source code, documentation
+              source, and configuration files.
+
+              "Object" form shall mean any form resulting from mechanical
+              transformation or translation of a Source form, including but
+              not limited to compiled object code, generated documentation,
+              and conversions to other media types.
+
+              "Work" shall mean the work of authorship, whether in Source or
+              Object form, made available under the License, as indicated by a
+              copyright notice that is included in or attached to the work
+              (an example is provided in the Appendix below).
+
+              "Derivative Works" shall mean any work, whether in Source or Object
+              form, that is based on (or derived from) the Work and for which the
+              editorial revisions, annotations, elaborations, or other modifications
+              represent, as a whole, an original work of authorship. For the purposes
+              of this License, Derivative Works shall not include works that remain
+              separable from, or merely link (or bind by name) to the interfaces of,
+              the Work and Derivative Works thereof.
+
+              "Contribution" shall mean any work of authorship, including
+              the original version of the Work and any modifications or additions
+              to that Work or Derivative Works thereof, that is intentionally
+              submitted to Licensor for inclusion in the Work by the copyright owner
+              or by an individual or Legal Entity authorized to submit on behalf of
+              the copyright owner. For the purposes of this definition, "submitted"
+              means any form of electronic, verbal, or written communication sent
+              to the Licensor or its representatives, including but not limited to
+              communication on electronic mailing lists, source code control systems,
+              and issue tracking systems that are managed by, or on behalf of, the
+              Licensor for the purpose of discussing and improving the Work, but
+              excluding communication that is conspicuously marked or otherwise
+              designated in writing by the copyright owner as "Not a Contribution."
+
+              "Contributor" shall mean Licensor and any individual or Legal Entity
+              on behalf of whom a Contribution has been received by Licensor and
+              subsequently incorporated within the Work.
+
+           2. Grant of Copyright License. Subject to the terms and conditions of
+              this License, each Contributor hereby grants to You a perpetual,
+              worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+              copyright license to reproduce, prepare Derivative Works of,
+              publicly display, publicly perform, sublicense, and distribute the
+              Work and such Derivative Works in Source or Object form.
+
+           3. Grant of Patent License. Subject to the terms and conditions of
+              this License, each Contributor hereby grants to You a perpetual,
+              worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+              (except as stated in this section) patent license to make, have made,
+              use, offer to sell, sell, import, and otherwise transfer the Work,
+              where such license applies only to those patent claims licensable
+              by such Contributor that are necessarily infringed by their
+              Contribution(s) alone or by combination of their Contribution(s)
+              with the Work to which such Contribution(s) was submitted. If You
+              institute patent litigation against any entity (including a
+              cross-claim or counterclaim in a lawsuit) alleging that the Work
+              or a Contribution incorporated within the Work constitutes direct
+              or contributory patent infringement, then any patent licenses
+              granted to You under this License for that Work shall terminate
+              as of the date such litigation is filed.
+
+           4. Redistribution. You may reproduce and distribute copies of the
+              Work or Derivative Works thereof in any medium, with or without
+              modifications, and in Source or Object form, provided that You
+              meet the following conditions:
+
+              (a) You must give any other recipients of the Work or
+                  Derivative Works a copy of this License; and
+
+              (b) You must cause any modified files to carry prominent notices
+                  stating that You changed the files; and
+
+              (c) You must retain, in the Source form of any Derivative Works
+                  that You distribute, all copyright, patent, trademark, and
+                  attribution notices from the Source form of the Work,
+                  excluding those notices that do not pertain to any part of
+                  the Derivative Works; and
+
+              (d) If the Work includes a "NOTICE" text file as part of its
+                  distribution, then any Derivative Works that You distribute must
+                  include a readable copy of the attribution notices contained
+                  within such NOTICE file, excluding those notices that do not
+                  pertain to any part of the Derivative Works, in at least one
+                  of the following places: within a NOTICE text file distributed
+                  as part of the Derivative Works; within the Source form or
+                  documentation, if provided along with the Derivative Works; or,
+                  within a display generated by the Derivative Works, if and
+                  wherever such third-party notices normally appear. The contents
+                  of the NOTICE file are for informational purposes only and
+                  do not modify the License. You may add Your own attribution
+                  notices within Derivative Works that You distribute, alongside
+                  or as an addendum to the NOTICE text from the Work, provided
+                  that such additional attribution notices cannot be construed
+                  as modifying the License.
+
+              You may add Your own copyright statement to Your modifications and
+              may provide additional or different license terms and conditions
+              for use, reproduction, or distribution of Your modifications, or
+              for any such Derivative Works as a whole, provided Your use,
+              reproduction, and distribution of the Work otherwise complies with
+              the conditions stated in this License.
+
+           5. Submission of Contributions. Unless You explicitly state otherwise,
+              any Contribution intentionally submitted for inclusion in the Work
+              by You to the Licensor shall be under the terms and conditions of
+              this License, without any additional terms or conditions.
+              Notwithstanding the above, nothing herein shall supersede or modify
+              the terms of any separate license agreement you may have executed
+              with Licensor regarding such Contributions.
+
+           6. Trademarks. This License does not grant permission to use the trade
+              names, trademarks, service marks, or product names of the Licensor,
+              except as required for reasonable and customary use in describing the
+              origin of the Work and reproducing the content of the NOTICE file.
+
+           7. Disclaimer of Warranty. Unless required by applicable law or
+              agreed to in writing, Licensor provides the Work (and each
+              Contributor provides its Contributions) on an "AS IS" BASIS,
+              WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+              implied, including, without limitation, any warranties or conditions
+              of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+              PARTICULAR PURPOSE. You are solely responsible for determining the
+              appropriateness of using or redistributing the Work and assume any
+              risks associated with Your exercise of permissions under this License.
+
+           8. Limitation of Liability. In no event and under no legal theory,
+              whether in tort (including negligence), contract, or otherwise,
+              unless required by applicable law (such as deliberate and grossly
+              negligent acts) or agreed to in writing, shall any Contributor be
+              liable to You for damages, including any direct, indirect, special,
+              incidental, or consequential damages of any character arising as a
+              result of this License or out of the use or inability to use the
+              Work (including but not limited to damages for loss of goodwill,
+              work stoppage, computer failure or malfunction, or any and all
+              other commercial damages or losses), even if such Contributor
+              has been advised of the possibility of such damages.
+
+           9. Accepting Warranty or Additional Liability. While redistributing
+              the Work or Derivative Works thereof, You may choose to offer,
+              and charge a fee for, acceptance of support, warranty, indemnity,
+              or other liability obligations and/or rights consistent with this
+              License. However, in accepting such obligations, You may act only
+              on Your own behalf and on Your sole responsibility, not on behalf
+              of any other Contributor, and only if You agree to indemnify,
+              defend, and hold each Contributor harmless for any liability
+              incurred by, or claims asserted against, such Contributor by reason
+              of your accepting any such warranty or additional liability.
+
+           END OF TERMS AND CONDITIONS
+
+           APPENDIX: How to apply the Apache License to your work.
+
+              To apply the Apache License to your work, attach the following
+              boilerplate notice, with the fields enclosed by brackets "{}"
+              replaced with your own identifying information. (Don't include
+              the brackets!)  The text should be enclosed in the appropriate
+              comment syntax for the file format. We also recommend that a
+              file or class name and description of purpose be included on the
+              same "printed page" as the copyright notice for easier
+              identification within third-party archives.
+
+           Copyright 2017 - 2022 R. Thomas
+           Copyright 2017 - 2022 Quarkslab
+
+           Licensed under the Apache License, Version 2.0 (the "License");
+           you may not use this file except in compliance with the License.
+           You may obtain a copy of the License at
+
+               http://www.apache.org/licenses/LICENSE-2.0
+
+           Unless required by applicable law or agreed to in writing, software
+           distributed under the License is distributed on an "AS IS" BASIS,
+           WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+           See the License for the specific language governing permissions and
+           limitations under the License.
+      """
+  """
+
 - OpenSSL, located at deps/openssl, is licensed as follows:
   """
                                      Apache License
@@ -3717,8 +3793,7 @@ The externally maintained libraries used by Node.js are:
       - Strongtalk assembler, the basis of the files assembler-arm-inl.h,
         assembler-arm.cc, assembler-arm.h, assembler-ia32-inl.h,
         assembler-ia32.cc, assembler-ia32.h, assembler-x64-inl.h,
-        assembler-x64.cc, assembler-x64.h, assembler-mips-inl.h,
-        assembler-mips.cc, assembler-mips.h, assembler.cc and assembler.h.
+        assembler-x64.cc, assembler-x64.h, assembler.cc and assembler.h.
         This code is copyrighted by Sun Microsystems Inc. and released
         under a 3-clause BSD license.
 
@@ -3778,9 +3853,9 @@ The externally maintained libraries used by Node.js are:
 - zlib, located at deps/zlib, is licensed as follows:
   """
     zlib.h -- interface of the 'zlib' general purpose compression library
-    version 1.2.11, January 15th, 2017
+    version 1.2.13, October 13th, 2022
 
-    Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
+    Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
 
     This software is provided 'as-is', without any express or implied
     warranty.  In no event will the authors be held liable for any damages
@@ -3802,6 +3877,28 @@ The externally maintained libraries used by Node.js are:
     jloup@gzip.org          madler@alumni.caltech.edu
   """
 
+- simdutf, located at deps/simdutf, is licensed as follows:
+  """
+    Copyright 2021 The simdutf authors
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy of
+    this software and associated documentation files (the "Software"), to deal in
+    the Software without restriction, including without limitation the rights to
+    use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+    the Software, and to permit persons to whom the Software is furnished to do so,
+    subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+    FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+    COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+    IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+    CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  """
+
 - npm, located at deps/npm, is licensed as follows:
   """
     The npm application
@@ -4616,12 +4713,12 @@ A. HISTORY OF THE SOFTWARE
 ==========================
 
 Python was created in the early 1990s by Guido van Rossum at Stichting
-Mathematisch Centrum (CWI, see http://www.cwi.nl) in the Netherlands
+Mathematisch Centrum (CWI, see https://www.cwi.nl) in the Netherlands
 as a successor of a language called ABC.  Guido remains Python's
 principal author, although it includes many contributions from others.
 
 In 1995, Guido continued his work on Python at the Corporation for
-National Research Initiatives (CNRI, see http://www.cnri.reston.va.us)
+National Research Initiatives (CNRI, see https://www.cnri.reston.va.us)
 in Reston, Virginia where he released several versions of the
 software.
 
@@ -4633,7 +4730,7 @@ https://www.python.org/psf/) was formed, a non-profit organization
 created specifically to own Python-related Intellectual Property.
 Zope Corporation was a sponsoring member of the PSF.
 
-All Python releases are Open Source (see http://www.opensource.org for
+All Python releases are Open Source (see https://opensource.org for
 the Open Source Definition).  Historically, most, but not all, Python
 releases have also been GPL-compatible; the table below summarizes
 the various releases.
@@ -4698,7 +4795,7 @@ analyze, test, perform and/or display publicly, prepare derivative works,
 distribute, and otherwise use Python alone or in any derivative version,
 provided, however, that PSF's License Agreement and PSF's notice of copyright,
 i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Python Software Foundation;
+2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Python Software Foundation;
 All Rights Reserved" are retained in Python alone or in any derivative version
 prepared by Licensee.
 
diff --git a/scripts/lca/default-licenses/mit.txt b/scripts/lca/default-licenses/mit.txt
index e69de29bb2..ccd92d183e 100644
--- a/scripts/lca/default-licenses/mit.txt
+++ b/scripts/lca/default-licenses/mit.txt
@@ -0,0 +1,8 @@
+The MIT License (MIT)
+Copyright © 2023
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/scripts/lca/generate-third-party.ts b/scripts/lca/generate-third-party.ts
index 98329ffcb5..d010021773 100644
--- a/scripts/lca/generate-third-party.ts
+++ b/scripts/lca/generate-third-party.ts
@@ -1,13 +1,27 @@
+// eslint-disable no-console
+
 import { program } from "commander";
 import * as fs from "fs";
-import fetch from "node-fetch";
+import fetch, { HeaderInit } from "node-fetch";
 import * as path from "path";
 import { Constants } from "../../src/client/client-constants";
 
-export interface ThirdPartyNoticeOptions {
+interface ThirdPartyNoticeOptions {
     check?: boolean;
 }
 
+interface Dependency {
+    name: string;
+    version: string;
+    url: string;
+    repoUrl?: string | null;
+    licenseType: string;
+}
+
+interface License {
+    content: string;
+}
+
 const defaultThirdPartyNoticeOptions: ThirdPartyNoticeOptions = {
     check: false,
 };
@@ -20,18 +34,17 @@ const repoNameRegex = /https?:\/\/github\.com\/(.*)/;
 const innerSeparator = "-".repeat(60);
 const outerSeparator = "=".repeat(60);
 
-const defaultLicenseRoot = path.join(Constants.root, "scripts/lca/default-licenses");
+const defaultLicenseRoot = path.join(__dirname, "default-licenses");
 
-// eslint-disable no-console
 const defaultLicenses = {
-    "mit": fs.readFileSync(path.join(defaultLicenseRoot, "mit.txt")).toString(),
-    "bsd-2-clause": fs.readFileSync(path.join(defaultLicenseRoot, "bsd-2-clause.txt")).toString(),
-    "(ofl-1.1 and mit)": fs.readFileSync(path.join(defaultLicenseRoot, "ofl-1.1-and-mit.txt")).toString(),
-    "apache-2.0": fs.readFileSync(path.join(defaultLicenseRoot, "apache-2.0.txt")).toString(),
-    "electron": fs.readFileSync(path.join(defaultLicenseRoot, "electron.txt")).toString(),
+    "mit": "mit.txt",
+    "bsd-2-clause": "bsd-2-clause.txt",
+    "(ofl-1.1 and mit)": "ofl-1.1-and-mit.txt",
+    "apache-2.0": "apache-2.0.txt",
+    "electron": "electron.txt",
 };
 
-const additionalDependencies = [
+const additionalDependencies: Dependency[] = [
     {
         name: "websockets",
         version: "3.3",
@@ -83,7 +96,7 @@ function listDependencies(): string[] {
     });
 }
 
-function loadDependency(name: string) {
+function loadDependency(name: string): Dependency {
     const contents = fs.readFileSync(`node_modules/${name}/package.json`).toString();
     const dependency = JSON.parse(contents);
     const repoUrl = getRepoUrl(dependency);
@@ -91,8 +104,8 @@ function loadDependency(name: string) {
     return {
         name: dependency.name,
         version: dependency.version,
-        url: url,
-        repoUrl: repoUrl,
+        url,
+        repoUrl,
         licenseType: dependency.license,
     };
 }
@@ -101,7 +114,10 @@ function getRepoUrl(dependency) {
     const repo = dependency.repository;
     if (!repo) { return null; }
     if (typeof repo === "string") {
-        return `https://github.com/${repo}`;
+        if (repo.startsWith(`https://github.com/`)) {
+            return repo;
+        }
+        return `https://github.com/${repo.replace(/^github:/, "")}`;
     }
     const match = gitUrlRegex.exec(repo.url);
     if (!match) { return null; }
@@ -119,20 +135,25 @@ function getRepoName(repoUrl: string | null): string | null {
     return value.split("/").slice(0, 2).join("/");
 }
 
-function loadLicense(repoUrl: string | null, anonymous = false): Promise<any> {
+async function loadLicense(dependency: Dependency, anonymous = false):
+    Promise<License> {
+    const { repoUrl = null } = dependency;
     const repoName = getRepoName(repoUrl);
     const licenseUrl = `https://api.github.com/repos/${repoName}/license`;
-    const headers = anonymous ? {} : { Authorization: `token ${process.env.GH_TOKEN}`}
+    const headers: HeaderInit = anonymous ? {} :
+        { Authorization: `token ${process.env.GH_TOKEN}` }
 
-    return fetch(licenseUrl, {headers}).then((res) => {
+    return fetch(licenseUrl, { headers }).then(async (res) => {
         /** Will look up default license if cannot find a license */
         if (!anonymous && res.status === 403) {
             console.warn(`Access denied, retrying request anonymously. Url: ${licenseUrl}`);
-            return loadLicense(repoUrl, anonymous = true);
+            return loadLicense(dependency, anonymous = true);
         } else if (res.status >= 300 && res.status != 404) {
             throw new Error(`Response status ${res.status} ${res.statusText} with url: ${licenseUrl}`);
+        } else if (res.status === 404) {
+            console.warn(`No license found for ${repoName}. Using default license ${dependency.licenseType} instead.`);
         }
-        return res.json();
+        return await res.json();
     }).catch((error) => {
         console.error(`Error loading license for ${repoName}`, error);
         process.exit(1)
@@ -144,14 +165,17 @@ function decode64(content: string) {
 }
 
 function getHeader() {
-    return fs.readFileSync(path.join(Constants.root, "scripts/lca/header.txt")).toString();
+    return fs.readFileSync(path.join(__dirname, "header.txt")).toString();
 }
 
-function getLicenseContent(dependency, license) {
+function getLicenseContent(dependency, license): string | null {
     if (!license.content) {
-        const licenseType = dependency.licenseType && dependency.licenseType.toLowerCase();
-        if (licenseType in defaultLicenses) {
-            return defaultLicenses[licenseType];
+        const licenseType = dependency?.licenseType.toLowerCase();
+        if (Object.keys(defaultLicenses).includes(licenseType)) {
+            const licenseFilePath =
+                path.join(defaultLicenseRoot, defaultLicenses[licenseType]);
+            const licenseContent = fs.readFileSync(licenseFilePath).toString();
+            return licenseContent;
         } else {
             console.warn(`Repo ${dependency.name} doesn't have a license file`
                 + ` for ${licenseType} and no default provided`);
@@ -179,20 +203,20 @@ function run(options: ThirdPartyNoticeOptions = {}) {
     output.push(getHeader());
     output.push("");
 
-    const depenencyNames = listDependencies();
-    const dependencies = depenencyNames.map((dep) => {
-        return loadDependency(dep);
-    }).concat(additionalDependencies);
+    const dependencyNames = listDependencies();
+    const dependencies = dependencyNames
+        .map(dep => loadDependency(dep))
+        .concat(additionalDependencies);
     console.log("Loading dependencies...");
 
     const toc = dependencies.map((dependency, index) => {
-        return `${index}. ${dependency.name}(${dependency.url}) - ${dependency.licenseType}`;
+        return `${index + 1}. ${dependency.name} (${dependency.url}) - ${dependency.licenseType}`;
     });
     output.push(toc.join("\n"));
     output.push("");
 
-    const licensePromises = dependencies.map((dependency, index) => {
-        return loadLicense(dependency.repoUrl);
+    const licensePromises = dependencies.map((dependency) => {
+        return loadLicense(dependency);
     });
     console.log("Loading licenses...");
 
@@ -204,9 +228,8 @@ function run(options: ThirdPartyNoticeOptions = {}) {
             output.push(innerSeparator);
 
             const licenseContent = getLicenseContent(dependency, license);
-            if (!licenseContent) { continue; }
 
-            output.push(licenseContent);
+            output.push(licenseContent || "[NO LICENSE]");
             output.push(innerSeparator);
             output.push(`    End license for ${dependency.name}`);
             output.push(outerSeparator);
@@ -224,7 +247,8 @@ function run(options: ThirdPartyNoticeOptions = {}) {
 }
 
 const options = program
-    .option("-c, --check", "Check the current third party notice file is valid.")
+    .option("-c, --check",
+        "Check the current third party notice file is valid.")
     .parse(process.argv);
 
-run(options as any);
+run({ check: options.getOptionValue("check") });