From f5c63ff4c724bd7e0943d0951b9bcf036f063324 Mon Sep 17 00:00:00 2001
From: J Boddey <boddey@google.com>
Date: Tue, 2 Jan 2024 14:03:07 +0000
Subject: [PATCH 01/11] Merge dev into main (Release 1.1-alpha) (#182)

---
 .github/workflows/testing.yml                 |   43 +-
 README.md                                     |   21 +-
 cmd/build                                     |   19 +
 cmd/package                                   |    4 +-
 cmd/prepare                                   |    2 +-
 docs/configure_device.md                      |   29 +
 docs/get_started.md                           |    4 +-
 framework/python/src/api/api.py               |  710 +-
 framework/python/src/common/device.py         |    5 +-
 framework/python/src/common/session.py        |   21 +-
 framework/python/src/common/testreport.py     |   96 +-
 framework/python/src/common/util.py           |   15 +
 framework/python/src/core/test_runner.py      |    4 +-
 framework/python/src/core/testrun.py          |   75 +-
 .../src/net_orc/network_orchestrator.py       |    5 +-
 .../python/src/test_orc/test_orchestrator.py  |   31 +-
 make/DEBIAN/control                           |    2 +-
 make/DEBIAN/prerm                             |    9 +
 modules/network/dhcp-1/conf/dhcpd.conf        |   56 +-
 modules/network/dhcp-1/conf/radvd.conf        |   10 +-
 modules/network/dhcp-1/dhcp-1.Dockerfile      |    2 +-
 .../python/src/grpc_server/dhcp_server.py     |   11 +-
 .../python/src/grpc_server/radvd_server.py    |   15 +-
 modules/network/dhcp-2/conf/dhcpd.conf        |    1 -
 modules/network/dhcp-2/conf/radvd.conf        |   12 +-
 modules/network/dhcp-2/dhcp-2.Dockerfile      |    2 +-
 .../python/src/grpc_server/dhcp_server.py     |   10 +-
 .../python/src/grpc_server/radvd_server.py    |   15 +-
 modules/test/conn/conf/module_config.json     |   14 +-
 modules/test/conn/conn.Dockerfile             |    2 +-
 .../test/conn/python/src/connection_module.py |  182 +-
 modules/test/conn/python/src/dhcp_util.py     |   80 +-
 modules/test/dns/conf/module_config.json      |    6 -
 modules/test/nmap/python/src/nmap_module.py   |   10 +-
 modules/test/ntp/python/src/ntp_module.py     |   16 +-
 modules/test/tls/conf/module_config.json      |   12 -
 modules/test/tls/python/src/tls_util.py       |    4 +-
 modules/ui/.eslintrc.json                     |   50 +
 modules/ui/.gitignore                         |    7 +-
 modules/ui/.prettierignore                    |   43 +
 modules/ui/.prettierrc.json                   |   12 +
 modules/ui/README.md                          |   27 +
 modules/ui/angular.json                       |   39 +-
 modules/ui/conf/nginx.conf                    |   13 -
 modules/ui/package-lock.json                  | 7982 ++++++++++++-----
 modules/ui/package.json                       |   52 +-
 modules/ui/src/app/app-routing.module.ts      |   37 +-
 modules/ui/src/app/app.component.html         |  141 +-
 modules/ui/src/app/app.component.scss         |  110 +-
 modules/ui/src/app/app.component.spec.ts      |  403 +-
 modules/ui/src/app/app.component.ts           |  142 +-
 modules/ui/src/app/app.module.ts              |   60 +-
 .../components/bypass/bypass.component.html   |   26 +
 .../components/bypass/bypass.component.scss   |   43 +
 .../bypass/bypass.component.spec.ts           |   61 +
 .../app/components/bypass/bypass.component.ts |   37 +
 .../components/callout/callout.component.html |   26 +
 .../components/callout/callout.component.scss |   69 +
 .../callout/callout.component.spec.ts         |   45 +
 .../components/callout/callout.component.ts   |   30 +
 .../delete-form/delete-form.component.html    |   28 +
 .../delete-form/delete-form.component.scss}   |   42 +-
 .../delete-form/delete-form.component.spec.ts |   99 +
 .../delete-form/delete-form.component.ts      |   52 +
 .../delete-report.component.html              |   24 +
 .../delete-report.component.scss              |   26 +
 .../delete-report.component.spec.ts           |  108 +
 .../delete-report/delete-report.component.ts  |   83 +
 .../device-item/device-item.component.html    |   23 +-
 .../device-item/device-item.component.scss    |   14 +-
 .../device-item/device-item.component.spec.ts |   40 +-
 .../device-item/device-item.component.ts      |   11 +-
 .../device-tests/device-tests.component.html  |   15 +-
 .../device-tests/device-tests.component.scss  |   26 +-
 .../device-tests.component.spec.ts            |   64 +-
 .../device-tests/device-tests.component.ts    |   35 +-
 .../download-report.component.html            |    7 +-
 .../download-report.component.spec.ts         |   62 +-
 .../download-report.component.ts              |   31 +-
 .../escapable-dialog.component.spec.ts        |   72 +
 .../escapable-dialog.component.ts             |   39 +
 .../filter-chips/filter-chips.component.html  |   47 +
 .../filter-chips/filter-chips.component.scss  |   60 +
 .../filter-chips.component.spec.ts            |  138 +
 .../filter-chips/filter-chips.component.ts    |   66 +
 .../filter-dialog.component.html              |   74 +
 .../filter-dialog.component.scss              |   66 +
 .../filter-dialog.component.spec.ts           |  208 +
 .../filter-dialog/filter-dialog.component.ts  |  233 +
 .../general-settings.component.html           |  142 +-
 .../general-settings.component.scss           |   49 +-
 .../general-settings.component.spec.ts        |  279 +-
 .../general-settings.component.ts             |  110 +-
 .../only-different-values.validator.ts        |   16 +-
 .../report-action.component.spec.ts           |   50 +
 .../report-action/report-action.component.ts  |   26 +
 .../components/spinner/spinner.component.html |    3 +
 .../components/spinner/spinner.component.scss |   36 +
 .../spinner/spinner.component.spec.ts         |   43 +
 .../components/spinner/spinner.component.ts   |   21 +
 .../update-dialog.component.html              |   39 +
 .../update-dialog.component.scss              |   43 +
 .../update-dialog.component.spec.ts           |  107 +
 .../update-dialog/update-dialog.component.ts  |   44 +
 .../components/version/version.component.html |   41 +
 .../components/version/version.component.scss |   58 +
 .../version/version.component.spec.ts         |   86 +
 .../components/version/version.component.ts   |   56 +
 .../device-form/device-form.component.html    |   69 +-
 .../device-form/device-form.component.scss    |   10 +-
 .../device-form/device-form.component.spec.ts |  365 +-
 .../device-form/device-form.component.ts      |  106 +-
 .../device-form/device.validators.ts          |   31 +-
 .../device-repository-routing.module.ts       |   13 +-
 .../device-repository.component.html          |   18 +-
 .../device-repository.component.scss          |    8 +-
 .../device-repository.component.spec.ts       |  208 +-
 .../device-repository.component.ts            |   97 +-
 .../device-repository.module.ts               |   48 +-
 .../guards/allow-to-run-test.guard.spec.ts    |   61 -
 .../src/app/history/history-routing.module.ts |   13 +-
 .../ui/src/app/history/history.component.html |  247 +-
 .../ui/src/app/history/history.component.scss |   67 +-
 .../src/app/history/history.component.spec.ts |  247 +-
 .../ui/src/app/history/history.component.ts   |  252 +-
 modules/ui/src/app/history/history.module.ts  |   35 +-
 .../error-handler.interceptor.spec.ts         |   50 +
 .../interceptors/error-handler.interceptor.ts |   42 +
 .../interceptors/error.interceptor.spec.ts    |  108 +
 .../src/app/interceptors/error.interceptor.ts |   64 +
 .../interceptors/loading.interceptor.spec.ts  |   90 +
 .../app/interceptors/loading.interceptor.ts   |   48 +
 modules/ui/src/app/mocks/device.mock.ts       |   18 +-
 modules/ui/src/app/mocks/progress.mock.ts     |   79 +-
 modules/ui/src/app/mocks/version.mock.ts      |   28 +
 modules/ui/src/app/model/callout-type.ts      |   19 +
 modules/ui/src/app/model/device.ts            |    8 +-
 modules/ui/src/app/model/filters.ts           |   61 +
 modules/ui/src/app/model/routes.ts            |   21 +
 modules/ui/src/app/model/setting.ts           |    4 +-
 modules/ui/src/app/model/testrun-status.ts    |   28 +-
 modules/ui/src/app/model/version.ts           |   22 +
 .../progress-breadcrumbs.component.html       |   13 +-
 .../progress-breadcrumbs.component.scss       |    2 +-
 .../progress-breadcrumbs.component.spec.ts    |    8 +-
 .../progress-breadcrumbs.component.ts         |    6 +-
 .../progress-initiate-form.component.html     |   45 +-
 .../progress-initiate-form.component.scss     |    4 +-
 .../progress-initiate-form.component.spec.ts  |  238 +-
 .../progress-initiate-form.component.ts       |  137 +-
 .../app/progress/progress-routing.module.ts   |   13 +-
 .../progress-status-card.component.html       |  111 +-
 .../progress-status-card.component.scss       |    3 +-
 .../progress-status-card.component.spec.ts    |  144 +-
 .../progress-status-card.component.ts         |   56 +-
 .../progress-table.component.html             |   49 +-
 .../progress-table.component.scss             |    9 +-
 .../progress-table.component.spec.ts          |   32 +-
 .../progress-table.component.ts               |   10 +-
 .../src/app/progress/progress.component.html  |   48 +-
 .../src/app/progress/progress.component.scss  |   22 +-
 .../app/progress/progress.component.spec.ts   |  437 +-
 .../ui/src/app/progress/progress.component.ts |  182 +-
 .../ui/src/app/progress/progress.module.ts    |   49 +-
 .../src/app/services/loader.service.spec.ts   |   38 +
 modules/ui/src/app/services/loader.service.ts |   31 +
 modules/ui/src/app/services/loaderConfig.ts   |   20 +
 .../notification.service.spec.ts              |   39 +-
 .../{ => services}/notification.service.ts    |   22 +-
 .../src/app/services/test-run.service.spec.ts |  438 +
 .../ui/src/app/services/test-run.service.ts   |  279 +
 modules/ui/src/app/test-run.service.spec.ts   |  309 -
 modules/ui/src/app/test-run.service.ts        |  193 -
 modules/ui/src/assets/icons/desktop.svg       |   23 +
 modules/ui/src/index.html                     |   49 +-
 modules/ui/src/main.ts                        |    6 +-
 modules/ui/src/styles.scss                    |   99 +-
 modules/ui/src/theming/colors.scss            |   96 +-
 modules/ui/src/theming/theme.scss             |   72 +-
 modules/ui/tsconfig.app.json                  |    8 +-
 modules/ui/tsconfig.json                      |    5 +-
 modules/ui/tsconfig.spec.json                 |    9 +-
 testing/api/test_api.py                       |    8 +-
 .../device_configs/tester1/device_config.json |    2 +-
 .../device_configs/tester2/device_config.json |    4 +-
 testing/tests/test_tests                      |   29 +-
 186 files changed, 15142 insertions(+), 4892 deletions(-)
 create mode 100644 docs/configure_device.md
 create mode 100644 modules/ui/.eslintrc.json
 create mode 100644 modules/ui/.prettierignore
 create mode 100644 modules/ui/.prettierrc.json
 create mode 100644 modules/ui/README.md
 delete mode 100644 modules/ui/conf/nginx.conf
 create mode 100644 modules/ui/src/app/components/bypass/bypass.component.html
 create mode 100644 modules/ui/src/app/components/bypass/bypass.component.scss
 create mode 100644 modules/ui/src/app/components/bypass/bypass.component.spec.ts
 create mode 100644 modules/ui/src/app/components/bypass/bypass.component.ts
 create mode 100644 modules/ui/src/app/components/callout/callout.component.html
 create mode 100644 modules/ui/src/app/components/callout/callout.component.scss
 create mode 100644 modules/ui/src/app/components/callout/callout.component.spec.ts
 create mode 100644 modules/ui/src/app/components/callout/callout.component.ts
 create mode 100644 modules/ui/src/app/components/delete-form/delete-form.component.html
 rename modules/ui/src/app/{guards/allow-to-run-test.guard.ts => components/delete-form/delete-form.component.scss} (53%)
 create mode 100644 modules/ui/src/app/components/delete-form/delete-form.component.spec.ts
 create mode 100644 modules/ui/src/app/components/delete-form/delete-form.component.ts
 create mode 100644 modules/ui/src/app/components/delete-report/delete-report.component.html
 create mode 100644 modules/ui/src/app/components/delete-report/delete-report.component.scss
 create mode 100644 modules/ui/src/app/components/delete-report/delete-report.component.spec.ts
 create mode 100644 modules/ui/src/app/components/delete-report/delete-report.component.ts
 create mode 100644 modules/ui/src/app/components/escapable-dialog/escapable-dialog.component.spec.ts
 create mode 100644 modules/ui/src/app/components/escapable-dialog/escapable-dialog.component.ts
 create mode 100644 modules/ui/src/app/components/filter-chips/filter-chips.component.html
 create mode 100644 modules/ui/src/app/components/filter-chips/filter-chips.component.scss
 create mode 100644 modules/ui/src/app/components/filter-chips/filter-chips.component.spec.ts
 create mode 100644 modules/ui/src/app/components/filter-chips/filter-chips.component.ts
 create mode 100644 modules/ui/src/app/components/filter-dialog/filter-dialog.component.html
 create mode 100644 modules/ui/src/app/components/filter-dialog/filter-dialog.component.scss
 create mode 100644 modules/ui/src/app/components/filter-dialog/filter-dialog.component.spec.ts
 create mode 100644 modules/ui/src/app/components/filter-dialog/filter-dialog.component.ts
 create mode 100644 modules/ui/src/app/components/report-action/report-action.component.spec.ts
 create mode 100644 modules/ui/src/app/components/report-action/report-action.component.ts
 create mode 100644 modules/ui/src/app/components/spinner/spinner.component.html
 create mode 100644 modules/ui/src/app/components/spinner/spinner.component.scss
 create mode 100644 modules/ui/src/app/components/spinner/spinner.component.spec.ts
 create mode 100644 modules/ui/src/app/components/spinner/spinner.component.ts
 create mode 100644 modules/ui/src/app/components/version/update-dialog/update-dialog.component.html
 create mode 100644 modules/ui/src/app/components/version/update-dialog/update-dialog.component.scss
 create mode 100644 modules/ui/src/app/components/version/update-dialog/update-dialog.component.spec.ts
 create mode 100644 modules/ui/src/app/components/version/update-dialog/update-dialog.component.ts
 create mode 100644 modules/ui/src/app/components/version/version.component.html
 create mode 100644 modules/ui/src/app/components/version/version.component.scss
 create mode 100644 modules/ui/src/app/components/version/version.component.spec.ts
 create mode 100644 modules/ui/src/app/components/version/version.component.ts
 delete mode 100644 modules/ui/src/app/guards/allow-to-run-test.guard.spec.ts
 create mode 100644 modules/ui/src/app/interceptors/error-handler.interceptor.spec.ts
 create mode 100644 modules/ui/src/app/interceptors/error-handler.interceptor.ts
 create mode 100644 modules/ui/src/app/interceptors/error.interceptor.spec.ts
 create mode 100644 modules/ui/src/app/interceptors/error.interceptor.ts
 create mode 100644 modules/ui/src/app/interceptors/loading.interceptor.spec.ts
 create mode 100644 modules/ui/src/app/interceptors/loading.interceptor.ts
 create mode 100644 modules/ui/src/app/mocks/version.mock.ts
 create mode 100644 modules/ui/src/app/model/callout-type.ts
 create mode 100644 modules/ui/src/app/model/filters.ts
 create mode 100644 modules/ui/src/app/model/routes.ts
 create mode 100644 modules/ui/src/app/model/version.ts
 create mode 100644 modules/ui/src/app/services/loader.service.spec.ts
 create mode 100644 modules/ui/src/app/services/loader.service.ts
 create mode 100644 modules/ui/src/app/services/loaderConfig.ts
 rename modules/ui/src/app/{ => services}/notification.service.spec.ts (59%)
 rename modules/ui/src/app/{ => services}/notification.service.ts (64%)
 create mode 100644 modules/ui/src/app/services/test-run.service.spec.ts
 create mode 100644 modules/ui/src/app/services/test-run.service.ts
 delete mode 100644 modules/ui/src/app/test-run.service.spec.ts
 delete mode 100644 modules/ui/src/app/test-run.service.ts
 create mode 100644 modules/ui/src/assets/icons/desktop.svg

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 92f7cd956..4071860f5 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -31,7 +31,7 @@ jobs:
     name:  Tests
     runs-on: ubuntu-20.04
     needs: testrun_baseline
-    timeout-minutes: 40
+    timeout-minutes: 45
     steps:
       - name: Checkout source
         uses: actions/checkout@v2.3.4
@@ -44,13 +44,12 @@ jobs:
       - name: Install Testrun
         shell: bash {0}
         run: sudo dpkg -i testrun*.deb
-        timeout-minutes: 10
       - name: Run tests
         shell: bash {0}
         run: testing/tests/test_tests
       - name: Archive runtime results
         if: ${{ always() }}
-        run: sudo tar --exclude-vcs -czf runtime.tgz /usr/local/testrun/runtime/ /usr/local/testrun/local/
+        run: sudo tar --exclude-vcs -czf runtime.tgz /usr/local/testrun/runtime/
       - name: Upload runtime results
         uses: actions/upload-artifact@v3
         if: ${{ always() }}
@@ -69,16 +68,26 @@ jobs:
       - name: Install dependencies
         shell: bash {0}
         run: cmd/prepare
-      - name: Package Testrun
+      - name: Package Testrun  
         shell: bash {0}
         run: cmd/package
       - name: Install Testrun
         shell: bash {0}
         run: sudo dpkg -i testrun*.deb
-        timeout-minutes: 10
+        timeout-minutes: 30
       - name: Run tests
         shell: bash {0}
         run: testing/api/test_api
+      - name: Archive runtime results
+        if: ${{ always() }}
+        run: sudo tar --exclude-vcs -czf runtime.tgz /usr/local/testrun/runtime/ /usr/local/testrun/local/
+      - name: Upload runtime results
+        uses: actions/upload-artifact@v3
+        if: ${{ always() }}
+        with:
+          if-no-files-found: error
+          name: runtime_${{ github.workflow }}_${{ github.run_id }}
+          path: runtime.tgz
 
   pylint:
     name:  Pylint
@@ -105,4 +114,26 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: Testrun Installer
-          path: testrun*.deb
\ No newline at end of file
+          path: testrun*.deb
+
+  testrun_ui:
+    name: UI
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Install Node
+      uses: actions/setup-node@v3
+      with:
+        node-version: 18.10.0
+    - name: Install Chromium Browser
+      run: sudo apt install chromium-browser
+    - name: Install dependencies
+      run: npm install && npm ci
+      working-directory: ./modules/ui
+    - name: Run tests
+      run: |
+        export CHROME_BIN=/usr/bin/chromium-browser
+        CI=true npm run test-headless
+      env:
+        CI: true
+      working-directory: ./modules/ui
diff --git a/README.md b/README.md
index 6b1836fa2..53915aaaa 100644
--- a/README.md
+++ b/README.md
@@ -5,37 +5,35 @@
 [![Testrun test suite](https://github.com/google/testrun/actions/workflows/testing.yml/badge.svg?branch=main&event=push)](https://github.com/google/testrun/actions/workflows/testing.yml)
 
 ## Introduction :wave:
-Testrun automates specific test cases to verify network and security functionality in IoT devices. It is an open source tool which allows external manufacturers to test their devices for the purposes of Device Qualification within the BOS program.
+Testrun automates specific test cases to verify network and security functionality in IoT devices. It is an open source tool which allows manufacturers of IP capable devices to test their devices for the purposes of Device Qualification within the BOS program.
 
 ## Motivation :bulb:
-Without tools like Testrun, testing labs may be maintaining a large and complex network using equipment such as: A managed layer 3 switch, an enterprise-grade network router, virtualized or physical servers to provide DNS, NTP, 802.1x etc. With this amount of moving parts, all with dynamic configuration files and constant software updates, more time is likely to be spent on preparation and clean up of functinality or penetration testing - not forgetting the number of software tools required to perform the testing. The major issues which can and should be solved:
+Without tools like Testrun, test labs and engineers may need to  maintain a large and complex network coupled with dynamic configuration files and constant software updates. The major issues which can and should be solved are:
  1) The complexity of managing a testing network
  2) The time required to perform testing of network functionality
  3) The accuracy and consistency of testing network functionality
 
 ## How it works :triangular_ruler:
-Testrun creates an isolated and controlled network environment to fully simulate enterprise network deployments in your device testing lab. 
-This removes the necessity for complex hardware, advanced knowledge and networking experience whilst enabling semi-technical engineers to validate device 
-behaviour against industry cyber standards. 
+Testrun creates an isolated and controlled network environment on a linux machine. This removes the necessity for complex hardware, advanced knowledge and networking experience whilst enabling test engineers to validate device behaviour against Google’s Building Operating System requirements.
 
-Two runtime modes are supported by Testrun:
+Two modes are supported by Testrun:
 
 1) <strong>Automated testing</strong>
 
-Once the device has become operational (steady state), automated testing of the device under test will begin. Containerized test modules will then execute against the device (one module at a time). Once all test modules have completed execution, a final test report will be produced - presenting the results and further description of findings.
+Once the device has become operational (steady state), automated testing of the DUT (device under test) will begin. Containerized test modules will then execute against the device, one module at a time. Once all test modules have been executed, a report will be produced - presenting the results.
 
 2) <strong>Lab network</strong>
 
-Testrun cannot automate everything, and so additional manual testing may be required (or configuration changes may be required on the device). Rather than having to maintain a separate but idential lab network, Testrun will provide the network and some tools to assist an engineer performing the additional testing. At the same time, packet captures of the device behaviour will be recorded, alongside logs for each network service, for further debugging.
+When manual testing or configuration changes are required, Testrun will provide the network and some tools to assist an engineer performing the additional testing. This reduces the need to maintain a separate but identical lab network. Testrun will take care of packet captures and logs for each network service for further debugging.
 
 ## Minimum requirements :computer:
 ### Hardware
- - PC running Ubuntu LTS (laptop or desktop)
+ - PC running Ubuntu LTS 20.04 or 22.04 (laptop or desktop)
  - 2x USB ethernet adapter (One may be built in ethernet)
  - Internet connection
 ### Software
 - Docker - installation guide: [https://docs.docker.com/engine/install/ubuntu/#install-using-the-repository](https://docs.docker.com/engine/install/ubuntu/#install-using-the-repository)
-### Device
+### Device under test (DUT)
  - DHCP client - The device must be able to obtain an IP address via DHCP
 
 ## Get started ▶️
@@ -68,8 +66,7 @@ The contributing requirements can be found in [CONTRIBUTING.md](CONTRIBUTING.md)
   
 3) Can I run Testrun on a virtual machine?
 
-  Probably. Provided that the required 2x USB ethernet adapters are passed to the virtual machine as USB devices rather than network adapters, Testrun should
-  still work. We will look to test and approve the use of virtualisation to run Testrun in the future.
+  Testrun can be virtualized if the 2x ethernet adapters are passed through to a Virtual Box VM as a USB device rather than managed network adapters. A full guide will be provided once virtualization of Testrun has been fully tested.
 
  4) Can I connect multiple devices to Testrun?
 
diff --git a/cmd/build b/cmd/build
index 5143e8902..da67db00a 100755
--- a/cmd/build
+++ b/cmd/build
@@ -14,6 +14,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# Check if Docker is installed
+if [[ $(which docker) && $(docker --version) ]]; then
+    # Docker is installed
+    echo Using $(docker --version)
+  else
+    # Docker is not installed
+    echo Docker is not installed. Please follow the Get Started guide at https://github.com/google/testrun
+    exit 1
+fi
+
+# Stop any running containers
+echo Stopping any running containers
+running_containers=$(docker container ls -q --filter name=tr-*)
+if [ -n "$running_containers" ]; then
+  docker container kill $running_containers
+else
+  echo No containers were found running
+fi
+
 # Builds all docker images
 echo Building docker images
 
diff --git a/cmd/package b/cmd/package
index c4da2aeaf..87e66d977 100755
--- a/cmd/package
+++ b/cmd/package
@@ -44,7 +44,7 @@ mkdir -p $MAKE_SRC_DIR/usr/local/testrun/local/devices
 
 # Copy root_certs folder
 mkdir -p local/root_certs
-cp -r local/root_certs $MAKE_SRC_DIR/usr/local/testrun/local/root_certs
+cp -r local/root_certs $MAKE_SRC_DIR/usr/local/testrun/local/
 
 # Copy framework and modules into testrun folder
 cp -r {framework,modules} $MAKE_SRC_DIR/usr/local/testrun
@@ -53,4 +53,4 @@ cp -r {framework,modules} $MAKE_SRC_DIR/usr/local/testrun
 dpkg-deb --build --root-owner-group make
 
 # Rename the .deb file
-mv make.deb testrun_1-0-3_amd64.deb
\ No newline at end of file
+mv make.deb testrun_1-1_amd64.deb
diff --git a/cmd/prepare b/cmd/prepare
index 950051bd3..436af87ae 100755
--- a/cmd/prepare
+++ b/cmd/prepare
@@ -19,6 +19,6 @@
 
 echo Installing system dependencies
 
-sudo apt-get install openvswitch-common openvswitch-switch python3 libpangocairo-1.0-0
+sudo apt-get update && sudo apt-get install openvswitch-common openvswitch-switch python3 libpangocairo-1.0-0
 
 echo Finished installing system dependencies
diff --git a/docs/configure_device.md b/docs/configure_device.md
new file mode 100644
index 000000000..9eefcd866
--- /dev/null
+++ b/docs/configure_device.md
@@ -0,0 +1,29 @@
+# Device Configuration
+
+The device configuration file allows you to customize the testing behavior for a specific device. This file is located at `local/devices/{Device Name}/device_config.json`. Below is an overview of how to configure the device tests.
+
+## Device Information
+
+The device information section includes the manufacturer, model, and MAC address of the device. These details help identify the specific device being tested.
+
+## Test Modules
+
+Test modules are groups of tests that can be enabled or disabled as needed. You can choose which test modules to run on your device.
+
+### Enabling and Disabling Test Modules
+
+To enable or disable a test module, modify the `enabled` field within the respective module. Setting it to `true` enables the module, while setting it to `false` disables the module.
+
+## Customizing the Device Configuration
+
+To customize the device configuration for your specific device, follow these steps:
+
+1. Copy the default configuration file provided in the `resources/devices/template` folder.
+   - Create a new folder for your device under `local/devices` directory.
+   - Copy the `device_config.json` file from `resources/devices/template` to the newly created device folder.
+
+This ensures that you have a copy of the default configuration file, which you can then modify for your specific device.
+
+> Note: Ensure that the device configuration file is properly formatted, and the changes made align with the intended test behavior. Incorrect settings or syntax may lead to unexpected results during testing.
+
+If you encounter any issues or need assistance with the device configuration, refer to the Testrun documentation or ask a question on the Issues page.
diff --git a/docs/get_started.md b/docs/get_started.md
index 9e2315940..70215ac62 100644
--- a/docs/get_started.md
+++ b/docs/get_started.md
@@ -41,6 +41,8 @@ However, to achieve a compliant test outcome, your device must be configured cor
    - Testing data will be available in the ``local/devices/{device}/reports`` folders
    - Additional configuration options are available in the ``local/system.json`` file
 
+    **NOTE: Place your local CA certificate in local/root_certs (any name with a .crt extension) to perform TLS server tests**
+
 ## Start Testrun
 
 1. Attach network interfaces:
@@ -105,4 +107,4 @@ If you encounter any issues or need assistance, consider the following:
 - Refer to the Testrun documentation or ask for assistance in the issues page: https://github.com/google/testrun/issues
 
 # Uninstall
-To uninstall Testrun, use the built-in dpkg uninstall command to remove Testrun correctly. For Testrun, this would be:  ```sudo apt-get remove testrun```
\ No newline at end of file
+To uninstall Testrun, use the built-in dpkg uninstall command to remove Testrun correctly. For Testrun, this would be:  ```sudo apt-get remove testrun```
diff --git a/framework/python/src/api/api.py b/framework/python/src/api/api.py
index 919684cce..305310e7e 100644
--- a/framework/python/src/api/api.py
+++ b/framework/python/src/api/api.py
@@ -1,272 +1,438 @@
-# Copyright 2023 Google LLC
-#
-# 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
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from fastapi import FastAPI, APIRouter, Response, Request, status
-from fastapi.responses import FileResponse
-from fastapi.middleware.cors import CORSMiddleware
-import json
-from json import JSONDecodeError
-import os
-import psutil
-import threading
-import uvicorn
-
-from common import logger
-from common.device import Device
-
-LOGGER = logger.get_logger("api")
-
-DEVICE_MAC_ADDR_KEY = "mac_addr"
-DEVICE_MANUFACTURER_KEY = "manufacturer"
-DEVICE_MODEL_KEY = "model"
-DEVICE_TEST_MODULES_KEY = "test_modules"
-DEVICES_PATH = "/usr/local/testrun/local/devices"
-
-class Api:
-  """Provide REST endpoints to manage Testrun"""
-
-  def __init__(self, test_run):
-
-    self._test_run = test_run
-    self._name = "TestRun API"
-    self._router = APIRouter()
-
-    self._session = self._test_run.get_session()
-
-    self._router.add_api_route("/system/interfaces", self.get_sys_interfaces)
-    self._router.add_api_route("/system/config", self.post_sys_config,
-                              methods=["POST"])
-    self._router.add_api_route("/system/config", self.get_sys_config)
-    self._router.add_api_route("/system/start", self.start_test_run,
-                               methods=["POST"])
-    self._router.add_api_route("/system/stop", self.stop_test_run,
-                               methods=["POST"])
-    self._router.add_api_route("/system/status", self.get_status)
-
-    self._router.add_api_route("/history", self.get_history)
-    self._router.add_api_route("/report/{device_name}/{timestamp}",
-                               self.get_report)
-
-    self._router.add_api_route("/devices", self.get_devices)
-    self._router.add_api_route("/device", self.save_device, methods=["POST"])
-
-    # TODO: Make this configurable in system.json
-    origins = ["http://localhost:8080", "http://localhost:4200"]
-
-    self._app = FastAPI()
-    self._app.include_router(self._router)
-    self._app.add_middleware(
-      CORSMiddleware,
-      allow_origins=origins,
-      allow_credentials=True,
-      allow_methods=["*"],
-      allow_headers=["*"],
-    )
-
-    self._api_thread = threading.Thread(target=self._start,
-                                        name="Testrun API",
-                                        daemon=True)
-
-  def start(self):
-    LOGGER.info("Starting API")
-    self._api_thread.start()
-    LOGGER.info("API waiting for requests")
-
-  def _start(self):
-    uvicorn.run(self._app, log_config=None, port=self._session.get_api_port())
-
-  def stop(self):
-    LOGGER.info("Stopping API")
-
-  async def get_sys_interfaces(self):
-    addrs = psutil.net_if_addrs()
-    ifaces = []
-    for iface in addrs:
-      ifaces.append(iface)
-    return ifaces
-
-  async def post_sys_config(self, request: Request, response: Response):
-    try:
-      config = (await request.body()).decode("UTF-8")
-      config_json = json.loads(config)
-      self._session.set_config(config_json)
-    # Catch JSON Decode error etc
-    except JSONDecodeError:
-      response.status_code = status.HTTP_400_BAD_REQUEST
-      return self._generate_msg(False, "Invalid JSON received")
-    return self._session.get_config()
-
-  async def get_sys_config(self):
-    return self._session.get_config()
-
-  async def get_devices(self):
-    return self._session.get_device_repository()
-
-  async def start_test_run(self, request: Request, response: Response):
-
-    LOGGER.debug("Received start command")
-
-    # Check request is valid
-    body = (await request.body()).decode("UTF-8")
-    body_json = None
-
-    try:
-      body_json = json.loads(body)
-    except JSONDecodeError:
-      response.status_code = status.HTTP_400_BAD_REQUEST
-      return self._generate_msg(False, "Invalid JSON received")
-
-    if "device" not in body_json or not (
-      "mac_addr" in body_json["device"] and
-      "firmware" in body_json["device"]):
-      response.status_code = status.HTTP_400_BAD_REQUEST
-      return self._generate_msg(False, "Invalid request received")
-
-    device = self._session.get_device(body_json["device"]["mac_addr"])
-
-    # Check Testrun is not already running
-    if self._test_run.get_session().get_status() in [
-        "In Progress",
-        "Waiting for Device",
-      ]:
-      LOGGER.debug("Testrun is already running. Cannot start another instance")
-      response.status_code = status.HTTP_409_CONFLICT
-      return self._generate_msg(False, "Testrun is already running")
-
-    # Check if requested device is known in the device repository
-    if device is None:
-      response.status_code = status.HTTP_404_NOT_FOUND
-      return self._generate_msg(
-        False,
-        "A device with that MAC address could not be found")
-
-    device.firmware = body_json["device"]["firmware"]
-
-    # Check Testrun is able to start
-    if self._test_run.get_net_orc().check_config() is False:
-      response.status_code = status.HTTP_500_INTERNAL_SERVER_ERROR
-      return self._generate_msg(False,"Configured interfaces are not " +
-                                "ready for use. Ensure required interfaces " +
-                                "are connected.")
-
-    self._test_run.get_session().reset()
-    self._test_run.get_session().set_target_device(device)
-    LOGGER.info("Starting Testrun with device target " +
-                f"{device.manufacturer} {device.model} with " +
-                f"MAC address {device.mac_addr}")
-
-    thread = threading.Thread(target=self._start_test_run,
-                                        name="Testrun")
-    thread.start()
-    return self._test_run.get_session().to_json()
-
-  def _generate_msg(self, success, message):
-    msg_type = "success"
-    if not success:
-      msg_type = "error"
-    return json.loads('{"' + msg_type + '": "' + message + '"}')
-
-  def _start_test_run(self):
-    self._test_run.start()
-
-  async def stop_test_run(self):
-    LOGGER.debug("Received stop command. Stopping Testrun")
-
-    # TODO: Set status of 'Stopping'?
-    self._test_run.stop()
-
-    return self._generate_msg(True, "Testrun stopped")
-
-  async def get_status(self):
-    return self._test_run.get_session().to_json()
-
-  async def get_history(self):
-    LOGGER.debug("Received history list request")
-    return self._session.get_all_reports()
-
-  async def save_device(self, request: Request, response: Response):
-    LOGGER.debug("Received device post request")
-
-    try:
-      device_raw = (await request.body()).decode("UTF-8")
-      device_json = json.loads(device_raw)
-
-      if not self._validate_device_json(device_json):
-        response.status_code = status.HTTP_400_BAD_REQUEST
-        return self._generate_msg(False, "Invalid request received")
-
-      device = self._session.get_device(device_json.get(DEVICE_MAC_ADDR_KEY))
-
-      if device is None:
-
-        # Create new device
-        device = Device()
-        device.mac_addr = device_json.get(DEVICE_MAC_ADDR_KEY).lower()
-        device.manufacturer = device_json.get(DEVICE_MANUFACTURER_KEY)
-        device.model = device_json.get(DEVICE_MODEL_KEY)
-        device.device_folder = device.manufacturer + " " + device.model
-        device.test_modules = device_json.get(DEVICE_TEST_MODULES_KEY)
-
-        self._test_run.create_device(device)
-        response.status_code = status.HTTP_201_CREATED
-
-      else:
-
-        self._test_run.save_device(device, device_json)
-        response.status_code = status.HTTP_200_OK
-
-      return device.to_config_json()
-
-    # Catch JSON Decode error etc
-    except JSONDecodeError:
-      response.status_code = status.HTTP_400_BAD_REQUEST
-      return self._generate_msg(False, "Invalid JSON received")
-
-  async def get_report(self, response: Response,
-                       device_name, timestamp):
-
-    file_path = os.path.join(DEVICES_PATH, device_name, "reports",
-                             timestamp, "report.pdf")
-    LOGGER.debug(f"Received get report request for {device_name} / {timestamp}")
-    if os.path.isfile(file_path):
-      return FileResponse(file_path)
-    else:
-      LOGGER.info("Report could not be found, returning 404")
-      response.status_code = 404
-      return self._generate_msg(False, "Report could not be found")
-
-  def _validate_device_json(self, json_obj):
-
-    # Check all required properties are present
-    if not (DEVICE_MAC_ADDR_KEY in json_obj and
-            DEVICE_MANUFACTURER_KEY in json_obj and
-            DEVICE_MODEL_KEY in json_obj
-    ):
-      return False
-
-    # Check length of strings
-    if len(json_obj.get(DEVICE_MANUFACTURER_KEY)) > 64 or len(
-      json_obj.get(DEVICE_MODEL_KEY)) > 64:
-      return False
-
-    disallowed_chars = ["/", "\\", "\'", "\"", ";"]
-    for char in json_obj.get(DEVICE_MANUFACTURER_KEY):
-      if char in disallowed_chars:
-        return False
-
-    for char in json_obj.get(DEVICE_MODEL_KEY):
-      if char in disallowed_chars:
-        return False
-
-    return True
\ No newline at end of file
+# Copyright 2023 Google LLC
+#
+# 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
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from fastapi import FastAPI, APIRouter, Response, Request, status
+from fastapi.responses import FileResponse
+from fastapi.middleware.cors import CORSMiddleware
+from datetime import datetime
+import json
+from json import JSONDecodeError
+import os
+import psutil
+import requests
+import threading
+import uvicorn
+from urllib.parse import urlparse
+
+from common import logger
+from common.device import Device
+
+LOGGER = logger.get_logger("api")
+
+DEVICE_MAC_ADDR_KEY = "mac_addr"
+DEVICE_MANUFACTURER_KEY = "manufacturer"
+DEVICE_MODEL_KEY = "model"
+DEVICE_TEST_MODULES_KEY = "test_modules"
+DEVICES_PATH = "/usr/local/testrun/local/devices"
+DEFAULT_DEVICE_INTF = "enx123456789123"
+
+LATEST_RELEASE_CHECK = "https://api.github.com/repos/google/testrun/releases/latest"
+
+class Api:
+  """Provide REST endpoints to manage Testrun"""
+
+  def __init__(self, test_run):
+
+    self._test_run = test_run
+    self._name = "TestRun API"
+    self._router = APIRouter()
+
+    self._session = self._test_run.get_session()
+
+    self._router.add_api_route("/system/interfaces", self.get_sys_interfaces)
+    self._router.add_api_route("/system/config", self.post_sys_config,
+                              methods=["POST"])
+    self._router.add_api_route("/system/config", self.get_sys_config)
+    self._router.add_api_route("/system/start", self.start_test_run,
+                               methods=["POST"])
+    self._router.add_api_route("/system/stop", self.stop_test_run,
+                               methods=["POST"])
+    self._router.add_api_route("/system/status", self.get_status)
+
+    self._router.add_api_route("/system/version", self.get_version)
+
+    # Deprecated: /history will be removed in version 1.1
+    self._router.add_api_route("/history", self.get_reports)
+
+    self._router.add_api_route("/reports", self.get_reports)
+    self._router.add_api_route("/report",
+                               self.delete_report,
+                               methods=["DELETE"])
+    self._router.add_api_route("/report/{device_name}/{timestamp}",
+                               self.get_report)
+
+    self._router.add_api_route("/devices", self.get_devices)
+    self._router.add_api_route("/device",
+                               self.delete_device,
+                               methods=["DELETE"])
+    self._router.add_api_route("/device", self.save_device, methods=["POST"])
+
+    # Allow all origins to access the API
+    origins = ["*"]
+
+    self._app = FastAPI()
+    self._app.include_router(self._router)
+    self._app.add_middleware(
+      CORSMiddleware,
+      allow_origins=origins,
+      allow_credentials=True,
+      allow_methods=["*"],
+      allow_headers=["*"],
+    )
+
+    self._api_thread = threading.Thread(target=self._start,
+                                        name="Testrun API",
+                                        daemon=True)
+
+  def start(self):
+    LOGGER.info("Starting API")
+    self._api_thread.start()
+    LOGGER.info("API waiting for requests")
+
+  def _start(self):
+    uvicorn.run(self._app,
+                log_config=None,
+                host="0.0.0.0",
+                port=self._session.get_api_port())
+
+  def stop(self):
+    LOGGER.info("Stopping API")
+
+  async def get_sys_interfaces(self):
+    addrs = psutil.net_if_addrs()
+    ifaces = []
+    for iface in addrs:
+
+      # Ignore any interfaces that are not ethernet
+      if not (iface.startswith("en") or iface.startswith("eth")):
+        continue
+
+      ifaces.append(iface)
+
+    return ifaces
+
+  async def post_sys_config(self, request: Request, response: Response):
+    try:
+      config = (await request.body()).decode("UTF-8")
+      config_json = json.loads(config)
+      self._session.set_config(config_json)
+    # Catch JSON Decode error etc
+    except JSONDecodeError:
+      response.status_code = status.HTTP_400_BAD_REQUEST
+      return self._generate_msg(False, "Invalid JSON received")
+    return self._session.get_config()
+
+  async def get_sys_config(self):
+    return self._session.get_config()
+
+  async def get_devices(self):
+    return self._session.get_device_repository()
+
+  async def start_test_run(self, request: Request, response: Response):
+
+    LOGGER.debug("Received start command")
+
+    # Check request is valid
+    body = (await request.body()).decode("UTF-8")
+    body_json = None
+
+    try:
+      body_json = json.loads(body)
+    except JSONDecodeError:
+      response.status_code = status.HTTP_400_BAD_REQUEST
+      return self._generate_msg(False, "Invalid JSON received")
+
+    if "device" not in body_json or not (
+      "mac_addr" in body_json["device"] and
+      "firmware" in body_json["device"]):
+      response.status_code = status.HTTP_400_BAD_REQUEST
+      return self._generate_msg(False, "Invalid request received")
+
+    device = self._session.get_device(body_json["device"]["mac_addr"])
+
+    # Check Testrun is not already running
+    if self._test_run.get_session().get_status() in [
+        "In Progress",
+        "Waiting for Device",
+        "Monitoring"
+      ]:
+      LOGGER.debug("Testrun is already running. Cannot start another instance")
+      response.status_code = status.HTTP_409_CONFLICT
+      return self._generate_msg(False, "Testrun is already running")
+
+    # Check if requested device is known in the device repository
+    if device is None:
+      response.status_code = status.HTTP_404_NOT_FOUND
+      return self._generate_msg(
+        False,
+        "A device with that MAC address could not be found")
+
+    device.firmware = body_json["device"]["firmware"]
+
+    # Check if config has been updated (device interface not default)
+    if (self._test_run.get_session().get_device_interface()
+        == DEFAULT_DEVICE_INTF):
+      response.status_code = status.HTTP_400_BAD_REQUEST
+      return self._generate_msg(False,"Testrun configuration has not yet " +
+                                "been completed.")
+
+    # Check Testrun is able to start
+    if self._test_run.get_net_orc().check_config() is False:
+      response.status_code = status.HTTP_500_INTERNAL_SERVER_ERROR
+      return self._generate_msg(False,"Configured interfaces are not " +
+                                "ready for use. Ensure required interfaces " +
+                                "are connected.")
+
+    LOGGER.info("Starting Testrun with device target " +
+                f"{device.manufacturer} {device.model} with " +
+                f"MAC address {device.mac_addr}")
+
+    thread = threading.Thread(target=self._start_test_run,
+                                        name="Testrun")
+    thread.start()
+
+    self._test_run.get_session().set_target_device(device)
+
+    return self._test_run.get_session().to_json()
+
+  def _generate_msg(self, success, message):
+    msg_type = "success"
+    if not success:
+      msg_type = "error"
+    return json.loads('{"' + msg_type + '": "' + message + '"}')
+
+  def _start_test_run(self):
+    self._test_run.start()
+
+  async def stop_test_run(self):
+    LOGGER.debug("Received stop command. Stopping Testrun")
+
+    self._test_run.stop()
+
+    return self._generate_msg(True, "Testrun stopped")
+
+  async def get_status(self):
+    return self._test_run.get_session().to_json()
+
+  async def get_version(self, response: Response):
+    json_response = {}
+
+    # Obtain the current version
+    current_version = self._session.get_version()
+
+    # Check if current version was able to be obtained
+    if current_version is None:
+      response.status_code = 500
+      return self._generate_msg(False, "Could not fetch current version")
+
+    # Set the installed version
+    json_response["installed_version"] = "v" + current_version
+
+    # Check latest version number from GitHub API
+    version_check = requests.get(LATEST_RELEASE_CHECK, timeout=5)
+
+    # Check OK response was received
+    if version_check.status_code != 200:
+      response.status_code = 500
+      LOGGER.error(version_check.content)
+      return self._generate_msg(False, "Failed to fetch latest version")
+
+    # Extract version number from response, removing the leading 'v'
+    latest_version_no = version_check.json()["name"].strip("v")
+    LOGGER.debug(f"Latest version available is {latest_version_no}")
+
+    # Craft JSON response
+    json_response["latest_version"] = "v" + latest_version_no
+    json_response["latest_version_url"] = version_check.json()["html_url"]
+
+    # String comparison between current and latest version
+    if latest_version_no > current_version:
+      json_response["update_available"] = True
+      LOGGER.debug("An update is available")
+    else:
+      json_response["update_available"] = False
+      LOGGER.debug("The latest version is installed")
+
+    return json_response
+
+  async def get_reports(self, request: Request):
+    LOGGER.debug("Received reports list request")
+    # Resolve the server IP from the request so we
+    # can fix the report URL
+    client_origin = request.headers.get("Origin")
+    parsed_url = urlparse(client_origin)
+    server_ip = parsed_url.hostname  # This will give you the IP address
+
+    reports = self._session.get_all_reports()
+    for report in reports:
+      # report URL is currently hard coded as localhost so we can
+      # replace that to fix the IP dynamically from the requester
+      report["report"] = report["report"].replace("localhost",server_ip)
+    return reports
+
+  async def delete_report(self, request: Request, response: Response):
+
+    body_raw = (await request.body()).decode("UTF-8")
+
+    if len(body_raw) == 0:
+      response.status_code = 400
+      return self._generate_msg(False, "Invalid request received")
+
+    body_json = json.loads(body_raw)
+
+    if "mac_addr" not in body_json or "timestamp" not in body_json:
+      response.status_code = 400
+      return self._generate_msg(False, "Invalid request received")
+
+    mac_addr = body_json.get("mac_addr").lower()
+    timestamp = body_json.get("timestamp")
+    parsed_timestamp = datetime.strptime(timestamp, "%Y-%m-%d %H:%M:%S")
+    timestamp_formatted = parsed_timestamp.strftime("%Y-%m-%dT%H:%M:%S")
+
+    # Get device from MAC address
+    device = self._session.get_device(mac_addr)
+
+    if device is None:
+      response.status_code = 404
+      return self._generate_msg(False, "Could not find device")
+
+    if self._test_run.delete_report(device, timestamp_formatted):
+      return self._generate_msg(True, "Deleted report")
+
+    response.status_code = 500
+    return self._generate_msg(False, "Error occured whilst deleting report")
+
+  async def delete_device(self, request: Request, response: Response):
+
+    LOGGER.debug("Received device delete request")
+
+    try:
+
+      # Extract MAC address from request body
+      device_raw = (await request.body()).decode("UTF-8")
+      device_json = json.loads(device_raw)
+
+      # Validate that mac_addr has been specified in the body
+      if "mac_addr" not in device_json:
+        response.status_code = 400
+        return self._generate_msg(False, "Invalid request received")
+
+      mac_addr = device_json.get("mac_addr").lower()
+
+      # Check that device exists
+      device = self._test_run.get_session().get_device(mac_addr)
+
+      if device is None:
+        response.status_code = 404
+        return self._generate_msg(False, "Device not found")
+
+      # Check that Testrun is not currently running against this device
+      if (self._session.get_target_device() == device and
+          self._session.get_status() not in [
+            "Cancelled",
+            "Compliant",
+            "Non-Compliant"]):
+        response.status_code = 403
+        return self._generate_msg(False, "Cannot delete this device whilst " +
+                                  "it is being tested")
+
+      # Delete device
+      self._test_run.delete_device(device)
+
+      # Return success response
+      response.status_code = 200
+      return self._generate_msg(True, "Successfully deleted the device")
+
+    # TODO: Find specific exception to catch
+    except Exception as e:
+      LOGGER.error(e)
+      response.status_code = 500
+      return self._generate_msg(False, "An error occured whilst deleting " +
+                                "the device")
+
+  async def save_device(self, request: Request, response: Response):
+    LOGGER.debug("Received device post request")
+
+    try:
+      device_raw = (await request.body()).decode("UTF-8")
+      device_json = json.loads(device_raw)
+
+      if not self._validate_device_json(device_json):
+        response.status_code = status.HTTP_400_BAD_REQUEST
+        return self._generate_msg(False, "Invalid request received")
+
+      device = self._session.get_device(device_json.get(DEVICE_MAC_ADDR_KEY))
+
+      if device is None:
+
+        # Create new device
+        device = Device()
+        device.mac_addr = device_json.get(DEVICE_MAC_ADDR_KEY).lower()
+        device.manufacturer = device_json.get(DEVICE_MANUFACTURER_KEY)
+        device.model = device_json.get(DEVICE_MODEL_KEY)
+        device.device_folder = device.manufacturer + " " + device.model
+        device.test_modules = device_json.get(DEVICE_TEST_MODULES_KEY)
+
+        self._test_run.create_device(device)
+        response.status_code = status.HTTP_201_CREATED
+
+      else:
+
+        self._test_run.save_device(device, device_json)
+        response.status_code = status.HTTP_200_OK
+
+      return device.to_config_json()
+
+    # Catch JSON Decode error etc
+    except JSONDecodeError:
+      response.status_code = status.HTTP_400_BAD_REQUEST
+      return self._generate_msg(False, "Invalid JSON received")
+
+  async def get_report(self, response: Response,
+                       device_name, timestamp):
+
+    file_path = os.path.join(DEVICES_PATH, device_name, "reports",
+                             timestamp, "report.pdf")
+    LOGGER.debug(f"Received get report request for {device_name} / {timestamp}")
+    if os.path.isfile(file_path):
+      return FileResponse(file_path)
+    else:
+      LOGGER.info("Report could not be found, returning 404")
+      response.status_code = 404
+      return self._generate_msg(False, "Report could not be found")
+
+  def _validate_device_json(self, json_obj):
+
+    # Check all required properties are present
+    if not (DEVICE_MAC_ADDR_KEY in json_obj and
+            DEVICE_MANUFACTURER_KEY in json_obj and
+            DEVICE_MODEL_KEY in json_obj
+    ):
+      return False
+
+    # Check length of strings
+    if len(json_obj.get(DEVICE_MANUFACTURER_KEY)) > 64 or len(
+      json_obj.get(DEVICE_MODEL_KEY)) > 64:
+      return False
+
+    disallowed_chars = ["/", "\\", "\'", "\"", ";"]
+    for char in json_obj.get(DEVICE_MANUFACTURER_KEY):
+      if char in disallowed_chars:
+        return False
+
+    for char in json_obj.get(DEVICE_MODEL_KEY):
+      if char in disallowed_chars:
+        return False
+
+    return True
diff --git a/framework/python/src/common/device.py b/framework/python/src/common/device.py
index cb666f89a..979344eb4 100644
--- a/framework/python/src/common/device.py
+++ b/framework/python/src/common/device.py
@@ -30,6 +30,7 @@ class Device():
   ip_addr: str = None
   firmware: str = None
   device_folder: str = None
+  reports: List[TestReport] = field(default_factory=list)
   max_device_reports: int = None
   reports: List[TestReport] = field(default_factory=list)
 
@@ -43,7 +44,8 @@ def remove_report(self, timestamp):
 
     remove_report_target = None
     for report in self.reports:
-      if report.get_started() == timestamp:
+      report_timestamp = report.get_started().strftime('%Y-%m-%dT%H:%M:%S')
+      if report_timestamp == timestamp:
         remove_report_target = report
 
     if remove_report_target is not None:
@@ -58,6 +60,7 @@ def to_dict(self):
     device_json['model'] = self.model
     if self.firmware is not None:
       device_json['firmware'] = self.firmware
+    device_json['test_modules'] = self.test_modules
     return device_json
 
   def to_config_json(self):
diff --git a/framework/python/src/common/session.py b/framework/python/src/common/session.py
index d82bdbf62..70442e9ff 100644
--- a/framework/python/src/common/session.py
+++ b/framework/python/src/common/session.py
@@ -42,6 +42,10 @@ def __init__(self, config_file):
     self._runtime_params = []
     self._device_repository = []
     self._total_tests = 0
+
+    self._version = None
+    self._load_version()
+
     self._config_file = config_file
     self._config = self._get_default_config()
     self._load_config()
@@ -121,6 +125,18 @@ def _load_config(self):
 
       LOGGER.debug(self._config)
 
+  def _load_version(self):
+    version_cmd = util.run_command(
+      'dpkg-query --showformat=\'${Version}\' --show testrun')
+
+    if version_cmd:
+      version = version_cmd[0]
+      LOGGER.info(f'Running Testrun version {version}')
+    self._version = version
+
+  def get_version(self):
+    return self._version
+
   def _save_config(self):
     with open(self._config_file, 'w', encoding='utf-8') as f:
       f.write(json.dumps(self._config, indent=2))
@@ -174,10 +190,13 @@ def clear_device_repository(self):
 
   def get_device(self, mac_addr):
     for device in self._device_repository:
-      if device.mac_addr == mac_addr:
+      if device.mac_addr.lower() == mac_addr.lower():
         return device
     return None
 
+  def remove_device(self, device):
+    self._device_repository.remove(device)
+
   def get_status(self):
     return self._status
 
diff --git a/framework/python/src/common/testreport.py b/framework/python/src/common/testreport.py
index 28a3d4d31..0ac4cb9a6 100644
--- a/framework/python/src/common/testreport.py
+++ b/framework/python/src/common/testreport.py
@@ -17,6 +17,7 @@
 from datetime import datetime
 from weasyprint import HTML
 from io import BytesIO
+from common import util
 import base64
 import os
 
@@ -94,6 +95,9 @@ def from_json(self, json_file):
     if 'firmware' in json_file['device']:
       self._device['firmware'] = json_file['device']['firmware']
 
+    if 'test_modules' in json_file['device']:
+      self._device['test_modules'] = json_file['device']['test_modules']
+
     self._status = json_file['status']
     self._started = datetime.strptime(json_file['started'], DATE_TIME_FORMAT)
     self._finished = datetime.strptime(json_file['finished'], DATE_TIME_FORMAT)
@@ -178,8 +182,7 @@ def generate_pages(self, json_data):
 
   def generate_page(self, json_data, page_num, max_page):
     # Placeholder until available in json report
-
-    version = 'v1.0.3 (2023-11-14)'
+    version = 'v1.1 (2023-12-15)'
     page = '<div class="page">'
     page += self.generate_header(json_data)
     if page_num == 1:
@@ -191,7 +194,7 @@ def generate_page(self, json_data, page_num, max_page):
       page += '<div style="break-after:page"></div>'
     return page
 
-  def generate_body(self, json_data, page_num=1, max_page=1):
+  def generate_body(self, json_data):
     return f'''
     <body>
       {self.generate_pages(json_data)}
@@ -269,11 +272,15 @@ def generate_summary(self, json_data):
       <div class="summary-vertical-line"></div>
      '''
     # Add the device information
-    manufacturer = json_data['device']['manufacturer'] if 'manufacturer' in json_data['device']  else 'Undefined'
-    model = json_data['device']['model'] if 'model' in json_data['device']  else 'Undefined'
-    fw = json_data['device']['firmware'] if 'firmware' in json_data['device']  else 'Undefined'
-    mac = json_data['device']['mac_addr'] if 'mac_addr' in json_data['device']  else 'Undefined'
-    
+    manufacturer = (json_data['device']['manufacturer']
+                    if 'manufacturer' in json_data['device'] else 'Undefined')
+    model = (json_data['device']['model']
+             if 'model' in json_data['device'] else 'Undefined')
+    fw = (json_data['device']['firmware']
+          if 'firmware' in json_data['device'] else 'Undefined')
+    mac = (json_data['device']['mac_addr']
+           if 'mac_addr' in json_data['device'] else 'Undefined')
+
     summary += self.generate_device_summary_label('Manufacturer',manufacturer)
     summary += self.generate_device_summary_label('Model',model)
     summary += self.generate_device_summary_label('Firmware',fw)
@@ -282,20 +289,66 @@ def generate_summary(self, json_data):
       mac,
       trailing_space=False)
 
+    # Add device configuration
+    summary += '''
+    <div class="summary-device-modules">
+      <div class="summary-item-label" style="margin-bottom:10px;">
+        Device Configuration
+      </div>
+    '''
+
+    if 'test_modules' in json_data['device']:
+
+      sorted_modules = {}
+
+      for test_module in json_data['device']['test_modules']:
+        if 'enabled' in json_data['device']['test_modules'][test_module]:
+          sorted_modules[test_module] = json_data['device']['test_modules'][
+            test_module]['enabled']
+
+      # Sort the modules by enabled first
+      sorted_modules = sorted(sorted_modules.items(),
+                              key=lambda x:x[1],
+                              reverse=True)
+
+      for module in sorted_modules:
+        summary += self.generate_device_module_label(
+          module[0],
+          module[1]
+        )
+
+    summary += '</div>'
+
     # Add the result summary
     summary += self.generate_result_summary(json_data)
 
     summary += '\n</div>'
     return summary
 
+  def generate_device_module_label(self, module, enabled):
+    label = '<div class="summary-device-module-label">'
+    if enabled:
+      label += '<span style="color:#34a853">✔ </span>'
+    else:
+      label += '<span style="color:#ea4335">✖ </span>'
+    label += util.get_module_display_name(module)
+    label += '</div>'
+    return label
+
   def generate_result_summary(self,json_data):
     if json_data['status'] == 'Compliant':
-      result_summary = '''<div class ="summary-color-box summary-box-compliant">'''
+      result_summary = '''<div class ="summary-color-box
+      summary-box-compliant">'''
     else:
-      result_summary = '''<div class ="summary-color-box summary-box-non-compliant">'''
-    result_summary += self.generate_result_summary_item('Test status', 'Complete')
-    result_summary += self.generate_result_summary_item('Test result', json_data['status'], style='color: white; font-size:24px; font-weight: 700;')
-    result_summary += self.generate_result_summary_item('Started', json_data['started'])
+      result_summary = '''<div class ="summary-color-box
+      summary-box-non-compliant">'''
+    result_summary += self.generate_result_summary_item('Test status',
+                                                        'Complete')
+    result_summary += self.generate_result_summary_item(
+      'Test result',json_data['status'],
+      style='color: white; font-size:24px; font-weight: 700;')
+    result_summary += self.generate_result_summary_item('Started',
+                                                        json_data['started'])
 
     # Convert the timestamp strings to datetime objects
     start_time = datetime.strptime(json_data['started'], '%Y-%m-%d %H:%M:%S')
@@ -312,7 +365,8 @@ def generate_result_summary(self,json_data):
   def generate_result_summary_item(self, key, value, style=None):
     summary_item = f'''<div class="summary-box-label">{key}</div>'''
     if style is not None:
-      summary_item += f'''<div style="{style}" class="summary-box-value">{value}</div>'''
+      summary_item += f'''<div style="{style}"
+      class="summary-box-value">{value}</div>'''
     else:
       summary_item += f'''<div class="summary-box-value">{value}</div>'''
     return summary_item
@@ -438,6 +492,20 @@ def generate_css(self):
       margin: 0;
     }
 
+    .summary-device-modules {
+      position: absolute;
+      left: 3.2in;
+      top: .3in;
+    }
+
+    .summary-device-module-label {
+      font-size: 16px;
+      font-weight: 500;
+      color: #202124;
+      width: fit-content;
+      margin-bottom: 0.1in;
+    }
+
     .summary-vertical-line {
       width: 1px;
       height: var(--vertical-line-height);
diff --git a/framework/python/src/common/util.py b/framework/python/src/common/util.py
index 3916ce141..098c478d3 100644
--- a/framework/python/src/common/util.py
+++ b/framework/python/src/common/util.py
@@ -96,3 +96,18 @@ def get_user():
 
 def set_file_owner(path, owner):
   run_command(f'chown -R {owner} {path}')
+
+def get_module_display_name(search):
+  modules = {
+    'ntp': 'NTP',
+    'dns': 'DNS',
+    'connection': 'Connection',
+    'nmap': 'Services',
+    'tls': 'TLS'
+  }
+
+  for module in modules.items():
+    if search == module[0]:
+      return module[1]
+
+  return 'Unknown'
diff --git a/framework/python/src/core/test_runner.py b/framework/python/src/core/test_runner.py
index f3db52eec..aa0668a66 100644
--- a/framework/python/src/core/test_runner.py
+++ b/framework/python/src/core/test_runner.py
@@ -61,8 +61,8 @@ def _exit_handler(self, signum, arg):  # pylint: disable=unused-argument
       self._stop(True)
       sys.exit(1)
 
-  def stop(self, kill=False):
-    self.test_run.stop(kill)
+  def stop(self):
+    self.test_run.stop()
 
 
 def parse_args():
diff --git a/framework/python/src/core/testrun.py b/framework/python/src/core/testrun.py
index 98ab9ebe6..48e31c721 100644
--- a/framework/python/src/core/testrun.py
+++ b/framework/python/src/core/testrun.py
@@ -23,8 +23,9 @@
 import docker
 import json
 import os
-import sys
+import shutil
 import signal
+import sys
 import time
 from common import logger, util
 from common.device import Device
@@ -104,7 +105,7 @@ def __init__(self,
 
     if self._no_ui:
 
-      # Check Test Run is able to start
+      # Check Testrun is able to start
       if self.get_net_orc().check_config() is False:
         return
 
@@ -128,7 +129,7 @@ def load_all_devices(self):
     self._session.clear_device_repository()
     self._load_devices(device_dir=LOCAL_DEVICES_DIR)
 
-    # Temporarily removing loading of template device 
+    # Temporarily removing loading of template device
     # configs (feature not required yet)
     # self._load_devices(device_dir=RESOURCE_DEVICES_DIR)
     return self.get_session().get_device_repository()
@@ -146,7 +147,8 @@ def _load_devices(self, device_dir):
 
       # Check if device config file exists before loading
       if not os.path.exists(device_config_file_path):
-        LOGGER.error(f'Device configuration file missing from device {device_folder}')
+        LOGGER.error('Device configuration file missing ' +
+                     f'from device {device_folder}')
         continue
 
       # Open device config file
@@ -181,6 +183,8 @@ def _load_devices(self, device_dir):
 
   def _load_test_reports(self, device):
 
+    LOGGER.debug(f'Loading test reports for device {device.model}')
+
     # Locate reports folder
     reports_folder = os.path.join(root_dir,
                                   LOCAL_DEVICES_DIR,
@@ -209,6 +213,27 @@ def _load_test_reports(self, device):
         test_report.from_json(report_json)
         device.add_report(test_report)
 
+  def delete_report(self, device: Device, timestamp):
+    LOGGER.debug(f'Deleting test report for device {device.model} ' +
+                 f'at {timestamp}')
+
+    # Locate reports folder
+    reports_folder = os.path.join(root_dir,
+                                  LOCAL_DEVICES_DIR,
+                                  device.device_folder, 'reports')
+
+    # Check if reports folder exists (device may have no reports)
+    if not os.path.exists(reports_folder):
+      return False
+
+    for report_folder in os.listdir(reports_folder):
+      if report_folder == timestamp:
+        shutil.rmtree(os.path.join(reports_folder, report_folder))
+        device.remove_report(timestamp)
+        return True
+
+    return False
+
   def create_device(self, device: Device):
 
     # Define the device folder location
@@ -256,6 +281,19 @@ def save_device(self, device: Device, device_json):
 
     return device.to_config_json()
 
+  def delete_device(self, device: Device):
+
+    # Obtain the config file path
+    device_folder = os.path.join(root_dir,
+                                  LOCAL_DEVICES_DIR,
+                                  device.device_folder)
+
+    # Delete the device directory
+    shutil.rmtree(device_folder)
+
+    # Remove the device from the current session device repository
+    self.get_session().remove_device(device)
+
   def start(self):
 
     self.get_session().start()
@@ -279,21 +317,21 @@ def start(self):
 
     self.get_net_orc().start_listener()
     LOGGER.info('Waiting for devices on the network...')
-    self._set_status('Waiting for Device')
 
     # Keep application running until stopped
     while True:
       time.sleep(5)
 
-  def stop(self, kill=False):
+  def stop(self):
 
     # Prevent discovering new devices whilst stopping
     if self.get_net_orc().get_listener() is not None:
       self.get_net_orc().get_listener().stop_listener()
 
+    self.get_session().set_status('Stopping')
+
     self._stop_tests()
-    self._stop_network(kill=kill)
-    self._stop_ui()
+    self._stop_network(kill=True)
     self.get_session().set_status('Cancelled')
 
   def _register_exits(self):
@@ -306,7 +344,8 @@ def _exit_handler(self, signum, arg):  # pylint: disable=unused-argument
     LOGGER.debug('Exit signal received: ' + str(signum))
     if signum in (2, signal.SIGTERM):
       LOGGER.info('Exit signal received.')
-      self.stop(kill=True)
+      self.stop()
+      self._stop_ui()
       sys.exit(1)
 
   def _get_config_abs(self, config_file=None):
@@ -326,11 +365,11 @@ def get_net_orc(self):
   def _start_network(self):
     # Start the network orchestrator
     if not self.get_net_orc().start():
-      self.stop(kill=True)
+      self.stop()
       sys.exit(1)
 
-  def _stop_network(self, kill=False):
-    self.get_net_orc().stop(kill=kill)
+  def _stop_network(self, kill=True):
+    self.get_net_orc().stop(kill)
 
   def _stop_tests(self):
     self._test_orc.stop()
@@ -364,9 +403,18 @@ def _device_discovered(self, mac_addr):
         'Waiting for device to obtain IP')
 
   def _device_stable(self, mac_addr):
+
+    # Do not continue testing if Testrun has cancelled during monitor phase
+    if self.get_session().get_status() == 'Cancelled':
+      return
+
     LOGGER.info(f'Device with mac address {mac_addr} is ready for testing.')
+    self._set_status('In Progress')
     result = self._test_orc.run_test_modules()
-    self._set_status(result)
+
+    if result is not None:
+      self._set_status(result)
+    self._stop_network()
 
   def get_session(self):
     return self._session
@@ -397,6 +445,7 @@ def start_ui(self):
     LOGGER.info('User interface is ready on http://localhost:8080')
 
   def _stop_ui(self):
+    LOGGER.info('Stopping user interface')
     client = docker.from_env()
     try:
       container = client.containers.get('tr-ui')
diff --git a/framework/python/src/net_orc/network_orchestrator.py b/framework/python/src/net_orc/network_orchestrator.py
index 64eb1eaaf..8126d0738 100644
--- a/framework/python/src/net_orc/network_orchestrator.py
+++ b/framework/python/src/net_orc/network_orchestrator.py
@@ -61,7 +61,6 @@ def __init__(self,
                 os.path.dirname(os.path.dirname(os.path.realpath(__file__))))))
 
     self.validator = NetworkValidator()
-    shutil.rmtree(os.path.join(os.getcwd(), NET_DIR), ignore_errors=True)
     self.network_config = NetworkConfig()
     self._ovs = OVSControl(self._session)
     self._ip_ctrl = IPControl()
@@ -71,6 +70,9 @@ def start(self):
 
     LOGGER.debug('Starting network orchestrator')
 
+    # Delete the runtime/network directory
+    shutil.rmtree(os.path.join(os.getcwd(), NET_DIR), ignore_errors=True)
+
     # Get all components ready
     self.load_network_modules()
 
@@ -217,6 +219,7 @@ def _dhcp_lease_ack(self, packet):
   def _start_device_monitor(self, device):
     """Start a timer until the steady state has been reached and
         callback the steady state method for this device."""
+    self.get_session().set_status('Monitoring')
     LOGGER.info(f'Monitoring device with mac addr {device.mac_addr} '
                 f'for {str(self._session.get_monitor_period())} seconds')
 
diff --git a/framework/python/src/test_orc/test_orchestrator.py b/framework/python/src/test_orc/test_orchestrator.py
index 117d82839..21b8650bb 100644
--- a/framework/python/src/test_orc/test_orchestrator.py
+++ b/framework/python/src/test_orc/test_orchestrator.py
@@ -76,6 +76,10 @@ def stop(self):
   def run_test_modules(self):
     """Iterates through each test module and starts the container."""
 
+    # Do not start test modules if status is not in progress, e.g. Stopping
+    if self.get_session().get_status() != "In Progress":
+      return
+
     device = self._session.get_target_device()
     self._test_in_progress = True
     LOGGER.info(
@@ -100,6 +104,10 @@ def run_test_modules(self):
 
     self._session.stop()
 
+    # Do not carry on (generating a report) if Testrun has been stopped
+    if self.get_session().get_status() != "In Progress":
+      return None
+
     report = TestReport()
     report.from_json(self._generate_report())
     device.add_report(report)
@@ -235,7 +243,7 @@ def _timestamp_results(self, device):
     # Copy the results to the timestamp directory
     # leave current copy in place for quick reference to
     # most recent test
-    shutil.copytree(cur_results_dir, completed_results_dir)
+    shutil.copytree(cur_results_dir, completed_results_dir, dirs_exist_ok=True)
     util.run_command(f"chown -R {self._host_user} '{completed_results_dir}'")
 
   def test_in_progress(self):
@@ -253,6 +261,10 @@ def _is_module_enabled(self, module, device):
   def _run_test_module(self, module):
     """Start the test container and extract the results."""
 
+    # Check that Testrun is not stopping
+    if self.get_session().get_status() != "In Progress":
+      return
+
     device = self._session.get_target_device()
 
     LOGGER.info("Running test module " + module.name)
@@ -332,8 +344,11 @@ def _run_test_module(self, module):
     status = self._get_module_status(module)
 
     log_stream = module.container.logs(stream=True, stdout=True, stderr=True)
-    while (time.time() < test_module_timeout and status == "running"
-           and self._session.get_status() == "In Progress"):
+    while (status == "running" and self._session.get_status() == "In Progress"):
+      if time.time() > test_module_timeout:
+        LOGGER.error("Module timeout exceeded, killing module: " + module.name)
+        self._stop_module(module=module,kill=True)
+        break
       try:
         line = next(log_stream).decode("utf-8").strip()
         if re.search(LOG_REGEX, line):
@@ -342,6 +357,12 @@ def _run_test_module(self, module):
         time.sleep(1)
       status = self._get_module_status(module)
 
+    # Check that Testrun has not been stopped whilst this module was running
+    if self.get_session().get_status() == "Stopping":
+      # Discard results for this module
+      LOGGER.info(f"Test module {module.name} has forcefully quit")
+      return
+
     # Get test results from module
     container_runtime_dir = os.path.join(
         self._root_path,
@@ -356,8 +377,8 @@ def _run_test_module(self, module):
     except (FileNotFoundError, PermissionError,
             json.JSONDecodeError) as results_error:
       LOGGER.error(
-          f"Error occured whilst obbtaining results for module {module.name}")
-      LOGGER.debug(results_error)
+          f"Error occurred whilst obtaining results for module {module.name}")
+      LOGGER.error(results_error)
 
     LOGGER.info(f"Test module {module.name} has finished")
 
diff --git a/make/DEBIAN/control b/make/DEBIAN/control
index 0cf7e37d6..c5af91918 100644
--- a/make/DEBIAN/control
+++ b/make/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: Testrun
-Version: 1.0.3
+Version: 1.1
 Architecture: amd64
 Maintainer: Google <boddey@google.com>
 Homepage: https://github.com/google/testrun
diff --git a/make/DEBIAN/prerm b/make/DEBIAN/prerm
index 8f0054282..95f226749 100755
--- a/make/DEBIAN/prerm
+++ b/make/DEBIAN/prerm
@@ -14,6 +14,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# Stop any running containers
+echo Stopping any running containers
+running_containers=$(docker container ls -q --filter name=tr-*)
+if [ -n "$running_containers" ]; then
+  docker container kill $running_containers
+else
+  echo No containers were found running
+fi
+
 # Remove docker images
 echo Removing docker images
 docker_images=$(sudo docker images --filter=reference="test-run/*" -q)
diff --git a/modules/network/dhcp-1/conf/dhcpd.conf b/modules/network/dhcp-1/conf/dhcpd.conf
index 39f67c3b8..3862ed6d8 100644
--- a/modules/network/dhcp-1/conf/dhcpd.conf
+++ b/modules/network/dhcp-1/conf/dhcpd.conf
@@ -1,29 +1,29 @@
-default-lease-time 30;
-max-lease-time 30;
-
-failover peer "failover-peer" {
-    primary;
-    address 10.10.10.2;
-    port 847;
-    peer address 10.10.10.3;
-    peer port 647;
-    max-response-delay 60;
-    max-unacked-updates 10;
-    mclt 30;
-    split 128;
-    load balance max seconds 3;
-}
-
-subnet 10.10.10.0 netmask 255.255.255.0 {
-    option ntp-servers 10.10.10.5;
-    option subnet-mask 255.255.255.0;
-    option broadcast-address 10.10.10.255;
-    option routers 10.10.10.1;
-    option domain-name-servers 10.10.10.4;
-    interface veth0;
-    authoritative;
-    pool {
-        failover peer "failover-peer";
-        range 10.10.10.10 10.10.10.20;
-	}
+default-lease-time 30;
+max-lease-time 30;
+
+failover peer "failover-peer" {
+    primary;
+    address 10.10.10.2;
+    port 847;
+    peer address 10.10.10.3;
+    peer port 647;
+    max-response-delay 60;
+    max-unacked-updates 10;
+    mclt 30;
+    split 128;
+    load balance max seconds 3600;
+}
+
+subnet 10.10.10.0 netmask 255.255.255.0 {
+    option ntp-servers 10.10.10.5;
+    option subnet-mask 255.255.255.0;
+    option broadcast-address 10.10.10.255;
+    option routers 10.10.10.1;
+    option domain-name-servers 10.10.10.4;
+    interface veth0;
+    authoritative;
+    pool {
+        failover peer "failover-peer";
+        range 10.10.10.10 10.10.10.20;
+	}
 }
\ No newline at end of file
diff --git a/modules/network/dhcp-1/conf/radvd.conf b/modules/network/dhcp-1/conf/radvd.conf
index 0cc500fd5..8d7bbf849 100644
--- a/modules/network/dhcp-1/conf/radvd.conf
+++ b/modules/network/dhcp-1/conf/radvd.conf
@@ -2,11 +2,13 @@ interface veth0
 {
         AdvSendAdvert on;
         AdvManagedFlag off;
-        MinRtrAdvInterval 30; 
-        MaxRtrAdvInterval 60;
+        MinRtrAdvInterval 10; 
+        MaxRtrAdvInterval 30;
         prefix fd10:77be:4186::/64 { 
-                AdvOnLink on; 
+                AdvOnLink on;
                 AdvAutonomous on; 
                 AdvRouterAddr on;
+                AdvValidLifetime 60;
+                AdvPreferredLifetime 30; 
         };
-};
+};
\ No newline at end of file
diff --git a/modules/network/dhcp-1/dhcp-1.Dockerfile b/modules/network/dhcp-1/dhcp-1.Dockerfile
index 8ef896f17..8fc2d0630 100644
--- a/modules/network/dhcp-1/dhcp-1.Dockerfile
+++ b/modules/network/dhcp-1/dhcp-1.Dockerfile
@@ -24,7 +24,7 @@ RUN apt-get update --fix-missing
 # Install all necessary packages
 RUN apt-get install -y wget
 
-#Update the oui.txt file from ieee
+# Update the oui.txt file from ieee
 RUN wget http://standards-oui.ieee.org/oui.txt -P /usr/local/etc/
 
 # Install dhcp server
diff --git a/modules/network/dhcp-1/python/src/grpc_server/dhcp_server.py b/modules/network/dhcp-1/python/src/grpc_server/dhcp_server.py
index 7c2ca3d83..cd58987bb 100644
--- a/modules/network/dhcp-1/python/src/grpc_server/dhcp_server.py
+++ b/modules/network/dhcp-1/python/src/grpc_server/dhcp_server.py
@@ -30,7 +30,7 @@ def __init__(self):
     global LOGGER
     LOGGER = logger.get_logger(LOG_NAME, 'dhcp-1')
     self.dhcp_config = DHCPConfig()
-    self.radvd = RADVDServer()
+    self.radvd = RADVDServer(enabled=True)
     self.isc_dhcp = ISCDHCPServer()
     self.dhcp_config.resolve_config()
 
@@ -38,7 +38,7 @@ def restart(self):
     LOGGER.info('Restarting DHCP server')
     isc_started = self.isc_dhcp.restart()
     radvd_started = self.radvd.restart()
-    started = isc_started and radvd_started
+    started = isc_started and (radvd_started or not self.radvd.enabled)
     LOGGER.info('DHCP server restarted: ' + str(started))
     return started
 
@@ -46,7 +46,7 @@ def start(self):
     LOGGER.info('Starting DHCP server')
     isc_started = self.isc_dhcp.start()
     radvd_started = self.radvd.start()
-    started = isc_started and radvd_started
+    started = isc_started and (radvd_started or not self.radvd.enabled)
     LOGGER.info('DHCP server started: ' + str(started))
     return started
 
@@ -54,7 +54,7 @@ def stop(self):
     LOGGER.info('Stopping DHCP server')
     isc_stopped = self.isc_dhcp.stop()
     radvd_stopped = self.radvd.stop()
-    stopped = isc_stopped and radvd_stopped
+    stopped = isc_stopped and (radvd_stopped or not self.radvd.enabled)
     LOGGER.info('DHCP server stopped: ' + str(stopped))
     return stopped
 
@@ -62,7 +62,7 @@ def is_running(self):
     LOGGER.info('Checking DHCP server status')
     isc_running = self.isc_dhcp.is_running()
     radvd_running = self.radvd.is_running()
-    running = isc_running and radvd_running
+    running = isc_running and (radvd_running or not self.radvd.enabled)
     LOGGER.info('DHCP server status: ' + str(running))
     return running
 
@@ -83,7 +83,6 @@ def boot(self):
       LOGGER.info('DHCP server booted: ' + str(booted))
     return booted
 
-
 def run():
   dhcp_server = DHCPServer()
   booted = dhcp_server.boot()
diff --git a/modules/network/dhcp-1/python/src/grpc_server/radvd_server.py b/modules/network/dhcp-1/python/src/grpc_server/radvd_server.py
index 38eec4985..1422242a3 100644
--- a/modules/network/dhcp-1/python/src/grpc_server/radvd_server.py
+++ b/modules/network/dhcp-1/python/src/grpc_server/radvd_server.py
@@ -22,29 +22,42 @@
 class RADVDServer:
   """Represents the RADVD Server"""
 
-  def __init__(self):
+  def __init__(self, enabled=True):
     global LOGGER
     LOGGER = logger.get_logger(LOG_NAME, 'dhcp-1')
+    self.enabled = enabled
 
   def restart(self):
+    if not self.enabled:
+      LOGGER.info('Cannot restart RADVD server, disabled')
+      return False
     LOGGER.info('Restarting RADVD server')
     response = util.run_command('radvd-service restart', False)
     LOGGER.info('RADVD restarted: ' + str(response))
     return response
 
   def start(self):
+    if not self.enabled:
+      LOGGER.info('Cannot start RADVD server, disabled')
+      return False
     LOGGER.info('Starting RADVD server')
     response = util.run_command('radvd-service start', False)
     LOGGER.info('RADVD started: ' + str(response))
     return response
 
   def stop(self):
+    if not self.enabled:
+      LOGGER.info('Cannot stop RADVD server, disabled')
+      return False
     LOGGER.info('Stopping RADVD server')
     response = util.run_command('radvd-service stop', False)
     LOGGER.info('RADVD stopped: ' + str(response))
     return response
 
   def is_running(self):
+    if not self.enabled:
+      LOGGER.info('RADVD server disabled')
+      return False
     LOGGER.info('Checking RADVD status')
     response = util.run_command('radvd-service status')
     running = response[0] == 'radvd service is running.'
diff --git a/modules/network/dhcp-2/conf/dhcpd.conf b/modules/network/dhcp-2/conf/dhcpd.conf
index 5a6c82410..3cf2e5e1d 100644
--- a/modules/network/dhcp-2/conf/dhcpd.conf
+++ b/modules/network/dhcp-2/conf/dhcpd.conf
@@ -9,7 +9,6 @@ failover peer "failover-peer" {
     peer port 847;
     max-response-delay 60;
     max-unacked-updates 10;
-    load balance max seconds 3;
 }
 
 subnet 10.10.10.0 netmask 255.255.255.0 {
diff --git a/modules/network/dhcp-2/conf/radvd.conf b/modules/network/dhcp-2/conf/radvd.conf
index f6d6f30d9..5b8d4f78d 100644
--- a/modules/network/dhcp-2/conf/radvd.conf
+++ b/modules/network/dhcp-2/conf/radvd.conf
@@ -2,11 +2,13 @@ interface veth0
 {
         AdvSendAdvert on;
         AdvManagedFlag off;
-        MinRtrAdvInterval 30; 
-        MaxRtrAdvInterval 60;
-        prefix fd10:77be:4186::/64 { 
-                AdvOnLink on; 
+        MinRtrAdvInterval 10;
+        MaxRtrAdvInterval 30;
+        prefix fd10:77be:4186::/64 {
+                AdvOnLink on;
                 AdvAutonomous on; 
-                AdvRouterAddr on; 
+                AdvRouterAddr on;
+                AdvValidLifetime 60;
+                AdvPreferredLifetime 30;
         };
 };
\ No newline at end of file
diff --git a/modules/network/dhcp-2/dhcp-2.Dockerfile b/modules/network/dhcp-2/dhcp-2.Dockerfile
index f2426c196..58256813f 100644
--- a/modules/network/dhcp-2/dhcp-2.Dockerfile
+++ b/modules/network/dhcp-2/dhcp-2.Dockerfile
@@ -24,7 +24,7 @@ RUN apt-get update --fix-missing
 # Install all necessary packages
 RUN apt-get install -y wget
 
-#Update the oui.txt file from ieee
+# Update the oui.txt file from ieee
 RUN wget http://standards-oui.ieee.org/oui.txt -P /usr/local/etc/
 
 # Install dhcp server
diff --git a/modules/network/dhcp-2/python/src/grpc_server/dhcp_server.py b/modules/network/dhcp-2/python/src/grpc_server/dhcp_server.py
index 7aec674f2..2e917417a 100644
--- a/modules/network/dhcp-2/python/src/grpc_server/dhcp_server.py
+++ b/modules/network/dhcp-2/python/src/grpc_server/dhcp_server.py
@@ -30,7 +30,7 @@ def __init__(self):
     global LOGGER
     LOGGER = logger.get_logger(LOG_NAME, 'dhcp-2')
     self.dhcp_config = DHCPConfig()
-    self.radvd = RADVDServer()
+    self.radvd = RADVDServer(enabled=False)
     self.isc_dhcp = ISCDHCPServer()
     self.dhcp_config.resolve_config()
 
@@ -38,7 +38,7 @@ def restart(self):
     LOGGER.info('Restarting DHCP server')
     isc_started = self.isc_dhcp.restart()
     radvd_started = self.radvd.restart()
-    started = isc_started and radvd_started
+    started = isc_started and (radvd_started or not self.radvd.enabled)
     LOGGER.info('DHCP server restarted: ' + str(started))
     return started
 
@@ -46,7 +46,7 @@ def start(self):
     LOGGER.info('Starting DHCP server')
     isc_started = self.isc_dhcp.start()
     radvd_started = self.radvd.start()
-    started = isc_started and radvd_started
+    started = isc_started and (radvd_started or not self.radvd.enabled)
     LOGGER.info('DHCP server started: ' + str(started))
     return started
 
@@ -54,7 +54,7 @@ def stop(self):
     LOGGER.info('Stopping DHCP server')
     isc_stopped = self.isc_dhcp.stop()
     radvd_stopped = self.radvd.stop()
-    stopped = isc_stopped and radvd_stopped
+    stopped = isc_stopped and (radvd_stopped or not self.radvd.enabled)
     LOGGER.info('DHCP server stopped: ' + str(stopped))
     return stopped
 
@@ -62,7 +62,7 @@ def is_running(self):
     LOGGER.info('Checking DHCP server status')
     isc_running = self.isc_dhcp.is_running()
     radvd_running = self.radvd.is_running()
-    running = isc_running and radvd_running
+    running = isc_running and (radvd_running or not self.radvd.enabled)
     LOGGER.info('DHCP server status: ' + str(running))
     return running
 
diff --git a/modules/network/dhcp-2/python/src/grpc_server/radvd_server.py b/modules/network/dhcp-2/python/src/grpc_server/radvd_server.py
index 910354e31..1a5e2a312 100644
--- a/modules/network/dhcp-2/python/src/grpc_server/radvd_server.py
+++ b/modules/network/dhcp-2/python/src/grpc_server/radvd_server.py
@@ -22,29 +22,42 @@
 class RADVDServer:
   """Represents the RADVD Server"""
 
-  def __init__(self):
+  def __init__(self, enabled=True):
     global LOGGER
     LOGGER = logger.get_logger(LOG_NAME, 'dhcp-2')
+    self.enabled = enabled
 
   def restart(self):
+    if not self.enabled:
+      LOGGER.info('Cannot restart RADVD server, disabled')
+      return False
     LOGGER.info('Restarting RADVD server')
     response = util.run_command('radvd-service restart', False)
     LOGGER.info('RADVD restarted: ' + str(response))
     return response
 
   def start(self):
+    if not self.enabled:
+      LOGGER.info('Cannot start RADVD server, disabled')
+      return False
     LOGGER.info('Starting RADVD server')
     response = util.run_command('radvd-service start', False)
     LOGGER.info('RADVD started: ' + str(response))
     return response
 
   def stop(self):
+    if not self.enabled:
+      LOGGER.info('Cannot stop RADVD server, disabled')
+      return False
     LOGGER.info('Stopping RADVD server')
     response = util.run_command('radvd-service stop', False)
     LOGGER.info('RADVD stopped: ' + str(response))
     return response
 
   def is_running(self):
+    if not self.enabled:
+      LOGGER.info('RADVD server disabled')
+      return False
     LOGGER.info('Checking RADVD status')
     response = util.run_command('radvd-service status')
     running = response[0] == 'radvd service is running.'
diff --git a/modules/test/conn/conf/module_config.json b/modules/test/conn/conf/module_config.json
index 5253c59f9..b00fa35f7 100644
--- a/modules/test/conn/conf/module_config.json
+++ b/modules/test/conn/conf/module_config.json
@@ -10,7 +10,7 @@
     "docker": {
       "depends_on": "base",
       "enable_container": true,
-      "timeout": 600
+      "timeout": 1800
     },
     "tests": [
       {
@@ -37,6 +37,7 @@
         "expected_behavior": "The device under test accepts IP addresses within all ranges specified in RFC 1918 and communicates using these addresses.  The Internet Assigned Numbers Authority (IANA) has reserved the following three blocks of the IP address space for private internets.  10.0.0.0 - 10.255.255.255.255 (10/8 prefix). 172.16.0.0 - 172.31.255.255 (172.16/12 prefix).  192.168.0.0 - 192.168.255.255 (192.168/16 prefix)",
         "required_result": "Required",
         "config": {
+          "lease_wait_time_sec": 60,
           "ranges": [
             {
               "start": "10.0.0.100",
@@ -59,6 +60,7 @@
         "expected_behavior": "The device under test accepts IP addresses within the ranges specified in RFC 6598 and communicates using these addresses",
         "required_result": "Required",
         "config": {
+          "lease_wait_time_sec": 60,
           "ranges": [
             {
               "start": "100.64.0.1",
@@ -83,13 +85,19 @@
         "name": "connection.ipaddr.ip_change",
         "test_description": "The device responds to a ping (ICMP echo request) to the new IP address it has received after the initial DHCP lease has expired.",
         "expected_behavior": "If the lease expires before the client receiveds a DHCPACK, the client moves to INIT state, MUST immediately stop any other network processing and requires network initialization parameters as if the client were uninitialized.  If the client then receives a DHCPACK allocating the client its previous network addres, the client SHOULD continue network processing.  If the client is given a new network address, it MUST NOT continue using the previous network address and SHOULD notify the local users of the problem.",
-        "required_result": "Required"
+        "required_result": "Required",
+        "config":{
+          "lease_wait_time_sec": 60
+        }
       },
       {
         "name": "connection.ipaddr.dhcp_failover",
         "test_description": "The device has requested a DHCPREQUEST/REBIND to the DHCP failover server after the primary DHCP server has been brought down.",
         "expected_behavior": "",
-        "required_result": "Required"
+        "required_result": "Required",
+        "config":{
+          "lease_wait_time_sec": 60
+        }
       },
       {
         "name": "connection.ipv6_slaac",
diff --git a/modules/test/conn/conn.Dockerfile b/modules/test/conn/conn.Dockerfile
index 5d8148335..af1921d69 100644
--- a/modules/test/conn/conn.Dockerfile
+++ b/modules/test/conn/conn.Dockerfile
@@ -23,7 +23,7 @@ ARG GRPC_PROTO_FILE="grpc.proto"
 # Install all necessary packages
 RUN apt-get install -y wget
 
-#Update the oui.txt file from ieee
+# Update the oui.txt file from ieee
 RUN wget http://standards-oui.ieee.org/oui.txt -P /usr/local/etc/
 
 #Load the requirements file
diff --git a/modules/test/conn/python/src/connection_module.py b/modules/test/conn/python/src/connection_module.py
index be8098dd8..3fc0e6765 100644
--- a/modules/test/conn/python/src/connection_module.py
+++ b/modules/test/conn/python/src/connection_module.py
@@ -15,6 +15,7 @@
 import util
 import time
 import datetime
+import traceback
 from scapy.all import rdpcap, DHCP, Ether, IPv6, ICMPv6ND_NS
 from test_module import TestModule
 from dhcp1.client import Client as DHCPClient1
@@ -30,6 +31,10 @@
 SLAAC_PREFIX = 'fd10:77be:4186'
 TR_CONTAINER_MAC_PREFIX = '9a:02:57:1e:8f:'
 
+# Should be at least twice as much as the max lease time
+# set in the DHCP server
+LEASE_WAIT_TIME_DEFAULT = 60
+
 
 class ConnectionModule(TestModule):
   """Connection Test module"""
@@ -41,6 +46,7 @@ def __init__(self, module):
     self.dhcp1_client = DHCPClient1()
     self.dhcp2_client = DHCPClient2()
     self._dhcp_util = DHCPUtil(self.dhcp1_client, self.dhcp2_client, LOGGER)
+    self._lease_wait_time_sec = LEASE_WAIT_TIME_DEFAULT
 
     # ToDo: Move this into some level of testing, leave for
     # reference until tests are implemented with these calls
@@ -79,16 +85,14 @@ def _connection_shared_address(self, config):
 
   def _connection_dhcp_address(self):
     LOGGER.info('Running connection.dhcp_address')
-    response = self.dhcp1_client.get_lease(self._device_mac)
-    LOGGER.info('DHCP Lease resolved:\n' + str(response))
-    if response.code == 200:
-      lease = eval(response.message)  # pylint: disable=W0123
+    lease = self._dhcp_util.get_cur_lease(mac_address=self._device_mac, timeout=self._lease_wait_time_sec)
+    if lease is not None:
       if 'ip' in lease:
         ip_addr = lease['ip']
         LOGGER.info('IP Resolved: ' + ip_addr)
         LOGGER.info('Attempting to ping device...')
         ping_success = self._ping(self._device_ipv4_addr)
-        LOGGER.info('Ping Success: ' + str(ping_success))
+        LOGGER.debug('Ping success: ' + str(ping_success))
         if ping_success:
           return True, 'Device responded to leased ip address'
         else:
@@ -97,8 +101,8 @@ def _connection_dhcp_address(self):
         LOGGER.info('No IP information found in lease: ' + self._device_mac)
         return False, 'No IP information found in lease: ' + self._device_mac
     else:
-      LOGGER.info('Failed to query DHCP Servers for lease information: ' + self._device_mac)
-      return False, 'Failed to query DHCP Servers for lease information: ' + self._device_mac
+      LOGGER.info('No DHCP lease could be found: ' + self._device_mac)
+      return False, 'No DHCP lease could be found: ' + self._device_mac
 
   def _connection_mac_address(self):
     LOGGER.info('Running connection.mac_address')
@@ -137,9 +141,9 @@ def _connection_single_ip(self):
       if DHCP in packet:
         for option in packet[DHCP].options:
           # message-type, option 3 = DHCPREQUEST
-          if 'message-type' in option and option[1] == 3: 
+          if 'message-type' in option and option[1] == 3:
             mac_address = packet[Ether].src
-            LOGGER.info('DHCPREQUEST detected MAC addres: ' + mac_address)
+            LOGGER.info('DHCPREQUEST detected MAC address: ' + mac_address)
             if not mac_address.startswith(TR_CONTAINER_MAC_PREFIX):
               mac_addresses.add(mac_address.upper())
 
@@ -172,11 +176,15 @@ def _connection_target_ping(self):
       else:
         return False, 'Device does not respond to ping'
 
-  def _connection_ipaddr_ip_change(self):
+  def _connection_ipaddr_ip_change(self,config):
     result = None
     LOGGER.info('Running connection.ipaddr.ip_change')
+    # Resolve the configured lease wait time
+    if 'lease_wait_time_sec' in config:
+      self._lease_wait_time_sec = config['lease_wait_time_sec']
+
     if self._dhcp_util.setup_single_dhcp_server():
-      lease = self._dhcp_util.get_cur_lease(self._device_mac)
+      lease = self._dhcp_util.get_cur_lease(mac_address=self._device_mac, timeout=self._lease_wait_time_sec)
       if lease is not None:
         LOGGER.info('Current device lease resolved')
         LOGGER.debug(str(lease))
@@ -190,7 +198,7 @@ def _connection_ipaddr_ip_change(self):
             LOGGER.info('Pinging device at IP: ' + ip_address)
             if self._ping(ip_address):
               LOGGER.debug('Ping success')
-              LOGGER.info('Reserved lease confirmed active in device')
+              LOGGER.debug('Reserved lease confirmed active in device')
               result = True, 'Device has accepted an IP address change'
               LOGGER.debug('Restoring DHCP failover configuration')
               break
@@ -208,23 +216,28 @@ def _connection_ipaddr_ip_change(self):
       self._dhcp_util.restore_failover_dhcp_server()
       LOGGER.info('Waiting 30 seconds for reserved lease to expire')
       time.sleep(30)
-      self._dhcp_util.get_new_lease(self._device_mac)
+      self._dhcp_util.get_cur_lease(mac_address=self._device_mac,timeout=self._lease_wait_time_sec)
     else:
       result = None, 'Failed to configure network for test'
     return result
 
-  def _connection_ipaddr_dhcp_failover(self):
+  def _connection_ipaddr_dhcp_failover(self,config):
     result = None
+    LOGGER.info('Running connection.ipaddr.dhcp_failover')
+
+    # Resolve the configured lease wait time
+    if 'lease_wait_time_sec' in config:
+      self._lease_wait_time_sec = config['lease_wait_time_sec']
+
     # Confirm that both servers are online
     primary_status = self._dhcp_util.get_dhcp_server_status(
         dhcp_server_primary=True)
     secondary_status = self._dhcp_util.get_dhcp_server_status(
         dhcp_server_primary=False)
     if primary_status and secondary_status:
-      lease = self._dhcp_util.get_cur_lease(self._device_mac)
+      lease = self._dhcp_util.get_cur_lease(mac_address=self._device_mac, timeout=self._lease_wait_time_sec)
       if lease is not None:
         LOGGER.info('Current device lease resolved')
-        LOGGER.debug(str(lease))
         if self._dhcp_util.is_lease_active(lease):
           # Shutdown the primary server
           if self._dhcp_util.stop_dhcp_server(dhcp_server_primary=True):
@@ -232,16 +245,15 @@ def _connection_ipaddr_dhcp_failover(self):
             self._dhcp_util.wait_for_lease_expire(lease)
             # Make sure the device has received a new lease from the
             # secondary server
-            if self._dhcp_util.get_new_lease(self._device_mac,
-                                             dhcp_server_primary=False):
+            if self._dhcp_util.get_cur_lease(mac_address=self._device_mac,timeout=self._lease_wait_time_sec):
               if self._dhcp_util.is_lease_active(lease):
                 result = True, ('Secondary DHCP server lease confirmed active '
-                 'in device')
+                                'in device')
               else:
                 result = False, 'Could not validate lease is active in device'
             else:
               result = False, ('Device did not recieve a new lease from '
-                'secondary DHCP server')
+                               'secondary DHCP server')
             self._dhcp_util.start_dhcp_server(dhcp_server_primary=True)
           else:
             result = None, 'Failed to shutdown primary DHCP server'
@@ -282,7 +294,9 @@ def _connection_ipv6_slaac(self):
     return result
 
   def _has_slaac_addres(self):
-    packet_capture = rdpcap(DHCP_CAPTURE_FILE)
+    packet_capture = (rdpcap(STARTUP_CAPTURE_FILE)
+                      + rdpcap(MONITOR_CAPTURE_FILE)
+                      + rdpcap(DHCP_CAPTURE_FILE))
     sends_ipv6 = False
     for packet_number, packet in enumerate(packet_capture, start=1):
       if IPv6 in packet and packet.src == self._device_mac:
@@ -291,7 +305,8 @@ def _has_slaac_addres(self):
           ipv6_addr = str(packet[ICMPv6ND_NS].tgt)
           if ipv6_addr.startswith(SLAAC_PREFIX):
             self._device_ipv6_addr = ipv6_addr
-            LOGGER.info(f"SLAAC address detected at packet number {packet_number}")
+            LOGGER.info('SLAAC address detected at packet number' +
+                        f'{packet_number}')
             LOGGER.info(f'Device has formed SLAAC address {ipv6_addr}')
             return True, sends_ipv6
     return False, sends_ipv6
@@ -305,7 +320,8 @@ def _connection_ipv6_ping(self):
     else:
       if self._ping(self._device_ipv6_addr, ipv6=True):
         LOGGER.info(f'Device responds to IPv6 ping on {self._device_ipv6_addr}')
-        result = True, f'Device responds to IPv6 ping on {self._device_ipv6_addr}'
+        result = True, ('Device responds to IPv6 ping on ' +
+                        f'{self._device_ipv6_addr}')
       else:
         LOGGER.info('Device does not respond to IPv6 ping')
         result = False, 'Device does not respond to IPv6 ping'
@@ -349,11 +365,18 @@ def setup_single_dhcp_server(self):
       response = self.dhcp2_client.get_status()
       if response.code == 200:
         LOGGER.info('Secondary DHCP server stopped')
+        LOGGER.info('Configuring primary DHCP server')
+        # Move primary DHCP server from failover into a single DHCP server config
+        response = self.dhcp1_client.disable_failover()
+        if response.code == 200:
+          LOGGER.info('Primary DHCP server failover disabled')
+        else:
+          return False, 'Failed to disable primary DHCP server failover'
         return True, 'Single DHCP server configured'
       else:
-        return False, 'DHCP server still running'
+        return False, 'Secondary DHCP server still running'
     else:
-      return False, 'DHCP server stop command failed'
+      return False, 'Secondary DHCP server stop command failed'
 
   def enable_failover(self):
     # Move primary DHCP server to primary failover
@@ -385,6 +408,10 @@ def _run_subnet_test(self, config):
       LOGGER.error('No subnet ranges configured for test. Skipping')
       return None, 'No subnet ranges configured for test'
 
+    # Resolve the configured lease wait time
+    if 'lease_wait_time_sec' in config:
+      self._lease_wait_time_sec = config['lease_wait_time_sec']  
+
     response = self.dhcp1_client.get_dhcp_range()
     cur_range = {}
     if response.code == 200:
@@ -401,20 +428,9 @@ def _run_subnet_test(self, config):
     dhcp_setup = self.setup_single_dhcp_server()
     if dhcp_setup[0]:
       LOGGER.info(dhcp_setup[1])
-      # Lease timing could be in a state where
-      # is is currently reneweing so we want to
-      # pad a few tries to make sure we don't
-      # miss a valid lease state
-      for _ in range(5):
-        lease = self._get_cur_lease()
-        if lease is not None:
-          break
-        else:
-          LOGGER.debug("Lease not found")
-          time.sleep(5)
-
+      lease = self._dhcp_util.get_cur_lease(mac_address=self._device_mac, timeout=self._lease_wait_time_sec)
       if lease is not None:
-        if self._is_lease_active(lease):
+        if self._dhcp_util.is_lease_active(lease):
           results = self.test_subnets(ranges)
       else:
         LOGGER.info("Failed to confirm a valid active lease for the device")
@@ -430,7 +446,8 @@ def _run_subnet_test(self, config):
       if final_result is None:
         final_result = result['result']
       else:
-        final_result &= result['result']
+        if result['result'] is not None:
+          final_result &= result['result']
         if result['result']:
           final_result_details += result['details'] + '\n'
 
@@ -442,24 +459,22 @@ def _run_subnet_test(self, config):
       self.restore_failover_dhcp_server(cur_range)
 
       # Wait for the current lease to expire
-      self._wait_for_lease_expire(self._get_cur_lease())
+      self._wait_for_lease_expire(self._dhcp_util.get_cur_lease(
+          self._device_mac,timeout=self._lease_wait_time_sec))
 
       # Wait for a new lease to be provided before exiting test
       # to prevent other test modules from failing
-      for _ in range(5):
-        LOGGER.info('Checking for new lease')
-        lease = self._get_cur_lease()
-        if lease is not None:
-          LOGGER.info('New lease found')
-          LOGGER.debug(str(lease))
-          LOGGER.info('Validating subnet for new lease...')
-          in_range = self.is_ip_in_range(lease['ip'], cur_range['start'],
-                                         cur_range['end'])
-          LOGGER.debug('Lease within subnet: ' + str(in_range))
-          break
-        else:
-          LOGGER.info('New lease not found. Waiting to check again')
-        time.sleep(5)
+      LOGGER.info('Checking for new lease')
+      # Subnet changes tend to take longer to pick up so we'll allow
+      # for twice the lease wait time
+      lease = self._dhcp_util.get_cur_lease(mac_address=self._device_mac,timeout=2*self._lease_wait_time_sec)
+      if lease is not None:
+        LOGGER.info('Validating subnet for new lease...')
+        in_range = self.is_ip_in_range(lease['ip'], cur_range['start'],
+                                       cur_range['end'])
+        LOGGER.debug('Lease within subnet: ' + str(in_range))
+      else:
+        LOGGER.info('New lease not found. Waiting to check again')
 
     except Exception as e:  # pylint: disable=W0718
       LOGGER.error('Failed to restore DHCP server configuration: ' + str(e))
@@ -467,6 +482,7 @@ def _run_subnet_test(self, config):
     return final_result, final_result_details
 
   def _test_subnet(self, subnet, lease):
+    LOGGER.info("Testing subnet: " + str(subnet))
     if self._change_subnet(subnet):
       expiration = datetime.datetime.strptime(
         lease['expires'], '%Y-%m-%d %H:%M:%S')
@@ -479,19 +495,20 @@ def _test_subnet(self, subnet, lease):
         # Wait until the expiration time and add 5 seconds
         time.sleep(time_to_expire + 5)
         LOGGER.debug('Current lease expired. Checking for new lease')
-        for _ in range(5):
-          LOGGER.debug('Checking for new lease')
-          lease = self._get_cur_lease()
-          if lease is not None:
-            LOGGER.debug('New lease found: ' + str(lease))
-            LOGGER.debug('Validating subnet for new lease...')
-            in_range = self.is_ip_in_range(lease['ip'], subnet['start'],
-                                           subnet['end'])
-            LOGGER.info('Lease within subnet: ' + str(in_range))
-            return in_range
-          else:
-            LOGGER.info('New lease not found. Waiting to check again')
-          time.sleep(5)
+        LOGGER.debug('Checking for new lease')
+        # Subnet changes tend to take longer to pick up so we'll allow
+        # for twice the lease wait time
+        lease = self._dhcp_util.get_cur_lease(mac_address=self._device_mac,timeout=2*self._lease_wait_time_sec)
+        if lease is not None:
+          LOGGER.debug('New lease found: ' + str(lease))
+          LOGGER.debug('Validating subnet for new lease...')
+          in_range = self.is_ip_in_range(lease['ip'], subnet['start'],
+                                         subnet['end'])
+          LOGGER.info('Lease within subnet: ' + str(in_range))
+          return in_range
+        else:
+          LOGGER.info('Device did not receive lease in subnet')
+          return False
     else:
       LOGGER.error('Failed to change subnet')
 
@@ -521,32 +538,13 @@ def _change_subnet(self, subnet):
       LOGGER.debug('Subnet change request failed.')
     return False
 
-  def _get_cur_lease(self):
-    LOGGER.info('Checking current device lease')
-    response = self.dhcp1_client.get_lease(self._device_mac)
-    if response.code == 200:
-      lease = eval(response.message)  # pylint: disable=W0123
-      if lease:  # Check if non-empty lease
-        return lease
-    else:
-      return None
-
-  def _is_lease_active(self, lease):
-    if 'ip' in lease:
-      ip_addr = lease['ip']
-      LOGGER.info('Lease IP resolved: ' + ip_addr)
-      LOGGER.info('Attempting to ping device...')
-      ping_success = self._ping(self._device_ipv4_addr)
-      LOGGER.debug('Ping success: ' + str(ping_success))
-      LOGGER.debug('Current lease confirmed active in device')
-      return ping_success
-
   def test_subnets(self, subnets):
     results = []
     for subnet in subnets:
       result = {}
       try:
-        lease = self._get_cur_lease()
+        lease = self._dhcp_util.get_cur_lease(mac_address=self._device_mac,
+                                              timeout=self._lease_wait_time_sec)
         if lease is not None:
           result = self._test_subnet(subnet, lease)
           if result:
@@ -565,11 +563,15 @@ def test_subnets(self, subnets):
             }
         else:
           result = {
-            'result': None, 
-            'details': 'Device does not have active lease, cannot test subnet change. ' + 
+            'result':
+            None,
+            'details':
+            'Device does not have active lease, cannot test subnet change. ' +
             'Subnet ' + subnet['start'] + '-' + subnet['end'] + ' skipped'
           }
       except Exception as e:  # pylint: disable=W0718
+        LOGGER.error('Subnet test failed: ' + str(e))
+        LOGGER.error(traceback.format_exc())
         result = {'result': False, 'details': 'Subnet test failed: ' + str(e)}
       results.append(result)
     return results
\ No newline at end of file
diff --git a/modules/test/conn/python/src/dhcp_util.py b/modules/test/conn/python/src/dhcp_util.py
index 0fa5a80a3..6d063d62a 100644
--- a/modules/test/conn/python/src/dhcp_util.py
+++ b/modules/test/conn/python/src/dhcp_util.py
@@ -21,6 +21,7 @@
 LOG_NAME = 'dhcp_util'
 LOGGER = None
 
+
 class DHCPUtil():
   """Helper class for various tests concerning DHCP behavior"""
 
@@ -109,36 +110,77 @@ def stop_dhcp_server(self, dhcp_server_primary=True):
       return False
 
   def get_dhcp_server_status(self, dhcp_server_primary=True):
-    LOGGER.info('Checking DHCP server status')
+    server_name = 'primary' if dhcp_server_primary else 'secondary'
+    LOGGER.debug(f'Checking {server_name} DHCP server status')
     response = self.get_dhcp_client(dhcp_server_primary).get_status()
     if response.code == 200:
-      LOGGER.info('DHCP server status: ' + str(response.message))
+      LOGGER.debug(f'DHCP {server_name} server status: {response.message}')
       status = eval(response.message)  # pylint: disable=W0123
       return status['dhcpStatus']
     else:
       return False
 
-  def get_cur_lease(self, mac_address, dhcp_server_primary=True):
-    LOGGER.info('Checking current device lease')
-    response = self.get_dhcp_client(dhcp_server_primary).get_lease(mac_address)
-    if response.code == 200:
-      lease = eval(response.message)  # pylint: disable=W0123
-      if lease:  # Check if non-empty lease
+  def get_cur_lease(self, mac_address, timeout):
+    """
+      Retrieve the current lease for a given MAC address with retries.
+
+      Args:
+          mac_address (str): The MAC address of the client whose lease is being queried.
+          timeout (int): The maximum time (in seconds) to wait for a lease to be found.
+
+      Returns:
+          str or None: The lease information as a string if found, or None if no lease is found within the timeout.
+
+      Note:
+          This method will attempt to query both primary and secondary DHCP servers for the lease,
+          with a 5-second pause between retries until the `timeout` is reached.
+      """
+    LOGGER.info('Resolving current lease with max wait time of ' + str(timeout) + ' seconds')
+    start_time = time.time()
+
+    while True:
+      lease = self._get_cur_lease(mac_address)
+      if lease is not None or (time.time() - start_time) >= timeout:
         return lease
+      time.sleep(5)
+
+  def _get_cur_lease(self, mac_address):
+    """
+    Retrieve the current lease for a given MAC address from both primary and secondary DHCP servers.
+
+    Args:
+        mac_address (str): The MAC address of the client whose lease is being queried.
+
+    Returns:
+        str or None: The lease information as a string if found, or None if no lease is found.
+    """
+    primary = False
+    lease = self._get_cur_lease_from_server(mac_address=mac_address,
+                                            dhcp_server_primary=True)
+    if lease is not None:
+      primary=True
     else:
-      return None
+      lease = self._get_cur_lease_from_server(mac_address=mac_address,
+                                              dhcp_server_primary=False)
+    if lease is not None:
+      lease['primary']=primary
+      log_msg = 'DHCP lease resolved from '
+      log_msg += 'primary' if lease['primary'] else 'secondary'
+      log_msg += ' server'
+      LOGGER.info(log_msg)
+      LOGGER.info('DHCP Lease resolved:\n' + str(lease))
+    return lease
 
-  def get_new_lease(self, mac_address, dhcp_server_primary=True):
+  def _get_cur_lease_from_server(self, mac_address, dhcp_server_primary=True):
     lease = None
-    for _ in range(5):
-      LOGGER.info('Checking for new lease')
-      if lease is None:
-        lease = self.get_cur_lease(mac_address,dhcp_server_primary)
-        LOGGER.info('New lease found: ' + str(lease))
-        break
-      else:
-        LOGGER.info('New lease not found. Waiting to check again')
-        time.sleep(5)
+    # Check if the server is online first, old lease files can still return
+    # lease information that is no longer valid when a dhcp server is shutdown
+    if self.get_dhcp_server_status(dhcp_server_primary):
+      response = self.get_dhcp_client(dhcp_server_primary).get_lease(mac_address)
+      if response.code == 200:
+        lease_resp = eval(response.message)  # pylint: disable=W0123
+        if lease_resp:  # Check if non-empty lease
+          lease = lease_resp
     return lease
 
   def is_lease_active(self, lease):
diff --git a/modules/test/dns/conf/module_config.json b/modules/test/dns/conf/module_config.json
index a30e28077..9cff229c4 100644
--- a/modules/test/dns/conf/module_config.json
+++ b/modules/test/dns/conf/module_config.json
@@ -23,12 +23,6 @@
         "test_description": "Verify the device allows for a DNS server to be entered automatically", 
         "expected_behavior": "The device sends DNS requests to the DNS server provided by the DHCP server",
         "required_result": "Roadmap"
-      },
-      {
-        "name": "dns.mdns",
-        "test_description": "If the device has MDNS (or any kind of IP multicast), can it be disabled",
-        "expected_behavior": "Device may send MDNS requests",
-        "required_result": "Recommended"
       }
     ]
   }
diff --git a/modules/test/nmap/python/src/nmap_module.py b/modules/test/nmap/python/src/nmap_module.py
index 6f684c2ef..3f5371d98 100644
--- a/modules/test/nmap/python/src/nmap_module.py
+++ b/modules/test/nmap/python/src/nmap_module.py
@@ -165,12 +165,12 @@ def _check_results(self, ports, services):
                              open_port_info["tcp_udp"])
 
       if (open_port_info["service"] in services and
-          (open_port + "/" + open_port_info["tcp_udp"]) not in match_ports and
+          (open_port_info["number"] + "/" + open_port_info["tcp_udp"]
+           ) not in match_ports and
           open_port_info["state"] == "open"):
         LOGGER.debug("Found service " + open_port_info["service"] +
                     " on port " + str(open_port) + "/" +
                     open_port_info["tcp_udp"])
-
         if not allowed:
           match_ports.append(open_port_info["number"] + "/" +
                             open_port_info["tcp_udp"])
@@ -193,7 +193,8 @@ def _security_services_telnet(self, config):
     if len(open_ports) == 0:
       return True, "No telnet server found"
     else:
-      return False, f"Found telnet server running on port {', '.join(open_ports)}"
+      return (False,
+              f"Found telnet server running on port {', '.join(open_ports)}")
 
   def _security_services_smtp(self, config):
     LOGGER.info("Running security.services.smtp")
@@ -281,4 +282,5 @@ def _security_ssh_version(self, config):
           if config["version"] in open_port_info["version"]:
             return True, f"SSH server found running {open_port_info['version']}"
           else:
-            return False, f"SSH server found running {open_port_info['version']}"
+            return (False,
+                    f"SSH server found running {open_port_info['version']}")
diff --git a/modules/test/ntp/python/src/ntp_module.py b/modules/test/ntp/python/src/ntp_module.py
index 6a577d1a6..0e7de00ec 100644
--- a/modules/test/ntp/python/src/ntp_module.py
+++ b/modules/test/ntp/python/src/ntp_module.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 """NTP test module"""
 from test_module import TestModule
-from scapy.all import rdpcap, NTP, IP
+from scapy.all import rdpcap, NTP, IP, IPv6
 
 LOG_NAME = 'test_ntp'
 NTP_SERVER_CAPTURE_FILE = '/runtime/network/ntp.pcap'
@@ -44,12 +44,16 @@ def _ntp_network_ntp_support(self):
     for packet in packet_capture:
 
       if NTP in packet and packet.src == self._device_mac:
+        if IP in packet:
+          dest_ip = packet[IP].dst
+        elif IPv6 in packet:
+          dest_ip = packet[IPv6].dst
         if packet[NTP].version == 4:
           device_sends_ntp4 = True
-          LOGGER.info(f'Device sent NTPv4 request to {packet[IP].dst}')
+          LOGGER.info(f'Device sent NTPv4 request to {dest_ip}')
         elif packet[NTP].version == 3:
           device_sends_ntp3 = True
-          LOGGER.info(f'Device sent NTPv3 request to {packet[IP].dst}')
+          LOGGER.info(f'Device sent NTPv3 request to {dest_ip}')
 
     if not (device_sends_ntp3 or device_sends_ntp4):
       result = False, 'Device has not sent any NTP requests'
@@ -76,7 +80,11 @@ def _ntp_network_ntp_dhcp(self):
     for packet in packet_capture:
       if NTP in packet and packet.src == self._device_mac:
         device_sends_ntp = True
-        if packet[IP].dst == self._ntp_server:
+        if IP in packet:
+          dest_ip = packet[IP].dst
+        elif IPv6 in packet:
+          dest_ip = packet[IPv6].dst
+        if dest_ip == self._ntp_server:
           LOGGER.info('Device sent NTP request to DHCP provided NTP server')
           ntp_to_local = True
         else:
diff --git a/modules/test/tls/conf/module_config.json b/modules/test/tls/conf/module_config.json
index 194d1198c..c5b1283eb 100644
--- a/modules/test/tls/conf/module_config.json
+++ b/modules/test/tls/conf/module_config.json
@@ -18,23 +18,11 @@
         "expected_behavior": "TLS 1.2 certificate is issued to the web browser client when accessed",
         "required_result": "Required"
       },
-      {
-        "name": "security.tls.v1_3_server",
-        "test_description": "Check the device web server TLS 1.3 & certificate is valid",
-        "expected_behavior": "TLS 1.3 certificate is issued to the web browser client when accessed",
-        "required_result": "Recommended"
-      },
       {
         "name": "security.tls.v1_2_client",
         "test_description": "Device uses TLS with connection to an external service on port 443 (or any other port which could be running the webserver-HTTPS)",
         "expected_behavior": "The packet indicates a TLS connection with at least TLS 1.2 and support for ECDH and ECDSA ciphers",
         "required_result": "Required"
-      },
-      {
-        "name": "security.tls.v1_3_client",
-        "test_description": "Device uses TLS with connection to an external service on port 443 (or any other port which could be running the webserver-HTTPS)",
-        "expected_behavior": "The packet indicates a TLS connection with at least TLS 1.3",
-        "required_result": "Recommended"
       }
     ]
   }
diff --git a/modules/test/tls/python/src/tls_util.py b/modules/test/tls/python/src/tls_util.py
index 2cb7011cd..ff7a79c44 100644
--- a/modules/test/tls/python/src/tls_util.py
+++ b/modules/test/tls/python/src/tls_util.py
@@ -380,8 +380,8 @@ def validate_tls_client(self, client_ip, tls_version, capture_file):
           tls_client_details += 'Completed handshake detected from server: '
           tls_client_details += result + '\n'
     else:
-      LOGGER.info('No client hello packets detected. Skipping')
-      tls_client_details = 'No client hello packets detected. Skipping'
+      LOGGER.info('No client hello packets detected')
+      tls_client_details = 'No client hello packets detected'
     return tls_client_valid, tls_client_details
 
   def is_ecdh_and_ecdsa(self, ciphers):
diff --git a/modules/ui/.eslintrc.json b/modules/ui/.eslintrc.json
new file mode 100644
index 000000000..fd4ffce00
--- /dev/null
+++ b/modules/ui/.eslintrc.json
@@ -0,0 +1,50 @@
+{
+  "root": true,
+  "ignorePatterns": ["projects/**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts"],
+      "extends": [
+        "eslint:recommended",
+        "plugin:@typescript-eslint/recommended",
+        "plugin:@angular-eslint/recommended",
+        "plugin:@angular-eslint/template/process-inline-templates",
+        "plugin:prettier/recommended"
+      ],
+      "rules": {
+        "@angular-eslint/directive-selector": [
+          "error",
+          {
+            "type": "attribute",
+            "prefix": "app",
+            "style": "camelCase"
+          }
+        ],
+        "@angular-eslint/component-selector": [
+          "error",
+          {
+            "type": "element",
+            "prefix": "app",
+            "style": "kebab-case"
+          }
+        ]
+      }
+    },
+    {
+      "files": ["*.html"],
+      "extends": [
+        "plugin:@angular-eslint/template/recommended",
+        "plugin:@angular-eslint/template/accessibility",
+        "plugin:prettier/recommended"
+      ],
+      "rules": {
+        "prettier/prettier": [
+          "error",
+          {
+            "parser": "angular"
+          }
+        ]
+      }
+    }
+  ]
+}
diff --git a/modules/ui/.gitignore b/modules/ui/.gitignore
index 57fa6bf61..d53004b88 100644
--- a/modules/ui/.gitignore
+++ b/modules/ui/.gitignore
@@ -1,7 +1,3 @@
-node_modules/
-.angular/
-dist/
-
 # See http://help.github.com/ignore-files/ for more about ignoring files.
 
 # Compiled output
@@ -17,6 +13,7 @@ yarn-error.log
 
 # IDEs and editors
 .idea/
+!.idea/copyright
 .project
 .classpath
 .c9/
@@ -43,4 +40,4 @@ testem.log
 
 # System files
 .DS_Store
-Thumbs.db
\ No newline at end of file
+Thumbs.db
diff --git a/modules/ui/.prettierignore b/modules/ui/.prettierignore
new file mode 100644
index 000000000..d53004b88
--- /dev/null
+++ b/modules/ui/.prettierignore
@@ -0,0 +1,43 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# Compiled output
+/dist
+/tmp
+/out-tsc
+/bazel-out
+
+# Node
+/node_modules
+npm-debug.log
+yarn-error.log
+
+# IDEs and editors
+.idea/
+!.idea/copyright
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# Visual Studio Code
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+.history/*
+
+# Miscellaneous
+/.angular/cache
+.sass-cache/
+/connect.lock
+/coverage
+/libpeerconnection.log
+testem.log
+/typings
+
+# System files
+.DS_Store
+Thumbs.db
diff --git a/modules/ui/.prettierrc.json b/modules/ui/.prettierrc.json
new file mode 100644
index 000000000..33508a36a
--- /dev/null
+++ b/modules/ui/.prettierrc.json
@@ -0,0 +1,12 @@
+{
+  "tabWidth": 2,
+  "useTabs": false,
+  "singleQuote": true,
+  "semi": true,
+  "bracketSpacing": true,
+  "arrowParens": "avoid",
+  "trailingComma": "es5",
+  "bracketSameLine": true,
+  "printWidth": 80,
+  "endOfLine": "auto"
+}
diff --git a/modules/ui/README.md b/modules/ui/README.md
new file mode 100644
index 000000000..cef441386
--- /dev/null
+++ b/modules/ui/README.md
@@ -0,0 +1,27 @@
+# TestRunUi
+
+This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 16.1.3.
+
+## Development server
+
+Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The application will automatically reload if you change any of the source files.
+
+## Code scaffolding
+
+Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
+
+## Build
+
+Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory.
+
+## Running unit tests
+
+Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
+
+## Running end-to-end tests
+
+Run `ng e2e` to execute the end-to-end tests via a platform of your choice. To use this command, you need to first add a package that implements end-to-end testing capabilities.
+
+## Further help
+
+To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.io/cli) page.
diff --git a/modules/ui/angular.json b/modules/ui/angular.json
index 90a6df04c..d72fee51f 100644
--- a/modules/ui/angular.json
+++ b/modules/ui/angular.json
@@ -20,18 +20,11 @@
             "outputPath": "dist",
             "index": "src/index.html",
             "main": "src/main.ts",
-            "polyfills": [
-              "zone.js"
-            ],
+            "polyfills": ["zone.js"],
             "tsConfig": "tsconfig.app.json",
             "inlineStyleLanguage": "scss",
-            "assets": [
-              "src/favicon.ico",
-              "src/assets"
-            ],
-            "styles": [
-              "src/styles.scss"
-            ],
+            "assets": ["src/favicon.ico", "src/assets"],
+            "styles": ["src/styles.scss"],
             "scripts": []
           },
           "configurations": {
@@ -40,11 +33,11 @@
                 {
                   "type": "initial",
                   "maximumWarning": "1000kb",
-                  "maximumError": "2000kb"
+                  "maximumError": "3000kb"
                 },
                 {
                   "type": "anyComponentStyle",
-                  "maximumWarning": "2kb",
+                  "maximumWarning": "3kb",
                   "maximumError": "4kb"
                 }
               ],
@@ -82,26 +75,24 @@
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
-            "polyfills": [
-              "zone.js",
-              "zone.js/testing"
-            ],
+            "polyfills": ["zone.js", "zone.js/testing"],
             "tsConfig": "tsconfig.spec.json",
             "inlineStyleLanguage": "scss",
-            "assets": [
-              "src/favicon.ico",
-              "src/assets"
-            ],
-            "styles": [
-              "src/styles.scss"
-            ],
+            "assets": ["src/favicon.ico", "src/assets"],
+            "styles": ["src/styles.scss"],
             "scripts": []
           }
+        },
+        "lint": {
+          "builder": "@angular-eslint/builder:lint",
+          "options": {
+            "lintFilePatterns": ["src/**/*.ts", "src/**/*.html"]
+          }
         }
       }
     }
   },
   "cli": {
-    "analytics": false
+    "schematicCollections": ["@angular-eslint/schematics"]
   }
 }
diff --git a/modules/ui/conf/nginx.conf b/modules/ui/conf/nginx.conf
deleted file mode 100644
index ade6ad17a..000000000
--- a/modules/ui/conf/nginx.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-events{}
-http {
-    include /etc/nginx/mime.types;
-    server {
-        listen 80;
-        server_name localhost;
-        root /usr/share/nginx/html;
-        index index.html;
-        location / {
-            try_files $uri $uri/ /index.html;
-        }
-    }
-}
\ No newline at end of file
diff --git a/modules/ui/package-lock.json b/modules/ui/package-lock.json
index e07c4fd91..8e90d3a71 100644
--- a/modules/ui/package-lock.json
+++ b/modules/ui/package-lock.json
@@ -8,34 +8,56 @@
       "name": "test-run-ui",
       "version": "0.0.0",
       "dependencies": {
-        "@angular/animations": "^16.1.0",
-        "@angular/cdk": "^16.1.4",
-        "@angular/common": "^16.1.0",
-        "@angular/compiler": "^16.1.0",
-        "@angular/core": "^16.1.0",
-        "@angular/forms": "^16.1.0",
-        "@angular/material": "^16.1.4",
-        "@angular/platform-browser": "^16.1.0",
-        "@angular/platform-browser-dynamic": "^16.1.0",
-        "@angular/router": "^16.1.0",
+        "@angular/animations": "^16.2.10",
+        "@angular/cdk": "^16.2.9",
+        "@angular/common": "^16.2.10",
+        "@angular/compiler": "^16.2.10",
+        "@angular/core": "^16.2.10",
+        "@angular/forms": "^16.2.10",
+        "@angular/material": "^16.2.9",
+        "@angular/platform-browser": "^16.2.10",
+        "@angular/platform-browser-dynamic": "^16.2.10",
+        "@angular/router": "^16.2.10",
+        "ngx-mask": "^16.3.9",
         "rxjs": "~7.8.0",
-        "tslib": "^2.3.0",
-        "zone.js": "~0.13.0"
+        "tslib": "^2.6.2",
+        "zone.js": "~0.13.3"
       },
       "devDependencies": {
-        "@angular-devkit/build-angular": "^16.1.3",
-        "@angular/cli": "~16.1.3",
-        "@angular/compiler-cli": "^16.1.0",
-        "@types/jasmine": "~4.3.0",
+        "@angular-devkit/build-angular": "^16.2.6",
+        "@angular-eslint/builder": "16.2.0",
+        "@angular-eslint/eslint-plugin": "16.2.0",
+        "@angular-eslint/eslint-plugin-template": "16.2.0",
+        "@angular-eslint/schematics": "16.2.0",
+        "@angular-eslint/template-parser": "16.2.0",
+        "@angular/cli": "~16.1.8",
+        "@angular/compiler-cli": "^16.2.10",
+        "@types/jasmine": "~4.3.6",
+        "@typescript-eslint/eslint-plugin": "5.62.0",
+        "@typescript-eslint/parser": "5.62.0",
+        "eslint": "^8.49.0",
+        "eslint-config-prettier": "^9.0.0",
+        "eslint-plugin-prettier": "^5.0.1",
         "jasmine-core": "~4.6.0",
         "karma": "~6.4.0",
         "karma-chrome-launcher": "~3.2.0",
         "karma-coverage": "~2.2.0",
         "karma-jasmine": "~5.1.0",
         "karma-jasmine-html-reporter": "~2.1.0",
+        "prettier": "^3.0.3",
+        "prettier-eslint": "^16.1.1",
         "typescript": "~5.1.3"
       }
     },
+    "node_modules/@aashutoshrathi/word-wrap": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
+      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/@ampproject/remapping": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
@@ -50,12 +72,12 @@
       }
     },
     "node_modules/@angular-devkit/architect": {
-      "version": "0.1601.3",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1601.3.tgz",
-      "integrity": "sha512-HvW51cCEoIYe2mYqcmnm2RZiMMFbFn7iIdsjbCJe7etFhcG+Y3hGDZMh4IFSiQiss+pwPSYOvQY2zwGrndMgLw==",
+      "version": "0.1602.6",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1602.6.tgz",
+      "integrity": "sha512-b1NNV3yNg6Rt86ms20bJIroWUI8ihaEwv5k+EoijEXLoMs4eNs5PhqL+QE8rTj+q9pa1gSrWf2blXor2JGwf1g==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "16.1.3",
+        "@angular-devkit/core": "16.2.6",
         "rxjs": "7.8.1"
       },
       "engines": {
@@ -65,40 +87,40 @@
       }
     },
     "node_modules/@angular-devkit/build-angular": {
-      "version": "16.1.3",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-16.1.3.tgz",
-      "integrity": "sha512-1scrdUdKRa9TkJ9jev/KRzFttbLUVACQvVRL0G67nUAdtJ/bQX8eui85axpCNPFihK4ReSW3R4lrgcVC2NUSoA==",
+      "version": "16.2.6",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-16.2.6.tgz",
+      "integrity": "sha512-QdU/q77K1P8CPEEZGxw1QqLcnA9ofboDWS7vcLRBmFmk2zydtLTApbK0P8GNDRbnmROOKkoaLo+xUTDJz9gvPA==",
       "dev": true,
       "dependencies": {
         "@ampproject/remapping": "2.2.1",
-        "@angular-devkit/architect": "0.1601.3",
-        "@angular-devkit/build-webpack": "0.1601.3",
-        "@angular-devkit/core": "16.1.3",
-        "@babel/core": "7.22.5",
-        "@babel/generator": "7.22.5",
+        "@angular-devkit/architect": "0.1602.6",
+        "@angular-devkit/build-webpack": "0.1602.6",
+        "@angular-devkit/core": "16.2.6",
+        "@babel/core": "7.22.9",
+        "@babel/generator": "7.22.9",
         "@babel/helper-annotate-as-pure": "7.22.5",
-        "@babel/helper-split-export-declaration": "7.22.5",
+        "@babel/helper-split-export-declaration": "7.22.6",
         "@babel/plugin-proposal-async-generator-functions": "7.20.7",
         "@babel/plugin-transform-async-to-generator": "7.22.5",
-        "@babel/plugin-transform-runtime": "7.22.5",
-        "@babel/preset-env": "7.22.5",
-        "@babel/runtime": "7.22.5",
+        "@babel/plugin-transform-runtime": "7.22.9",
+        "@babel/preset-env": "7.22.9",
+        "@babel/runtime": "7.22.6",
         "@babel/template": "7.22.5",
         "@discoveryjs/json-ext": "0.5.7",
-        "@ngtools/webpack": "16.1.3",
+        "@ngtools/webpack": "16.2.6",
         "@vitejs/plugin-basic-ssl": "1.0.1",
         "ansi-colors": "4.1.3",
         "autoprefixer": "10.4.14",
-        "babel-loader": "9.1.2",
+        "babel-loader": "9.1.3",
         "babel-plugin-istanbul": "6.1.1",
         "browserslist": "^4.21.5",
-        "cacache": "17.1.3",
         "chokidar": "3.5.3",
         "copy-webpack-plugin": "11.0.0",
-        "critters": "0.0.19",
+        "critters": "0.0.20",
         "css-loader": "6.8.1",
-        "esbuild-wasm": "0.17.19",
-        "fast-glob": "3.2.12",
+        "esbuild-wasm": "0.18.17",
+        "fast-glob": "3.3.1",
+        "guess-parser": "0.4.22",
         "https-proxy-agent": "5.0.1",
         "inquirer": "8.2.4",
         "jsonc-parser": "3.2.0",
@@ -107,31 +129,31 @@
         "less-loader": "11.1.0",
         "license-webpack-plugin": "4.0.2",
         "loader-utils": "3.2.1",
-        "magic-string": "0.30.0",
+        "magic-string": "0.30.1",
         "mini-css-extract-plugin": "2.7.6",
         "mrmime": "1.0.1",
         "open": "8.4.2",
         "ora": "5.4.1",
         "parse5-html-rewriting-stream": "7.0.0",
         "picomatch": "2.3.1",
-        "piscina": "3.2.0",
-        "postcss": "8.4.24",
-        "postcss-loader": "7.3.2",
+        "piscina": "4.0.0",
+        "postcss": "8.4.31",
+        "postcss-loader": "7.3.3",
         "resolve-url-loader": "5.0.0",
         "rxjs": "7.8.1",
-        "sass": "1.63.2",
-        "sass-loader": "13.3.1",
-        "semver": "7.5.3",
+        "sass": "1.64.1",
+        "sass-loader": "13.3.2",
+        "semver": "7.5.4",
         "source-map-loader": "4.0.1",
         "source-map-support": "0.5.21",
-        "terser": "5.17.7",
+        "terser": "5.19.2",
         "text-table": "0.2.0",
         "tree-kill": "1.2.2",
-        "tslib": "2.5.3",
-        "vite": "4.3.9",
-        "webpack": "5.86.0",
+        "tslib": "2.6.1",
+        "vite": "4.4.7",
+        "webpack": "5.88.2",
         "webpack-dev-middleware": "6.1.1",
-        "webpack-dev-server": "4.15.0",
+        "webpack-dev-server": "4.15.1",
         "webpack-merge": "5.9.0",
         "webpack-subresource-integrity": "5.1.0"
       },
@@ -141,7 +163,7 @@
         "yarn": ">= 1.13.0"
       },
       "optionalDependencies": {
-        "esbuild": "0.17.19"
+        "esbuild": "0.18.17"
       },
       "peerDependencies": {
         "@angular/compiler-cli": "^16.0.0",
@@ -186,199 +208,244 @@
         }
       }
     },
-    "node_modules/@angular-devkit/build-angular/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==",
+    "node_modules/@angular-devkit/build-angular/node_modules/tslib": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz",
+      "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==",
+      "dev": true
+    },
+    "node_modules/@angular-devkit/build-webpack": {
+      "version": "0.1602.6",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1602.6.tgz",
+      "integrity": "sha512-BJPR6xdq7gRJ6bVWnZ81xHyH75j7lyLbegCXbvUNaM8TWVBkwWsSdqr2NQ717dNLLn5umg58SFpU/pWMq6CxMQ==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "@angular-devkit/architect": "0.1602.6",
+        "rxjs": "7.8.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^16.14.0 || >=18.10.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
       },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      "peerDependencies": {
+        "webpack": "^5.30.0",
+        "webpack-dev-server": "^4.0.0"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/@angular-devkit/core": {
+      "version": "16.2.6",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-16.2.6.tgz",
+      "integrity": "sha512-iez/8NYXQT6fqVQLlKmZUIRkFUEZ88ACKbTwD4lBmk0+hXW+bQBxI7JOnE3C4zkcM2YeuTXIYsC5SebTKYiR4Q==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "ajv": "8.12.0",
+        "ajv-formats": "2.1.1",
+        "jsonc-parser": "3.2.0",
+        "picomatch": "2.3.1",
+        "rxjs": "7.8.1",
+        "source-map": "0.7.4"
       },
       "engines": {
-        "node": ">=10"
+        "node": "^16.14.0 || >=18.10.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
       },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+      "peerDependencies": {
+        "chokidar": "^3.5.2"
+      },
+      "peerDependenciesMeta": {
+        "chokidar": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/cli-width": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
-      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
+    "node_modules/@angular-devkit/schematics": {
+      "version": "16.1.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-16.1.8.tgz",
+      "integrity": "sha512-6LyzMdFJs337RTxxkI2U1Ndw0CW5mMX/aXWl8d7cW2odiSrAg8IdlMqpc+AM8+CPfsB0FtS1aWkEZqJLT0jHOg==",
       "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "16.1.8",
+        "jsonc-parser": "3.2.0",
+        "magic-string": "0.30.0",
+        "ora": "5.4.1",
+        "rxjs": "7.8.1"
+      },
       "engines": {
-        "node": ">= 10"
+        "node": "^16.14.0 || >=18.10.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@angular-devkit/build-angular/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==",
+    "node_modules/@angular-devkit/schematics/node_modules/@angular-devkit/core": {
+      "version": "16.1.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-16.1.8.tgz",
+      "integrity": "sha512-dSRD/+bGanArIXkj+kaU1kDFleZeQMzmBiOXX+pK0Ah9/0Yn1VmY3RZh1zcX9vgIQXV+t7UPrTpOjaERMUtVGw==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "ajv": "8.12.0",
+        "ajv-formats": "2.1.1",
+        "jsonc-parser": "3.2.0",
+        "rxjs": "7.8.1",
+        "source-map": "0.7.4"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": "^16.14.0 || >=18.10.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "chokidar": "^3.5.2"
+      },
+      "peerDependenciesMeta": {
+        "chokidar": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@angular-devkit/build-angular/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==",
+    "node_modules/@angular-devkit/schematics/node_modules/magic-string": {
+      "version": "0.30.0",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.0.tgz",
+      "integrity": "sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==",
       "dev": true,
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.4.13"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/inquirer": {
-      "version": "8.2.4",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.4.tgz",
-      "integrity": "sha512-nn4F01dxU8VeKfq192IjLsxu0/OmMZ4Lg3xKAns148rCaXP6ntAoEkVYZThWjwON8AlzdZZi6oqnhNbxUG9hVg==",
+    "node_modules/@angular-eslint/builder": {
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-16.2.0.tgz",
+      "integrity": "sha512-SZjXOi3YIjuX2CocuRsR2QH6k1ca9lRO6IMm0YIYMmBPFCRP2KFHkL6aQnXM6DSaymQNN2TXfpuvUd45NxhU1w==",
       "dev": true,
       "dependencies": {
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.1.1",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^3.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^3.0.0",
-        "lodash": "^4.17.21",
-        "mute-stream": "0.0.8",
-        "ora": "^5.4.1",
-        "run-async": "^2.4.0",
-        "rxjs": "^7.5.5",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "through": "^2.3.6",
-        "wrap-ansi": "^7.0.0"
+        "@nx/devkit": "16.5.1",
+        "nx": "16.5.1"
       },
-      "engines": {
-        "node": ">=12.0.0"
+      "peerDependencies": {
+        "eslint": "^7.20.0 || ^8.0.0",
+        "typescript": "*"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/mute-stream": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
+    "node_modules/@angular-eslint/bundled-angular-compiler": {
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-16.2.0.tgz",
+      "integrity": "sha512-ct9orDYxkMl2+uvM7UBfgV28Dq57V4dEs+Drh7cD673JIMa6sXbgmd0QEtm8W3cmyK/jcTzmuoufxbH7hOxd6g==",
       "dev": true
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/run-async": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
-      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
+    "node_modules/@angular-eslint/eslint-plugin": {
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-16.2.0.tgz",
+      "integrity": "sha512-zdiAIox1T+B71HL+A8m+1jWdU34nvPGLhCRw/uZNwHzknsF4tYzNQ9W7T/SC/g/2s1yT2yNosEVNJSGSFvunJg==",
       "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
+      "dependencies": {
+        "@angular-eslint/utils": "16.2.0",
+        "@typescript-eslint/utils": "5.62.0"
+      },
+      "peerDependencies": {
+        "eslint": "^7.20.0 || ^8.0.0",
+        "typescript": "*"
       }
     },
-    "node_modules/@angular-devkit/build-angular/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==",
+    "node_modules/@angular-eslint/eslint-plugin-template": {
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-16.2.0.tgz",
+      "integrity": "sha512-YFdQ6hHX6NlQj0lfogZwfyKjU8pqkJU+Zsk0ehjlXP8VfKFVmDeQT5/Xr6Df9C8pveC3hvq6Jgd8vo67S9Enxg==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "@angular-eslint/bundled-angular-compiler": "16.2.0",
+        "@angular-eslint/utils": "16.2.0",
+        "@typescript-eslint/type-utils": "5.62.0",
+        "@typescript-eslint/utils": "5.62.0",
+        "aria-query": "5.3.0",
+        "axobject-query": "3.2.1"
       },
-      "engines": {
-        "node": ">=8"
+      "peerDependencies": {
+        "eslint": "^7.20.0 || ^8.0.0",
+        "typescript": "*"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/tslib": {
-      "version": "2.5.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz",
-      "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==",
-      "dev": true
+    "node_modules/@angular-eslint/schematics": {
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-16.2.0.tgz",
+      "integrity": "sha512-2JUVR7hAKx37mgWeDjvyWEMH5uSeeksYuaQT5wwlgIzgrO4BNFuqs6Rgyp2jiYa7BFMX/qHULSa+bSq5J5ceEA==",
+      "dev": true,
+      "dependencies": {
+        "@angular-eslint/eslint-plugin": "16.2.0",
+        "@angular-eslint/eslint-plugin-template": "16.2.0",
+        "@nx/devkit": "16.5.1",
+        "ignore": "5.2.4",
+        "nx": "16.5.1",
+        "strip-json-comments": "3.1.1",
+        "tmp": "0.2.1"
+      },
+      "peerDependencies": {
+        "@angular/cli": ">= 16.0.0 < 17.0.0"
+      }
     },
-    "node_modules/@angular-devkit/build-webpack": {
-      "version": "0.1601.3",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1601.3.tgz",
-      "integrity": "sha512-744+72vi/Vx010VxizGgilhpnDCOG29qyhMmu7BkUhtpq8E8eQn2HU3nPpxAqrg3bKVAwD7v3F111MVIhub8kA==",
+    "node_modules/@angular-eslint/schematics/node_modules/tmp": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
+      "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/architect": "0.1601.3",
-        "rxjs": "7.8.1"
+        "rimraf": "^3.0.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.10.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
+        "node": ">=8.17.0"
+      }
+    },
+    "node_modules/@angular-eslint/template-parser": {
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-16.2.0.tgz",
+      "integrity": "sha512-v2jVKTy2wN7iM9nHpBkxLn2wfL8jSl4IlPrXThIqj8No2VHtpLQZPKuXbGPUXQX05VS2Mj5feScQ36ZVGS8Rbw==",
+      "dev": true,
+      "dependencies": {
+        "@angular-eslint/bundled-angular-compiler": "16.2.0",
+        "eslint-scope": "^7.0.0"
       },
       "peerDependencies": {
-        "webpack": "^5.30.0",
-        "webpack-dev-server": "^4.0.0"
+        "eslint": "^7.20.0 || ^8.0.0",
+        "typescript": "*"
       }
     },
-    "node_modules/@angular-devkit/core": {
-      "version": "16.1.3",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-16.1.3.tgz",
-      "integrity": "sha512-cFhNdJHumNMZGD3NYxOtNuMGRQXeDnKbwvK+IJmKAttXt8na6EvURR/ZxZOI7rl/YRVX+vcNSdtXz3hE6g+Isw==",
+    "node_modules/@angular-eslint/template-parser/node_modules/eslint-scope": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
       "dev": true,
       "dependencies": {
-        "ajv": "8.12.0",
-        "ajv-formats": "2.1.1",
-        "jsonc-parser": "3.2.0",
-        "rxjs": "7.8.1",
-        "source-map": "0.7.4"
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.10.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      },
-      "peerDependencies": {
-        "chokidar": "^3.5.2"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
-      "peerDependenciesMeta": {
-        "chokidar": {
-          "optional": true
-        }
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/@angular-devkit/schematics": {
-      "version": "16.1.3",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-16.1.3.tgz",
-      "integrity": "sha512-hWEuQnfQOgcSs4YX6iF4QR/34ROeSPaMi7lQOYg33hStg+pnk/JDdIU0f2nrIIz3t0jqAj+5VXVLBJvOCd84vg==",
+    "node_modules/@angular-eslint/utils": {
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-16.2.0.tgz",
+      "integrity": "sha512-NxMRwnlIgzmbJQfWkfd9y3Sz0hzjFdK5LH44i+3D5NhpPdZ6SzwHAjMYWoYsmmNQX5tlDXoicYF9Mz9Wz8DJ/A==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "16.1.3",
-        "jsonc-parser": "3.2.0",
-        "magic-string": "0.30.0",
-        "ora": "5.4.1",
-        "rxjs": "7.8.1"
+        "@angular-eslint/bundled-angular-compiler": "16.2.0",
+        "@typescript-eslint/utils": "5.62.0"
       },
-      "engines": {
-        "node": "^16.14.0 || >=18.10.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
+      "peerDependencies": {
+        "eslint": "^7.20.0 || ^8.0.0",
+        "typescript": "*"
       }
     },
     "node_modules/@angular/animations": {
-      "version": "16.1.3",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-16.1.3.tgz",
-      "integrity": "sha512-ET6ahrlbOyTYXOTouKs2VJxx0CMTrYkfz0HfI6IHnSKBC6wguDxXYnamMouHgrCkDDEB5qClfGHyS9se0AOX4w==",
+      "version": "16.2.10",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-16.2.10.tgz",
+      "integrity": "sha512-UudunZoyFWWNpuWkwiBxC3cleLCVJGHIfMgypFwC35YjtiIlRJ0r4nVkc96Rq1xd4mT71Dbk1kQHc8urB8A7aw==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -386,13 +453,13 @@
         "node": "^16.14.0 || >=18.10.0"
       },
       "peerDependencies": {
-        "@angular/core": "16.1.3"
+        "@angular/core": "16.2.10"
       }
     },
     "node_modules/@angular/cdk": {
-      "version": "16.1.4",
-      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-16.1.4.tgz",
-      "integrity": "sha512-05m0+NoAkV5O15GUEX2GQLySe8iC6P0GXVqUjLipdGmZ2/pNndJ/DGbqkX8dAAo/Z3ss2TEyRNYMOJdLIjV5vw==",
+      "version": "16.2.9",
+      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-16.2.9.tgz",
+      "integrity": "sha512-TrLV68YpddUx3t2rs8W29CPk8YkgNGA8PKHwjB4Xvo1yaEH5XUnsw3MQCh42Ee7FKseaqzFgG85USZXAK0IB0A==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -406,15 +473,15 @@
       }
     },
     "node_modules/@angular/cli": {
-      "version": "16.1.3",
-      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-16.1.3.tgz",
-      "integrity": "sha512-D0gU12z/N2oJ+s6pggAnWYrTUZ+2duGb3Y5oUyClsubz7JWpAwHjSZpb8exPUrgYhr+qIEMGO685y1JazJQ2tA==",
+      "version": "16.1.8",
+      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-16.1.8.tgz",
+      "integrity": "sha512-amOIHMq8EvixhnI+do5Bcy6IZSFAJx0njhhLM4ltDuNUczH8VH0hNegZKxhb8K87AMO8jITFM+NLrzccyghsDQ==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/architect": "0.1601.3",
-        "@angular-devkit/core": "16.1.3",
-        "@angular-devkit/schematics": "16.1.3",
-        "@schematics/angular": "16.1.3",
+        "@angular-devkit/architect": "0.1601.8",
+        "@angular-devkit/core": "16.1.8",
+        "@angular-devkit/schematics": "16.1.8",
+        "@schematics/angular": "16.1.8",
         "@yarnpkg/lockfile": "1.1.0",
         "ansi-colors": "4.1.3",
         "ini": "4.1.1",
@@ -439,130 +506,84 @@
         "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@angular/cli/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==",
+    "node_modules/@angular/cli/node_modules/@angular-devkit/architect": {
+      "version": "0.1601.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1601.8.tgz",
+      "integrity": "sha512-kOXVGwsQnZvtz2UZNefcEy64Jiwq0eSoQUeozvDXOaYRJABLjPKI2YaarvKC9/Z1SGLuje0o/eRJO4T8aRk9rQ==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "@angular-devkit/core": "16.1.8",
+        "rxjs": "7.8.1"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": "^16.14.0 || >=18.10.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@angular/cli/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/@angular/cli/node_modules/@angular-devkit/core": {
+      "version": "16.1.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-16.1.8.tgz",
+      "integrity": "sha512-dSRD/+bGanArIXkj+kaU1kDFleZeQMzmBiOXX+pK0Ah9/0Yn1VmY3RZh1zcX9vgIQXV+t7UPrTpOjaERMUtVGw==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "ajv": "8.12.0",
+        "ajv-formats": "2.1.1",
+        "jsonc-parser": "3.2.0",
+        "rxjs": "7.8.1",
+        "source-map": "0.7.4"
       },
       "engines": {
-        "node": ">=10"
+        "node": "^16.14.0 || >=18.10.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
       },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+      "peerDependencies": {
+        "chokidar": "^3.5.2"
+      },
+      "peerDependenciesMeta": {
+        "chokidar": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@angular/cli/node_modules/cli-width": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
-      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
+    "node_modules/@angular/cli/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
       "engines": {
-        "node": ">= 10"
+        "node": ">=10"
       }
     },
-    "node_modules/@angular/cli/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==",
+    "node_modules/@angular/cli/node_modules/semver": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz",
+      "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "lru-cache": "^6.0.0"
       },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@angular/cli/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/@angular/cli/node_modules/inquirer": {
-      "version": "8.2.4",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.4.tgz",
-      "integrity": "sha512-nn4F01dxU8VeKfq192IjLsxu0/OmMZ4Lg3xKAns148rCaXP6ntAoEkVYZThWjwON8AlzdZZi6oqnhNbxUG9hVg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.1.1",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^3.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^3.0.0",
-        "lodash": "^4.17.21",
-        "mute-stream": "0.0.8",
-        "ora": "^5.4.1",
-        "run-async": "^2.4.0",
-        "rxjs": "^7.5.5",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "through": "^2.3.6",
-        "wrap-ansi": "^7.0.0"
+      "bin": {
+        "semver": "bin/semver.js"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=10"
       }
     },
-    "node_modules/@angular/cli/node_modules/mute-stream": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
+    "node_modules/@angular/cli/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
       "dev": true
     },
-    "node_modules/@angular/cli/node_modules/run-async": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
-      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/@angular/cli/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/@angular/common": {
-      "version": "16.1.3",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-16.1.3.tgz",
-      "integrity": "sha512-ZzJ6EwQHUkiZYV0zH/UxyUYW5uxomsyk7tdtqZIxAR5m2ktYkQ5XlqgPjBO8voF54Rs5Ot43RkPCLesbZyJDsw==",
+      "version": "16.2.10",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-16.2.10.tgz",
+      "integrity": "sha512-cLth66aboInNcWFjDBRmK30jC5KN10nKDDcv4U/r3TDTBpKOtnmTjNFFr7dmjfUmVhHFy/66piBMfpjZI93Rxg==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -570,14 +591,14 @@
         "node": "^16.14.0 || >=18.10.0"
       },
       "peerDependencies": {
-        "@angular/core": "16.1.3",
+        "@angular/core": "16.2.10",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
     "node_modules/@angular/compiler": {
-      "version": "16.1.3",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-16.1.3.tgz",
-      "integrity": "sha512-7Ckvssk9+s5xLyXvp72IwAw5vd/Osa3tR6oiQatdbw+O3XjLO04QycoGXwkp/fYVexGsjFyOn6QJ5n1F/PYPbQ==",
+      "version": "16.2.10",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-16.2.10.tgz",
+      "integrity": "sha512-ty6SfqkZlV2bLU/SSi3wmxrEFgPrK+WVslCNIr3FlTnCBdqpIbadHN2QB3A1d9XaNc7c4Tq5DQKh34cwMwNbuw==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -585,7 +606,7 @@
         "node": "^16.14.0 || >=18.10.0"
       },
       "peerDependencies": {
-        "@angular/core": "16.1.3"
+        "@angular/core": "16.2.10"
       },
       "peerDependenciesMeta": {
         "@angular/core": {
@@ -594,12 +615,12 @@
       }
     },
     "node_modules/@angular/compiler-cli": {
-      "version": "16.1.3",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-16.1.3.tgz",
-      "integrity": "sha512-aUqnIV9rRTBNgiQRS0Gv6lhghaGj1vpVRyXgiE4VnTR9uBONSsGKMNALYBBhXRTSk2e0cvutt0ubLgmNpdyWyQ==",
+      "version": "16.2.10",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-16.2.10.tgz",
+      "integrity": "sha512-swgmtm4R23vQV9nJTXdDEFpOyIw3kz80mdT9qo3VId/2rqenOK253JsFypoqEj/fKzjV9gwXtTbmrMlhVyuyxw==",
       "dev": true,
       "dependencies": {
-        "@babel/core": "7.22.5",
+        "@babel/core": "7.23.2",
         "@jridgewell/sourcemap-codec": "^1.4.14",
         "chokidar": "^3.0.0",
         "convert-source-map": "^1.5.1",
@@ -617,14 +638,88 @@
         "node": "^16.14.0 || >=18.10.0"
       },
       "peerDependencies": {
-        "@angular/compiler": "16.1.3",
+        "@angular/compiler": "16.2.10",
         "typescript": ">=4.9.3 <5.2"
       }
     },
+    "node_modules/@angular/compiler-cli/node_modules/@babel/core": {
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.2.tgz",
+      "integrity": "sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ==",
+      "dev": true,
+      "dependencies": {
+        "@ampproject/remapping": "^2.2.0",
+        "@babel/code-frame": "^7.22.13",
+        "@babel/generator": "^7.23.0",
+        "@babel/helper-compilation-targets": "^7.22.15",
+        "@babel/helper-module-transforms": "^7.23.0",
+        "@babel/helpers": "^7.23.2",
+        "@babel/parser": "^7.23.0",
+        "@babel/template": "^7.22.15",
+        "@babel/traverse": "^7.23.2",
+        "@babel/types": "^7.23.0",
+        "convert-source-map": "^2.0.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.3",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/@babel/core/node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true
+    },
+    "node_modules/@angular/compiler-cli/node_modules/@babel/core/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/@babel/generator": {
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
+      "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.23.0",
+        "@jridgewell/gen-mapping": "^0.3.2",
+        "@jridgewell/trace-mapping": "^0.3.17",
+        "jsesc": "^2.5.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/@babel/template": {
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.22.13",
+        "@babel/parser": "^7.22.15",
+        "@babel/types": "^7.22.15"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
     "node_modules/@angular/core": {
-      "version": "16.1.3",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-16.1.3.tgz",
-      "integrity": "sha512-yhRo9hVS8KhfcEgzciWuRWF4Pnnko98bmSJTqd7u8Kys6z3Uj0qgXMssXHIPUALe3mQKjVkdSZPLIZ9/CaVn/Q==",
+      "version": "16.2.10",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-16.2.10.tgz",
+      "integrity": "sha512-0XTsPjNflFhOl2CfNEdGeDOklG2t+m/D3g10Y7hg9dBjC1dURUEqTmM4d6J7JNbBURrP+/iP7uLsn3WRSipGUw==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -637,9 +732,9 @@
       }
     },
     "node_modules/@angular/forms": {
-      "version": "16.1.3",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-16.1.3.tgz",
-      "integrity": "sha512-9tJHgoi/Jmeo30zfnReVZWFcd1WthR+QwYUNwPev+ys58u1mB0cDGORvROySmC2YUyXFSpXt8sxwyWCkYvaV2w==",
+      "version": "16.2.10",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-16.2.10.tgz",
+      "integrity": "sha512-TZliEtSWIL1UzY8kjed4QcMawWS8gk/H60KVgzCh83NGE0wd1OGv20Z5OR7O8j07dxB9vaxY7CQz/8eCz5KaNQ==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -647,69 +742,69 @@
         "node": "^16.14.0 || >=18.10.0"
       },
       "peerDependencies": {
-        "@angular/common": "16.1.3",
-        "@angular/core": "16.1.3",
-        "@angular/platform-browser": "16.1.3",
+        "@angular/common": "16.2.10",
+        "@angular/core": "16.2.10",
+        "@angular/platform-browser": "16.2.10",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
     "node_modules/@angular/material": {
-      "version": "16.1.4",
-      "resolved": "https://registry.npmjs.org/@angular/material/-/material-16.1.4.tgz",
-      "integrity": "sha512-1SKWB14J+IorRL6uzq4a9cBLpVOMONTzso05LoVLGKrmtMCL5cRYLM/otT0IjY+oqG/fnTpsYDwV7E6n7AljeA==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.b994146f6.0",
-        "@material/auto-init": "15.0.0-canary.b994146f6.0",
-        "@material/banner": "15.0.0-canary.b994146f6.0",
-        "@material/base": "15.0.0-canary.b994146f6.0",
-        "@material/button": "15.0.0-canary.b994146f6.0",
-        "@material/card": "15.0.0-canary.b994146f6.0",
-        "@material/checkbox": "15.0.0-canary.b994146f6.0",
-        "@material/chips": "15.0.0-canary.b994146f6.0",
-        "@material/circular-progress": "15.0.0-canary.b994146f6.0",
-        "@material/data-table": "15.0.0-canary.b994146f6.0",
-        "@material/density": "15.0.0-canary.b994146f6.0",
-        "@material/dialog": "15.0.0-canary.b994146f6.0",
-        "@material/dom": "15.0.0-canary.b994146f6.0",
-        "@material/drawer": "15.0.0-canary.b994146f6.0",
-        "@material/elevation": "15.0.0-canary.b994146f6.0",
-        "@material/fab": "15.0.0-canary.b994146f6.0",
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/floating-label": "15.0.0-canary.b994146f6.0",
-        "@material/form-field": "15.0.0-canary.b994146f6.0",
-        "@material/icon-button": "15.0.0-canary.b994146f6.0",
-        "@material/image-list": "15.0.0-canary.b994146f6.0",
-        "@material/layout-grid": "15.0.0-canary.b994146f6.0",
-        "@material/line-ripple": "15.0.0-canary.b994146f6.0",
-        "@material/linear-progress": "15.0.0-canary.b994146f6.0",
-        "@material/list": "15.0.0-canary.b994146f6.0",
-        "@material/menu": "15.0.0-canary.b994146f6.0",
-        "@material/menu-surface": "15.0.0-canary.b994146f6.0",
-        "@material/notched-outline": "15.0.0-canary.b994146f6.0",
-        "@material/radio": "15.0.0-canary.b994146f6.0",
-        "@material/ripple": "15.0.0-canary.b994146f6.0",
-        "@material/rtl": "15.0.0-canary.b994146f6.0",
-        "@material/segmented-button": "15.0.0-canary.b994146f6.0",
-        "@material/select": "15.0.0-canary.b994146f6.0",
-        "@material/shape": "15.0.0-canary.b994146f6.0",
-        "@material/slider": "15.0.0-canary.b994146f6.0",
-        "@material/snackbar": "15.0.0-canary.b994146f6.0",
-        "@material/switch": "15.0.0-canary.b994146f6.0",
-        "@material/tab": "15.0.0-canary.b994146f6.0",
-        "@material/tab-bar": "15.0.0-canary.b994146f6.0",
-        "@material/tab-indicator": "15.0.0-canary.b994146f6.0",
-        "@material/tab-scroller": "15.0.0-canary.b994146f6.0",
-        "@material/textfield": "15.0.0-canary.b994146f6.0",
-        "@material/theme": "15.0.0-canary.b994146f6.0",
-        "@material/tooltip": "15.0.0-canary.b994146f6.0",
-        "@material/top-app-bar": "15.0.0-canary.b994146f6.0",
-        "@material/touch-target": "15.0.0-canary.b994146f6.0",
-        "@material/typography": "15.0.0-canary.b994146f6.0",
+      "version": "16.2.9",
+      "resolved": "https://registry.npmjs.org/@angular/material/-/material-16.2.9.tgz",
+      "integrity": "sha512-ppEVvB5+TAqYxEiWCOt56TJbKayuJXPO5gAIaoIgaj7a77A3iuJRBZD/TLldqUxqCI6T5pwuTVzdeDU4tTHGug==",
+      "dependencies": {
+        "@material/animation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/auto-init": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/banner": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/base": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/button": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/card": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/checkbox": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/chips": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/circular-progress": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/data-table": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/density": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/dialog": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/dom": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/drawer": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/elevation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/fab": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/floating-label": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/form-field": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/icon-button": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/image-list": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/layout-grid": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/line-ripple": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/linear-progress": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/list": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/menu": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/menu-surface": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/notched-outline": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/radio": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/ripple": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/rtl": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/segmented-button": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/select": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/shape": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/slider": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/snackbar": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/switch": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/tab": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/tab-bar": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/tab-indicator": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/tab-scroller": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/textfield": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/theme": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/tooltip": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/top-app-bar": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/touch-target": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/typography": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.3.0"
       },
       "peerDependencies": {
         "@angular/animations": "^16.0.0 || ^17.0.0",
-        "@angular/cdk": "16.1.4",
+        "@angular/cdk": "16.2.9",
         "@angular/common": "^16.0.0 || ^17.0.0",
         "@angular/core": "^16.0.0 || ^17.0.0",
         "@angular/forms": "^16.0.0 || ^17.0.0",
@@ -718,9 +813,9 @@
       }
     },
     "node_modules/@angular/platform-browser": {
-      "version": "16.1.3",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-16.1.3.tgz",
-      "integrity": "sha512-qZA6Lua2fpBe+KD/QArY/4hilypSZFcTcJsPjZwIzo5pavXqYDI8BVghwh5dcZoUa56hVRDJjv+XW6kl8m9Tdw==",
+      "version": "16.2.10",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-16.2.10.tgz",
+      "integrity": "sha512-TOZiK7ji550F8G39Ri255NnK1+2Xlr74RiElJdQct4TzfN0lqNf2KRDFFNwDohkP/78FUzcP4qBxs+Nf8M7OuQ==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -728,9 +823,9 @@
         "node": "^16.14.0 || >=18.10.0"
       },
       "peerDependencies": {
-        "@angular/animations": "16.1.3",
-        "@angular/common": "16.1.3",
-        "@angular/core": "16.1.3"
+        "@angular/animations": "16.2.10",
+        "@angular/common": "16.2.10",
+        "@angular/core": "16.2.10"
       },
       "peerDependenciesMeta": {
         "@angular/animations": {
@@ -739,9 +834,9 @@
       }
     },
     "node_modules/@angular/platform-browser-dynamic": {
-      "version": "16.1.3",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-16.1.3.tgz",
-      "integrity": "sha512-UHxSWpPB5+FSv8zm8T+4ZikLqyy+VE6GlOLp/DdgEz77j81rz2C1pMqozwTnVbD16XbI4rhTp+RFY3C9ArWOtw==",
+      "version": "16.2.10",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-16.2.10.tgz",
+      "integrity": "sha512-YVmhAjOmsp2SWRonv6Mr/qXuKroCiew9asd1IlAZ//wqcml9ZrNAcX3WlDa8ZqdmOplQb0LuvvirfNB/6Is/jg==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -749,16 +844,16 @@
         "node": "^16.14.0 || >=18.10.0"
       },
       "peerDependencies": {
-        "@angular/common": "16.1.3",
-        "@angular/compiler": "16.1.3",
-        "@angular/core": "16.1.3",
-        "@angular/platform-browser": "16.1.3"
+        "@angular/common": "16.2.10",
+        "@angular/compiler": "16.2.10",
+        "@angular/core": "16.2.10",
+        "@angular/platform-browser": "16.2.10"
       }
     },
     "node_modules/@angular/router": {
-      "version": "16.1.3",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-16.1.3.tgz",
-      "integrity": "sha512-bkn8cWGBKKZidDaP+R7g/S/6miSfH8iP24d2k86Awo+vaO+7G/5WWGfKJMKK8UNM/A5ueX6ugAZrMHpQ9e6Y4w==",
+      "version": "16.2.10",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-16.2.10.tgz",
+      "integrity": "sha512-ndiq2NkGZ8hTsyL/KK8qsiR3UA0NjOFIn1jtGXOKtHryXZ6vSTtkhtkE4h4+G6/QNTL1IKtocFhOQt/xsc7DUA==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -766,9 +861,9 @@
         "node": "^16.14.0 || >=18.10.0"
       },
       "peerDependencies": {
-        "@angular/common": "16.1.3",
-        "@angular/core": "16.1.3",
-        "@angular/platform-browser": "16.1.3",
+        "@angular/common": "16.2.10",
+        "@angular/core": "16.2.10",
+        "@angular/platform-browser": "16.2.10",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
@@ -779,47 +874,48 @@
       "dev": true
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz",
-      "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==",
+      "version": "7.22.13",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
+      "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
       "dev": true,
       "dependencies": {
-        "@babel/highlight": "^7.22.5"
+        "@babel/highlight": "^7.22.13",
+        "chalk": "^2.4.2"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.5.tgz",
-      "integrity": "sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA==",
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.2.tgz",
+      "integrity": "sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.5.tgz",
-      "integrity": "sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg==",
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.9.tgz",
+      "integrity": "sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==",
       "dev": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.22.5",
-        "@babel/generator": "^7.22.5",
-        "@babel/helper-compilation-targets": "^7.22.5",
-        "@babel/helper-module-transforms": "^7.22.5",
-        "@babel/helpers": "^7.22.5",
-        "@babel/parser": "^7.22.5",
+        "@babel/generator": "^7.22.9",
+        "@babel/helper-compilation-targets": "^7.22.9",
+        "@babel/helper-module-transforms": "^7.22.9",
+        "@babel/helpers": "^7.22.6",
+        "@babel/parser": "^7.22.7",
         "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.5",
+        "@babel/traverse": "^7.22.8",
         "@babel/types": "^7.22.5",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
         "json5": "^2.2.2",
-        "semver": "^6.3.0"
+        "semver": "^6.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -839,9 +935,9 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.5.tgz",
-      "integrity": "sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA==",
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.9.tgz",
+      "integrity": "sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==",
       "dev": true,
       "dependencies": {
         "@babel/types": "^7.22.5",
@@ -866,34 +962,31 @@
       }
     },
     "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.5.tgz",
-      "integrity": "sha512-m1EP3lVOPptR+2DwD125gziZNcmoNSHGmJROKoy87loWUQyJaVXDgpmruWqDARZSmtYQ+Dl25okU8+qhVzuykw==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz",
+      "integrity": "sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/types": "^7.22.15"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.5.tgz",
-      "integrity": "sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz",
+      "integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.22.5",
-        "@babel/helper-validator-option": "^7.22.5",
-        "browserslist": "^4.21.3",
+        "@babel/compat-data": "^7.22.9",
+        "@babel/helper-validator-option": "^7.22.15",
+        "browserslist": "^4.21.9",
         "lru-cache": "^5.1.1",
-        "semver": "^6.3.0"
+        "semver": "^6.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
@@ -906,20 +999,20 @@
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.5.tgz",
-      "integrity": "sha512-xkb58MyOYIslxu3gKmVXmjTtUPvBU4odYzbiIQbWwLKIHCsx6UGZGX6F1IznMFVnDdirseUZopzN+ZRt8Xb33Q==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.15.tgz",
+      "integrity": "sha512-jKkwA59IXcvSaiK2UN45kKwSC9o+KuoXsBDvHvU/7BecYIp8GQ2UwrVvFgJASUT+hBnwJx6MhvMCuMzwZZ7jlg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
         "@babel/helper-environment-visitor": "^7.22.5",
         "@babel/helper-function-name": "^7.22.5",
-        "@babel/helper-member-expression-to-functions": "^7.22.5",
+        "@babel/helper-member-expression-to-functions": "^7.22.15",
         "@babel/helper-optimise-call-expression": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.9",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.5",
-        "semver": "^6.3.0"
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "semver": "^6.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -938,14 +1031,14 @@
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.5.tgz",
-      "integrity": "sha512-1VpEFOIbMRaXyDeUwUfmTIxExLwQ+zkW+Bh5zXpApA3oQedBx9v/updixWxnx/bZpKw7u8VxWjb/qWpIcmPq8A==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz",
+      "integrity": "sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
         "regexpu-core": "^5.3.1",
-        "semver": "^6.3.0"
+        "semver": "^6.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -964,48 +1057,52 @@
       }
     },
     "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.0.tgz",
-      "integrity": "sha512-RnanLx5ETe6aybRi1cO/edaRH+bNYWaryCEmjDDYyNr4wnSzyOp8T0dWipmqVHKEY3AbVKUom50AKSlj1zmKbg==",
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.3.tgz",
+      "integrity": "sha512-WBrLmuPP47n7PNwsZ57pqam6G/RGo1vw/87b0Blc53tZNGZ4x7YvZ6HgQe2vo1W/FR20OgjeZuGXzudPiXHFug==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.17.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-compilation-targets": "^7.22.6",
+        "@babel/helper-plugin-utils": "^7.22.5",
         "debug": "^4.1.1",
         "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2",
-        "semver": "^6.1.2"
+        "resolve": "^1.14.2"
       },
       "peerDependencies": {
-        "@babel/core": "^7.4.0-0"
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
-    "node_modules/@babel/helper-define-polyfill-provider/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+    "node_modules/@babel/helper-environment-visitor": {
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
       "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz",
-      "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==",
+    "node_modules/@babel/helper-function-name": {
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
       "dev": true,
+      "dependencies": {
+        "@babel/template": "^7.22.15",
+        "@babel/types": "^7.23.0"
+      },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz",
-      "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==",
+    "node_modules/@babel/helper-function-name/node_modules/@babel/template": {
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
       "dev": true,
       "dependencies": {
-        "@babel/template": "^7.22.5",
-        "@babel/types": "^7.22.5"
+        "@babel/code-frame": "^7.22.13",
+        "@babel/parser": "^7.22.15",
+        "@babel/types": "^7.22.15"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1024,46 +1121,46 @@
       }
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz",
-      "integrity": "sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz",
+      "integrity": "sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/types": "^7.23.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz",
-      "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
+      "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/types": "^7.22.15"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz",
-      "integrity": "sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz",
+      "integrity": "sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-module-imports": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-module-imports": "^7.22.15",
         "@babel/helper-simple-access": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.5",
-        "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.5",
-        "@babel/types": "^7.22.5"
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/helper-validator-identifier": "^7.22.20"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
     "node_modules/@babel/helper-optimise-call-expression": {
@@ -1088,15 +1185,14 @@
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.5.tgz",
-      "integrity": "sha512-cU0Sq1Rf4Z55fgz7haOakIyM7+x/uCFwXpLPaeRzfoUtAEAuUZjZvFPjL/rk5rW693dIgn2hng1W7xbT7lWT4g==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz",
+      "integrity": "sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-wrap-function": "^7.22.5",
-        "@babel/types": "^7.22.5"
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-wrap-function": "^7.22.20"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1106,20 +1202,20 @@
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.5.tgz",
-      "integrity": "sha512-aLdNM5I3kdI/V9xGNyKSF3X/gTyMUBohTZ+/3QdQKAA9vxIiy12E+8E2HoOP1/DjeqU+g6as35QHJNMDDYpuCg==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz",
+      "integrity": "sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-member-expression-to-functions": "^7.22.5",
-        "@babel/helper-optimise-call-expression": "^7.22.5",
-        "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.5",
-        "@babel/types": "^7.22.5"
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-member-expression-to-functions": "^7.22.15",
+        "@babel/helper-optimise-call-expression": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
     "node_modules/@babel/helper-simple-access": {
@@ -1147,9 +1243,9 @@
       }
     },
     "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.5.tgz",
-      "integrity": "sha512-thqK5QFghPKWLhAV321lxF95yCg2K3Ob5yw+M3VHWfdia0IkPXUtoLH8x/6Fh486QUvzhb8YOWHChTVen2/PoQ==",
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
       "dev": true,
       "dependencies": {
         "@babel/types": "^7.22.5"
@@ -1168,60 +1264,87 @@
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
-      "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz",
-      "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz",
+      "integrity": "sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-wrap-function": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.5.tgz",
-      "integrity": "sha512-bYqLIBSEshYcYQyfks8ewYA8S30yaGSeRslcvKMvoUk6HHPySbxHq9YRi6ghhzEU+yhQv9bP/jXnygkStOcqZw==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz",
+      "integrity": "sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-function-name": "^7.22.5",
-        "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.5",
-        "@babel/types": "^7.22.5"
+        "@babel/template": "^7.22.15",
+        "@babel/types": "^7.22.19"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-wrap-function/node_modules/@babel/template": {
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.22.13",
+        "@babel/parser": "^7.22.15",
+        "@babel/types": "^7.22.15"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.5.tgz",
-      "integrity": "sha512-pSXRmfE1vzcUIDFQcSGA5Mr+GxBV9oiRKDuDxXvWQQBCh8HoIjs/2DlDB7H8smac1IVrB9/xdXj2N3Wol9Cr+Q==",
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.2.tgz",
+      "integrity": "sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ==",
       "dev": true,
       "dependencies": {
-        "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.5",
-        "@babel/types": "^7.22.5"
+        "@babel/template": "^7.22.15",
+        "@babel/traverse": "^7.23.2",
+        "@babel/types": "^7.23.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helpers/node_modules/@babel/template": {
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.22.13",
+        "@babel/parser": "^7.22.15",
+        "@babel/types": "^7.22.15"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz",
-      "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
+      "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.22.5",
-        "chalk": "^2.0.0",
+        "@babel/helper-validator-identifier": "^7.22.20",
+        "chalk": "^2.4.2",
         "js-tokens": "^4.0.0"
       },
       "engines": {
@@ -1229,9 +1352,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.5.tgz",
-      "integrity": "sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
+      "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==",
       "dev": true,
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -1241,9 +1364,9 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz",
-      "integrity": "sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15.tgz",
+      "integrity": "sha512-FB9iYlz7rURmRJyXRKEnalYPPdn87H5no108cyuQQyMwlpJ2SJtpIUBI27kdTin956pz+LPypkPVPUTlxOmrsg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1256,14 +1379,14 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz",
-      "integrity": "sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15.tgz",
+      "integrity": "sha512-Hyph9LseGvAeeXzikV88bczhsrLrIZqDPxO+sSmAunMPaGrBGhfMWzCPYTtiW9t+HzSE2wtV8e5cc5P6r1xMDQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/plugin-transform-optional-chaining": "^7.22.5"
+        "@babel/plugin-transform-optional-chaining": "^7.22.15"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1276,6 +1399,7 @@
       "version": "7.20.7",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz",
       "integrity": "sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==",
+      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-async-generator-functions instead.",
       "dev": true,
       "dependencies": {
         "@babel/helper-environment-visitor": "^7.18.9",
@@ -1306,6 +1430,7 @@
       "version": "7.18.6",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz",
       "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==",
+      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-unicode-property-regex instead.",
       "dev": true,
       "dependencies": {
         "@babel/helper-create-regexp-features-plugin": "^7.18.6",
@@ -1569,14 +1694,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-generator-functions": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.5.tgz",
-      "integrity": "sha512-gGOEvFzm3fWoyD5uZq7vVTD57pPJ3PczPUD/xCFGjzBpUosnklmXyKnGQbbbGs1NPNPskFex0j93yKbHt0cHyg==",
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.2.tgz",
+      "integrity": "sha512-BBYVGxbDVHfoeXbOwcagAkOQAm9NxoTdMGfTqghu1GrvadSaw6iW3Je6IcL5PNOw8VwjxqBECXy50/iCQSY/lQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.20",
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-remap-async-to-generator": "^7.22.5",
+        "@babel/helper-remap-async-to-generator": "^7.22.20",
         "@babel/plugin-syntax-async-generators": "^7.8.4"
       },
       "engines": {
@@ -1619,9 +1744,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.5.tgz",
-      "integrity": "sha512-EcACl1i5fSQ6bt+YGuU/XGCeZKStLmyVGytWkpyhCLeQVA0eu6Wtiw92V+I1T/hnezUv7j74dA/Ro69gWcU+hg==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.0.tgz",
+      "integrity": "sha512-cOsrbmIOXmf+5YbL99/S49Y3j46k/T16b9ml8bm9lP6N9US5iQ2yBK7gpui1pg0V/WMcXdkfKbTb7HXq9u+v4g==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1650,12 +1775,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-static-block": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.5.tgz",
-      "integrity": "sha512-SPToJ5eYZLxlnp1UzdARpOGeC2GbHvr9d/UV0EukuVx8atktg194oe+C5BqQ8jRTkgLRVOPYeXRSBg1IlMoVRA==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.11.tgz",
+      "integrity": "sha512-GMM8gGmqI7guS/llMFk1bJDkKfn3v3C4KHK9Yg1ey5qcHcOlKb0QvcMrgzvxo+T03/4szNh5lghY+fEC98Kq9g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-create-class-features-plugin": "^7.22.11",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-class-static-block": "^7.14.5"
       },
@@ -1667,19 +1792,19 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.5.tgz",
-      "integrity": "sha512-2edQhLfibpWpsVBx2n/GKOz6JdGQvLruZQfGr9l1qes2KQaWswjBzhQF7UDUZMNaMMQeYnQzxwOMPsbYF7wqPQ==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.15.tgz",
+      "integrity": "sha512-VbbC3PGjBdE0wAWDdHM9G8Gm977pnYI0XpqMd6LrKISj8/DJXEsWqgRuTYaNE9Bv0JGhTZUzHDlMk18IpOuoqw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.15",
         "@babel/helper-environment-visitor": "^7.22.5",
         "@babel/helper-function-name": "^7.22.5",
         "@babel/helper-optimise-call-expression": "^7.22.5",
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.9",
+        "@babel/helper-split-export-declaration": "^7.22.6",
         "globals": "^11.1.0"
       },
       "engines": {
@@ -1706,9 +1831,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.5.tgz",
-      "integrity": "sha512-GfqcFuGW8vnEqTUBM7UtPd5A4q797LTvvwKxXTgRsFjoqaJiEg9deBG6kWeQYkVEL569NpnmpC0Pkr/8BLKGnQ==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.0.tgz",
+      "integrity": "sha512-vaMdgNXFkYrB+8lbgniSYWHsgqK5gjaMNcc84bMIOMRLH0L9AqYq3hwMdvnyqj1OPqea8UtjPEuS/DCenah1wg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1752,9 +1877,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-dynamic-import": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.5.tgz",
-      "integrity": "sha512-0MC3ppTB1AMxd8fXjSrbPa7LT9hrImt+/fcj+Pg5YMD7UQyWp/02+JWpdnCymmsXwIx5Z+sYn1bwCn4ZJNvhqQ==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.11.tgz",
+      "integrity": "sha512-g/21plo58sfteWjaO0ZNVb+uEOkJNjAaHhbejrnBmu011l/eNDScmkbjCC3l4FKb10ViaGU4aOkFznSu2zRHgA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1784,9 +1909,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-export-namespace-from": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.5.tgz",
-      "integrity": "sha512-X4hhm7FRnPgd4nDA4b/5V280xCx6oL7Oob5+9qVS5C13Zq4bh1qq7LU0GgRU6b5dBWBvhGaXYVB4AcN6+ol6vg==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.11.tgz",
+      "integrity": "sha512-xa7aad7q7OiT8oNZ1mU7NrISjlSkVdMbNxn9IuLZyL9AJEhs1Apba3I+u5riX1dIkdptP5EKDG5XDPByWxtehw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1800,9 +1925,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz",
-      "integrity": "sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.15.tgz",
+      "integrity": "sha512-me6VGeHsx30+xh9fbDLLPi0J1HzmeIIyenoOQHuw2D4m2SAU3NrspX5XxJLBpqn5yrLzrlw2Iy3RA//Bx27iOA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1832,9 +1957,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-json-strings": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.5.tgz",
-      "integrity": "sha512-DuCRB7fu8MyTLbEQd1ew3R85nx/88yMoqo2uPSjevMj3yoN7CDM8jkgrY0wmVxfJZyJ/B9fE1iq7EQppWQmR5A==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.11.tgz",
+      "integrity": "sha512-CxT5tCqpA9/jXFlme9xIBCc5RPtdDq3JpkkhgHQqtDdiTnTI0jtZ0QzXhr5DILeYifDPp2wvY2ad+7+hLMW5Pw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1863,9 +1988,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-logical-assignment-operators": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.5.tgz",
-      "integrity": "sha512-MQQOUW1KL8X0cDWfbwYP+TbVbZm16QmQXJQ+vndPtH/BoO0lOKpVoEDMI7+PskYxH+IiE0tS8xZye0qr1lGzSA==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.11.tgz",
+      "integrity": "sha512-qQwRTP4+6xFCDV5k7gZBF3C31K34ut0tbEcTKxlX/0KXxm9GLcO14p570aWxFvVzx6QAfPgq7gaeIHXJC8LswQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1894,12 +2019,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz",
-      "integrity": "sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.0.tgz",
+      "integrity": "sha512-xWT5gefv2HGSm4QHtgc1sYPbseOyf+FFDo2JbpE25GWl5BqTGO9IMwTYJRoIdjsF85GE+VegHxSCUt5EvoYTAw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-module-transforms": "^7.23.0",
         "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
@@ -1910,12 +2035,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz",
-      "integrity": "sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.0.tgz",
+      "integrity": "sha512-32Xzss14/UVc7k9g775yMIvkVK8xwKE0DPdP5JTapr3+Z9w4tzeOuLNY6BXDQR6BdnzIlXnCGAzsk/ICHBLVWQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-module-transforms": "^7.23.0",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-simple-access": "^7.22.5"
       },
@@ -1927,15 +2052,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.5.tgz",
-      "integrity": "sha512-emtEpoaTMsOs6Tzz+nbmcePl6AKVtS1yC4YNAeMun9U8YCsgadPNxnOPQ8GhHFB2qdx+LZu9LgoC0Lthuu05DQ==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.0.tgz",
+      "integrity": "sha512-qBej6ctXZD2f+DhlOC9yO47yEYgUh5CZNz/aBoH4j/3NOlRfJXJbY7xDQCqQVf9KbrqGzIWER1f23doHGrIHFg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-module-transforms": "^7.23.0",
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.5"
+        "@babel/helper-validator-identifier": "^7.22.20"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1992,9 +2117,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.5.tgz",
-      "integrity": "sha512-6CF8g6z1dNYZ/VXok5uYkkBBICHZPiGEl7oDnAx2Mt1hlHVHOSIKWJaXHjQJA5VB43KZnXZDIexMchY4y2PGdA==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.11.tgz",
+      "integrity": "sha512-YZWOw4HxXrotb5xsjMJUDlLgcDXSfO9eCmdl1bgW4+/lAGdkjaEvOnQ4p5WKKdUgSzO39dgPl0pTnfxm0OAXcg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -2008,9 +2133,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-numeric-separator": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.5.tgz",
-      "integrity": "sha512-NbslED1/6M+sXiwwtcAB/nieypGw02Ejf4KtDeMkCEpP6gWFMX1wI9WKYua+4oBneCCEmulOkRpwywypVZzs/g==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.11.tgz",
+      "integrity": "sha512-3dzU4QGPsILdJbASKhF/V2TVP+gJya1PsueQCxIPCEcerqF21oEcrob4mzjsp2Py/1nLfF5m+xYNMDpmA8vffg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -2024,16 +2149,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-rest-spread": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.5.tgz",
-      "integrity": "sha512-Kk3lyDmEslH9DnvCDA1s1kkd3YWQITiBOHngOtDL9Pt6BZjzqb6hiOlb8VfjiiQJ2unmegBqZu0rx5RxJb5vmQ==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.15.tgz",
+      "integrity": "sha512-fEB+I1+gAmfAyxZcX1+ZUwLeAuuf8VIg67CTznZE0MqVFumWkh8xWtn58I4dxdVf080wn7gzWoF8vndOViJe9Q==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.22.5",
-        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/compat-data": "^7.22.9",
+        "@babel/helper-compilation-targets": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.22.5"
+        "@babel/plugin-transform-parameters": "^7.22.15"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2059,9 +2184,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-catch-binding": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.5.tgz",
-      "integrity": "sha512-pH8orJahy+hzZje5b8e2QIlBWQvGpelS76C63Z+jhZKsmzfNaPQ+LaW6dcJ9bxTpo1mtXbgHwy765Ro3jftmUg==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.11.tgz",
+      "integrity": "sha512-rli0WxesXUeCJnMYhzAglEjLWVDF6ahb45HuprcmQuLidBJFWjNnOzssk2kuc6e33FlLaiZhG/kUIzUMWdBKaQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -2075,9 +2200,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.5.tgz",
-      "integrity": "sha512-AconbMKOMkyG+xCng2JogMCDcqW8wedQAqpVIL4cOSescZ7+iW8utC6YDZLMCSUIReEA733gzRSaOSXMAt/4WQ==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.0.tgz",
+      "integrity": "sha512-sBBGXbLJjxTzLBF5rFWaikMnOGOk/BmK6vVByIdEggZ7Vn6CvWXZyRkkLFK6WE0IF8jSliyOkUN6SScFgzCM0g==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -2092,9 +2217,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz",
-      "integrity": "sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.15.tgz",
+      "integrity": "sha512-hjk7qKIqhyzhhUvRT683TYQOFa/4cQKwQy7ALvTpODswN40MljzNDa0YldevS6tGbxwaEKVn502JmY0dP7qEtQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -2123,13 +2248,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-property-in-object": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.5.tgz",
-      "integrity": "sha512-/9xnaTTJcVoBtSSmrVyhtSvO3kbqS2ODoh2juEU72c3aYonNF0OMGiaz2gjukyKM2wBBYJP38S4JiE0Wfb5VMQ==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.11.tgz",
+      "integrity": "sha512-sSCbqZDBKHetvjSwpyWzhuHkmW5RummxJBVbYLkGkaiTOWGxml7SXt0iWa03bzxFIx7wOj3g/ILRd0RcJKBeSQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-create-class-features-plugin": "^7.22.11",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
       },
@@ -2156,13 +2281,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.5.tgz",
-      "integrity": "sha512-rR7KePOE7gfEtNTh9Qw+iO3Q/e4DEsoQ+hdvM6QUDH7JRJ5qxq5AA52ZzBWbI5i9lfNuvySgOGP8ZN7LAmaiPw==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz",
+      "integrity": "sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
-        "regenerator-transform": "^0.15.1"
+        "regenerator-transform": "^0.15.2"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2187,17 +2312,17 @@
       }
     },
     "node_modules/@babel/plugin-transform-runtime": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.5.tgz",
-      "integrity": "sha512-bg4Wxd1FWeFx3daHFTWk1pkSWK/AyQuiyAoeZAOkAOUBjnZPH6KT7eMxouV47tQ6hl6ax2zyAWBdWZXbrvXlaw==",
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.9.tgz",
+      "integrity": "sha512-9KjBH61AGJetCPYp/IEyLEp47SyybZb0nDRpBvmtEkm+rUIwxdlKpyNHI1TmsGkeuLclJdleQHRZ8XLBnnh8CQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-module-imports": "^7.22.5",
         "@babel/helper-plugin-utils": "^7.22.5",
-        "babel-plugin-polyfill-corejs2": "^0.4.3",
-        "babel-plugin-polyfill-corejs3": "^0.8.1",
-        "babel-plugin-polyfill-regenerator": "^0.5.0",
-        "semver": "^6.3.0"
+        "babel-plugin-polyfill-corejs2": "^0.4.4",
+        "babel-plugin-polyfill-corejs3": "^0.8.2",
+        "babel-plugin-polyfill-regenerator": "^0.5.1",
+        "semver": "^6.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2292,9 +2417,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.5.tgz",
-      "integrity": "sha512-biEmVg1IYB/raUO5wT1tgfacCef15Fbzhkx493D3urBI++6hpJ+RFG4SrWMn0NEZLfvilqKf3QDrRVZHo08FYg==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz",
+      "integrity": "sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -2355,13 +2480,13 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.5.tgz",
-      "integrity": "sha512-fj06hw89dpiZzGZtxn+QybifF07nNiZjZ7sazs2aVDcysAZVGjW7+7iFYxg6GLNM47R/thYfLdrXc+2f11Vi9A==",
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.9.tgz",
+      "integrity": "sha512-wNi5H/Emkhll/bqPjsjQorSykrlfY5OWakd6AulLvMEytpKasMVUpVy8RL4qBIBs5Ac6/5i0/Rv0b/Fg6Eag/g==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.22.5",
-        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/compat-data": "^7.22.9",
+        "@babel/helper-compilation-targets": "^7.22.9",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-validator-option": "^7.22.5",
         "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.5",
@@ -2386,13 +2511,13 @@
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
         "@babel/plugin-transform-arrow-functions": "^7.22.5",
-        "@babel/plugin-transform-async-generator-functions": "^7.22.5",
+        "@babel/plugin-transform-async-generator-functions": "^7.22.7",
         "@babel/plugin-transform-async-to-generator": "^7.22.5",
         "@babel/plugin-transform-block-scoped-functions": "^7.22.5",
         "@babel/plugin-transform-block-scoping": "^7.22.5",
         "@babel/plugin-transform-class-properties": "^7.22.5",
         "@babel/plugin-transform-class-static-block": "^7.22.5",
-        "@babel/plugin-transform-classes": "^7.22.5",
+        "@babel/plugin-transform-classes": "^7.22.6",
         "@babel/plugin-transform-computed-properties": "^7.22.5",
         "@babel/plugin-transform-destructuring": "^7.22.5",
         "@babel/plugin-transform-dotall-regex": "^7.22.5",
@@ -2417,7 +2542,7 @@
         "@babel/plugin-transform-object-rest-spread": "^7.22.5",
         "@babel/plugin-transform-object-super": "^7.22.5",
         "@babel/plugin-transform-optional-catch-binding": "^7.22.5",
-        "@babel/plugin-transform-optional-chaining": "^7.22.5",
+        "@babel/plugin-transform-optional-chaining": "^7.22.6",
         "@babel/plugin-transform-parameters": "^7.22.5",
         "@babel/plugin-transform-private-methods": "^7.22.5",
         "@babel/plugin-transform-private-property-in-object": "^7.22.5",
@@ -2435,11 +2560,11 @@
         "@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
         "@babel/preset-modules": "^0.1.5",
         "@babel/types": "^7.22.5",
-        "babel-plugin-polyfill-corejs2": "^0.4.3",
-        "babel-plugin-polyfill-corejs3": "^0.8.1",
-        "babel-plugin-polyfill-regenerator": "^0.5.0",
-        "core-js-compat": "^3.30.2",
-        "semver": "^6.3.0"
+        "babel-plugin-polyfill-corejs2": "^0.4.4",
+        "babel-plugin-polyfill-corejs3": "^0.8.2",
+        "babel-plugin-polyfill-regenerator": "^0.5.1",
+        "core-js-compat": "^3.31.0",
+        "semver": "^6.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2458,9 +2583,9 @@
       }
     },
     "node_modules/@babel/preset-modules": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
-      "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6.tgz",
+      "integrity": "sha512-ID2yj6K/4lKfhuU3+EX4UvNbIt7eACFbHmNUjzA+ep+B5971CknnA/9DEWKbRokfbbtblxxxXFJJrH47UEAMVg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.0.0",
@@ -2470,7 +2595,7 @@
         "esutils": "^2.0.2"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0"
       }
     },
     "node_modules/@babel/regjsgen": {
@@ -2480,9 +2605,9 @@
       "dev": true
     },
     "node_modules/@babel/runtime": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.5.tgz",
-      "integrity": "sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA==",
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.6.tgz",
+      "integrity": "sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==",
       "dev": true,
       "dependencies": {
         "regenerator-runtime": "^0.13.11"
@@ -2506,19 +2631,19 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.5.tgz",
-      "integrity": "sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ==",
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
+      "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.22.5",
-        "@babel/generator": "^7.22.5",
-        "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-function-name": "^7.22.5",
+        "@babel/code-frame": "^7.22.13",
+        "@babel/generator": "^7.23.0",
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-function-name": "^7.23.0",
         "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.5",
-        "@babel/parser": "^7.22.5",
-        "@babel/types": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/parser": "^7.23.0",
+        "@babel/types": "^7.23.0",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -2526,14 +2651,29 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@babel/traverse/node_modules/@babel/generator": {
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
+      "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.23.0",
+        "@jridgewell/gen-mapping": "^0.3.2",
+        "@jridgewell/trace-mapping": "^0.3.17",
+        "jsesc": "^2.5.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
     "node_modules/@babel/types": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz",
-      "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
+      "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-string-parser": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.20",
         "to-fast-properties": "^2.0.0"
       },
       "engines": {
@@ -2559,9 +2699,9 @@
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.19.tgz",
-      "integrity": "sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==",
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.17.tgz",
+      "integrity": "sha512-wHsmJG/dnL3OkpAcwbgoBTTMHVi4Uyou3F5mf58ZtmUyIKfcdA7TROav/6tCzET4A3QW2Q2FC+eFneMU+iyOxg==",
       "cpu": [
         "arm"
       ],
@@ -2575,9 +2715,9 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.19.tgz",
-      "integrity": "sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==",
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.17.tgz",
+      "integrity": "sha512-9np+YYdNDed5+Jgr1TdWBsozZ85U1Oa3xW0c7TWqH0y2aGghXtZsuT8nYRbzOMcl0bXZXjOGbksoTtVOlWrRZg==",
       "cpu": [
         "arm64"
       ],
@@ -2591,9 +2731,9 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.19.tgz",
-      "integrity": "sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==",
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.17.tgz",
+      "integrity": "sha512-O+FeWB/+xya0aLg23hHEM2E3hbfwZzjqumKMSIqcHbNvDa+dza2D0yLuymRBQQnC34CWrsJUXyH2MG5VnLd6uw==",
       "cpu": [
         "x64"
       ],
@@ -2607,9 +2747,9 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.19.tgz",
-      "integrity": "sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==",
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.17.tgz",
+      "integrity": "sha512-M9uJ9VSB1oli2BE/dJs3zVr9kcCBBsE883prage1NWz6pBS++1oNn/7soPNS3+1DGj0FrkSvnED4Bmlu1VAE9g==",
       "cpu": [
         "arm64"
       ],
@@ -2623,9 +2763,9 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.19.tgz",
-      "integrity": "sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==",
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.17.tgz",
+      "integrity": "sha512-XDre+J5YeIJDMfp3n0279DFNrGCXlxOuGsWIkRb1NThMZ0BsrWXoTg23Jer7fEXQ9Ye5QjrvXpxnhzl3bHtk0g==",
       "cpu": [
         "x64"
       ],
@@ -2639,9 +2779,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.19.tgz",
-      "integrity": "sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==",
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.17.tgz",
+      "integrity": "sha512-cjTzGa3QlNfERa0+ptykyxs5A6FEUQQF0MuilYXYBGdBxD3vxJcKnzDlhDCa1VAJCmAxed6mYhA2KaJIbtiNuQ==",
       "cpu": [
         "arm64"
       ],
@@ -2655,9 +2795,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.19.tgz",
-      "integrity": "sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==",
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.17.tgz",
+      "integrity": "sha512-sOxEvR8d7V7Kw8QqzxWc7bFfnWnGdaFBut1dRUYtu+EIRXefBc/eIsiUiShnW0hM3FmQ5Zf27suDuHsKgZ5QrA==",
       "cpu": [
         "x64"
       ],
@@ -2671,9 +2811,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.19.tgz",
-      "integrity": "sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==",
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.17.tgz",
+      "integrity": "sha512-2d3Lw6wkwgSLC2fIvXKoMNGVaeY8qdN0IC3rfuVxJp89CRfA3e3VqWifGDfuakPmp90+ZirmTfye1n4ncjv2lg==",
       "cpu": [
         "arm"
       ],
@@ -2687,9 +2827,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.19.tgz",
-      "integrity": "sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==",
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.17.tgz",
+      "integrity": "sha512-c9w3tE7qA3CYWjT+M3BMbwMt+0JYOp3vCMKgVBrCl1nwjAlOMYzEo+gG7QaZ9AtqZFj5MbUc885wuBBmu6aADQ==",
       "cpu": [
         "arm64"
       ],
@@ -2703,9 +2843,9 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.19.tgz",
-      "integrity": "sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==",
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.17.tgz",
+      "integrity": "sha512-1DS9F966pn5pPnqXYz16dQqWIB0dmDfAQZd6jSSpiT9eX1NzKh07J6VKR3AoXXXEk6CqZMojiVDSZi1SlmKVdg==",
       "cpu": [
         "ia32"
       ],
@@ -2719,9 +2859,9 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.19.tgz",
-      "integrity": "sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==",
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.17.tgz",
+      "integrity": "sha512-EvLsxCk6ZF0fpCB6w6eOI2Fc8KW5N6sHlIovNe8uOFObL2O+Mr0bflPHyHwLT6rwMg9r77WOAWb2FqCQrVnwFg==",
       "cpu": [
         "loong64"
       ],
@@ -2735,9 +2875,9 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.19.tgz",
-      "integrity": "sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==",
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.17.tgz",
+      "integrity": "sha512-e0bIdHA5p6l+lwqTE36NAW5hHtw2tNRmHlGBygZC14QObsA3bD4C6sXLJjvnDIjSKhW1/0S3eDy+QmX/uZWEYQ==",
       "cpu": [
         "mips64el"
       ],
@@ -2751,9 +2891,9 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.19.tgz",
-      "integrity": "sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==",
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.17.tgz",
+      "integrity": "sha512-BAAilJ0M5O2uMxHYGjFKn4nJKF6fNCdP1E0o5t5fvMYYzeIqy2JdAP88Az5LHt9qBoUa4tDaRpfWt21ep5/WqQ==",
       "cpu": [
         "ppc64"
       ],
@@ -2767,9 +2907,9 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.19.tgz",
-      "integrity": "sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==",
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.17.tgz",
+      "integrity": "sha512-Wh/HW2MPnC3b8BqRSIme/9Zhab36PPH+3zam5pqGRH4pE+4xTrVLx2+XdGp6fVS3L2x+DrsIcsbMleex8fbE6g==",
       "cpu": [
         "riscv64"
       ],
@@ -2783,9 +2923,9 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.19.tgz",
-      "integrity": "sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==",
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.17.tgz",
+      "integrity": "sha512-j/34jAl3ul3PNcK3pfI0NSlBANduT2UO5kZ7FCaK33XFv3chDhICLY8wJJWIhiQ+YNdQ9dxqQctRg2bvrMlYgg==",
       "cpu": [
         "s390x"
       ],
@@ -2799,9 +2939,9 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.19.tgz",
-      "integrity": "sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==",
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.17.tgz",
+      "integrity": "sha512-QM50vJ/y+8I60qEmFxMoxIx4de03pGo2HwxdBeFd4nMh364X6TIBZ6VQ5UQmPbQWUVWHWws5MmJXlHAXvJEmpQ==",
       "cpu": [
         "x64"
       ],
@@ -2815,9 +2955,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.19.tgz",
-      "integrity": "sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==",
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.17.tgz",
+      "integrity": "sha512-/jGlhWR7Sj9JPZHzXyyMZ1RFMkNPjC6QIAan0sDOtIo2TYk3tZn5UDrkE0XgsTQCxWTTOcMPf9p6Rh2hXtl5TQ==",
       "cpu": [
         "x64"
       ],
@@ -2831,9 +2971,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.19.tgz",
-      "integrity": "sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==",
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.17.tgz",
+      "integrity": "sha512-rSEeYaGgyGGf4qZM2NonMhMOP/5EHp4u9ehFiBrg7stH6BYEEjlkVREuDEcQ0LfIl53OXLxNbfuIj7mr5m29TA==",
       "cpu": [
         "x64"
       ],
@@ -2847,9 +2987,9 @@
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.19.tgz",
-      "integrity": "sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==",
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.17.tgz",
+      "integrity": "sha512-Y7ZBbkLqlSgn4+zot4KUNYst0bFoO68tRgI6mY2FIM+b7ZbyNVtNbDP5y8qlu4/knZZ73fgJDlXID+ohY5zt5g==",
       "cpu": [
         "x64"
       ],
@@ -2863,9 +3003,9 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.19.tgz",
-      "integrity": "sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==",
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.17.tgz",
+      "integrity": "sha512-bwPmTJsEQcbZk26oYpc4c/8PvTY3J5/QK8jM19DVlEsAB41M39aWovWoHtNm78sd6ip6prilxeHosPADXtEJFw==",
       "cpu": [
         "arm64"
       ],
@@ -2879,9 +3019,9 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.19.tgz",
-      "integrity": "sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==",
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.17.tgz",
+      "integrity": "sha512-H/XaPtPKli2MhW+3CQueo6Ni3Avggi6hP/YvgkEe1aSaxw+AeO8MFjq8DlgfTd9Iz4Yih3QCZI6YLMoyccnPRg==",
       "cpu": [
         "ia32"
       ],
@@ -2895,9 +3035,9 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz",
-      "integrity": "sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==",
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.17.tgz",
+      "integrity": "sha512-fGEb8f2BSA3CW7riJVurug65ACLuQAzKq0SSqkY2b2yHHH0MzDfbLyKIGzHwOI/gkHcxM/leuSW6D5w/LMNitA==",
       "cpu": [
         "x64"
       ],
@@ -2910,13 +3050,169 @@
         "node": ">=12"
       }
     },
-    "node_modules/@isaacs/cliui": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
-      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+    "node_modules/@eslint-community/eslint-utils": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
       "dev": true,
       "dependencies": {
-        "string-width": "^5.1.2",
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+      }
+    },
+    "node_modules/@eslint-community/regexpp": {
+      "version": "4.9.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.9.1.tgz",
+      "integrity": "sha512-Y27x+MBLjXa+0JWDhykM3+JE+il3kHKAEqabfEWq3SDhZjLYb6/BHL/JKFnH3fe207JaXkyDo685Oc2Glt6ifA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@eslint/eslintrc": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz",
+      "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.6.0",
+        "globals": "^13.19.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/ajv": {
+      "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",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "node_modules/@eslint/eslintrc/node_modules/globals": {
+      "version": "13.23.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz",
+      "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/@eslint/eslintrc/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==",
+      "dev": true
+    },
+    "node_modules/@eslint/eslintrc/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/@eslint/js": {
+      "version": "8.52.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.52.0.tgz",
+      "integrity": "sha512-mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@humanwhocodes/config-array": {
+      "version": "0.11.13",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz",
+      "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==",
+      "dev": true,
+      "dependencies": {
+        "@humanwhocodes/object-schema": "^2.0.1",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.5"
+      },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/@humanwhocodes/module-importer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.22"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
+    },
+    "node_modules/@humanwhocodes/object-schema": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz",
+      "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==",
+      "dev": true
+    },
+    "node_modules/@isaacs/cliui": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^5.1.2",
         "string-width-cjs": "npm:string-width@^4.2.0",
         "strip-ansi": "^7.0.1",
         "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
@@ -3031,6 +3327,18 @@
         "node": ">=8"
       }
     },
+    "node_modules/@jest/schemas": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
+      "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
+      "dev": true,
+      "dependencies": {
+        "@sinclair/typebox": "^0.27.8"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
     "node_modules/@jridgewell/gen-mapping": {
       "version": "0.3.3",
       "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
@@ -3046,9 +3354,9 @@
       }
     },
     "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
-      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
+      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
       "dev": true,
       "engines": {
         "node": ">=6.0.0"
@@ -3064,9 +3372,9 @@
       }
     },
     "node_modules/@jridgewell/source-map": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.3.tgz",
-      "integrity": "sha512-b+fsZXeLYi9fEULmfBrhxn4IrPlINf8fiNarzTof004v3lFdntdwa9PF7vFJqm3mg7s+ScJMxXaE3Acp1irZcg==",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz",
+      "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==",
       "dev": true,
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.0",
@@ -3080,21 +3388,15 @@
       "dev": true
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.18",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
-      "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
+      "version": "0.3.20",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz",
+      "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==",
       "dev": true,
       "dependencies": {
-        "@jridgewell/resolve-uri": "3.1.0",
-        "@jridgewell/sourcemap-codec": "1.4.14"
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
-    "node_modules/@jridgewell/trace-mapping/node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.14",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
-      "dev": true
-    },
     "node_modules/@leichtgewicht/ip-codec": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
@@ -3102,761 +3404,761 @@
       "dev": true
     },
     "node_modules/@material/animation": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/animation/-/animation-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-kqqzG54tabYJ5VsBur5k1bqCFQCEpaW3hmLRMiSVVxRY7XgTt7qkuOOz48gs+MPqR6P8VIi6gFpuscV1+DWDhw==",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/animation/-/animation-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-leRf+BcZTfC/iSigLXnYgcHAGvFVQveoJT5+2PIRdyPI/bIG7hhciRgacHRsCKC0sGya81dDblLgdkjSUemYLw==",
       "dependencies": {
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/auto-init": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/auto-init/-/auto-init-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-8nLe/XeueJg5yyYx5e4UxWQXpTDyUhibKfyroGwnRKc8pdpOCOulHSOj/fIVGJAIbxkEJoebwMadWUNCjUhc9A==",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/auto-init/-/auto-init-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-uxzDq7q3c0Bu1pAsMugc1Ik9ftQYQqZY+5e2ybNplT8gTImJhNt4M2mMiMHbMANk2l3UgICmUyRSomgPBWCPIA==",
       "dependencies": {
-        "@material/base": "15.0.0-canary.b994146f6.0",
+        "@material/base": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/banner": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/banner/-/banner-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-gJ4/VdP4dJgHP72Kdjy2f/UjHB45J4CuxoGvI0NIQYUjOSsr4kQiQHsjVgyEPZR/5wa7kBhM7/0mJ+zF7Ghv2A==",
-      "dependencies": {
-        "@material/base": "15.0.0-canary.b994146f6.0",
-        "@material/button": "15.0.0-canary.b994146f6.0",
-        "@material/dom": "15.0.0-canary.b994146f6.0",
-        "@material/elevation": "15.0.0-canary.b994146f6.0",
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/ripple": "15.0.0-canary.b994146f6.0",
-        "@material/rtl": "15.0.0-canary.b994146f6.0",
-        "@material/shape": "15.0.0-canary.b994146f6.0",
-        "@material/theme": "15.0.0-canary.b994146f6.0",
-        "@material/tokens": "15.0.0-canary.b994146f6.0",
-        "@material/typography": "15.0.0-canary.b994146f6.0",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/banner/-/banner-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-SHeVoidCUFVhXANN6MNWxK9SZoTSgpIP8GZB7kAl52BywLxtV+FirTtLXkg/8RUkxZRyRWl7HvQ0ZFZa7QQAyA==",
+      "dependencies": {
+        "@material/base": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/button": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/dom": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/elevation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/ripple": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/rtl": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/shape": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/theme": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/tokens": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/typography": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/base": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/base/-/base-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-rW2upYD5YjRFBL6DzYn3SCRhtvpEDkwplDS810e3vt71uLMRyqXyw4OQJH+Nab/t+32TFDtKNUphXIzwICXGDQ==",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/base/-/base-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-Fc3vGuOf+duGo22HTRP6dHdc+MUe0VqQfWOuKrn/wXKD62m0QQR2TqJd3rRhCumH557T5QUyheW943M3E+IGfg==",
       "dependencies": {
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/button": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/button/-/button-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-SMyqtsvJuCqpXBz2JgciuR6wddNJSGpTXUFxmLbGluBy5/hHm06JWlOFcUOxGDv46OdRGGrRfkg6A9JtvtsJsw==",
-      "dependencies": {
-        "@material/density": "15.0.0-canary.b994146f6.0",
-        "@material/dom": "15.0.0-canary.b994146f6.0",
-        "@material/elevation": "15.0.0-canary.b994146f6.0",
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/focus-ring": "15.0.0-canary.b994146f6.0",
-        "@material/ripple": "15.0.0-canary.b994146f6.0",
-        "@material/rtl": "15.0.0-canary.b994146f6.0",
-        "@material/shape": "15.0.0-canary.b994146f6.0",
-        "@material/theme": "15.0.0-canary.b994146f6.0",
-        "@material/tokens": "15.0.0-canary.b994146f6.0",
-        "@material/touch-target": "15.0.0-canary.b994146f6.0",
-        "@material/typography": "15.0.0-canary.b994146f6.0",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/button/-/button-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-3AQgwrPZCTWHDJvwgKq7Cj+BurQ4wTjDdGL+FEnIGUAjJDskwi1yzx5tW2Wf/NxIi7IoPFyOY3UB41jwMiOrnw==",
+      "dependencies": {
+        "@material/density": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/dom": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/elevation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/focus-ring": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/ripple": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/rtl": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/shape": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/theme": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/tokens": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/touch-target": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/typography": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/card": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/card/-/card-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-WSggGon91HcDhJyatnYLFkoM9glkkeJjyjFDWrcJkwN1rdrPJU+GH+PNjvmArz5hGv9WkmjDjhOdAuPnL4Mb7g==",
-      "dependencies": {
-        "@material/dom": "15.0.0-canary.b994146f6.0",
-        "@material/elevation": "15.0.0-canary.b994146f6.0",
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/ripple": "15.0.0-canary.b994146f6.0",
-        "@material/rtl": "15.0.0-canary.b994146f6.0",
-        "@material/shape": "15.0.0-canary.b994146f6.0",
-        "@material/theme": "15.0.0-canary.b994146f6.0",
-        "@material/tokens": "15.0.0-canary.b994146f6.0",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/card/-/card-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-nPlhiWvbLmooTnBmV5gmzB0eLWSgLKsSRBYAbIBmO76Okgz1y+fQNLag+lpm/TDaHVsn5fmQJH8e0zIg0rYsQA==",
+      "dependencies": {
+        "@material/dom": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/elevation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/ripple": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/rtl": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/shape": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/theme": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/tokens": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/checkbox": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/checkbox/-/checkbox-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-pulRiwG9S/dS6WBG+GteODBltddFiL0Sb7HAqdzF2BTKNKv25q1ZIR3ftoEa09TNeWM88AOzTJ4aBHiADfJn2w==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.b994146f6.0",
-        "@material/base": "15.0.0-canary.b994146f6.0",
-        "@material/density": "15.0.0-canary.b994146f6.0",
-        "@material/dom": "15.0.0-canary.b994146f6.0",
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/focus-ring": "15.0.0-canary.b994146f6.0",
-        "@material/ripple": "15.0.0-canary.b994146f6.0",
-        "@material/rtl": "15.0.0-canary.b994146f6.0",
-        "@material/theme": "15.0.0-canary.b994146f6.0",
-        "@material/touch-target": "15.0.0-canary.b994146f6.0",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/checkbox/-/checkbox-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-4tpNnO1L0IppoMF3oeQn8F17t2n0WHB0D7mdJK9rhrujen/fLbekkIC82APB3fdGtLGg3qeNqDqPsJm1YnmrwA==",
+      "dependencies": {
+        "@material/animation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/base": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/density": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/dom": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/focus-ring": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/ripple": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/rtl": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/theme": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/touch-target": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/chips": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/chips/-/chips-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-3yJPj7x+eKLA4LMKG7aTWI+itAnKRVGOcniuR6aiXVy0OKr5asNuWNeZc9J0/VErjjxF3tdybDzDSPo01qPy9w==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.b994146f6.0",
-        "@material/base": "15.0.0-canary.b994146f6.0",
-        "@material/checkbox": "15.0.0-canary.b994146f6.0",
-        "@material/density": "15.0.0-canary.b994146f6.0",
-        "@material/dom": "15.0.0-canary.b994146f6.0",
-        "@material/elevation": "15.0.0-canary.b994146f6.0",
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/focus-ring": "15.0.0-canary.b994146f6.0",
-        "@material/ripple": "15.0.0-canary.b994146f6.0",
-        "@material/rtl": "15.0.0-canary.b994146f6.0",
-        "@material/shape": "15.0.0-canary.b994146f6.0",
-        "@material/theme": "15.0.0-canary.b994146f6.0",
-        "@material/tokens": "15.0.0-canary.b994146f6.0",
-        "@material/touch-target": "15.0.0-canary.b994146f6.0",
-        "@material/typography": "15.0.0-canary.b994146f6.0",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/chips/-/chips-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-fqHKvE5bSWK0bXVkf57MWxZtytGqYBZvvHIOs4JI9HPHEhaJy4CpSw562BEtbm3yFxxALoQknvPW2KYzvADnmA==",
+      "dependencies": {
+        "@material/animation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/base": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/checkbox": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/density": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/dom": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/elevation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/focus-ring": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/ripple": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/rtl": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/shape": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/theme": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/tokens": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/touch-target": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/typography": "15.0.0-canary.bc9ae6c9c.0",
         "safevalues": "^0.3.4",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/circular-progress": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/circular-progress/-/circular-progress-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-6YUvGXdtZKJoE7AuovR4xk1aiWp/EDZ6j2U3TOeynd1assQQCg5XT4abqAoHtpJrRPaCFgUAp836HyiDVVuYug==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.b994146f6.0",
-        "@material/base": "15.0.0-canary.b994146f6.0",
-        "@material/dom": "15.0.0-canary.b994146f6.0",
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/progress-indicator": "15.0.0-canary.b994146f6.0",
-        "@material/rtl": "15.0.0-canary.b994146f6.0",
-        "@material/theme": "15.0.0-canary.b994146f6.0",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/circular-progress/-/circular-progress-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-Lxe8BGAxQwCQqrLhrYrIP0Uok10h7aYS3RBXP41ph+5GmwJd5zdyE2t93qm2dyThvU6qKuXw9726Dtq/N+wvZQ==",
+      "dependencies": {
+        "@material/animation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/base": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/dom": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/progress-indicator": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/rtl": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/theme": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/data-table": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/data-table/-/data-table-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-v4hIduIe/wzyibuL/RPM/ErYrt8XpB7fxyQqtV+0JsMpFa8E81QYyvMCS9EJj9m4YdkrQnZgA+vXQlOkhWvmdQ==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.b994146f6.0",
-        "@material/base": "15.0.0-canary.b994146f6.0",
-        "@material/checkbox": "15.0.0-canary.b994146f6.0",
-        "@material/density": "15.0.0-canary.b994146f6.0",
-        "@material/dom": "15.0.0-canary.b994146f6.0",
-        "@material/elevation": "15.0.0-canary.b994146f6.0",
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/icon-button": "15.0.0-canary.b994146f6.0",
-        "@material/linear-progress": "15.0.0-canary.b994146f6.0",
-        "@material/list": "15.0.0-canary.b994146f6.0",
-        "@material/menu": "15.0.0-canary.b994146f6.0",
-        "@material/rtl": "15.0.0-canary.b994146f6.0",
-        "@material/select": "15.0.0-canary.b994146f6.0",
-        "@material/shape": "15.0.0-canary.b994146f6.0",
-        "@material/theme": "15.0.0-canary.b994146f6.0",
-        "@material/tokens": "15.0.0-canary.b994146f6.0",
-        "@material/touch-target": "15.0.0-canary.b994146f6.0",
-        "@material/typography": "15.0.0-canary.b994146f6.0",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/data-table/-/data-table-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-j/7qplT9+sUpfe4pyWhPbl01qJA+OoNAG3VMJruBBR461ZBKyTi7ssKH9yksFGZ8eCEPkOsk/+kDxsiZvRWkeQ==",
+      "dependencies": {
+        "@material/animation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/base": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/checkbox": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/density": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/dom": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/elevation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/icon-button": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/linear-progress": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/list": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/menu": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/rtl": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/select": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/shape": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/theme": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/tokens": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/touch-target": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/typography": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/density": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/density/-/density-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-m8l0vuoWSoAPItBpWp5eZDvitUcB2JWoO8V486hLgdveVcKgXG09xWM43ScH+PLXAWjzr5olDEuJ2tvfkN3SpQ==",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/density/-/density-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-Zt3u07fXrBWLW06Tl5fgvjicxNQMkFdawLyNTzZ5TvbXfVkErILLePwwGaw8LNcvzqJP6ABLA8jiR+sKNoJQCg==",
       "dependencies": {
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/dialog": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/dialog/-/dialog-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-JucU92yh8cfZQpyRBunHr6uohacePLYmhcPaGpkAGQ1b+zCznEsNs55tjhaVQNoj91XA9rrBqtL6Otg+fxFJtQ==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.b994146f6.0",
-        "@material/base": "15.0.0-canary.b994146f6.0",
-        "@material/button": "15.0.0-canary.b994146f6.0",
-        "@material/dom": "15.0.0-canary.b994146f6.0",
-        "@material/elevation": "15.0.0-canary.b994146f6.0",
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/icon-button": "15.0.0-canary.b994146f6.0",
-        "@material/ripple": "15.0.0-canary.b994146f6.0",
-        "@material/rtl": "15.0.0-canary.b994146f6.0",
-        "@material/shape": "15.0.0-canary.b994146f6.0",
-        "@material/theme": "15.0.0-canary.b994146f6.0",
-        "@material/tokens": "15.0.0-canary.b994146f6.0",
-        "@material/touch-target": "15.0.0-canary.b994146f6.0",
-        "@material/typography": "15.0.0-canary.b994146f6.0",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/dialog/-/dialog-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-o+9a/fmwJ9+gY3Z/uhj/PMVJDq7it1NTWKJn2GwAKdB+fDkT4hb9qEdcxMPyvJJ5ups+XiKZo03+tZrD+38c1w==",
+      "dependencies": {
+        "@material/animation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/base": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/button": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/dom": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/elevation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/icon-button": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/ripple": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/rtl": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/shape": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/theme": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/tokens": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/touch-target": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/typography": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/dom": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/dom/-/dom-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-DiUsTezrCi4iytjIn7xXoXZSNFvuTrVVZgc7cR9cW8yu2Hpz8bPf87PacVn4IP9OsNwy/dCDMk1Kcq/DMh7gXQ==",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/dom/-/dom-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-ly78R7aoCJtundSUu0UROU+5pQD5Piae0Y1MkN6bs0724azeazX1KeXFeaf06JOXnlr5/41ol+fSUPowjoqnOg==",
       "dependencies": {
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/rtl": "15.0.0-canary.b994146f6.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/rtl": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/drawer": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/drawer/-/drawer-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-Kbuf32V0eX69amvCVbAjNSabNDerZWyG8ip466EfQHRh0OUZwvsbhLp9FZOB7AyR+/bQiHf3mVLcombOdmdkcQ==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.b994146f6.0",
-        "@material/base": "15.0.0-canary.b994146f6.0",
-        "@material/dom": "15.0.0-canary.b994146f6.0",
-        "@material/elevation": "15.0.0-canary.b994146f6.0",
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/list": "15.0.0-canary.b994146f6.0",
-        "@material/ripple": "15.0.0-canary.b994146f6.0",
-        "@material/rtl": "15.0.0-canary.b994146f6.0",
-        "@material/shape": "15.0.0-canary.b994146f6.0",
-        "@material/theme": "15.0.0-canary.b994146f6.0",
-        "@material/typography": "15.0.0-canary.b994146f6.0",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/drawer/-/drawer-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-PFL4cEFnt7VTxDsuspFVNhsFDYyumjU0VWfj3PWB7XudsEfQ3lo85D3HCEtTTbRsCainGN8bgYNDNafLBqiigw==",
+      "dependencies": {
+        "@material/animation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/base": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/dom": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/elevation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/list": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/ripple": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/rtl": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/shape": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/theme": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/typography": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/elevation": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/elevation/-/elevation-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-l2YDNgBajSI6oA2l6gaeYCTGHRao657syqQ/tv95/Hkcee9900A4RrsxCwSxOqqAs5pZZDEJ33kFJjj27nqZDw==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.b994146f6.0",
-        "@material/base": "15.0.0-canary.b994146f6.0",
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/rtl": "15.0.0-canary.b994146f6.0",
-        "@material/theme": "15.0.0-canary.b994146f6.0",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/elevation/-/elevation-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-Ro+Pk8jFuap+T0B0shA3xI1hs2b89dNQ2EIPCNjNMp87emHKAzJfhKb7EZGIwv3+gFLlVaLyIVkb94I89KLsyg==",
+      "dependencies": {
+        "@material/animation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/base": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/rtl": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/theme": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/fab": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/fab/-/fab-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-ExyDVkNWINpns41Ahj4u8I/OhiVkqI0nmcqjFRtgTJMmKEd4NhlvqIxE7gakAlyS68riJu5UleqTSTVmt8mv2Q==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.b994146f6.0",
-        "@material/dom": "15.0.0-canary.b994146f6.0",
-        "@material/elevation": "15.0.0-canary.b994146f6.0",
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/focus-ring": "15.0.0-canary.b994146f6.0",
-        "@material/ripple": "15.0.0-canary.b994146f6.0",
-        "@material/rtl": "15.0.0-canary.b994146f6.0",
-        "@material/shape": "15.0.0-canary.b994146f6.0",
-        "@material/theme": "15.0.0-canary.b994146f6.0",
-        "@material/tokens": "15.0.0-canary.b994146f6.0",
-        "@material/touch-target": "15.0.0-canary.b994146f6.0",
-        "@material/typography": "15.0.0-canary.b994146f6.0",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/fab/-/fab-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-dvU0KWMRglwJEQwmQtFAmJcAjzg9VFF6Aqj78bJYu/DAIGFJ1VTTTSgoXM/XCm1YyQEZ7kZRvxBO37CH54rSDg==",
+      "dependencies": {
+        "@material/animation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/dom": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/elevation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/focus-ring": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/ripple": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/rtl": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/shape": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/theme": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/tokens": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/touch-target": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/typography": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/feature-targeting": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/feature-targeting/-/feature-targeting-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-HR/FjSQmza98B1DF80MRjODyfOI9r7wXkPSts/cLQsYkpwZ5uJmxhvQKjDCeYVpMV0lQuvuvVOQo7uD44TdWEg==",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/feature-targeting/-/feature-targeting-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-wkDjVcoVEYYaJvun28IXdln/foLgPD7n9ZC9TY76GErGCwTq+HWpU6wBAAk+ePmpRFDayw4vI4wBlaWGxLtysQ==",
       "dependencies": {
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/floating-label": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/floating-label/-/floating-label-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-g64talBNWCS0FUfLWal0uB637gUciSIqYxFzSW//LglTtbZLGK2J4+9gAEswQGnKeO4ux08EN2n1ZcMDYQ58ow==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.b994146f6.0",
-        "@material/base": "15.0.0-canary.b994146f6.0",
-        "@material/dom": "15.0.0-canary.b994146f6.0",
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/rtl": "15.0.0-canary.b994146f6.0",
-        "@material/theme": "15.0.0-canary.b994146f6.0",
-        "@material/typography": "15.0.0-canary.b994146f6.0",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/floating-label/-/floating-label-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-bUWPtXzZITOD/2mkvLkEPO1ngDWmb74y0Kgbz6llHLOQBtycyJIpuoQJ1q2Ez0NM/tFLwPphhAgRqmL3YQ/Kzw==",
+      "dependencies": {
+        "@material/animation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/base": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/dom": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/rtl": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/theme": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/typography": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/focus-ring": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/focus-ring/-/focus-ring-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-87qEMuXsCvlQfTiimnzJUZoebnIXWcMtRZevNLymN9Y0t9jGckQxZPmrI0llRkpyiR/Ewhec5SI/JGrFlYHnsA==",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/focus-ring/-/focus-ring-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-cZHThVose3GvAlJzpJoBI1iqL6d1/Jj9hXrR+r8Mwtb1hBIUEG3hxfsRd4vGREuzROPlf0OgNf/V+YHoSwgR5w==",
       "dependencies": {
-        "@material/dom": "15.0.0-canary.b994146f6.0",
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/rtl": "15.0.0-canary.b994146f6.0"
+        "@material/dom": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/rtl": "15.0.0-canary.bc9ae6c9c.0"
       }
     },
     "node_modules/@material/form-field": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/form-field/-/form-field-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-Tg1SQQaopvXMyDEYxGTWnhCWQmNcWVIoKMLmle9P/gi2p8ulcj0iOCPYf+3ECqUBVozOmTPKlYOOiRwtKStAeA==",
-      "dependencies": {
-        "@material/base": "15.0.0-canary.b994146f6.0",
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/ripple": "15.0.0-canary.b994146f6.0",
-        "@material/rtl": "15.0.0-canary.b994146f6.0",
-        "@material/theme": "15.0.0-canary.b994146f6.0",
-        "@material/typography": "15.0.0-canary.b994146f6.0",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/form-field/-/form-field-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-+JFXy5X44Gue1CbZZAQ6YejnI203lebYwL0i6k0ylDpWHEOdD5xkF2PyHR28r9/65Ebcbwbff6q7kI1SGoT7MA==",
+      "dependencies": {
+        "@material/base": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/ripple": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/rtl": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/theme": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/typography": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/icon-button": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/icon-button/-/icon-button-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-X6DvOv4jpymHUjI7ZAbO946nDgGYKDwPZfkRzBE84gv2XEr2qfMuABhojxkYubRbt03oauBdcJVVMFCXkVhArQ==",
-      "dependencies": {
-        "@material/base": "15.0.0-canary.b994146f6.0",
-        "@material/density": "15.0.0-canary.b994146f6.0",
-        "@material/dom": "15.0.0-canary.b994146f6.0",
-        "@material/elevation": "15.0.0-canary.b994146f6.0",
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/focus-ring": "15.0.0-canary.b994146f6.0",
-        "@material/ripple": "15.0.0-canary.b994146f6.0",
-        "@material/rtl": "15.0.0-canary.b994146f6.0",
-        "@material/theme": "15.0.0-canary.b994146f6.0",
-        "@material/touch-target": "15.0.0-canary.b994146f6.0",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/icon-button/-/icon-button-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-1a0MHgyIwOs4RzxrVljsqSizGYFlM1zY2AZaLDsgT4G3kzsplTx8HZQ022GpUCjAygW+WLvg4z1qAhQHvsbqlw==",
+      "dependencies": {
+        "@material/base": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/density": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/dom": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/elevation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/focus-ring": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/ripple": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/rtl": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/theme": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/touch-target": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/image-list": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/image-list/-/image-list-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-kf903XFF1P+V5ZPXCt+7R6c55g4UyQE1ZHkTViCIJfd52gU40bHODMhTQy/ywBkwDeJfNk8uf1V1IM24WQYpxA==",
-      "dependencies": {
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/shape": "15.0.0-canary.b994146f6.0",
-        "@material/theme": "15.0.0-canary.b994146f6.0",
-        "@material/typography": "15.0.0-canary.b994146f6.0",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/image-list/-/image-list-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-WKWmiYap2iu4QdqmeUSliLlN4O2Ueqa0OuVAYHn/TCzmQ2xmnhZ1pvDLbs6TplpOmlki7vFfe+aSt5SU9gwfOQ==",
+      "dependencies": {
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/shape": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/theme": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/typography": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/layout-grid": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/layout-grid/-/layout-grid-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-OALBSGue8g1/mEwLYYi2d950dJFpNYKW87jPS9/KM65JKMyxoU7tU2d4An1BuyqK0r9sopGq6Pn/zhill0iLaw==",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/layout-grid/-/layout-grid-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-5GqmT6oTZhUGWIb+CLD0ZNyDyTiJsr/rm9oRIi3+vCujACwxFkON9tzBlZohdtFS16nuzUusthN6Jt9UrJcN6Q==",
       "dependencies": {
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/line-ripple": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/line-ripple/-/line-ripple-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-evjZxCu4iodiKtW8N0xjY8ACRXm3sY+4rAmq3vV5BmHWAJ3BobjbFYslDMZQ+4mu3HmwMatbJehKxHegahitNg==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.b994146f6.0",
-        "@material/base": "15.0.0-canary.b994146f6.0",
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/theme": "15.0.0-canary.b994146f6.0",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/line-ripple/-/line-ripple-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-8S30WXEuUdgDdBulzUDlPXD6qMzwCX9SxYb5mGDYLwl199cpSGdXHtGgEcCjokvnpLhdZhcT1Dsxeo1g2Evh5Q==",
+      "dependencies": {
+        "@material/animation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/base": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/theme": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/linear-progress": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/linear-progress/-/linear-progress-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-jlXh+tIj+/o0Ks7fHdC/24fH6IXCAl2vF52U6NwT39ESrlwmlLhp3gtag5GSBHN5E7Z09nK871Yo1G/b1F+COg==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.b994146f6.0",
-        "@material/base": "15.0.0-canary.b994146f6.0",
-        "@material/dom": "15.0.0-canary.b994146f6.0",
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/progress-indicator": "15.0.0-canary.b994146f6.0",
-        "@material/rtl": "15.0.0-canary.b994146f6.0",
-        "@material/theme": "15.0.0-canary.b994146f6.0",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/linear-progress/-/linear-progress-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-6EJpjrz6aoH2/gXLg9iMe0yF2C42hpQyZoHpmcgTLKeci85ktDvJIjwup8tnk8ULQyFiGiIrhXw2v2RSsiFjvQ==",
+      "dependencies": {
+        "@material/animation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/base": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/dom": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/progress-indicator": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/rtl": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/theme": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/list": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/list/-/list-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-kY/i6VvFBb/W3VvCPvWRMzWvu7mvNFJ+R8ijfawDoAXiv4fj42GO4iFyTcFXaUevEPKp791pN/09BMJQ6jYEvA==",
-      "dependencies": {
-        "@material/base": "15.0.0-canary.b994146f6.0",
-        "@material/density": "15.0.0-canary.b994146f6.0",
-        "@material/dom": "15.0.0-canary.b994146f6.0",
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/ripple": "15.0.0-canary.b994146f6.0",
-        "@material/rtl": "15.0.0-canary.b994146f6.0",
-        "@material/shape": "15.0.0-canary.b994146f6.0",
-        "@material/theme": "15.0.0-canary.b994146f6.0",
-        "@material/tokens": "15.0.0-canary.b994146f6.0",
-        "@material/typography": "15.0.0-canary.b994146f6.0",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/list/-/list-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-TQ1ppqiCMQj/P7bGD4edbIIv4goczZUoiUAaPq/feb1dflvrFMzYqJ7tQRRCyBL8nRhJoI2x99tk8Q2RXvlGUQ==",
+      "dependencies": {
+        "@material/base": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/density": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/dom": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/ripple": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/rtl": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/shape": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/theme": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/tokens": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/typography": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/menu": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/menu/-/menu-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-y6smNmLJ+U0DoXWbyqzW+VW/uWDuklhdGHc5MbZrTOhsKkhvoTVNMSOa+NFPU4gTwrplvUjaUvnIsQ0wygwD3g==",
-      "dependencies": {
-        "@material/base": "15.0.0-canary.b994146f6.0",
-        "@material/dom": "15.0.0-canary.b994146f6.0",
-        "@material/elevation": "15.0.0-canary.b994146f6.0",
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/list": "15.0.0-canary.b994146f6.0",
-        "@material/menu-surface": "15.0.0-canary.b994146f6.0",
-        "@material/ripple": "15.0.0-canary.b994146f6.0",
-        "@material/rtl": "15.0.0-canary.b994146f6.0",
-        "@material/shape": "15.0.0-canary.b994146f6.0",
-        "@material/theme": "15.0.0-canary.b994146f6.0",
-        "@material/tokens": "15.0.0-canary.b994146f6.0",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/menu/-/menu-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-IlAh61xzrzxXs38QZlt74UYt8J431zGznSzDtB1Fqs6YFNd11QPKoiRXn1J2Qu/lUxbFV7i8NBKMCKtia0n6/Q==",
+      "dependencies": {
+        "@material/base": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/dom": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/elevation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/list": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/menu-surface": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/ripple": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/rtl": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/shape": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/theme": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/tokens": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/menu-surface": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/menu-surface/-/menu-surface-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-StmM3lrRn1iMEZfq532jpMNppqyBBy68FbPurKEsHuP/3q+CscfnwjrS9ym+JcHqXKMHnQXbL/49ymffRGX2AQ==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.b994146f6.0",
-        "@material/base": "15.0.0-canary.b994146f6.0",
-        "@material/elevation": "15.0.0-canary.b994146f6.0",
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/rtl": "15.0.0-canary.b994146f6.0",
-        "@material/shape": "15.0.0-canary.b994146f6.0",
-        "@material/theme": "15.0.0-canary.b994146f6.0",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/menu-surface/-/menu-surface-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-dMtSPN+olTWE+08M5qe4ea1IZOhVryYqzK0Gyb2u1G75rSArUxCOB5rr6OC/ST3Mq3RS6zGuYo7srZt4534K9Q==",
+      "dependencies": {
+        "@material/animation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/base": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/elevation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/rtl": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/shape": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/theme": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/notched-outline": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/notched-outline/-/notched-outline-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-UZxU8jXM2t/bk/CiO0K+TSPspuJRZIyrYlIS0gd+qq/u8Gi2DpALBlLAh9Jeu46IUg4YGlPsNWYfe8p3QAVyoA==",
-      "dependencies": {
-        "@material/base": "15.0.0-canary.b994146f6.0",
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/floating-label": "15.0.0-canary.b994146f6.0",
-        "@material/rtl": "15.0.0-canary.b994146f6.0",
-        "@material/shape": "15.0.0-canary.b994146f6.0",
-        "@material/theme": "15.0.0-canary.b994146f6.0",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/notched-outline/-/notched-outline-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-WuurMg44xexkvLTBTnsO0A+qnzFjpcPdvgWBGstBepYozsvSF9zJGdb1x7Zv1MmqbpYh/Ohnuxtb/Y3jOh6irg==",
+      "dependencies": {
+        "@material/base": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/floating-label": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/rtl": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/shape": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/theme": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/progress-indicator": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/progress-indicator/-/progress-indicator-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-VT+mOQhohaM+pBX1rknbVOI6JCGKg9NiOHBoYljIvnexNeILE+mW9g6mtQ0ZCJPz0oMmiSAMLcuxMIcBXx84Xw==",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/progress-indicator/-/progress-indicator-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-uOnsvqw5F2fkeTnTl4MrYzjI7KCLmmLyZaM0cgLNuLsWVlddQE+SGMl28tENx7DUK3HebWq0FxCP8f25LuDD+w==",
       "dependencies": {
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/radio": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/radio/-/radio-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-U/RR2lVNWwEO2+kJtGz9XzvnOF0gAZn1krMY0z/eU9Wnl0OgPZbqQrxXMoVNv1pzKYSEwZQEGado/rv8qp7piA==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.b994146f6.0",
-        "@material/base": "15.0.0-canary.b994146f6.0",
-        "@material/density": "15.0.0-canary.b994146f6.0",
-        "@material/dom": "15.0.0-canary.b994146f6.0",
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/focus-ring": "15.0.0-canary.b994146f6.0",
-        "@material/ripple": "15.0.0-canary.b994146f6.0",
-        "@material/theme": "15.0.0-canary.b994146f6.0",
-        "@material/touch-target": "15.0.0-canary.b994146f6.0",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/radio/-/radio-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-ehzOK+U1IxQN+OQjgD2lsnf1t7t7RAwQzeO6Czkiuid29ookYbQynWuLWk7NW8H8ohl7lnmfqTP1xSNkkL/F0g==",
+      "dependencies": {
+        "@material/animation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/base": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/density": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/dom": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/focus-ring": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/ripple": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/theme": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/touch-target": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/ripple": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/ripple/-/ripple-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-WzIbc8wYTzMOczqGXVCBPdNcv/73Ef8FwcQYsscGMaqCzgVsdpoqilTfsx7Ryyz6dQbyfmJqp7s+YpPujcezOA==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.b994146f6.0",
-        "@material/base": "15.0.0-canary.b994146f6.0",
-        "@material/dom": "15.0.0-canary.b994146f6.0",
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/rtl": "15.0.0-canary.b994146f6.0",
-        "@material/theme": "15.0.0-canary.b994146f6.0",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/ripple/-/ripple-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-JfLW+g3GMVDv4cruQ19+HUxpKVdWCldFlIPw1UYezz2h3WTNDy05S3uP2zUdXzZ01C3dkBFviv4nqZ0GCT16MA==",
+      "dependencies": {
+        "@material/animation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/base": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/dom": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/rtl": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/theme": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/rtl": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/rtl/-/rtl-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-H/W6BVn4Ygfkrf/FgSrNhbu1uY7PST2wlsjEYQt06EfAM0CDHEwSL1MwV4FmpQA/r40Q0PqoLN6moDrtCe5S8g==",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/rtl/-/rtl-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-SkKLNLFp5QtG7/JEFg9R92qq4MzTcZ5As6sWbH7rRg6ahTHoJEuqE+pOb9Vrtbj84k5gtX+vCYPvCILtSlr2uw==",
       "dependencies": {
-        "@material/theme": "15.0.0-canary.b994146f6.0",
+        "@material/theme": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/segmented-button": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/segmented-button/-/segmented-button-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-jd+f4BTnU0tghxBpAM/XdVmruDXSoQ88TYSFWbrhulS+/c/ooCZURWvVC4mHNej+QR/fODkx4adbqkBiwwCtMw==",
-      "dependencies": {
-        "@material/base": "15.0.0-canary.b994146f6.0",
-        "@material/elevation": "15.0.0-canary.b994146f6.0",
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/ripple": "15.0.0-canary.b994146f6.0",
-        "@material/theme": "15.0.0-canary.b994146f6.0",
-        "@material/touch-target": "15.0.0-canary.b994146f6.0",
-        "@material/typography": "15.0.0-canary.b994146f6.0",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/segmented-button/-/segmented-button-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-YDwkCWP9l5mIZJ7pZJZ2hMDxfBlIGVJ+deNzr8O+Z7/xC5LGXbl4R5aPtUVHygvXAXxpf5096ZD+dSXzYzvWlw==",
+      "dependencies": {
+        "@material/base": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/elevation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/ripple": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/theme": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/touch-target": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/typography": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/select": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/select/-/select-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-5thEQS+B17JSm3I8D+mqQe2G3ArVnXJALTEEE9FmMUKwKYkrsLplm3FYuEXERZGJnYeTRdkdmhYY/YeocfZoyA==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.b994146f6.0",
-        "@material/base": "15.0.0-canary.b994146f6.0",
-        "@material/density": "15.0.0-canary.b994146f6.0",
-        "@material/dom": "15.0.0-canary.b994146f6.0",
-        "@material/elevation": "15.0.0-canary.b994146f6.0",
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/floating-label": "15.0.0-canary.b994146f6.0",
-        "@material/line-ripple": "15.0.0-canary.b994146f6.0",
-        "@material/list": "15.0.0-canary.b994146f6.0",
-        "@material/menu": "15.0.0-canary.b994146f6.0",
-        "@material/menu-surface": "15.0.0-canary.b994146f6.0",
-        "@material/notched-outline": "15.0.0-canary.b994146f6.0",
-        "@material/ripple": "15.0.0-canary.b994146f6.0",
-        "@material/rtl": "15.0.0-canary.b994146f6.0",
-        "@material/shape": "15.0.0-canary.b994146f6.0",
-        "@material/theme": "15.0.0-canary.b994146f6.0",
-        "@material/tokens": "15.0.0-canary.b994146f6.0",
-        "@material/typography": "15.0.0-canary.b994146f6.0",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/select/-/select-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-unfOWVf7T0sixVG+3k3RTuATfzqvCF6QAzA6J9rlCh/Tq4HuIBNDdV4z19IVu4zwmgWYxY0iSvqWUvdJJYwakQ==",
+      "dependencies": {
+        "@material/animation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/base": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/density": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/dom": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/elevation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/floating-label": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/line-ripple": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/list": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/menu": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/menu-surface": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/notched-outline": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/ripple": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/rtl": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/shape": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/theme": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/tokens": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/typography": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/shape": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/shape/-/shape-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-sINM3gr3aLgdvqZVfqfXV5EB77owLLJjy+2NqchJ8ZPqucCJ+F/BsCBfLA2Wu3O4Sc9IpAEn/o1hzYm/CWAFAw==",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/shape/-/shape-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-Dsvr771ZKC46ODzoixLdGwlLEQLfxfLrtnRojXABoZf5G3o9KtJU+J+5Ld5aa960OAsCzzANuaub4iR88b1guA==",
       "dependencies": {
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/rtl": "15.0.0-canary.b994146f6.0",
-        "@material/theme": "15.0.0-canary.b994146f6.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/rtl": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/theme": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/slider": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/slider/-/slider-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-dyT72+Kp//AEajJxDUVoMoizUjf2uggVMGXOaQ7FhpGHuf7LC3EyEjrrJ15efFzYgTjdJUU1YQkCwGmdt6CQsA==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.b994146f6.0",
-        "@material/base": "15.0.0-canary.b994146f6.0",
-        "@material/dom": "15.0.0-canary.b994146f6.0",
-        "@material/elevation": "15.0.0-canary.b994146f6.0",
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/ripple": "15.0.0-canary.b994146f6.0",
-        "@material/rtl": "15.0.0-canary.b994146f6.0",
-        "@material/theme": "15.0.0-canary.b994146f6.0",
-        "@material/tokens": "15.0.0-canary.b994146f6.0",
-        "@material/typography": "15.0.0-canary.b994146f6.0",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/slider/-/slider-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-3AEu+7PwW4DSNLndue47dh2u7ga4hDJRYmuu7wnJCIWJBnLCkp6C92kNc4Rj5iQY2ftJio5aj1gqryluh5tlYg==",
+      "dependencies": {
+        "@material/animation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/base": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/dom": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/elevation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/ripple": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/rtl": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/theme": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/tokens": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/typography": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/snackbar": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/snackbar/-/snackbar-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-fEhPASJossScNpcrNYrrH8uU+rUf6+kw7/ZMrpUzzz1lVXliL28jTNEmU1nFpcDI4M2GXH+Z64f7vl2hiMDG8g==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.b994146f6.0",
-        "@material/base": "15.0.0-canary.b994146f6.0",
-        "@material/button": "15.0.0-canary.b994146f6.0",
-        "@material/dom": "15.0.0-canary.b994146f6.0",
-        "@material/elevation": "15.0.0-canary.b994146f6.0",
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/icon-button": "15.0.0-canary.b994146f6.0",
-        "@material/ripple": "15.0.0-canary.b994146f6.0",
-        "@material/rtl": "15.0.0-canary.b994146f6.0",
-        "@material/shape": "15.0.0-canary.b994146f6.0",
-        "@material/theme": "15.0.0-canary.b994146f6.0",
-        "@material/tokens": "15.0.0-canary.b994146f6.0",
-        "@material/typography": "15.0.0-canary.b994146f6.0",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/snackbar/-/snackbar-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-TwwQSYxfGK6mc03/rdDamycND6o+1p61WNd7ElZv1F1CLxB4ihRjbCoH7Qo+oVDaP8CTpjeclka+24RLhQq0mA==",
+      "dependencies": {
+        "@material/animation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/base": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/button": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/dom": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/elevation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/icon-button": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/ripple": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/rtl": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/shape": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/theme": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/tokens": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/typography": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/switch": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/switch/-/switch-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-czCXTUa30ILIf1J3exiuSVIRcodGATHexd3eWDq4sfHo4iMh4rBMaIxcqkmnb2iwE/mMTNyVfoauijx2QiNKrA==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.b994146f6.0",
-        "@material/base": "15.0.0-canary.b994146f6.0",
-        "@material/density": "15.0.0-canary.b994146f6.0",
-        "@material/dom": "15.0.0-canary.b994146f6.0",
-        "@material/elevation": "15.0.0-canary.b994146f6.0",
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/focus-ring": "15.0.0-canary.b994146f6.0",
-        "@material/ripple": "15.0.0-canary.b994146f6.0",
-        "@material/rtl": "15.0.0-canary.b994146f6.0",
-        "@material/shape": "15.0.0-canary.b994146f6.0",
-        "@material/theme": "15.0.0-canary.b994146f6.0",
-        "@material/tokens": "15.0.0-canary.b994146f6.0",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/switch/-/switch-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-OjUjtT0kRz1ASAsOS+dNzwMwvsjmqy5edK57692qmrP6bL4GblFfBDoiNJ6t0AN4OaKcmL5Hy/xNrTdOZW7Qqw==",
+      "dependencies": {
+        "@material/animation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/base": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/density": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/dom": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/elevation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/focus-ring": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/ripple": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/rtl": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/shape": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/theme": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/tokens": "15.0.0-canary.bc9ae6c9c.0",
         "safevalues": "^0.3.4",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/tab": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/tab/-/tab-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-ygswooiNdBNNDnQdbPX0nzDQu7oQlHo8vWZ0/xL4IPVEXabY5zCzsEbGNZw2u/syo56c/NHPyMsUmXDGRSXOvQ==",
-      "dependencies": {
-        "@material/base": "15.0.0-canary.b994146f6.0",
-        "@material/elevation": "15.0.0-canary.b994146f6.0",
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/focus-ring": "15.0.0-canary.b994146f6.0",
-        "@material/ripple": "15.0.0-canary.b994146f6.0",
-        "@material/rtl": "15.0.0-canary.b994146f6.0",
-        "@material/tab-indicator": "15.0.0-canary.b994146f6.0",
-        "@material/theme": "15.0.0-canary.b994146f6.0",
-        "@material/tokens": "15.0.0-canary.b994146f6.0",
-        "@material/typography": "15.0.0-canary.b994146f6.0",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/tab/-/tab-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-s/L9otAwn/pZwVQZBRQJmPqYeNbjoEbzbjMpDQf/VBG/6dJ+aP03ilIBEkqo8NVnCoChqcdtVCoDNRtbU+yp6w==",
+      "dependencies": {
+        "@material/base": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/elevation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/focus-ring": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/ripple": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/rtl": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/tab-indicator": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/theme": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/tokens": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/typography": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/tab-bar": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/tab-bar/-/tab-bar-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-F9NegACnFEWMu1pAAypV4Jd7qROeffkvEgVO28Xxk/CvzZxFz8kAjYJZ+rI6RUhPX3BhXzwsz/AlLwsJMT2tnA==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.b994146f6.0",
-        "@material/base": "15.0.0-canary.b994146f6.0",
-        "@material/density": "15.0.0-canary.b994146f6.0",
-        "@material/elevation": "15.0.0-canary.b994146f6.0",
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/tab": "15.0.0-canary.b994146f6.0",
-        "@material/tab-indicator": "15.0.0-canary.b994146f6.0",
-        "@material/tab-scroller": "15.0.0-canary.b994146f6.0",
-        "@material/theme": "15.0.0-canary.b994146f6.0",
-        "@material/tokens": "15.0.0-canary.b994146f6.0",
-        "@material/typography": "15.0.0-canary.b994146f6.0",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/tab-bar/-/tab-bar-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-Xmtq0wJGfu5k+zQeFeNsr4bUKv7L+feCmUp/gsapJ655LQKMXOUQZtSv9ZqWOfrCMy55hoF1CzGFV+oN3tyWWQ==",
+      "dependencies": {
+        "@material/animation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/base": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/density": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/elevation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/tab": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/tab-indicator": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/tab-scroller": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/theme": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/tokens": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/typography": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/tab-indicator": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/tab-indicator/-/tab-indicator-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-8IH/DmwlZhQlw/2Y3aKrEvjEhZB+qbKUiyaij3BkTAexvyFeDBh5cLNjRpYkUJSGeSPhS6yu4SYzMHPmQEwQmA==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.b994146f6.0",
-        "@material/base": "15.0.0-canary.b994146f6.0",
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/theme": "15.0.0-canary.b994146f6.0",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/tab-indicator/-/tab-indicator-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-despCJYi1GrDDq7F2hvLQkObHnSLZPPDxnOzU16zJ6FNYvIdszgfzn2HgAZ6pl5hLOexQ8cla6cAqjTDuaJBhQ==",
+      "dependencies": {
+        "@material/animation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/base": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/theme": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/tab-scroller": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/tab-scroller/-/tab-scroller-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-1MeWkr62OICfTv8oqhIZe6jFo0dKeMlUfB+/WcgnpoeMBszCOSlx5tQ4pedxUkuR3I+Z7rsTfSN0LavgF8bATA==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.b994146f6.0",
-        "@material/base": "15.0.0-canary.b994146f6.0",
-        "@material/dom": "15.0.0-canary.b994146f6.0",
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/tab": "15.0.0-canary.b994146f6.0",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/tab-scroller/-/tab-scroller-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-QWHG/EWxirj4V9u2IHz+OSY9XCWrnNrPnNgEufxAJVUKV/A8ma1DYeFSQqxhX709R8wKGdycJksg0Flkl7Gq7w==",
+      "dependencies": {
+        "@material/animation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/base": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/dom": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/tab": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/textfield": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/textfield/-/textfield-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-Kxb3DoJ5o8u3Y1gRMHKmWrDl1TirVxuf/UFrxPFiCE3J1SqiE2VQpakiD1emZwp+LSKtbRsQ/iILYLB/h7Wuvw==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.b994146f6.0",
-        "@material/base": "15.0.0-canary.b994146f6.0",
-        "@material/density": "15.0.0-canary.b994146f6.0",
-        "@material/dom": "15.0.0-canary.b994146f6.0",
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/floating-label": "15.0.0-canary.b994146f6.0",
-        "@material/line-ripple": "15.0.0-canary.b994146f6.0",
-        "@material/notched-outline": "15.0.0-canary.b994146f6.0",
-        "@material/ripple": "15.0.0-canary.b994146f6.0",
-        "@material/rtl": "15.0.0-canary.b994146f6.0",
-        "@material/shape": "15.0.0-canary.b994146f6.0",
-        "@material/theme": "15.0.0-canary.b994146f6.0",
-        "@material/tokens": "15.0.0-canary.b994146f6.0",
-        "@material/typography": "15.0.0-canary.b994146f6.0",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/textfield/-/textfield-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-R3qRex9kCaZIAK8DuxPnVC42R0OaW7AB7fsFknDKeTeVQvRcbnV8E+iWSdqTiGdsi6QQHifX8idUrXw+O45zPw==",
+      "dependencies": {
+        "@material/animation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/base": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/density": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/dom": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/floating-label": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/line-ripple": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/notched-outline": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/ripple": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/rtl": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/shape": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/theme": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/tokens": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/typography": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/theme": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/theme/-/theme-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-5tsZ92dAeUcZ9g9CrIkqX/GYc0M5DIfsydtI1PAidaBzr1Uokuh4rTZVQZBv7gyglF0yDua59lkb0I6wI9vxXg==",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/theme/-/theme-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-CpUwXGE0dbhxQ45Hu9r9wbJtO/MAlv5ER4tBHA9tp/K+SU+lDgurBE2touFMg5INmdfVNtdumxb0nPPLaNQcUg==",
       "dependencies": {
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/tokens": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/tokens/-/tokens-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-jFqU7PtvGkrP8b8i2soCrYQInTrnZ1/rIPDi+Xm3sa/qSghCNwFrdJEqwcwtv1fPlJIOtzkIuVRYRmAP9rXQIQ==",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/tokens/-/tokens-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-nbEuGj05txWz6ZMUanpM47SaAD7soyjKILR+XwDell9Zg3bGhsnexCNXPEz2fD+YgomS+jM5XmIcaJJHg/H93Q==",
       "dependencies": {
-        "@material/elevation": "15.0.0-canary.b994146f6.0"
+        "@material/elevation": "15.0.0-canary.bc9ae6c9c.0"
       }
     },
     "node_modules/@material/tooltip": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/tooltip/-/tooltip-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-bVzydXGn3fauHJ8pkh32DsdyRJXleeFQ4t7jZ/rcRik+n4G1BvYiblfuu3Z/OCC0m3TJDyMdJhd+sLqRDqLUUg==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.b994146f6.0",
-        "@material/base": "15.0.0-canary.b994146f6.0",
-        "@material/button": "15.0.0-canary.b994146f6.0",
-        "@material/dom": "15.0.0-canary.b994146f6.0",
-        "@material/elevation": "15.0.0-canary.b994146f6.0",
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/rtl": "15.0.0-canary.b994146f6.0",
-        "@material/shape": "15.0.0-canary.b994146f6.0",
-        "@material/theme": "15.0.0-canary.b994146f6.0",
-        "@material/tokens": "15.0.0-canary.b994146f6.0",
-        "@material/typography": "15.0.0-canary.b994146f6.0",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/tooltip/-/tooltip-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-UzuXp0b9NuWuYLYpPguxrjbJnCmT/Cco8CkjI/6JajxaeA3o2XEBbQfRMTq8PTafuBjCHTc0b0mQY7rtxUp1Gg==",
+      "dependencies": {
+        "@material/animation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/base": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/button": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/dom": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/elevation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/rtl": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/shape": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/theme": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/tokens": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/typography": "15.0.0-canary.bc9ae6c9c.0",
         "safevalues": "^0.3.4",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/top-app-bar": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/top-app-bar/-/top-app-bar-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-VHq0wX3OJE1TKvjO8Qtlu+rv5EGoqAhNLBcEjpUUGoqHH/gpd356FEuIqJId4pUh5jaWf8T4ZU9xVbQGMtntzw==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.b994146f6.0",
-        "@material/base": "15.0.0-canary.b994146f6.0",
-        "@material/elevation": "15.0.0-canary.b994146f6.0",
-        "@material/ripple": "15.0.0-canary.b994146f6.0",
-        "@material/rtl": "15.0.0-canary.b994146f6.0",
-        "@material/shape": "15.0.0-canary.b994146f6.0",
-        "@material/theme": "15.0.0-canary.b994146f6.0",
-        "@material/typography": "15.0.0-canary.b994146f6.0",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/top-app-bar/-/top-app-bar-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-vJWjsvqtdSD5+yQ/9vgoBtBSCvPJ5uF/DVssv8Hdhgs1PYaAcODUi77kdi0+sy/TaWyOsTkQixqmwnFS16zesA==",
+      "dependencies": {
+        "@material/animation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/base": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/elevation": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/ripple": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/rtl": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/shape": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/theme": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/typography": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/touch-target": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/touch-target/-/touch-target-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-X26Y9OWvIqYOHo+sC2VMvOoeQWlUR3/yb7uPdfq92Y44zlQ4Vexgq7nEUblEiXQ8Fj+d0T9rIhRh1y9PP3Z2dw==",
-      "dependencies": {
-        "@material/base": "15.0.0-canary.b994146f6.0",
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/rtl": "15.0.0-canary.b994146f6.0",
-        "@material/theme": "15.0.0-canary.b994146f6.0",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/touch-target/-/touch-target-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-AqYh9fjt+tv4ZE0C6MeYHblS2H+XwLbDl2mtyrK0DOEnCVQk5/l5ImKDfhrUdFWHvS4a5nBM4AA+sa7KaroLoA==",
+      "dependencies": {
+        "@material/base": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/rtl": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/theme": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@material/typography": {
-      "version": "15.0.0-canary.b994146f6.0",
-      "resolved": "https://registry.npmjs.org/@material/typography/-/typography-15.0.0-canary.b994146f6.0.tgz",
-      "integrity": "sha512-sWU5W30WWqdw5P6bsRx9AbvMNcz/QvQg56Syr06V6nfgSztpeuo7TfPk2J+N0ArRALo1mUrkAPk66iWYQ2p/QA==",
+      "version": "15.0.0-canary.bc9ae6c9c.0",
+      "resolved": "https://registry.npmjs.org/@material/typography/-/typography-15.0.0-canary.bc9ae6c9c.0.tgz",
+      "integrity": "sha512-CKsG1zyv34AKPNyZC8olER2OdPII64iR2SzQjpqh1UUvmIFiMPk23LvQ1OnC5aCB14pOXzmVgvJt31r9eNdZ6Q==",
       "dependencies": {
-        "@material/feature-targeting": "15.0.0-canary.b994146f6.0",
-        "@material/theme": "15.0.0-canary.b994146f6.0",
+        "@material/feature-targeting": "15.0.0-canary.bc9ae6c9c.0",
+        "@material/theme": "15.0.0-canary.bc9ae6c9c.0",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@ngtools/webpack": {
-      "version": "16.1.3",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-16.1.3.tgz",
-      "integrity": "sha512-YTL1RzP7ErJqskx+ZwdC/nWsOSBfC4yYWmMyWL2J0d+oJ3N2XIzrKVoDcZ4IVzv3Du+3zoGp0ups/wWXvfzM/Q==",
+      "version": "16.2.6",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-16.2.6.tgz",
+      "integrity": "sha512-d8ZlZL6dOtWmHdjG9PTGBkdiJMcsXD2tp6WeFRVvTEuvCI3XvKsUXBvJDE+mZOhzn5pUEYt+1TR5DHjDZbME3w==",
       "dev": true,
       "engines": {
         "node": "^16.14.0 || >=18.10.0",
@@ -4042,124 +4344,516 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/@pkgjs/parseargs": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
-      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+    "node_modules/@nrwl/devkit": {
+      "version": "16.5.1",
+      "resolved": "https://registry.npmjs.org/@nrwl/devkit/-/devkit-16.5.1.tgz",
+      "integrity": "sha512-NB+DE/+AFJ7lKH/WBFyatJEhcZGj25F24ncDkwjZ6MzEiSOGOJS0LaV/R+VUsmS5EHTPXYOpn3zHWWAcJhyOmA==",
       "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=14"
+      "dependencies": {
+        "@nx/devkit": "16.5.1"
       }
     },
-    "node_modules/@schematics/angular": {
-      "version": "16.1.3",
-      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-16.1.3.tgz",
-      "integrity": "sha512-bNSxCLf6f+/dsQ1k3PhcZhrC/qgJSCpM6h3m6ATpjR+tYW/v7WR1OyE5r3DQmDe7NJSazBvpbrRtg8xjRsMzvw==",
+    "node_modules/@nrwl/tao": {
+      "version": "16.5.1",
+      "resolved": "https://registry.npmjs.org/@nrwl/tao/-/tao-16.5.1.tgz",
+      "integrity": "sha512-x+gi/fKdM6uQNIti9exFlm3V5LBP3Y8vOEziO42HdOigyrXa0S0HD2WMpccmp6PclYKhwEDUjKJ39xh5sdh4Ig==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "16.1.3",
-        "@angular-devkit/schematics": "16.1.3",
-        "jsonc-parser": "3.2.0"
+        "nx": "16.5.1"
+      },
+      "bin": {
+        "tao": "index.js"
+      }
+    },
+    "node_modules/@nx/devkit": {
+      "version": "16.5.1",
+      "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-16.5.1.tgz",
+      "integrity": "sha512-T1acZrVVmJw/sJ4PIGidCBYBiBqlg/jT9e8nIGXLSDS20xcLvfo4zBQf8UZLrmHglnwwpDpOWuVJCp2rYA5aDg==",
+      "dev": true,
+      "dependencies": {
+        "@nrwl/devkit": "16.5.1",
+        "ejs": "^3.1.7",
+        "ignore": "^5.0.4",
+        "semver": "7.5.3",
+        "tmp": "~0.2.1",
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "nx": ">= 15 <= 17"
+      }
+    },
+    "node_modules/@nx/devkit/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.10.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
+        "node": ">=10"
       }
     },
-    "node_modules/@sigstore/protobuf-specs": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.1.0.tgz",
-      "integrity": "sha512-a31EnjuIDSX8IXBUib3cYLDRlPMU36AWX4xS8ysLaNu4ZzUesDiPt83pgrW2X1YLMe5L2HbDyaKK5BrL4cNKaQ==",
+    "node_modules/@nx/devkit/node_modules/semver": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz",
+      "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==",
       "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": ">=10"
       }
     },
-    "node_modules/@sigstore/tuf": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-1.0.0.tgz",
-      "integrity": "sha512-bLzi9GeZgMCvjJeLUIfs8LJYCxrPRA8IXQkzUtaFKKVPTz0mucRyqFcV2U20yg9K+kYAD0YSitzGfRZCFLjdHQ==",
+    "node_modules/@nx/devkit/node_modules/tmp": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
+      "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
       "dev": true,
       "dependencies": {
-        "@sigstore/protobuf-specs": "^0.1.0",
-        "make-fetch-happen": "^11.0.1",
-        "tuf-js": "^1.1.3"
+        "rimraf": "^3.0.0"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": ">=8.17.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==",
+    "node_modules/@nx/devkit/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
       "dev": true
     },
-    "node_modules/@tootallnate/once": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
-      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
+    "node_modules/@nx/nx-darwin-arm64": {
+      "version": "16.5.1",
+      "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-16.5.1.tgz",
+      "integrity": "sha512-q98TFI4B/9N9PmKUr1jcbtD4yAFs1HfYd9jUXXTQOlfO9SbDjnrYJgZ4Fp9rMNfrBhgIQ4x1qx0AukZccKmH9Q==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
       "engines": {
         "node": ">= 10"
       }
     },
-    "node_modules/@tufjs/canonical-json": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-1.0.0.tgz",
-      "integrity": "sha512-QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ==",
+    "node_modules/@nx/nx-darwin-x64": {
+      "version": "16.5.1",
+      "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-16.5.1.tgz",
+      "integrity": "sha512-j9HmL1l8k7EVJ3eOM5y8COF93gqrydpxCDoz23ZEtsY+JHY77VAiRQsmqBgEx9GGA2dXi9VEdS67B0+1vKariw==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": ">= 10"
       }
     },
-    "node_modules/@tufjs/models": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-1.0.4.tgz",
-      "integrity": "sha512-qaGV9ltJP0EO25YfFUPhxRVK0evXFIAGicsVXuRim4Ed9cjPxYhNnNJ49SFmbeLgtxpslIkX317IgpfcHPVj/A==",
+    "node_modules/@nx/nx-freebsd-x64": {
+      "version": "16.5.1",
+      "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-16.5.1.tgz",
+      "integrity": "sha512-CXSPT01aVS869tvCCF2tZ7LnCa8l41wJ3mTVtWBkjmRde68E5Up093hklRMyXb3kfiDYlfIKWGwrV4r0eH6x1A==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "dependencies": {
-        "@tufjs/canonical-json": "1.0.0",
-        "minimatch": "^9.0.0"
-      },
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": ">= 10"
       }
     },
-    "node_modules/@types/body-parser": {
-      "version": "1.19.2",
-      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz",
-      "integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==",
+    "node_modules/@nx/nx-linux-arm-gnueabihf": {
+      "version": "16.5.1",
+      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-16.5.1.tgz",
+      "integrity": "sha512-BhrumqJSZCWFfLFUKl4CAUwR0Y0G2H5EfFVGKivVecEQbb+INAek1aa6c89evg2/OvetQYsJ+51QknskwqvLsA==",
+      "cpu": [
+        "arm"
+      ],
       "dev": true,
-      "dependencies": {
-        "@types/connect": "*",
-        "@types/node": "*"
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
       }
     },
-    "node_modules/@types/bonjour": {
-      "version": "3.5.10",
-      "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz",
-      "integrity": "sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==",
+    "node_modules/@nx/nx-linux-arm64-gnu": {
+      "version": "16.5.1",
+      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-16.5.1.tgz",
+      "integrity": "sha512-x7MsSG0W+X43WVv7JhiSq2eKvH2suNKdlUHEG09Yt0vm3z0bhtym1UCMUg3IUAK7jy9hhLeDaFVFkC6zo+H/XQ==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "dependencies": {
-        "@types/node": "*"
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
       }
     },
-    "node_modules/@types/connect": {
-      "version": "3.4.35",
-      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
-      "integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==",
+    "node_modules/@nx/nx-linux-arm64-musl": {
+      "version": "16.5.1",
+      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-16.5.1.tgz",
+      "integrity": "sha512-J+/v/mFjOm74I0PNtH5Ka+fDd+/dWbKhpcZ2R1/6b9agzZk+Ff/SrwJcSYFXXWKbPX+uQ4RcJoytT06Zs3s0ow==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "dependencies": {
-        "@types/node": "*"
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
       }
     },
-    "node_modules/@types/connect-history-api-fallback": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz",
-      "integrity": "sha512-4x5FkPpLipqwthjPsF7ZRbOv3uoLUFkTA9G9v583qi4pACvq0uTELrB8OLUzPWUI4IJIyvM85vzkV1nyiI2Lig==",
+    "node_modules/@nx/nx-linux-x64-gnu": {
+      "version": "16.5.1",
+      "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-16.5.1.tgz",
+      "integrity": "sha512-igooWJ5YxQ94Zft7IqgL+Lw0qHaY15Btw4gfK756g/YTYLZEt4tTvR1y6RnK/wdpE3sa68bFTLVBNCGTyiTiDQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@nx/nx-linux-x64-musl": {
+      "version": "16.5.1",
+      "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-16.5.1.tgz",
+      "integrity": "sha512-zF/exnPqFYbrLAduGhTmZ7zNEyADid2bzNQiIjJkh8Y6NpDwrQIwVIyvIxqynsjMrIs51kBH+8TUjKjj2Jgf5A==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@nx/nx-win32-arm64-msvc": {
+      "version": "16.5.1",
+      "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-16.5.1.tgz",
+      "integrity": "sha512-qtqiLS9Y9TYyAbbpq58kRoOroko4ZXg5oWVqIWFHoxc5bGPweQSJCROEqd1AOl2ZDC6BxfuVHfhDDop1kK05WA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@nx/nx-win32-x64-msvc": {
+      "version": "16.5.1",
+      "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-16.5.1.tgz",
+      "integrity": "sha512-kUJBLakK7iyA9WfsGGQBVennA4jwf5XIgm0lu35oMOphtZIluvzItMt0EYBmylEROpmpEIhHq0P6J9FA+WH0Rg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@parcel/watcher": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.0.4.tgz",
+      "integrity": "sha512-cTDi+FUDBIUOBKEtj+nhiJ71AZVlkAsQFuGQTun5tV9mwQBQgZvhCzG+URPQc8myeN32yRVZEfVAPCs1RW+Jvg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "node-addon-api": "^3.2.1",
+        "node-gyp-build": "^4.3.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@pkgr/utils": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/@pkgr/utils/-/utils-2.4.2.tgz",
+      "integrity": "sha512-POgTXhjrTfbTV63DiFXav4lBHiICLKKwDeaKn9Nphwj7WH6m0hMMCaJkMyRWjgtPFyRKRVoMXXjczsTQRDEhYw==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "fast-glob": "^3.3.0",
+        "is-glob": "^4.0.3",
+        "open": "^9.1.0",
+        "picocolors": "^1.0.0",
+        "tslib": "^2.6.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/unts"
+      }
+    },
+    "node_modules/@pkgr/utils/node_modules/define-lazy-prop": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz",
+      "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@pkgr/utils/node_modules/open": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/open/-/open-9.1.0.tgz",
+      "integrity": "sha512-OS+QTnw1/4vrf+9hh1jc1jnYjzSG4ttTBB8UxOwAnInG3Uo4ssetzC1ihqaIHjLJnA5GGlRl6QlZXOTQhRBUvg==",
+      "dev": true,
+      "dependencies": {
+        "default-browser": "^4.0.0",
+        "define-lazy-prop": "^3.0.0",
+        "is-inside-container": "^1.0.0",
+        "is-wsl": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@schematics/angular": {
+      "version": "16.1.8",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-16.1.8.tgz",
+      "integrity": "sha512-gTHy1A/E9BCr0sj3VCr6eBYkgVkO96QWiZcFumedGnvstvp5wiCoIoJPLLfYaxVt1vt08xmnmS3OZ3r0qCLdpA==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "16.1.8",
+        "@angular-devkit/schematics": "16.1.8",
+        "jsonc-parser": "3.2.0"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.10.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@schematics/angular/node_modules/@angular-devkit/core": {
+      "version": "16.1.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-16.1.8.tgz",
+      "integrity": "sha512-dSRD/+bGanArIXkj+kaU1kDFleZeQMzmBiOXX+pK0Ah9/0Yn1VmY3RZh1zcX9vgIQXV+t7UPrTpOjaERMUtVGw==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "8.12.0",
+        "ajv-formats": "2.1.1",
+        "jsonc-parser": "3.2.0",
+        "rxjs": "7.8.1",
+        "source-map": "0.7.4"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.10.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "chokidar": "^3.5.2"
+      },
+      "peerDependenciesMeta": {
+        "chokidar": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@sigstore/bundle": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-1.1.0.tgz",
+      "integrity": "sha512-PFutXEy0SmQxYI4texPw3dd2KewuNqv7OuK1ZFtY2fM754yhvG2KdgwIhRnoEE2uHdtdGNQ8s0lb94dW9sELog==",
+      "dev": true,
+      "dependencies": {
+        "@sigstore/protobuf-specs": "^0.2.0"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@sigstore/protobuf-specs": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.2.1.tgz",
+      "integrity": "sha512-XTWVxnWJu+c1oCshMLwnKvz8ZQJJDVOlciMfgpJBQbThVjKTCG8dwyhgLngBD2KN0ap9F/gOV8rFDEx8uh7R2A==",
+      "dev": true,
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@sigstore/sign": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-1.0.0.tgz",
+      "integrity": "sha512-INxFVNQteLtcfGmcoldzV6Je0sbbfh9I16DM4yJPw3j5+TFP8X6uIiA18mvpEa9yyeycAKgPmOA3X9hVdVTPUA==",
+      "dev": true,
+      "dependencies": {
+        "@sigstore/bundle": "^1.1.0",
+        "@sigstore/protobuf-specs": "^0.2.0",
+        "make-fetch-happen": "^11.0.1"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@sigstore/tuf": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-1.0.3.tgz",
+      "integrity": "sha512-2bRovzs0nJZFlCN3rXirE4gwxCn97JNjMmwpecqlbgV9WcxX7WRuIrgzx/X7Ib7MYRbyUTpBYE0s2x6AmZXnlg==",
+      "dev": true,
+      "dependencies": {
+        "@sigstore/protobuf-specs": "^0.2.0",
+        "tuf-js": "^1.1.7"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@sinclair/typebox": {
+      "version": "0.27.8",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
+      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
+      "dev": true
+    },
+    "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/@tootallnate/once": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/@tufjs/canonical-json": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-1.0.0.tgz",
+      "integrity": "sha512-QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ==",
+      "dev": true,
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@tufjs/models": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-1.0.4.tgz",
+      "integrity": "sha512-qaGV9ltJP0EO25YfFUPhxRVK0evXFIAGicsVXuRim4Ed9cjPxYhNnNJ49SFmbeLgtxpslIkX317IgpfcHPVj/A==",
+      "dev": true,
+      "dependencies": {
+        "@tufjs/canonical-json": "1.0.0",
+        "minimatch": "^9.0.0"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@tufjs/models/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@tufjs/models/node_modules/minimatch": {
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@types/body-parser": {
+      "version": "1.19.4",
+      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.4.tgz",
+      "integrity": "sha512-N7UDG0/xiPQa2D/XrVJXjkWbpqHCd2sBaB32ggRF2l83RhPfamgKGF8gwwqyksS95qUS5ZYF9aF+lLPRlwI2UA==",
+      "dev": true,
+      "dependencies": {
+        "@types/connect": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/bonjour": {
+      "version": "3.5.12",
+      "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.12.tgz",
+      "integrity": "sha512-ky0kWSqXVxSqgqJvPIkgFkcn4C8MnRog308Ou8xBBIVo39OmUFy+jqNe0nPwLCDFxUpmT9EvT91YzOJgkDRcFg==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/connect": {
+      "version": "3.4.37",
+      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.37.tgz",
+      "integrity": "sha512-zBUSRqkfZ59OcwXon4HVxhx5oWCJmc0OtBTK05M+p0dYjgN6iTwIL2T/WbsQZrEsdnwaF9cWQ+azOnpPvIqY3Q==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/connect-history-api-fallback": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.2.tgz",
+      "integrity": "sha512-gX2j9x+NzSh4zOhnRPSdPPmTepS4DfxES0AvIFv3jGv5QyeAJf6u6dY5/BAoAJU9Qq1uTvwOku8SSC2GnCRl6Q==",
       "dev": true,
       "dependencies": {
         "@types/express-serve-static-core": "*",
@@ -4173,18 +4867,18 @@
       "dev": true
     },
     "node_modules/@types/cors": {
-      "version": "2.8.13",
-      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.13.tgz",
-      "integrity": "sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA==",
+      "version": "2.8.15",
+      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.15.tgz",
+      "integrity": "sha512-n91JxbNLD8eQIuXDIChAN1tCKNWCEgpceU9b7ZMbFA+P+Q4yIeh80jizFLEvolRPc1ES0VdwFlGv+kJTSirogw==",
       "dev": true,
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/eslint": {
-      "version": "8.40.2",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.40.2.tgz",
-      "integrity": "sha512-PRVjQ4Eh9z9pmmtaq8nTjZjQwKFk7YIHIud3lRoKRBgUQjgjRmoGxxGEPXQkF+lH7QkHJRNr5F4aBgYCW0lqpQ==",
+      "version": "8.44.6",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.6.tgz",
+      "integrity": "sha512-P6bY56TVmX8y9J87jHNgQh43h6VVU+6H7oN7hgvivV81K2XY8qJZ5vqPy/HdUoVIelii2kChYVzQanlswPWVFw==",
       "dev": true,
       "dependencies": {
         "@types/estree": "*",
@@ -4192,9 +4886,9 @@
       }
     },
     "node_modules/@types/eslint-scope": {
-      "version": "3.7.4",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
-      "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
+      "version": "3.7.6",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.6.tgz",
+      "integrity": "sha512-zfM4ipmxVKWdxtDaJ3MP3pBurDXOCoyjvlpE3u6Qzrmw4BPbfm4/ambIeTk/r/J0iq/+2/xp0Fmt+gFvXJY2PQ==",
       "dev": true,
       "dependencies": {
         "@types/eslint": "*",
@@ -4202,15 +4896,15 @@
       }
     },
     "node_modules/@types/estree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz",
-      "integrity": "sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.3.tgz",
+      "integrity": "sha512-CS2rOaoQ/eAgAfcTfq6amKG7bsN+EMcgGY4FAFQdvSj2y1ixvOZTUA9mOtCai7E1SYu283XNw7urKK30nP3wkQ==",
       "dev": true
     },
     "node_modules/@types/express": {
-      "version": "4.17.17",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz",
-      "integrity": "sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==",
+      "version": "4.17.20",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.20.tgz",
+      "integrity": "sha512-rOaqlkgEvOW495xErXMsmyX3WKBInbhG5eqojXYi3cGUaLoRDlXa5d52fkfWZT963AZ3v2eZ4MbKE6WpDAGVsw==",
       "dev": true,
       "dependencies": {
         "@types/body-parser": "*",
@@ -4220,9 +4914,9 @@
       }
     },
     "node_modules/@types/express-serve-static-core": {
-      "version": "4.17.35",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz",
-      "integrity": "sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==",
+      "version": "4.17.38",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.38.tgz",
+      "integrity": "sha512-hXOtc0tuDHZPFwwhuBJXPbjemWtXnJjbvuuyNH2Y5Z6in+iXc63c4eXYDc7GGGqHy+iwYqAJMdaItqdnbcBKmg==",
       "dev": true,
       "dependencies": {
         "@types/node": "*",
@@ -4232,54 +4926,57 @@
       }
     },
     "node_modules/@types/http-errors": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.1.tgz",
-      "integrity": "sha512-/K3ds8TRAfBvi5vfjuz8y6+GiAYBZ0x4tXv1Av6CWBWn0IlADc+ZX9pMq7oU0fNQPnBwIZl3rmeLp6SBApbxSQ==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.3.tgz",
+      "integrity": "sha512-pP0P/9BnCj1OVvQR2lF41EkDG/lWWnDyA203b/4Fmi2eTyORnBtcDoKDwjWQthELrBvWkMOrvSOnZ8OVlW6tXA==",
       "dev": true
     },
     "node_modules/@types/http-proxy": {
-      "version": "1.17.11",
-      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.11.tgz",
-      "integrity": "sha512-HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA==",
+      "version": "1.17.13",
+      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.13.tgz",
+      "integrity": "sha512-GkhdWcMNiR5QSQRYnJ+/oXzu0+7JJEPC8vkWXK351BkhjraZF+1W13CUYARUvX9+NqIU2n6YHA4iwywsc/M6Sw==",
       "dev": true,
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/jasmine": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-4.3.5.tgz",
-      "integrity": "sha512-9YHUdvuNDDRJYXZwHqSsO72Ok0vmqoJbNn73ttyITQp/VA60SarnZ+MPLD37rJAhVoKp+9BWOvJP5tHIRfZylQ==",
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-4.3.6.tgz",
+      "integrity": "sha512-3N0FpQTeiWjm+Oo1WUYWguUS7E6JLceiGTriFrG8k5PU7zRLJCzLcWURU3wjMbZGS//a2/LgjsnO3QxIlwxt9g==",
       "dev": true
     },
     "node_modules/@types/json-schema": {
-      "version": "7.0.12",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz",
-      "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==",
+      "version": "7.0.14",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.14.tgz",
+      "integrity": "sha512-U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw==",
       "dev": true
     },
     "node_modules/@types/mime": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
-      "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.4.tgz",
+      "integrity": "sha512-1Gjee59G25MrQGk8bsNvC6fxNiRgUlGn2wlhGf95a59DrprnnHk80FIMMFG9XHMdrfsuA119ht06QPDXA1Z7tw==",
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.3.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.3.2.tgz",
-      "integrity": "sha512-vOBLVQeCQfIcF/2Y7eKFTqrMnizK5lRNQ7ykML/5RuwVXVWxYkgwS7xbt4B6fKCUPgbSL5FSsjHQpaGQP/dQmw==",
-      "dev": true
+      "version": "20.8.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.7.tgz",
+      "integrity": "sha512-21TKHHh3eUHIi2MloeptJWALuCu5H7HQTdTrWIFReA8ad+aggoX+lRes3ex7/FtpC+sVUpFMQ+QTfYr74mruiQ==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.25.1"
+      }
     },
     "node_modules/@types/qs": {
-      "version": "6.9.7",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
-      "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==",
+      "version": "6.9.9",
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.9.tgz",
+      "integrity": "sha512-wYLxw35euwqGvTDx6zfY1vokBFnsK0HNrzc6xNHchxfO2hpuRg74GbkEW7e3sSmPvj0TjCDT1VCa6OtHXnubsg==",
       "dev": true
     },
     "node_modules/@types/range-parser": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
-      "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.6.tgz",
+      "integrity": "sha512-+0autS93xyXizIYiyL02FCY8N+KkKPhILhcUSA276HxzreZ16kl+cmwvV2qAM/PuCCwPXzOXOWhiPcw20uSFcA==",
       "dev": true
     },
     "node_modules/@types/retry": {
@@ -4288,10 +4985,16 @@
       "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==",
       "dev": true
     },
+    "node_modules/@types/semver": {
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-MMzuxN3GdFwskAnb6fz0orFvhfqi752yjaXylr0Rp4oDg5H0Zn1IuyRhDVvYOwAXoJirx2xuS16I3WjxnAIHiQ==",
+      "dev": true
+    },
     "node_modules/@types/send": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.1.tgz",
-      "integrity": "sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==",
+      "version": "0.17.3",
+      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.3.tgz",
+      "integrity": "sha512-/7fKxvKUoETxjFUsuFlPB9YndePpxxRAOfGC/yJdc9kTjTeP5kRCTzfnE8kPUKCeyiyIZu0YQ76s50hCedI1ug==",
       "dev": true,
       "dependencies": {
         "@types/mime": "^1",
@@ -4299,18 +5002,18 @@
       }
     },
     "node_modules/@types/serve-index": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==",
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.3.tgz",
+      "integrity": "sha512-4KG+yMEuvDPRrYq5fyVm/I2uqAJSAwZK9VSa+Zf+zUq9/oxSSvy3kkIqyL+jjStv6UCVi8/Aho0NHtB1Fwosrg==",
       "dev": true,
       "dependencies": {
         "@types/express": "*"
       }
     },
     "node_modules/@types/serve-static": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.2.tgz",
-      "integrity": "sha512-J2LqtvFYCzaj8pVYKw8klQXrLLk7TBZmQ4ShlcdkELFKGwGMfevMLneMMRkMgZxotOD9wg497LpC7O8PcvAmfw==",
+      "version": "1.15.4",
+      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.4.tgz",
+      "integrity": "sha512-aqqNfs1XTF0HDrFdlY//+SGUxmdSUbjeRXb5iaZc3x0/vMbYmdw9qvOgHWOyyLFxSSRnUuP5+724zBgfw8/WAw==",
       "dev": true,
       "dependencies": {
         "@types/http-errors": "*",
@@ -4319,25 +5022,248 @@
       }
     },
     "node_modules/@types/sockjs": {
-      "version": "0.3.33",
-      "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz",
-      "integrity": "sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==",
+      "version": "0.3.35",
+      "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.35.tgz",
+      "integrity": "sha512-tIF57KB+ZvOBpAQwSaACfEu7htponHXaFzP7RfKYgsOS0NoYnn+9+jzp7bbq4fWerizI3dTB4NfAZoyeQKWJLw==",
       "dev": true,
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/ws": {
-      "version": "8.5.5",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.5.tgz",
-      "integrity": "sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==",
+      "version": "8.5.8",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.8.tgz",
+      "integrity": "sha512-flUksGIQCnJd6sZ1l5dqCEG/ksaoAg/eUwiLAGTJQcfgvZJKF++Ta4bJA6A5aPSJmsr+xlseHn4KLgVlNnvPTg==",
       "dev": true,
       "dependencies": {
         "@types/node": "*"
       }
     },
-    "node_modules/@vitejs/plugin-basic-ssl": {
-      "version": "1.0.1",
+    "node_modules/@typescript-eslint/eslint-plugin": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz",
+      "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/regexpp": "^4.4.0",
+        "@typescript-eslint/scope-manager": "5.62.0",
+        "@typescript-eslint/type-utils": "5.62.0",
+        "@typescript-eslint/utils": "5.62.0",
+        "debug": "^4.3.4",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.2.0",
+        "natural-compare-lite": "^1.4.0",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/parser": "^5.0.0",
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/parser": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz",
+      "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/scope-manager": "5.62.0",
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/typescript-estree": "5.62.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
+      "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/visitor-keys": "5.62.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz",
+      "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/typescript-estree": "5.62.0",
+        "@typescript-eslint/utils": "5.62.0",
+        "debug": "^4.3.4",
+        "tsutils": "^3.21.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "*"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/types": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
+      "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
+      "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/visitor-keys": "5.62.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+      "dev": true,
+      "dependencies": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@typescript-eslint/utils": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz",
+      "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@types/json-schema": "^7.0.9",
+        "@types/semver": "^7.3.12",
+        "@typescript-eslint/scope-manager": "5.62.0",
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/typescript-estree": "5.62.0",
+        "eslint-scope": "^5.1.1",
+        "semver": "^7.3.7"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/visitor-keys": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
+      "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.62.0",
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@ungap/structured-clone": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
+      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
+      "dev": true
+    },
+    "node_modules/@vitejs/plugin-basic-ssl": {
+      "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.0.1.tgz",
       "integrity": "sha512-pcub+YbFtFhaGRTo1832FQHQSHvMrlb43974e2eS8EKleR3p1cDdkJFPci1UhwkEf1J9Bz+wKBSzqpKp7nNj2A==",
       "dev": true,
@@ -4494,6 +5420,99 @@
         "@xtuc/long": "4.2.2"
       }
     },
+    "node_modules/@wessberg/ts-evaluator": {
+      "version": "0.0.27",
+      "resolved": "https://registry.npmjs.org/@wessberg/ts-evaluator/-/ts-evaluator-0.0.27.tgz",
+      "integrity": "sha512-7gOpVm3yYojUp/Yn7F4ZybJRxyqfMNf0LXK5KJiawbPfL0XTsJV+0mgrEDjOIR6Bi0OYk2Cyg4tjFu1r8MCZaA==",
+      "deprecated": "this package has been renamed to ts-evaluator. Please install ts-evaluator instead",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "jsdom": "^16.4.0",
+        "object-path": "^0.11.5",
+        "tslib": "^2.0.3"
+      },
+      "engines": {
+        "node": ">=10.1.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/wessberg/ts-evaluator?sponsor=1"
+      },
+      "peerDependencies": {
+        "typescript": ">=3.2.x || >= 4.x"
+      }
+    },
+    "node_modules/@wessberg/ts-evaluator/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/@wessberg/ts-evaluator/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "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/@wessberg/ts-evaluator/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/@wessberg/ts-evaluator/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/@wessberg/ts-evaluator/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/@wessberg/ts-evaluator/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/@xtuc/ieee754": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
@@ -4512,6 +5531,37 @@
       "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==",
       "dev": true
     },
+    "node_modules/@yarnpkg/parsers": {
+      "version": "3.0.0-rc.46",
+      "resolved": "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.0-rc.46.tgz",
+      "integrity": "sha512-aiATs7pSutzda/rq8fnuPwTglyVwjM22bNnK2ZgjrpAjQHSSl3lztd2f9evst1W/qnC58DRz7T7QndUDumAR4Q==",
+      "dev": true,
+      "dependencies": {
+        "js-yaml": "^3.10.0",
+        "tslib": "^2.4.0"
+      },
+      "engines": {
+        "node": ">=14.15.0"
+      }
+    },
+    "node_modules/@zkochan/js-yaml": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/@zkochan/js-yaml/-/js-yaml-0.0.6.tgz",
+      "integrity": "sha512-nzvgl3VfhcELQ8LyVrYOru+UtAy1nrygk2+AGbTm8a5YcO6o8lSjAT+pfg3vJWxIoZKOUhrK6UU7xW/+00kQrg==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/@zkochan/js-yaml/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
     "node_modules/abab": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
@@ -4538,9 +5588,31 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.9.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.9.0.tgz",
-      "integrity": "sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==",
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
+      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-globals": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
+      "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^7.1.1",
+        "acorn-walk": "^7.1.1"
+      }
+    },
+    "node_modules/acorn-globals/node_modules/acorn": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -4558,6 +5630,24 @@
         "acorn": "^8"
       }
     },
+    "node_modules/acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true,
+      "peerDependencies": {
+        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/acorn-walk": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/adjust-sourcemap-loader": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz",
@@ -4598,13 +5688,11 @@
       }
     },
     "node_modules/agentkeepalive": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.3.0.tgz",
-      "integrity": "sha512-7Epl1Blf4Sy37j4v9f9FjICCh4+KAQOyXgHEwlyBiAQLbhKdq/i2QQU3amQalS/wPhdPzDXPL5DMR5bkn+YeWg==",
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.5.0.tgz",
+      "integrity": "sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==",
       "dev": true,
       "dependencies": {
-        "debug": "^4.1.0",
-        "depd": "^2.0.0",
         "humanize-ms": "^1.2.1"
       },
       "engines": {
@@ -4767,16 +5855,46 @@
         "sprintf-js": "~1.0.2"
       }
     },
+    "node_modules/aria-query": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",
+      "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==",
+      "dev": true,
+      "dependencies": {
+        "dequal": "^2.0.3"
+      }
+    },
     "node_modules/array-flatten": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
       "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
       "dev": true
     },
-    "node_modules/autoprefixer": {
-      "version": "10.4.14",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.14.tgz",
-      "integrity": "sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==",
+    "node_modules/array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/async": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
+      "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==",
+      "dev": true
+    },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "dev": true
+    },
+    "node_modules/autoprefixer": {
+      "version": "10.4.14",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.14.tgz",
+      "integrity": "sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==",
       "dev": true,
       "funding": [
         {
@@ -4806,13 +5924,47 @@
         "postcss": "^8.1.0"
       }
     },
+    "node_modules/axios": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz",
+      "integrity": "sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==",
+      "dev": true,
+      "dependencies": {
+        "follow-redirects": "^1.15.0",
+        "form-data": "^4.0.0",
+        "proxy-from-env": "^1.1.0"
+      }
+    },
+    "node_modules/axios/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/axobject-query": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.2.1.tgz",
+      "integrity": "sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==",
+      "dev": true,
+      "dependencies": {
+        "dequal": "^2.0.3"
+      }
+    },
     "node_modules/babel-loader": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.2.tgz",
-      "integrity": "sha512-mN14niXW43tddohGl8HPu5yfQq70iUThvFL/4QzESA7GcZoC0eVOhvWdQ8+3UlSjaDE9MVtsW9mxDY07W7VpVA==",
+      "version": "9.1.3",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.3.tgz",
+      "integrity": "sha512-xG3ST4DglodGf8qSwv0MdeWLhrDsw/32QMdTO5T1ZIp9gQur0HkCyFs7Awskr10JKXFXwpAhiCuYX5oGXnRGbw==",
       "dev": true,
       "dependencies": {
-        "find-cache-dir": "^3.3.2",
+        "find-cache-dir": "^4.0.0",
         "schema-utils": "^4.0.0"
       },
       "engines": {
@@ -4840,17 +5992,17 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.3.tgz",
-      "integrity": "sha512-bM3gHc337Dta490gg+/AseNB9L4YLHxq1nGKZZSHbhXv4aTYU2MD2cjza1Ru4S6975YLTaL1K8uJf6ukJhhmtw==",
+      "version": "0.4.6",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.6.tgz",
+      "integrity": "sha512-jhHiWVZIlnPbEUKSSNb9YoWcQGdlTLq7z1GHL4AjFxaoOUMuuEVJ+Y4pAaQUGOGk93YsVCKPbqbfw3m0SM6H8Q==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.17.7",
-        "@babel/helper-define-polyfill-provider": "^0.4.0",
-        "semver": "^6.1.1"
+        "@babel/compat-data": "^7.22.6",
+        "@babel/helper-define-polyfill-provider": "^0.4.3",
+        "semver": "^6.3.1"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
     "node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": {
@@ -4863,28 +6015,28 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.1.tgz",
-      "integrity": "sha512-ikFrZITKg1xH6pLND8zT14UPgjKHiGLqex7rGEZCH2EvhsneJaJPemmpQaIZV5AL03II+lXylw3UmddDK8RU5Q==",
+      "version": "0.8.5",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.5.tgz",
+      "integrity": "sha512-Q6CdATeAvbScWPNLB8lzSO7fgUVBkQt6zLgNlfyeCr/EQaEQR+bWiBYYPYAFyE528BMjRhL+1QBMOI4jc/c5TA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.4.0",
-        "core-js-compat": "^3.30.1"
+        "@babel/helper-define-polyfill-provider": "^0.4.3",
+        "core-js-compat": "^3.32.2"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
     "node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.0.tgz",
-      "integrity": "sha512-hDJtKjMLVa7Z+LwnTCxoDLQj6wdc+B8dun7ayF2fYieI6OzfuvcLMB32ihJZ4UhCBwNYGl5bg/x/P9cMdnkc2g==",
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.3.tgz",
+      "integrity": "sha512-8sHeDOmXC8csczMrYEOf0UTNa4yE2SxV5JGeT/LP1n0OYVDUUFPxG9vdk2AlDlIit4t+Kf0xCtpgXPBwnn/9pw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.4.0"
+        "@babel/helper-define-polyfill-provider": "^0.4.3"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
     "node_modules/balanced-match": {
@@ -4928,6 +6080,15 @@
       "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
       "dev": true
     },
+    "node_modules/big-integer": {
+      "version": "1.6.51",
+      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz",
+      "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
     "node_modules/big.js": {
       "version": "5.2.2",
       "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
@@ -5014,13 +6175,26 @@
       "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
       "dev": true
     },
+    "node_modules/bplist-parser": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.2.0.tgz",
+      "integrity": "sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==",
+      "dev": true,
+      "dependencies": {
+        "big-integer": "^1.6.44"
+      },
+      "engines": {
+        "node": ">= 5.10.0"
+      }
+    },
     "node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
       "dependencies": {
-        "balanced-match": "^1.0.0"
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
       }
     },
     "node_modules/braces": {
@@ -5035,10 +6209,16 @@
         "node": ">=8"
       }
     },
+    "node_modules/browser-process-hrtime": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
+      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
+      "dev": true
+    },
     "node_modules/browserslist": {
-      "version": "4.21.9",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.9.tgz",
-      "integrity": "sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==",
+      "version": "4.22.1",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz",
+      "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==",
       "dev": true,
       "funding": [
         {
@@ -5055,10 +6235,10 @@
         }
       ],
       "dependencies": {
-        "caniuse-lite": "^1.0.30001503",
-        "electron-to-chromium": "^1.4.431",
-        "node-releases": "^2.0.12",
-        "update-browserslist-db": "^1.0.11"
+        "caniuse-lite": "^1.0.30001541",
+        "electron-to-chromium": "^1.4.535",
+        "node-releases": "^2.0.13",
+        "update-browserslist-db": "^1.0.13"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -5106,6 +6286,21 @@
         "semver": "^7.0.0"
       }
     },
+    "node_modules/bundle-name": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-3.0.0.tgz",
+      "integrity": "sha512-PKA4BeSvBpQKQ8iPOGCSiell+N8P+Tf1DlwqmYhpe2gAhKPHn8EYOxVT+ShuGmhg8lN8XiSlS80yiExKXrURlw==",
+      "dev": true,
+      "dependencies": {
+        "run-applescript": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/bytes": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
@@ -5116,16 +6311,16 @@
       }
     },
     "node_modules/cacache": {
-      "version": "17.1.3",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.3.tgz",
-      "integrity": "sha512-jAdjGxmPxZh0IipMdR7fK/4sDSrHMLUV0+GvVUsjwyGNKHsh79kW/otg+GkbXwl6Uzvy9wsvHOX4nUoWldeZMg==",
+      "version": "17.1.4",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz",
+      "integrity": "sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==",
       "dev": true,
       "dependencies": {
         "@npmcli/fs": "^3.1.0",
         "fs-minipass": "^3.0.0",
         "glob": "^10.2.2",
         "lru-cache": "^7.7.1",
-        "minipass": "^5.0.0",
+        "minipass": "^7.0.3",
         "minipass-collect": "^1.0.2",
         "minipass-flush": "^1.0.5",
         "minipass-pipeline": "^1.2.4",
@@ -5138,6 +6333,37 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
+    "node_modules/cacache/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/cacache/node_modules/glob": {
+      "version": "10.3.10",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
+      "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==",
+      "dev": true,
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^2.3.5",
+        "minimatch": "^9.0.1",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
+        "path-scurry": "^1.10.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/cacache/node_modules/lru-cache": {
       "version": "7.18.3",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
@@ -5147,6 +6373,30 @@
         "node": ">=12"
       }
     },
+    "node_modules/cacache/node_modules/minimatch": {
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/cacache/node_modules/minipass": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
+      "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
     "node_modules/call-bind": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
@@ -5179,9 +6429,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001509",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001509.tgz",
-      "integrity": "sha512-2uDDk+TRiTX5hMcUYT/7CSyzMZxjfGu0vAUjS2g0LSD8UoXOv0LtpH4LxGMemsiPq6LCVIUjNwVM0erkOkGCDA==",
+      "version": "1.0.30001551",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001551.tgz",
+      "integrity": "sha512-vtBAez47BoGMMzlbYhfXrMV1kvRF2WP/lqiMuDu1Sb4EE4LKEgjopFDSRtZfdVnslNRpOqV/woE+Xgrwj6VQlg==",
       "dev": true,
       "funding": [
         {
@@ -5285,9 +6535,9 @@
       }
     },
     "node_modules/cli-spinners": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.0.tgz",
-      "integrity": "sha512-4/aL9X3Wh0yiMQlE+eeRhWP6vclO3QRtw1JHKIT0FFUs5FjpFmESqtMvYZ0+lbzBw900b95mS0hohy+qn2VK/g==",
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.1.tgz",
+      "integrity": "sha512-jHgecW0pxkonBJdrKsqxgRX9AcG+u/5k0Q7WPDfi8AogLAdwxEkyYYNWwZ5GvVFoFx2uiY1eNcSK00fh+1+FyQ==",
       "dev": true,
       "engines": {
         "node": ">=6"
@@ -5296,6 +6546,15 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/cli-width": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
+      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
     "node_modules/cliui": {
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
@@ -5363,18 +6622,39 @@
       "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
       "dev": true
     },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "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==",
       "dev": true
     },
-    "node_modules/commondir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
+    "node_modules/common-path-prefix": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz",
+      "integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==",
       "dev": true
     },
+    "node_modules/common-tags": {
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz",
+      "integrity": "sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
     "node_modules/compressible": {
       "version": "2.0.18",
       "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
@@ -5577,12 +6857,12 @@
       }
     },
     "node_modules/core-js-compat": {
-      "version": "3.31.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.31.0.tgz",
-      "integrity": "sha512-hM7YCu1cU6Opx7MXNu0NuumM0ezNeAeRKadixyiQELWY3vT3De9S4J5ZBMraWV2vZnrE1Cirl0GtFtDtMUXzPw==",
+      "version": "3.33.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.33.0.tgz",
+      "integrity": "sha512-0w4LcLXsVEuNkIqwjjf9rjCoPhK8uqA4tMRh4Ge26vfLtUutshn+aRJU21I9LCJlh2QQHfisNToLjw1XEJLTWw==",
       "dev": true,
       "dependencies": {
-        "browserslist": "^4.21.5"
+        "browserslist": "^4.22.1"
       },
       "funding": {
         "type": "opencollective",
@@ -5609,14 +6889,14 @@
       }
     },
     "node_modules/cosmiconfig": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.2.0.tgz",
-      "integrity": "sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ==",
+      "version": "8.3.6",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz",
+      "integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==",
       "dev": true,
       "dependencies": {
-        "import-fresh": "^3.2.1",
+        "import-fresh": "^3.3.0",
         "js-yaml": "^4.1.0",
-        "parse-json": "^5.0.0",
+        "parse-json": "^5.2.0",
         "path-type": "^4.0.0"
       },
       "engines": {
@@ -5624,6 +6904,14 @@
       },
       "funding": {
         "url": "https://github.com/sponsors/d-fischer"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.9.5"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
     "node_modules/cosmiconfig/node_modules/argparse": {
@@ -5645,9 +6933,9 @@
       }
     },
     "node_modules/critters": {
-      "version": "0.0.19",
-      "resolved": "https://registry.npmjs.org/critters/-/critters-0.0.19.tgz",
-      "integrity": "sha512-Fm4ZAXsG0VzWy1U30rP4qxbaWGSsqXDgSupJW1OUJGDAs0KWC+j37v7p5a2kZ9BPJvhRzWm3be+Hc9WvQOBUOw==",
+      "version": "0.0.20",
+      "resolved": "https://registry.npmjs.org/critters/-/critters-0.0.20.tgz",
+      "integrity": "sha512-CImNRorKOl5d8TWcnAz5n5izQ6HFsvz29k327/ELy6UFcmbiZNOsinaKvzv16WZR0P6etfSWYzE47C4/56B3Uw==",
       "dev": true,
       "dependencies": {
         "chalk": "^4.1.0",
@@ -5743,6 +7031,21 @@
         "node": ">= 8"
       }
     },
+    "node_modules/cross-spawn/node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/css-loader": {
       "version": "6.8.1",
       "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.8.1.tgz",
@@ -5809,12 +7112,50 @@
         "node": ">=4"
       }
     },
+    "node_modules/cssom": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
+      "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==",
+      "dev": true
+    },
+    "node_modules/cssstyle": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
+      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
+      "dev": true,
+      "dependencies": {
+        "cssom": "~0.3.6"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cssstyle/node_modules/cssom": {
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
+      "dev": true
+    },
     "node_modules/custom-event": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
       "integrity": "sha512-GAj5FOq0Hd+RsCGVJxZuKaIDXDf3h6GQoNEjFgbLLI/trgtavwUbSnZ5pVfg27DVCaWjIohryS0JFwIJyT2cMg==",
       "dev": true
     },
+    "node_modules/data-urls": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
+      "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
+      "dev": true,
+      "dependencies": {
+        "abab": "^2.0.3",
+        "whatwg-mimetype": "^2.3.0",
+        "whatwg-url": "^8.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/date-format": {
       "version": "4.0.14",
       "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.14.tgz",
@@ -5841,88 +7182,268 @@
         }
       }
     },
-    "node_modules/default-gateway": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
-      "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
+    "node_modules/decimal.js": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
+      "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==",
+      "dev": true
+    },
+    "node_modules/deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
+    },
+    "node_modules/default-browser": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-4.0.0.tgz",
+      "integrity": "sha512-wX5pXO1+BrhMkSbROFsyxUm0i/cJEScyNhA4PPxc41ICuv05ZZB/MX28s8aZx6xjmatvebIapF6hLEKEcpneUA==",
       "dev": true,
       "dependencies": {
-        "execa": "^5.0.0"
+        "bundle-name": "^3.0.0",
+        "default-browser-id": "^3.0.0",
+        "execa": "^7.1.1",
+        "titleize": "^3.0.0"
       },
       "engines": {
-        "node": ">= 10"
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/defaults": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
-      "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
+    "node_modules/default-browser-id": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-3.0.0.tgz",
+      "integrity": "sha512-OZ1y3y0SqSICtE8DE4S8YOE9UZOJ8wO16fKWVP5J1Qz42kV9jcnMVFrEE/noXb/ss3Q4pZIH79kxofzyNNtUNA==",
       "dev": true,
       "dependencies": {
-        "clone": "^1.0.2"
+        "bplist-parser": "^0.2.0",
+        "untildify": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/define-lazy-prop": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
-      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
+    "node_modules/default-browser/node_modules/execa": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-7.2.0.tgz",
+      "integrity": "sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==",
       "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.1",
+        "human-signals": "^4.3.0",
+        "is-stream": "^3.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^5.1.0",
+        "onetime": "^6.0.0",
+        "signal-exit": "^3.0.7",
+        "strip-final-newline": "^3.0.0"
+      },
       "engines": {
-        "node": ">=8"
+        "node": "^14.18.0 || ^16.14.0 || >=18.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
       }
     },
-    "node_modules/delegates": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
-      "dev": true
-    },
-    "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==",
+    "node_modules/default-browser/node_modules/human-signals": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-4.3.1.tgz",
+      "integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==",
       "dev": true,
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=14.18.0"
       }
     },
-    "node_modules/destroy": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
-      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+    "node_modules/default-browser/node_modules/is-stream": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
+      "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==",
       "dev": true,
       "engines": {
-        "node": ">= 0.8",
-        "npm": "1.2.8000 || >= 1.4.16"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/detect-node": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
-      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
-      "dev": true
-    },
-    "node_modules/di": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
-      "integrity": "sha512-uJaamHkagcZtHPqCIHZxnFrXlunQXgBOsZSUOWwFw31QJCAbyTBoHMW75YOTur5ZNx8pIeAKgf6GWIgaqqiLhA==",
-      "dev": true
-    },
-    "node_modules/dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+    "node_modules/default-browser/node_modules/mimic-fn": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
+      "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==",
       "dev": true,
-      "dependencies": {
-        "path-type": "^4.0.0"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/default-browser/node_modules/npm-run-path": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz",
+      "integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/default-browser/node_modules/onetime": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz",
+      "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==",
+      "dev": true,
+      "dependencies": {
+        "mimic-fn": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/default-browser/node_modules/path-key": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
+      "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/default-browser/node_modules/strip-final-newline": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
+      "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/default-gateway": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
+      "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
+      "dev": true,
+      "dependencies": {
+        "execa": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/defaults": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
+      "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
+      "dev": true,
+      "dependencies": {
+        "clone": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/define-lazy-prop": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
+      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
+      "dev": true
+    },
+    "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/dequal": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
+      "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "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"
+      }
+    },
+    "node_modules/detect-node": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
+      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
+      "dev": true
+    },
+    "node_modules/di": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
+      "integrity": "sha512-uJaamHkagcZtHPqCIHZxnFrXlunQXgBOsZSUOWwFw31QJCAbyTBoHMW75YOTur5ZNx8pIeAKgf6GWIgaqqiLhA==",
+      "dev": true
+    },
+    "node_modules/dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "dev": true,
+      "dependencies": {
+        "path-type": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
+    "node_modules/dlv": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
+      "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==",
+      "dev": true
+    },
     "node_modules/dns-equal": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
@@ -5930,9 +7451,9 @@
       "dev": true
     },
     "node_modules/dns-packet": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.0.tgz",
-      "integrity": "sha512-rza3UH1LwdHh9qyPXp8lkwpjSNk/AMD3dPytUoRoqnypDUhY0xvbdmVhWOfxO68frEfV9BU8V12Ez7ZsHGZpCQ==",
+      "version": "5.6.1",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz",
+      "integrity": "sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==",
       "dev": true,
       "dependencies": {
         "@leichtgewicht/ip-codec": "^2.0.1"
@@ -5941,6 +7462,18 @@
         "node": ">=6"
       }
     },
+    "node_modules/doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
     "node_modules/dom-serialize": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz",
@@ -5979,6 +7512,27 @@
         }
       ]
     },
+    "node_modules/domexception": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
+      "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
+      "dev": true,
+      "dependencies": {
+        "webidl-conversions": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/domexception/node_modules/webidl-conversions": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
+      "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/domhandler": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
@@ -6008,6 +7562,21 @@
         "url": "https://github.com/fb55/domutils?sponsor=1"
       }
     },
+    "node_modules/dotenv": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz",
+      "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/duplexer": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
+      "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
+      "dev": true
+    },
     "node_modules/eastasianwidth": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
@@ -6020,10 +7589,25 @@
       "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
       "dev": true
     },
+    "node_modules/ejs": {
+      "version": "3.1.9",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz",
+      "integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==",
+      "dev": true,
+      "dependencies": {
+        "jake": "^10.8.5"
+      },
+      "bin": {
+        "ejs": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.445",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.445.tgz",
-      "integrity": "sha512-++DB+9VK8SBJwC+X1zlMfJ1tMA3F0ipi39GdEp+x3cV2TyBihqAgad8cNMWtLDEkbH39nlDQP7PfGrDr3Dr7HA==",
+      "version": "1.4.559",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.559.tgz",
+      "integrity": "sha512-iS7KhLYCSJbdo3rUSkhDTVuFNCV34RKs2UaB9Ecr7VlqzjjWW//0nfsFF5dtDmyXlZQaDYYtID5fjtC/6lpRug==",
       "dev": true
     },
     "node_modules/emoji-regex": {
@@ -6073,10 +7657,19 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.4.0"
+      }
+    },
     "node_modules/engine.io": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.5.1.tgz",
-      "integrity": "sha512-mGqhI+D7YxS9KJMppR6Iuo37Ed3abhU8NdfgSvJSDUafQutrN+sPTncJYTyM9+tkhSmWodKtVYGPPHyXJEwEQA==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.5.3.tgz",
+      "integrity": "sha512-IML/R4eG/pUS5w7OfcDE0jKrljWS9nwnEfsxWCIJF5eO6AHo6+Hlv+lQbdlAYsiJPHzUthLm1RUjnBzWOs45cw==",
       "dev": true,
       "dependencies": {
         "@types/cookie": "^0.4.1",
@@ -6087,20 +7680,41 @@
         "cookie": "~0.4.1",
         "cors": "~2.8.5",
         "debug": "~4.3.1",
-        "engine.io-parser": "~5.1.0",
+        "engine.io-parser": "~5.2.1",
         "ws": "~8.11.0"
       },
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=10.2.0"
       }
     },
     "node_modules/engine.io-parser": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.1.0.tgz",
-      "integrity": "sha512-enySgNiK5tyZFynt3z7iqBR+Bto9EVVVvDFuTT0ioHCGbzirZVGDGiQjZzEp8hWl6hd5FSVytJGuScX1C1C35w==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.1.tgz",
+      "integrity": "sha512-9JktcM3u18nU9N2Lz3bWeBgxVgOKpw7yhRaoxQA3FUDZzzw+9WlA6p4G4u0RixNkg14fH7EfEc/RhpurtiROTQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/engine.io/node_modules/ws": {
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
+      "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
       "dev": true,
       "engines": {
         "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
       }
     },
     "node_modules/enhanced-resolve": {
@@ -6116,6 +7730,18 @@
         "node": ">=10.13.0"
       }
     },
+    "node_modules/enquirer": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
     "node_modules/ent": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
@@ -6134,133 +7760,548 @@
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
-    "node_modules/env-paths": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
-      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
+    "node_modules/env-paths": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
+      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/err-code": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
+      "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==",
+      "dev": true
+    },
+    "node_modules/errno": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
+      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "prr": "~1.0.1"
+      },
+      "bin": {
+        "errno": "cli.js"
+      }
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "node_modules/es-module-lexer": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.1.tgz",
+      "integrity": "sha512-JUFAyicQV9mXc3YRxPnDlrfBKpqt6hUYzz9/boprUJHs4e4KVr3XwOF70doO6gwXUor6EWZJAyWAfKki84t20Q==",
+      "dev": true
+    },
+    "node_modules/esbuild": {
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.17.tgz",
+      "integrity": "sha512-1GJtYnUxsJreHYA0Y+iQz2UEykonY66HNWOb0yXYZi9/kNrORUEHVg87eQsCtqh59PEJ5YVZJO98JHznMJSWjg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "optionalDependencies": {
+        "@esbuild/android-arm": "0.18.17",
+        "@esbuild/android-arm64": "0.18.17",
+        "@esbuild/android-x64": "0.18.17",
+        "@esbuild/darwin-arm64": "0.18.17",
+        "@esbuild/darwin-x64": "0.18.17",
+        "@esbuild/freebsd-arm64": "0.18.17",
+        "@esbuild/freebsd-x64": "0.18.17",
+        "@esbuild/linux-arm": "0.18.17",
+        "@esbuild/linux-arm64": "0.18.17",
+        "@esbuild/linux-ia32": "0.18.17",
+        "@esbuild/linux-loong64": "0.18.17",
+        "@esbuild/linux-mips64el": "0.18.17",
+        "@esbuild/linux-ppc64": "0.18.17",
+        "@esbuild/linux-riscv64": "0.18.17",
+        "@esbuild/linux-s390x": "0.18.17",
+        "@esbuild/linux-x64": "0.18.17",
+        "@esbuild/netbsd-x64": "0.18.17",
+        "@esbuild/openbsd-x64": "0.18.17",
+        "@esbuild/sunos-x64": "0.18.17",
+        "@esbuild/win32-arm64": "0.18.17",
+        "@esbuild/win32-ia32": "0.18.17",
+        "@esbuild/win32-x64": "0.18.17"
+      }
+    },
+    "node_modules/esbuild-wasm": {
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.18.17.tgz",
+      "integrity": "sha512-9OHGcuRzy+I8ziF9FzjfKLWAPbvi0e/metACVg9k6bK+SI4FFxeV6PcZsz8RIVaMD4YNehw+qj6UMR3+qj/EuQ==",
+      "dev": true,
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
+      "dev": true
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/escodegen": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
+      "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
+      "dev": true,
+      "dependencies": {
+        "esprima": "^4.0.1",
+        "estraverse": "^5.2.0",
+        "esutils": "^2.0.2"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/escodegen/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eslint": {
+      "version": "8.52.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.52.0.tgz",
+      "integrity": "sha512-zh/JHnaixqHZsolRB/w9/02akBk9EPrOs9JwcTP2ek7yL5bVvXuRariiaAjjoJ5DvuwQ1WAE/HsMz+w17YgBCg==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.6.1",
+        "@eslint/eslintrc": "^2.1.2",
+        "@eslint/js": "8.52.0",
+        "@humanwhocodes/config-array": "^0.11.13",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
+        "@ungap/structured-clone": "^1.2.0",
+        "ajv": "^6.12.4",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.2.2",
+        "eslint-visitor-keys": "^3.4.3",
+        "espree": "^9.6.1",
+        "esquery": "^1.4.2",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "globals": "^13.19.0",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.2.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "is-path-inside": "^3.0.3",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.3",
+        "strip-ansi": "^6.0.1",
+        "text-table": "^0.2.0"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-config-prettier": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.0.0.tgz",
+      "integrity": "sha512-IcJsTkJae2S35pRsRAwoCE+925rJJStOdkKnLVgtE+tEpqU0EVVM7OqrwxqgptKdX29NUwC82I5pXsGFIgSevw==",
+      "dev": true,
+      "bin": {
+        "eslint-config-prettier": "bin/cli.js"
+      },
+      "peerDependencies": {
+        "eslint": ">=7.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-prettier": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.0.1.tgz",
+      "integrity": "sha512-m3u5RnR56asrwV/lDC4GHorlW75DsFfmUcjfCYylTUs85dBRnB7VM6xG8eCMJdeDRnppzmxZVf1GEPJvl1JmNg==",
+      "dev": true,
+      "dependencies": {
+        "prettier-linter-helpers": "^1.0.0",
+        "synckit": "^0.8.5"
+      },
+      "engines": {
+        "node": "^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/prettier"
+      },
+      "peerDependencies": {
+        "@types/eslint": ">=8.0.0",
+        "eslint": ">=8.0.0",
+        "prettier": ">=3.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/eslint": {
+          "optional": true
+        },
+        "eslint-config-prettier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/eslint-scope/node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/eslint-visitor-keys": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint/node_modules/ajv": {
+      "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",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/eslint/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/eslint/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "node_modules/eslint/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "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/eslint/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/eslint/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/eslint/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/eslint-scope": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint/node_modules/find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/eslint/node_modules/globals": {
+      "version": "13.23.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz",
+      "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/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/eslint/node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
       "dev": true,
-      "engines": {
-        "node": ">=6"
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/err-code": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
-      "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==",
+    "node_modules/eslint/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==",
       "dev": true
     },
-    "node_modules/errno": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
-      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
+    "node_modules/eslint/node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
       "dev": true,
-      "optional": true,
       "dependencies": {
-        "prr": "~1.0.1"
+        "p-locate": "^5.0.0"
       },
-      "bin": {
-        "errno": "cli.js"
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+    "node_modules/eslint/node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
       "dev": true,
       "dependencies": {
-        "is-arrayish": "^0.2.1"
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/es-module-lexer": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.0.tgz",
-      "integrity": "sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==",
-      "dev": true
-    },
-    "node_modules/esbuild": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.19.tgz",
-      "integrity": "sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==",
+    "node_modules/eslint/node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
       "dev": true,
-      "hasInstallScript": true,
-      "bin": {
-        "esbuild": "bin/esbuild"
+      "dependencies": {
+        "p-limit": "^3.0.2"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=10"
       },
-      "optionalDependencies": {
-        "@esbuild/android-arm": "0.17.19",
-        "@esbuild/android-arm64": "0.17.19",
-        "@esbuild/android-x64": "0.17.19",
-        "@esbuild/darwin-arm64": "0.17.19",
-        "@esbuild/darwin-x64": "0.17.19",
-        "@esbuild/freebsd-arm64": "0.17.19",
-        "@esbuild/freebsd-x64": "0.17.19",
-        "@esbuild/linux-arm": "0.17.19",
-        "@esbuild/linux-arm64": "0.17.19",
-        "@esbuild/linux-ia32": "0.17.19",
-        "@esbuild/linux-loong64": "0.17.19",
-        "@esbuild/linux-mips64el": "0.17.19",
-        "@esbuild/linux-ppc64": "0.17.19",
-        "@esbuild/linux-riscv64": "0.17.19",
-        "@esbuild/linux-s390x": "0.17.19",
-        "@esbuild/linux-x64": "0.17.19",
-        "@esbuild/netbsd-x64": "0.17.19",
-        "@esbuild/openbsd-x64": "0.17.19",
-        "@esbuild/sunos-x64": "0.17.19",
-        "@esbuild/win32-arm64": "0.17.19",
-        "@esbuild/win32-ia32": "0.17.19",
-        "@esbuild/win32-x64": "0.17.19"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/esbuild-wasm": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.17.19.tgz",
-      "integrity": "sha512-X9UQEMJMZXwlGCfqcBmJ1jEa+KrLfd+gCBypO/TSzo5hZvbVwFqpxj1YCuX54ptTF75wxmrgorR4RL40AKtLVg==",
+    "node_modules/eslint/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,
-      "bin": {
-        "esbuild": "bin/esbuild"
+      "dependencies": {
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=8"
       }
     },
-    "node_modules/escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+    "node_modules/eslint/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": ">=6"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
-      "dev": true
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+    "node_modules/eslint/node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
       "dev": true,
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+    "node_modules/espree": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
       "dev": true,
       "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
+        "acorn": "^8.9.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
-        "node": ">=8.0.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
     "node_modules/esprima": {
@@ -6276,6 +8317,18 @@
         "node": ">=4"
       }
     },
+    "node_modules/esquery": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
     "node_modules/esrecurse": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
@@ -6288,7 +8341,7 @@
         "node": ">=4.0"
       }
     },
-    "node_modules/esrecurse/node_modules/estraverse": {
+    "node_modules/estraverse": {
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
       "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
@@ -6297,15 +8350,6 @@
         "node": ">=4.0"
       }
     },
-    "node_modules/estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
     "node_modules/esutils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
@@ -6368,12 +8412,6 @@
         "url": "https://github.com/sindresorhus/execa?sponsor=1"
       }
     },
-    "node_modules/execa/node_modules/signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "dev": true
-    },
     "node_modules/exponential-backoff": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz",
@@ -6544,10 +8582,16 @@
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
       "dev": true
     },
+    "node_modules/fast-diff": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz",
+      "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==",
+      "dev": true
+    },
     "node_modules/fast-glob": {
-      "version": "3.2.12",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
-      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
+      "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
       "dev": true,
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
@@ -6566,6 +8610,12 @@
       "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
       "dev": true
     },
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "dev": true
+    },
     "node_modules/fastq": {
       "version": "1.15.0",
       "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
@@ -6602,6 +8652,48 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
+      "dependencies": {
+        "flat-cache": "^3.0.4"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/filelist": {
+      "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"
+      }
+    },
+    "node_modules/filelist/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/filelist/node_modules/minimatch": {
+      "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"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/fill-range": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
@@ -6660,20 +8752,19 @@
       }
     },
     "node_modules/find-cache-dir": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
-      "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-4.0.0.tgz",
+      "integrity": "sha512-9ZonPT4ZAK4a+1pUPVPZJapbi7O5qbbJPdYw/NOQWZZbVLdDTYM3A4R9z/DpAM08IDaFGsvPgiGZ82WEwUDWjg==",
       "dev": true,
       "dependencies": {
-        "commondir": "^1.0.1",
-        "make-dir": "^3.0.2",
-        "pkg-dir": "^4.1.0"
+        "common-path-prefix": "^3.0.0",
+        "pkg-dir": "^7.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=14.16"
       },
       "funding": {
-        "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/find-up": {
@@ -6689,16 +8780,39 @@
         "node": ">=8"
       }
     },
+    "node_modules/flat": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+      "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+      "dev": true,
+      "bin": {
+        "flat": "cli.js"
+      }
+    },
+    "node_modules/flat-cache": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.1.tgz",
+      "integrity": "sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q==",
+      "dev": true,
+      "dependencies": {
+        "flatted": "^3.2.9",
+        "keyv": "^4.5.3",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/flatted": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
-      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
+      "version": "3.2.9",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz",
+      "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==",
       "dev": true
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+      "version": "1.15.3",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz",
+      "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==",
       "dev": true,
       "funding": [
         {
@@ -6731,6 +8845,32 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/foreground-child/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/form-data": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
+      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+      "dev": true,
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/forwarded": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
@@ -6741,16 +8881,16 @@
       }
     },
     "node_modules/fraction.js": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
-      "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==",
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz",
+      "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==",
       "dev": true,
       "engines": {
         "node": "*"
       },
       "funding": {
         "type": "patreon",
-        "url": "https://www.patreon.com/infusion"
+        "url": "https://github.com/sponsors/rawify"
       }
     },
     "node_modules/fresh": {
@@ -6762,6 +8902,12 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/fs-constants": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+      "dev": true
+    },
     "node_modules/fs-extra": {
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
@@ -6777,21 +8923,30 @@
       }
     },
     "node_modules/fs-minipass": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.2.tgz",
-      "integrity": "sha512-2GAfyfoaCDRrM6jaOS3UsBts8yJ55VioXdWcOL7dK9zdAuKT71+WBA4ifnNYqVjYv+4SsPxjK0JT4yIIn4cA/g==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz",
+      "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==",
       "dev": true,
       "dependencies": {
-        "minipass": "^5.0.0"
+        "minipass": "^7.0.3"
       },
       "engines": {
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
+    "node_modules/fs-minipass/node_modules/minipass": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
+      "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
     "node_modules/fs-monkey": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.4.tgz",
-      "integrity": "sha512-INM/fWAxMICjttnD0DX1rBvinKskj5G1w+oy/pnm9u/tSlnBrzFonJMcalKJ30P8RRsPzKcCG7Q8l0jx5Fh9YQ==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.5.tgz",
+      "integrity": "sha512-8uMbBjrhzW76TYgEV27Y5E//W2f/lTFmx78P2w19FZSxarhI/798APGQyuGCwmkNxgwGRhrLfvWyLBvNtuOmew==",
       "dev": true
     },
     "node_modules/fs.realpath": {
@@ -6801,9 +8956,9 @@
       "dev": true
     },
     "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "dev": true,
       "hasInstallScript": true,
       "optional": true,
@@ -6815,10 +8970,13 @@
       }
     },
     "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/gauge": {
       "version": "4.0.4",
@@ -6839,12 +8997,6 @@
         "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
     },
-    "node_modules/gauge/node_modules/signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "dev": true
-    },
     "node_modules/gensync": {
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -6900,22 +9052,20 @@
       }
     },
     "node_modules/glob": {
-      "version": "10.3.1",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.1.tgz",
-      "integrity": "sha512-9BKYcEeIs7QwlCYs+Y3GBvqAMISufUS0i2ELd11zpZjxI5V9iyRj0HgzB5/cLf2NY4vcYBTYzJ7GIui7j/4DOw==",
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
       "dev": true,
       "dependencies": {
-        "foreground-child": "^3.1.0",
-        "jackspeak": "^2.0.3",
-        "minimatch": "^9.0.1",
-        "minipass": "^5.0.0 || ^6.0.2",
-        "path-scurry": "^1.10.0"
-      },
-      "bin": {
-        "glob": "dist/cjs/src/bin.js"
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.17"
+        "node": "*"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
@@ -6949,14 +9099,14 @@
       }
     },
     "node_modules/globby": {
-      "version": "13.2.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.0.tgz",
-      "integrity": "sha512-jWsQfayf13NvqKUIL3Ta+CIqMnvlaIDFveWE/dpOZ9+3AMEJozsxDvKA02zync9UuvOM8rOXzsD5GqKP4OnWPQ==",
+      "version": "13.2.2",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz",
+      "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==",
       "dev": true,
       "dependencies": {
         "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.11",
-        "ignore": "^5.2.0",
+        "fast-glob": "^3.3.0",
+        "ignore": "^5.2.4",
         "merge2": "^1.4.1",
         "slash": "^4.0.0"
       },
@@ -6973,6 +9123,24 @@
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
       "dev": true
     },
+    "node_modules/graphemer": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
+      "dev": true
+    },
+    "node_modules/guess-parser": {
+      "version": "0.4.22",
+      "resolved": "https://registry.npmjs.org/guess-parser/-/guess-parser-0.4.22.tgz",
+      "integrity": "sha512-KcUWZ5ACGaBM69SbqwVIuWGoSAgD+9iJnchR9j/IarVI1jHVeXv+bUXBIMeqVMSKt3zrn0Dgf9UpcOEpPBLbSg==",
+      "dev": true,
+      "dependencies": {
+        "@wessberg/ts-evaluator": "0.0.27"
+      },
+      "peerDependencies": {
+        "typescript": ">=3.7.5"
+      }
+    },
     "node_modules/handle-thing": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
@@ -6980,15 +9148,33 @@
       "dev": true
     },
     "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.4.tgz",
+      "integrity": "sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==",
       "dev": true,
       "dependencies": {
-        "function-bind": "^1.1.1"
+        "ansi-regex": "^2.0.0"
       },
       "engines": {
-        "node": ">= 0.4.0"
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-ansi/node_modules/ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
     "node_modules/has-flag": {
@@ -7110,6 +9296,18 @@
         "safe-buffer": "~5.1.0"
       }
     },
+    "node_modules/html-encoding-sniffer": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
+      "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
+      "dev": true,
+      "dependencies": {
+        "whatwg-encoding": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/html-entities": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.4.0.tgz",
@@ -7209,12 +9407,12 @@
       }
     },
     "node_modules/http-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
       "dev": true,
       "dependencies": {
-        "@tootallnate/once": "2",
+        "@tootallnate/once": "1",
         "agent-base": "6",
         "debug": "4"
       },
@@ -7342,6 +9540,30 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
+    "node_modules/ignore-walk/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/ignore-walk/node_modules/minimatch": {
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/image-size": {
       "version": "0.5.5",
       "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
@@ -7356,9 +9578,9 @@
       }
     },
     "node_modules/immutable": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.0.tgz",
-      "integrity": "sha512-0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.4.tgz",
+      "integrity": "sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA==",
       "dev": true
     },
     "node_modules/import-fresh": {
@@ -7429,6 +9651,102 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
+    "node_modules/inquirer": {
+      "version": "8.2.4",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.4.tgz",
+      "integrity": "sha512-nn4F01dxU8VeKfq192IjLsxu0/OmMZ4Lg3xKAns148rCaXP6ntAoEkVYZThWjwON8AlzdZZi6oqnhNbxUG9hVg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.1.1",
+        "cli-cursor": "^3.1.0",
+        "cli-width": "^3.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^3.0.0",
+        "lodash": "^4.17.21",
+        "mute-stream": "0.0.8",
+        "ora": "^5.4.1",
+        "run-async": "^2.4.0",
+        "rxjs": "^7.5.5",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "through": "^2.3.6",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/inquirer/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/inquirer/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "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/inquirer/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/inquirer/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/inquirer/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/inquirer/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/ip": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz",
@@ -7463,9 +9781,9 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.12.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz",
-      "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz",
+      "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==",
       "dev": true,
       "dependencies": {
         "has": "^1.0.3"
@@ -7519,6 +9837,39 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/is-inside-container": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz",
+      "integrity": "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==",
+      "dev": true,
+      "dependencies": {
+        "is-docker": "^3.0.0"
+      },
+      "bin": {
+        "is-inside-container": "cli.js"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-inside-container/node_modules/is-docker": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz",
+      "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==",
+      "dev": true,
+      "bin": {
+        "is-docker": "cli.js"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/is-interactive": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
@@ -7543,6 +9894,15 @@
         "node": ">=0.12.0"
       }
     },
+    "node_modules/is-path-inside": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/is-plain-obj": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
@@ -7567,6 +9927,12 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/is-potential-custom-element-name": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
+      "dev": true
+    },
     "node_modules/is-stream": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
@@ -7677,17 +10043,17 @@
       }
     },
     "node_modules/istanbul-lib-report": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-      "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
       "dev": true,
       "dependencies": {
         "istanbul-lib-coverage": "^3.0.0",
-        "make-dir": "^3.0.0",
+        "make-dir": "^4.0.0",
         "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       }
     },
     "node_modules/istanbul-lib-report/node_modules/has-flag": {
@@ -7735,9 +10101,9 @@
       }
     },
     "node_modules/istanbul-reports": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz",
-      "integrity": "sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==",
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz",
+      "integrity": "sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==",
       "dev": true,
       "dependencies": {
         "html-escaper": "^2.0.0",
@@ -7748,9 +10114,9 @@
       }
     },
     "node_modules/jackspeak": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.2.1.tgz",
-      "integrity": "sha512-MXbxovZ/Pm42f6cDIDkl3xpwv1AGwObKwfmjs2nQePiy85tP3fatofl3FC1aBsOtP/6fq5SbtgHwWcMsLP+bDw==",
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz",
+      "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==",
       "dev": true,
       "dependencies": {
         "@isaacs/cliui": "^8.0.2"
@@ -7765,6 +10131,94 @@
         "@pkgjs/parseargs": "^0.11.0"
       }
     },
+    "node_modules/jake": {
+      "version": "10.8.7",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.7.tgz",
+      "integrity": "sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==",
+      "dev": true,
+      "dependencies": {
+        "async": "^3.2.3",
+        "chalk": "^4.0.2",
+        "filelist": "^1.0.4",
+        "minimatch": "^3.1.2"
+      },
+      "bin": {
+        "jake": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jake/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/jake/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "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/jake/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/jake/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/jake/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/jake/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/jasmine-core": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-4.6.0.tgz",
@@ -7810,9 +10264,9 @@
       }
     },
     "node_modules/jiti": {
-      "version": "1.18.2",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.18.2.tgz",
-      "integrity": "sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg==",
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.20.0.tgz",
+      "integrity": "sha512-3TV69ZbrvV6U5DfQimop50jE9Dl6J8O1ja1dvBbMba/sZ3YBEQqJ2VZRoQPVnhlzjNtU1vaXRZVrVjU4qtm8yA==",
       "dev": true,
       "bin": {
         "jiti": "bin/jiti.js"
@@ -7837,6 +10291,58 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
+    "node_modules/jsdom": {
+      "version": "16.7.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
+      "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
+      "dev": true,
+      "dependencies": {
+        "abab": "^2.0.5",
+        "acorn": "^8.2.4",
+        "acorn-globals": "^6.0.0",
+        "cssom": "^0.4.4",
+        "cssstyle": "^2.3.0",
+        "data-urls": "^2.0.0",
+        "decimal.js": "^10.2.1",
+        "domexception": "^2.0.1",
+        "escodegen": "^2.0.0",
+        "form-data": "^3.0.0",
+        "html-encoding-sniffer": "^2.0.1",
+        "http-proxy-agent": "^4.0.1",
+        "https-proxy-agent": "^5.0.0",
+        "is-potential-custom-element-name": "^1.0.1",
+        "nwsapi": "^2.2.0",
+        "parse5": "6.0.1",
+        "saxes": "^5.0.1",
+        "symbol-tree": "^3.2.4",
+        "tough-cookie": "^4.0.0",
+        "w3c-hr-time": "^1.0.2",
+        "w3c-xmlserializer": "^2.0.0",
+        "webidl-conversions": "^6.1.0",
+        "whatwg-encoding": "^1.0.5",
+        "whatwg-mimetype": "^2.3.0",
+        "whatwg-url": "^8.5.0",
+        "ws": "^7.4.6",
+        "xml-name-validator": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "canvas": "^2.5.0"
+      },
+      "peerDependenciesMeta": {
+        "canvas": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jsdom/node_modules/parse5": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+      "dev": true
+    },
     "node_modules/jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
@@ -7849,6 +10355,12 @@
         "node": ">=4"
       }
     },
+    "node_modules/json-buffer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+      "dev": true
+    },
     "node_modules/json-parse-even-better-errors": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
@@ -7861,6 +10373,12 @@
       "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
       "dev": true
     },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "dev": true
+    },
     "node_modules/json5": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
@@ -7944,18 +10462,6 @@
         "which": "^1.2.1"
       }
     },
-    "node_modules/karma-chrome-launcher/node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
     "node_modules/karma-coverage": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/karma-coverage/-/karma-coverage-2.2.1.tgz",
@@ -7973,28 +10479,6 @@
         "node": ">=10.0.0"
       }
     },
-    "node_modules/karma-coverage/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/karma-coverage/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/karma-jasmine": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-5.1.0.tgz",
@@ -8030,16 +10514,6 @@
         "source-map-support": "^0.5.5"
       }
     },
-    "node_modules/karma/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
     "node_modules/karma/node_modules/cliui": {
       "version": "7.0.4",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
@@ -8051,38 +10525,6 @@
         "wrap-ansi": "^7.0.0"
       }
     },
-    "node_modules/karma/node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "dev": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/karma/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/karma/node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -8131,6 +10573,15 @@
         "node": ">=10"
       }
     },
+    "node_modules/keyv": {
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+      "dev": true,
+      "dependencies": {
+        "json-buffer": "3.0.1"
+      }
+    },
     "node_modules/kind-of": {
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
@@ -8150,13 +10601,13 @@
       }
     },
     "node_modules/launch-editor": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.0.tgz",
-      "integrity": "sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ==",
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.1.tgz",
+      "integrity": "sha512-eB/uXmFVpY4zezmGp5XtU21kwo7GBbKB+EQ+UZeWtGb9yAM5xt/Evk+lYH3eRNAtId+ej4u7TYPFZ07w4s7rRw==",
       "dev": true,
       "dependencies": {
         "picocolors": "^1.0.0",
-        "shell-quote": "^1.7.3"
+        "shell-quote": "^1.8.1"
       }
     },
     "node_modules/less": {
@@ -8252,6 +10703,19 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
     "node_modules/license-webpack-plugin": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-4.0.2.tgz",
@@ -8317,6 +10781,12 @@
       "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
       "dev": true
     },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
     "node_modules/log-symbols": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
@@ -8419,6 +10889,84 @@
         "node": ">=8.0"
       }
     },
+    "node_modules/loglevel": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.8.1.tgz",
+      "integrity": "sha512-tCRIJM51SHjAayKwC+QAg8hT8vg6z7GSgLJKGvzuPb1Wc+hLzqtuVLxp6/HzSPOozuK+8ErAhy7U/sVzw8Dgfg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6.0"
+      },
+      "funding": {
+        "type": "tidelift",
+        "url": "https://tidelift.com/funding/github/npm/loglevel"
+      }
+    },
+    "node_modules/loglevel-colored-level-prefix": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/loglevel-colored-level-prefix/-/loglevel-colored-level-prefix-1.0.0.tgz",
+      "integrity": "sha512-u45Wcxxc+SdAlh4yeF/uKlC1SPUPCy0gullSNKXod5I4bmifzk+Q4lSLExNEVn19tGaJipbZ4V4jbFn79/6mVA==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^1.1.3",
+        "loglevel": "^1.4.1"
+      }
+    },
+    "node_modules/loglevel-colored-level-prefix/node_modules/ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/loglevel-colored-level-prefix/node_modules/ansi-styles": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+      "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/loglevel-colored-level-prefix/node_modules/chalk": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+      "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^2.2.1",
+        "escape-string-regexp": "^1.0.2",
+        "has-ansi": "^2.0.0",
+        "strip-ansi": "^3.0.0",
+        "supports-color": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/loglevel-colored-level-prefix/node_modules/strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/loglevel-colored-level-prefix/node_modules/supports-color": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+      "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
     "node_modules/lru-cache": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
@@ -8429,41 +10977,32 @@
       }
     },
     "node_modules/magic-string": {
-      "version": "0.30.0",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.0.tgz",
-      "integrity": "sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==",
+      "version": "0.30.1",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.1.tgz",
+      "integrity": "sha512-mbVKXPmS0z0G4XqFDCTllmDQ6coZzn94aMlb0o/A4HEHJCKcanlDZwYJgwnkmgD3jyWhUgj9VsPrfd972yPffA==",
       "dev": true,
       "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.4.13"
+        "@jridgewell/sourcemap-codec": "^1.4.15"
       },
       "engines": {
         "node": ">=12"
       }
     },
     "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==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
       "dev": true,
       "dependencies": {
-        "semver": "^6.0.0"
+        "semver": "^7.5.3"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/make-dir/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
     "node_modules/make-fetch-happen": {
       "version": "11.1.1",
       "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz",
@@ -8490,6 +11029,29 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
+    "node_modules/make-fetch-happen/node_modules/@tootallnate/once": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
+      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/http-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
+      "dev": true,
+      "dependencies": {
+        "@tootallnate/once": "2",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/make-fetch-happen/node_modules/lru-cache": {
       "version": "7.18.3",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
@@ -8631,18 +11193,15 @@
       "dev": true
     },
     "node_modules/minimatch": {
-      "version": "9.0.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.2.tgz",
-      "integrity": "sha512-PZOT9g5v2ojiTL7r1xF6plNHLtOeTpSlDI007As2NlA2aYBMfVom17yqa6QzhmDP8QOhn7LjHTg7DFCVSSa6yg==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
       "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "brace-expansion": "^1.1.7"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "node": "*"
       }
     },
     "node_modules/minimist": {
@@ -8694,12 +11253,12 @@
       "dev": true
     },
     "node_modules/minipass-fetch": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.3.tgz",
-      "integrity": "sha512-n5ITsTkDqYkYJZjcRWzZt9qnZKCT7nKCosJhHoj7S7zD+BP4jVbWs+odsniw5TA3E0sLomhTKOKjF86wf11PuQ==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.4.tgz",
+      "integrity": "sha512-jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg==",
       "dev": true,
       "dependencies": {
-        "minipass": "^5.0.0",
+        "minipass": "^7.0.3",
         "minipass-sized": "^1.0.3",
         "minizlib": "^2.1.2"
       },
@@ -8710,6 +11269,15 @@
         "encoding": "^0.1.13"
       }
     },
+    "node_modules/minipass-fetch/node_modules/minipass": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
+      "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
     "node_modules/minipass-flush": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
@@ -8899,6 +11467,12 @@
         "multicast-dns": "cli.js"
       }
     },
+    "node_modules/mute-stream": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
+      "dev": true
+    },
     "node_modules/nanoid": {
       "version": "3.3.6",
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
@@ -8917,6 +11491,18 @@
         "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
       }
     },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true
+    },
+    "node_modules/natural-compare-lite": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
+      "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
+      "dev": true
+    },
     "node_modules/needle": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/needle/-/needle-3.2.0.tgz",
@@ -8973,6 +11559,19 @@
       "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
       "dev": true
     },
+    "node_modules/ngx-mask": {
+      "version": "16.3.9",
+      "resolved": "https://registry.npmjs.org/ngx-mask/-/ngx-mask-16.3.9.tgz",
+      "integrity": "sha512-cptsvlI4OLI8Tpj23ZgSQDKz5jksyWGzAuEEn5pd58cq2oFGeeHZS2i1SQQi8kp+a+Dh/2RvDsfFmDWmI5Ln9w==",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "@angular/common": ">=14.0.0",
+        "@angular/core": ">=14.0.0",
+        "@angular/forms": ">=14.0.0"
+      }
+    },
     "node_modules/nice-napi": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz",
@@ -8992,8 +11591,7 @@
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
       "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "node_modules/node-forge": {
       "version": "1.3.1",
@@ -9029,64 +11627,36 @@
         "node": "^12.13 || ^14.13 || >=16"
       }
     },
-    "node_modules/node-gyp-build": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.0.tgz",
-      "integrity": "sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ==",
-      "dev": true,
-      "optional": true,
-      "bin": {
-        "node-gyp-build": "bin.js",
-        "node-gyp-build-optional": "optional.js",
-        "node-gyp-build-test": "build-test.js"
-      }
-    },
-    "node_modules/node-gyp/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/node-gyp/node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "dev": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/node-gyp/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+    "node_modules/node-gyp-build": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.1.tgz",
+      "integrity": "sha512-24vnklJmyRS8ViBNI8KbtK/r/DmXQMRiOMXTNz2nrTnAYUwjmEEbnnpB/+kt+yWRv73bPsSPRFddrcIbAxSiMQ==",
+      "dev": true,
+      "bin": {
+        "node-gyp-build": "bin.js",
+        "node-gyp-build-optional": "optional.js",
+        "node-gyp-build-test": "build-test.js"
+      }
+    },
+    "node_modules/node-gyp/node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "dev": true,
       "dependencies": {
-        "brace-expansion": "^1.1.7"
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
       },
       "engines": {
-        "node": "*"
+        "node": ">= 8"
       }
     },
     "node_modules/node-releases": {
-      "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.12.tgz",
-      "integrity": "sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ==",
+      "version": "2.0.13",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
+      "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==",
       "dev": true
     },
     "node_modules/nopt": {
@@ -9150,9 +11720,9 @@
       }
     },
     "node_modules/npm-install-checks": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.1.1.tgz",
-      "integrity": "sha512-dH3GmQL4vsPtld59cOn8uY0iOqRmqKvV+DLGwNXV/Q7MDgD2QfOADWd/mFXcIE5LVhYYGjA3baz6W9JneqnuCw==",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.3.0.tgz",
+      "integrity": "sha512-W29RiK/xtpCGqn6f3ixfRYGk+zRyr+Ew9F2E20BfXxT5/euLdA/Nm7fO7OeTGuAmTs30cpgInyJ0cYe708YTZw==",
       "dev": true,
       "dependencies": {
         "semver": "^7.1.1"
@@ -9227,48 +11797,369 @@
         "proc-log": "^3.0.0"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/npm-run-path": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/npmlog": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz",
+      "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==",
+      "dev": true,
+      "dependencies": {
+        "are-we-there-yet": "^3.0.0",
+        "console-control-strings": "^1.1.0",
+        "gauge": "^4.0.3",
+        "set-blocking": "^2.0.0"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/nth-check": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
+      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/nth-check?sponsor=1"
+      }
+    },
+    "node_modules/nwsapi": {
+      "version": "2.2.7",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz",
+      "integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==",
+      "dev": true
+    },
+    "node_modules/nx": {
+      "version": "16.5.1",
+      "resolved": "https://registry.npmjs.org/nx/-/nx-16.5.1.tgz",
+      "integrity": "sha512-I3hJRE4hG7JWAtncWwDEO3GVeGPpN0TtM8xH5ArZXyDuVeTth/i3TtJzdDzqXO1HHtIoAQN0xeq4n9cLuMil5g==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "@nrwl/tao": "16.5.1",
+        "@parcel/watcher": "2.0.4",
+        "@yarnpkg/lockfile": "^1.1.0",
+        "@yarnpkg/parsers": "3.0.0-rc.46",
+        "@zkochan/js-yaml": "0.0.6",
+        "axios": "^1.0.0",
+        "chalk": "^4.1.0",
+        "cli-cursor": "3.1.0",
+        "cli-spinners": "2.6.1",
+        "cliui": "^7.0.2",
+        "dotenv": "~10.0.0",
+        "enquirer": "~2.3.6",
+        "fast-glob": "3.2.7",
+        "figures": "3.2.0",
+        "flat": "^5.0.2",
+        "fs-extra": "^11.1.0",
+        "glob": "7.1.4",
+        "ignore": "^5.0.4",
+        "js-yaml": "4.1.0",
+        "jsonc-parser": "3.2.0",
+        "lines-and-columns": "~2.0.3",
+        "minimatch": "3.0.5",
+        "npm-run-path": "^4.0.1",
+        "open": "^8.4.0",
+        "semver": "7.5.3",
+        "string-width": "^4.2.3",
+        "strong-log-transformer": "^2.1.0",
+        "tar-stream": "~2.2.0",
+        "tmp": "~0.2.1",
+        "tsconfig-paths": "^4.1.2",
+        "tslib": "^2.3.0",
+        "v8-compile-cache": "2.3.0",
+        "yargs": "^17.6.2",
+        "yargs-parser": "21.1.1"
+      },
+      "bin": {
+        "nx": "bin/nx.js"
+      },
+      "optionalDependencies": {
+        "@nx/nx-darwin-arm64": "16.5.1",
+        "@nx/nx-darwin-x64": "16.5.1",
+        "@nx/nx-freebsd-x64": "16.5.1",
+        "@nx/nx-linux-arm-gnueabihf": "16.5.1",
+        "@nx/nx-linux-arm64-gnu": "16.5.1",
+        "@nx/nx-linux-arm64-musl": "16.5.1",
+        "@nx/nx-linux-x64-gnu": "16.5.1",
+        "@nx/nx-linux-x64-musl": "16.5.1",
+        "@nx/nx-win32-arm64-msvc": "16.5.1",
+        "@nx/nx-win32-x64-msvc": "16.5.1"
+      },
+      "peerDependencies": {
+        "@swc-node/register": "^1.4.2",
+        "@swc/core": "^1.2.173"
+      },
+      "peerDependenciesMeta": {
+        "@swc-node/register": {
+          "optional": true
+        },
+        "@swc/core": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/nx/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/nx/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "node_modules/nx/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "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/nx/node_modules/cli-spinners": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz",
+      "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/nx/node_modules/cliui": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
+    "node_modules/nx/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/nx/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/nx/node_modules/fast-glob": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz",
+      "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/nx/node_modules/fs-extra": {
+      "version": "11.1.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
+      "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=14.14"
+      }
+    },
+    "node_modules/nx/node_modules/glob": {
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+      "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/nx/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/nx/node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/nx/node_modules/jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "dev": true,
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/nx/node_modules/lines-and-columns": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.3.tgz",
+      "integrity": "sha512-cNOjgCnLB+FnvWWtyRTzmB3POJ+cXxTA81LoW7u8JdmhfXzriropYwpjShnz1QLLWsQwY7nIxoDmcPTwphDK9w==",
+      "dev": true,
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      }
+    },
+    "node_modules/nx/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/nx/node_modules/minimatch": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz",
+      "integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/nx/node_modules/semver": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz",
+      "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
-    "node_modules/npm-run-path": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+    "node_modules/nx/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": {
-        "path-key": "^3.0.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/npmlog": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz",
-      "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==",
+    "node_modules/nx/node_modules/tmp": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
+      "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
       "dev": true,
       "dependencies": {
-        "are-we-there-yet": "^3.0.0",
-        "console-control-strings": "^1.1.0",
-        "gauge": "^4.0.3",
-        "set-blocking": "^2.0.0"
+        "rimraf": "^3.0.0"
       },
       "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+        "node": ">=8.17.0"
       }
     },
-    "node_modules/nth-check": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
-      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
+    "node_modules/nx/node_modules/universalify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
       "dev": true,
-      "dependencies": {
-        "boolbase": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/nth-check?sponsor=1"
+      "engines": {
+        "node": ">= 10.0.0"
       }
     },
+    "node_modules/nx/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
     "node_modules/object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -9279,14 +12170,23 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.12.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.0.tgz",
+      "integrity": "sha512-HQ4J+ic8hKrgIt3mqk6cVOVrW2ozL4KdvHlqpBv9vDYWx9ysAgENAdvy4FoGF+KFdhR7nQTNm5J0ctAeOwn+3g==",
       "dev": true,
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/object-path": {
+      "version": "0.11.8",
+      "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.11.8.tgz",
+      "integrity": "sha512-YJjNZrlXJFM42wTBn6zgOJVar9KFJvzx6sTWDte8sWZF//cnjl0BxHNpfZx+ZffXX63A9q0b1zsFiBX4g4X5KA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10.12.0"
+      }
+    },
     "node_modules/obuf": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
@@ -9355,6 +12255,23 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/optionator": {
+      "version": "0.9.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
+      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
+      "dev": true,
+      "dependencies": {
+        "@aashutoshrathi/word-wrap": "^1.2.3",
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
     "node_modules/ora": {
       "version": "5.4.1",
       "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
@@ -9688,13 +12605,13 @@
       "dev": true
     },
     "node_modules/path-scurry": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.0.tgz",
-      "integrity": "sha512-tZFEaRQbMLjwrsmidsGJ6wDMv0iazJWk6SfIKnY4Xru8auXgmJkOBa5DUbYFcFD2Rzk2+KDlIiF0GVXNCbgC7g==",
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz",
+      "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==",
       "dev": true,
       "dependencies": {
         "lru-cache": "^9.1.1 || ^10.0.0",
-        "minipass": "^5.0.0 || ^6.0.2"
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
       },
       "engines": {
         "node": ">=16 || 14 >=14.17"
@@ -9704,9 +12621,9 @@
       }
     },
     "node_modules/path-scurry/node_modules/lru-cache": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.0.tgz",
-      "integrity": "sha512-svTf/fzsKHffP42sujkO/Rjs37BCIsQVRCeNYIm9WN8rgT7ffoUnRtZCqU+6BqcSBdv8gwJeTz8knJpgACeQMw==",
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.1.tgz",
+      "integrity": "sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==",
       "dev": true,
       "engines": {
         "node": "14 || >=16.14"
@@ -9756,9 +12673,9 @@
       }
     },
     "node_modules/piscina": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/piscina/-/piscina-3.2.0.tgz",
-      "integrity": "sha512-yn/jMdHRw+q2ZJhFhyqsmANcbF6V2QwmD84c6xRau+QpQOmtrBCoRGdvTfeuFDYXB5W2m6MfLkjkvQa9lUSmIA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/piscina/-/piscina-4.0.0.tgz",
+      "integrity": "sha512-641nAmJS4k4iqpNUqfggqUBUMmlw0ZoM5VZKdQkV2e970Inn3Tk9kroCc1wpsYLD07vCwpys5iY0d3xI/9WkTg==",
       "dev": true,
       "dependencies": {
         "eventemitter-asyncresource": "^1.0.0",
@@ -9770,21 +12687,94 @@
       }
     },
     "node_modules/pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-7.0.0.tgz",
+      "integrity": "sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==",
       "dev": true,
       "dependencies": {
-        "find-up": "^4.0.0"
+        "find-up": "^6.3.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/find-up": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz",
+      "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^7.1.0",
+        "path-exists": "^5.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/locate-path": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz",
+      "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^6.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/p-limit": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
+      "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
+      "dev": true,
+      "dependencies": {
+        "yocto-queue": "^1.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/p-locate": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz",
+      "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/path-exists": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz",
+      "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.24",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.24.tgz",
-      "integrity": "sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==",
+      "version": "8.4.31",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
+      "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
       "dev": true,
       "funding": [
         {
@@ -9810,14 +12800,13 @@
       }
     },
     "node_modules/postcss-loader": {
-      "version": "7.3.2",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.3.2.tgz",
-      "integrity": "sha512-c7qDlXErX6n0VT+LUsW+nwefVtTu3ORtVvK8EXuUIDcxo+b/euYqpuHlJAvePb0Af5e8uMjR/13e0lTuYifaig==",
+      "version": "7.3.3",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.3.3.tgz",
+      "integrity": "sha512-YgO/yhtevGO/vJePCQmTxiaEwER94LABZN0ZMT4A0vsak9TpO+RvKRs7EmJ8peIlB9xfXCsS7M8LjqncsUZ5HA==",
       "dev": true,
       "dependencies": {
-        "cosmiconfig": "^8.1.3",
+        "cosmiconfig": "^8.2.0",
         "jiti": "^1.18.2",
-        "klona": "^2.0.6",
         "semver": "^7.3.8"
       },
       "engines": {
@@ -9825,91 +12814,294 @@
       },
       "funding": {
         "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "postcss": "^7.0.0 || ^8.0.1",
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/postcss-modules-extract-imports": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
+      "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
+      "dev": true,
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz",
+      "integrity": "sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==",
+      "dev": true,
+      "dependencies": {
+        "icss-utils": "^5.0.0",
+        "postcss-selector-parser": "^6.0.2",
+        "postcss-value-parser": "^4.1.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-scope": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
+      "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
+      "dev": true,
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.4"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-values": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
+      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
+      "dev": true,
+      "dependencies": {
+        "icss-utils": "^5.0.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-selector-parser": {
+      "version": "6.0.13",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
+      "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
+      "dev": true,
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-value-parser": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+      "dev": true
+    },
+    "node_modules/prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/prettier": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz",
+      "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==",
+      "dev": true,
+      "bin": {
+        "prettier": "bin/prettier.cjs"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
+    "node_modules/prettier-eslint": {
+      "version": "16.1.1",
+      "resolved": "https://registry.npmjs.org/prettier-eslint/-/prettier-eslint-16.1.1.tgz",
+      "integrity": "sha512-SbtugbH80njB9QOPqb8C+W40Rvhr6iD0wrJTxk1Zx10rkY7KdjtSwHpf/WfiI3REboaXbvIOJXGiua3maIt0Sw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/parser": "^6.7.5",
+        "common-tags": "^1.4.0",
+        "dlv": "^1.1.0",
+        "eslint": "^8.7.0",
+        "indent-string": "^4.0.0",
+        "lodash.merge": "^4.6.0",
+        "loglevel-colored-level-prefix": "^1.0.0",
+        "prettier": "^3.0.1",
+        "pretty-format": "^29.7.0",
+        "require-relative": "^0.8.7",
+        "typescript": "^5.2.2",
+        "vue-eslint-parser": "^9.1.0"
+      },
+      "engines": {
+        "node": ">=16.10.0"
+      }
+    },
+    "node_modules/prettier-eslint/node_modules/@typescript-eslint/parser": {
+      "version": "6.9.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.9.0.tgz",
+      "integrity": "sha512-GZmjMh4AJ/5gaH4XF2eXA8tMnHWP+Pm1mjQR2QN4Iz+j/zO04b9TOvJYOX2sCNIQHtRStKTxRY1FX7LhpJT4Gw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/scope-manager": "6.9.0",
+        "@typescript-eslint/types": "6.9.0",
+        "@typescript-eslint/typescript-estree": "6.9.0",
+        "@typescript-eslint/visitor-keys": "6.9.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^7.0.0 || ^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/prettier-eslint/node_modules/@typescript-eslint/scope-manager": {
+      "version": "6.9.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.9.0.tgz",
+      "integrity": "sha512-1R8A9Mc39n4pCCz9o79qRO31HGNDvC7UhPhv26TovDsWPBDx+Sg3rOZdCELIA3ZmNoWAuxaMOT7aWtGRSYkQxw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "6.9.0",
+        "@typescript-eslint/visitor-keys": "6.9.0"
+      },
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/prettier-eslint/node_modules/@typescript-eslint/types": {
+      "version": "6.9.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.9.0.tgz",
+      "integrity": "sha512-+KB0lbkpxBkBSiVCuQvduqMJy+I1FyDbdwSpM3IoBS7APl4Bu15lStPjgBIdykdRqQNYqYNMa8Kuidax6phaEw==",
+      "dev": true,
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/prettier-eslint/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "6.9.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.9.0.tgz",
+      "integrity": "sha512-NJM2BnJFZBEAbCfBP00zONKXvMqihZCrmwCaik0UhLr0vAgb6oguXxLX1k00oQyD+vZZ+CJn3kocvv2yxm4awQ==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "6.9.0",
+        "@typescript-eslint/visitor-keys": "6.9.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "semver": "^7.5.4",
+        "ts-api-utils": "^1.0.1"
+      },
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       },
-      "peerDependencies": {
-        "postcss": "^7.0.0 || ^8.0.1",
-        "webpack": "^5.0.0"
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/postcss-modules-extract-imports": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
-      "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
+    "node_modules/prettier-eslint/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "6.9.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.9.0.tgz",
+      "integrity": "sha512-dGtAfqjV6RFOtIP8I0B4ZTBRrlTT8NHHlZZSchQx3qReaoDeXhYM++M4So2AgFK9ZB0emRPA6JI1HkafzA2Ibg==",
       "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "6.9.0",
+        "eslint-visitor-keys": "^3.4.1"
+      },
       "engines": {
-        "node": "^10 || ^12 || >= 14"
+        "node": "^16.0.0 || >=18.0.0"
       },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/postcss-modules-local-by-default": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz",
-      "integrity": "sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==",
+    "node_modules/prettier-eslint/node_modules/globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
       "dev": true,
       "dependencies": {
-        "icss-utils": "^5.0.0",
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.1.0"
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >= 14"
+        "node": ">=10"
       },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/postcss-modules-scope": {
+    "node_modules/prettier-eslint/node_modules/slash": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
-      "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.4"
-      },
       "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
+        "node": ">=8"
       }
     },
-    "node_modules/postcss-modules-values": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
-      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
+    "node_modules/prettier-eslint/node_modules/typescript": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz",
+      "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==",
       "dev": true,
-      "dependencies": {
-        "icss-utils": "^5.0.0"
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
       },
       "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
+        "node": ">=14.17"
       }
     },
-    "node_modules/postcss-selector-parser": {
-      "version": "6.0.13",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
-      "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
+    "node_modules/prettier-linter-helpers": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
+      "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
       "dev": true,
       "dependencies": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
+        "fast-diff": "^1.1.2"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
     "node_modules/pretty-bytes": {
       "version": "5.6.0",
       "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
@@ -9922,6 +13114,32 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/pretty-format": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/schemas": "^29.6.3",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
     "node_modules/proc-log": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-3.0.0.tgz",
@@ -9978,6 +13196,12 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+      "dev": true
+    },
     "node_modules/prr": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
@@ -9985,6 +13209,12 @@
       "dev": true,
       "optional": true
     },
+    "node_modules/psl": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
+      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
+      "dev": true
+    },
     "node_modules/punycode": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
@@ -10018,6 +13248,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "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
+    },
     "node_modules/queue-microtask": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
@@ -10071,6 +13307,12 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/react-is": {
+      "version": "18.2.0",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
+      "dev": true
+    },
     "node_modules/read-package-json": {
       "version": "6.0.4",
       "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-6.0.4.tgz",
@@ -10108,6 +13350,37 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
+    "node_modules/read-package-json/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/read-package-json/node_modules/glob": {
+      "version": "10.3.10",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
+      "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==",
+      "dev": true,
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^2.3.5",
+        "minimatch": "^9.0.1",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
+        "path-scurry": "^1.10.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/read-package-json/node_modules/json-parse-even-better-errors": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.0.tgz",
@@ -10117,6 +13390,21 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
+    "node_modules/read-package-json/node_modules/minimatch": {
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/readable-stream": {
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
@@ -10156,9 +13444,9 @@
       "dev": true
     },
     "node_modules/regenerate-unicode-properties": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz",
-      "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==",
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz",
+      "integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==",
       "dev": true,
       "dependencies": {
         "regenerate": "^1.4.2"
@@ -10174,9 +13462,9 @@
       "dev": true
     },
     "node_modules/regenerator-transform": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.1.tgz",
-      "integrity": "sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==",
+      "version": "0.15.2",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz",
+      "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==",
       "dev": true,
       "dependencies": {
         "@babel/runtime": "^7.8.4"
@@ -10244,6 +13532,12 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/require-relative": {
+      "version": "0.8.7",
+      "resolved": "https://registry.npmjs.org/require-relative/-/require-relative-0.8.7.tgz",
+      "integrity": "sha512-AKGr4qvHiryxRb19m3PsLRGuKVAbJLUD7E6eOaHkfKhwc+vSgVOCY5xNvm9EkolBKTOf0GrQAZKLimOCz81Khg==",
+      "dev": true
+    },
     "node_modules/requires-port": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
@@ -10328,12 +13622,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/restore-cursor/node_modules/signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "dev": true
-    },
     "node_modules/retry": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
@@ -10374,62 +13662,44 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/rimraf/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/rimraf/node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+    "node_modules/rollup": {
+      "version": "3.29.4",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz",
+      "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==",
       "dev": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+      "bin": {
+        "rollup": "dist/bin/rollup"
       },
       "engines": {
-        "node": "*"
+        "node": ">=14.18.0",
+        "npm": ">=8.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
       }
     },
-    "node_modules/rimraf/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+    "node_modules/run-applescript": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-5.0.0.tgz",
+      "integrity": "sha512-XcT5rBksx1QdIhlFOCtgZkB99ZEouFZ1E2Kc2LHqNW13U3/74YGdkQRmThTwxy4QIyookibDKYZOPqX//6BlAg==",
       "dev": true,
       "dependencies": {
-        "brace-expansion": "^1.1.7"
+        "execa": "^5.0.0"
       },
       "engines": {
-        "node": "*"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/rollup": {
-      "version": "3.25.3",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.25.3.tgz",
-      "integrity": "sha512-ZT279hx8gszBj9uy5FfhoG4bZx8c+0A1sbqtr7Q3KNWIizpTdDEPZbV2xcbvHsnFp4MavCQYZyzApJ+virB8Yw==",
+    "node_modules/run-async": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
+      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
       "dev": true,
-      "bin": {
-        "rollup": "dist/bin/rollup"
-      },
       "engines": {
-        "node": ">=14.18.0",
-        "npm": ">=8.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
+        "node": ">=0.12.0"
       }
     },
     "node_modules/run-parallel": {
@@ -10495,9 +13765,9 @@
       "integrity": "sha512-LRneZZRXNgjzwG4bDQdOTSbze3fHm1EAKN/8bePxnlEZiBmkYEDggaHbuvHI9/hoqHbGfsEA7tWS9GhYHZBBsw=="
     },
     "node_modules/sass": {
-      "version": "1.63.2",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.63.2.tgz",
-      "integrity": "sha512-u56TU0AIFqMtauKl/OJ1AeFsXqRHkgO7nCWmHaDwfxDo9GUMSqBA4NEh6GMuh1CYVM7zuROYtZrHzPc2ixK+ww==",
+      "version": "1.64.1",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.64.1.tgz",
+      "integrity": "sha512-16rRACSOFEE8VN7SCgBu1MpYCyN7urj9At898tyzdXFhC+a+yOX5dXwAR7L8/IdPJ1NB8OYoXmD55DM30B2kEQ==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -10512,12 +13782,11 @@
       }
     },
     "node_modules/sass-loader": {
-      "version": "13.3.1",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.3.1.tgz",
-      "integrity": "sha512-cBTxmgyVA1nXPvIK4brjJMXOMJ2v2YrQEuHqLw3LylGb3gsR6jAvdjHMcy/+JGTmmIF9SauTrLLR7bsWDMWqgg==",
+      "version": "13.3.2",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.3.2.tgz",
+      "integrity": "sha512-CQbKl57kdEv+KDLquhC+gE3pXt74LEAzm+tzywcA0/aHZuub8wTErbjAoNI57rPUWRYRNC5WUnNl8eGJNbDdwg==",
       "dev": true,
       "dependencies": {
-        "klona": "^2.0.6",
         "neo-async": "^2.6.2"
       },
       "engines": {
@@ -10550,12 +13819,24 @@
       }
     },
     "node_modules/sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz",
+      "integrity": "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==",
       "dev": true,
       "optional": true
     },
+    "node_modules/saxes": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
+      "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
+      "dev": true,
+      "dependencies": {
+        "xmlchars": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/schema-utils": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
@@ -10594,9 +13875,9 @@
       }
     },
     "node_modules/semver": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz",
-      "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==",
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -10854,27 +14135,22 @@
       }
     },
     "node_modules/signal-exit": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.0.2.tgz",
-      "integrity": "sha512-MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true
     },
     "node_modules/sigstore": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-1.6.0.tgz",
-      "integrity": "sha512-QODKff/qW/TXOZI6V/Clqu74xnInAS6it05mufj4/fSewexLtfEntgLZZcBtUK44CDQyUE5TUXYy1ARYzlfG9g==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-1.9.0.tgz",
+      "integrity": "sha512-0Zjz0oe37d08VeOtBIuB6cRriqXse2e8w+7yIy2XSXjshRKxbc2KkhXjL229jXSxEm7UbcjS76wcJDGQddVI9A==",
       "dev": true,
       "dependencies": {
-        "@sigstore/protobuf-specs": "^0.1.0",
-        "@sigstore/tuf": "^1.0.0",
-        "make-fetch-happen": "^11.0.1",
-        "tuf-js": "^1.1.3"
+        "@sigstore/bundle": "^1.1.0",
+        "@sigstore/protobuf-specs": "^0.2.0",
+        "@sigstore/sign": "^1.0.0",
+        "@sigstore/tuf": "^1.0.3",
+        "make-fetch-happen": "^11.0.1"
       },
       "bin": {
         "sigstore": "bin/sigstore.js"
@@ -10906,21 +14182,21 @@
       }
     },
     "node_modules/socket.io": {
-      "version": "4.7.1",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.7.1.tgz",
-      "integrity": "sha512-W+utHys2w//dhFjy7iQQu9sGd3eokCjGbl2r59tyLqNiJJBdIebn3GAKEXBr3osqHTObJi2die/25bCx2zsaaw==",
+      "version": "4.7.2",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.7.2.tgz",
+      "integrity": "sha512-bvKVS29/I5fl2FGLNHuXlQaUH/BlzX1IN6S+NKLNZpBsPZIDH+90eQmCs2Railn4YUiww4SzUedJ6+uzwFnKLw==",
       "dev": true,
       "dependencies": {
         "accepts": "~1.3.4",
         "base64id": "~2.0.0",
         "cors": "~2.8.5",
         "debug": "~4.3.2",
-        "engine.io": "~6.5.0",
+        "engine.io": "~6.5.2",
         "socket.io-adapter": "~2.5.2",
         "socket.io-parser": "~4.2.4"
       },
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=10.2.0"
       }
     },
     "node_modules/socket.io-adapter": {
@@ -10932,6 +14208,27 @@
         "ws": "~8.11.0"
       }
     },
+    "node_modules/socket.io-adapter/node_modules/ws": {
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
+      "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/socket.io-parser": {
       "version": "4.2.4",
       "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz",
@@ -11081,9 +14378,9 @@
       }
     },
     "node_modules/spdx-license-ids": {
-      "version": "3.0.13",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz",
-      "integrity": "sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==",
+      "version": "3.0.16",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz",
+      "integrity": "sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw==",
       "dev": true
     },
     "node_modules/spdy": {
@@ -11123,17 +14420,26 @@
       "dev": true
     },
     "node_modules/ssri": {
-      "version": "10.0.4",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.4.tgz",
-      "integrity": "sha512-12+IR2CB2C28MMAw0Ncqwj5QbTcs0nGIhgJzYWzDkb21vWmfNI83KS4f3Ci6GI98WreIfG7o9UXp3C0qbpA8nQ==",
+      "version": "10.0.5",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.5.tgz",
+      "integrity": "sha512-bSf16tAFkGeRlUNDjXu8FzaMQt6g2HZJrun7mtMbIPOddxt3GLMSz5VWUWcqTJUPfLEaDIepGxv+bYQW49596A==",
       "dev": true,
       "dependencies": {
-        "minipass": "^5.0.0"
+        "minipass": "^7.0.3"
       },
       "engines": {
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
+    "node_modules/ssri/node_modules/minipass": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
+      "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
     "node_modules/statuses": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
@@ -11220,6 +14526,15 @@
         "node": ">=8"
       }
     },
+    "node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/strip-final-newline": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
@@ -11229,6 +14544,35 @@
         "node": ">=6"
       }
     },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/strong-log-transformer": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz",
+      "integrity": "sha512-B3Hgul+z0L9a236FAUC9iZsL+nVHgoCJnqCbN588DjYxvGXaXaaFbfmQ/JhvKjZwsOukuR72XbHv71Qkug0HxA==",
+      "dev": true,
+      "dependencies": {
+        "duplexer": "^0.1.1",
+        "minimist": "^1.2.0",
+        "through": "^2.3.4"
+      },
+      "bin": {
+        "sl-log-transformer": "bin/sl-log-transformer.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/supports-color": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -11262,6 +14606,28 @@
         "node": ">=0.10"
       }
     },
+    "node_modules/symbol-tree": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
+      "dev": true
+    },
+    "node_modules/synckit": {
+      "version": "0.8.5",
+      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.8.5.tgz",
+      "integrity": "sha512-L1dapNV6vu2s/4Sputv8xGsCdAVlb5nRDMFU/E27D44l5U6cw1g0dGd45uLc+OXjNMmF4ntiMdCimzcjFKQI8Q==",
+      "dev": true,
+      "dependencies": {
+        "@pkgr/utils": "^2.3.1",
+        "tslib": "^2.5.0"
+      },
+      "engines": {
+        "node": "^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/unts"
+      }
+    },
     "node_modules/tapable": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
@@ -11272,9 +14638,9 @@
       }
     },
     "node_modules/tar": {
-      "version": "6.1.15",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.15.tgz",
-      "integrity": "sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz",
+      "integrity": "sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==",
       "dev": true,
       "dependencies": {
         "chownr": "^2.0.0",
@@ -11288,6 +14654,22 @@
         "node": ">=10"
       }
     },
+    "node_modules/tar-stream": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+      "dev": true,
+      "dependencies": {
+        "bl": "^4.0.3",
+        "end-of-stream": "^1.4.1",
+        "fs-constants": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/tar/node_modules/fs-minipass": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
@@ -11331,9 +14713,9 @@
       "dev": true
     },
     "node_modules/terser": {
-      "version": "5.17.7",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.17.7.tgz",
-      "integrity": "sha512-/bi0Zm2C6VAexlGgLlVxA0P2lru/sdLyfCVaRMfKVo9nWxbmz7f/sD8VPybPeSUJaJcwmCJis9pBIhcVcG1QcQ==",
+      "version": "5.19.2",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.19.2.tgz",
+      "integrity": "sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==",
       "dev": true,
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
@@ -11445,48 +14827,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/test-exclude/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/test-exclude/node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "dev": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/test-exclude/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -11505,6 +14845,18 @@
       "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
       "dev": true
     },
+    "node_modules/titleize": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/titleize/-/titleize-3.0.0.tgz",
+      "integrity": "sha512-KxVu8EYHDPBdUYdKZdKtU2aj2XfEx9AfjXxE/Aj0vT06w2icA09Vus1rh6eSu1y01akYg6BjIK/hxyLJINoMLQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/tmp": {
       "version": "0.0.33",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
@@ -11547,6 +14899,42 @@
         "node": ">=0.6"
       }
     },
+    "node_modules/tough-cookie": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
+      "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
+      "dev": true,
+      "dependencies": {
+        "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==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
+      "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/tree-kill": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
@@ -11556,10 +14944,57 @@
         "tree-kill": "cli.js"
       }
     },
+    "node_modules/ts-api-utils": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.3.tgz",
+      "integrity": "sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==",
+      "dev": true,
+      "engines": {
+        "node": ">=16.13.0"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.2.0"
+      }
+    },
+    "node_modules/tsconfig-paths": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz",
+      "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==",
+      "dev": true,
+      "dependencies": {
+        "json5": "^2.2.2",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/tslib": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz",
-      "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA=="
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
+    },
+    "node_modules/tsutils": {
+      "version": "3.21.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.8.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      },
+      "peerDependencies": {
+        "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
+      }
+    },
+    "node_modules/tsutils/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
     },
     "node_modules/tuf-js": {
       "version": "1.1.7",
@@ -11575,6 +15010,18 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
+    "node_modules/type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
     "node_modules/type-fest": {
       "version": "0.21.3",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
@@ -11620,9 +15067,9 @@
       }
     },
     "node_modules/ua-parser-js": {
-      "version": "0.7.35",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.35.tgz",
-      "integrity": "sha512-veRf7dawaj9xaWEu9HoTVn5Pggtc/qj+kqTOFvNiN1l0YdxwC1kvel57UCjThjGa3BHBihE8/UJAHI+uQHmd/g==",
+      "version": "0.7.36",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.36.tgz",
+      "integrity": "sha512-CPPLoCts2p7D8VbybttE3P2ylv0OBZEAy7a12DsulIEcAiMtWJy+PBgMXgWDI80D5UwqE8oQPHYnk13tm38M2Q==",
       "dev": true,
       "funding": [
         {
@@ -11632,12 +15079,22 @@
         {
           "type": "paypal",
           "url": "https://paypal.me/faisalman"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/faisalman"
         }
       ],
       "engines": {
         "node": "*"
       }
     },
+    "node_modules/undici-types": {
+      "version": "5.25.3",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.25.3.tgz",
+      "integrity": "sha512-Ga1jfYwRn7+cP9v8auvEXN1rX3sWqlayd4HP7OKk4mZWylEmu3KzXDUGrQUN6Ol7qo1gPvB2e5gX6udnyEPgdA==",
+      "dev": true
+    },
     "node_modules/unicode-canonical-property-names-ecmascript": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
@@ -11720,10 +15177,19 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/untildify": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
+      "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/update-browserslist-db": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz",
-      "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==",
+      "version": "1.0.13",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
+      "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
       "dev": true,
       "funding": [
         {
@@ -11759,6 +15225,16 @@
         "punycode": "^2.1.0"
       }
     },
+    "node_modules/url-parse": {
+      "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"
+      }
+    },
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -11783,6 +15259,12 @@
         "uuid": "dist/bin/uuid"
       }
     },
+    "node_modules/v8-compile-cache": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+      "dev": true
+    },
     "node_modules/validate-npm-package-license": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
@@ -11815,14 +15297,14 @@
       }
     },
     "node_modules/vite": {
-      "version": "4.3.9",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-4.3.9.tgz",
-      "integrity": "sha512-qsTNZjO9NoJNW7KnOrgYwczm0WctJ8m/yqYAMAK9Lxt4SoySUfS5S8ia9K7JHpa3KEeMfyF8LoJ3c5NeBJy6pg==",
+      "version": "4.4.7",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.7.tgz",
+      "integrity": "sha512-6pYf9QJ1mHylfVh39HpuSfMPojPSKVxZvnclX1K1FyZ1PXDOcLBibdq5t1qxJSnL63ca8Wf4zts6mD8u8oc9Fw==",
       "dev": true,
       "dependencies": {
-        "esbuild": "^0.17.5",
-        "postcss": "^8.4.23",
-        "rollup": "^3.21.0"
+        "esbuild": "^0.18.10",
+        "postcss": "^8.4.26",
+        "rollup": "^3.25.2"
       },
       "bin": {
         "vite": "bin/vite.js"
@@ -11830,12 +15312,16 @@
       "engines": {
         "node": "^14.18.0 || >=16.0.0"
       },
+      "funding": {
+        "url": "https://github.com/vitejs/vite?sponsor=1"
+      },
       "optionalDependencies": {
         "fsevents": "~2.3.2"
       },
       "peerDependencies": {
         "@types/node": ">= 14",
         "less": "*",
+        "lightningcss": "^1.21.0",
         "sass": "*",
         "stylus": "*",
         "sugarss": "*",
@@ -11848,6 +15334,9 @@
         "less": {
           "optional": true
         },
+        "lightningcss": {
+          "optional": true
+        },
         "sass": {
           "optional": true
         },
@@ -11871,6 +15360,68 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/vue-eslint-parser": {
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.3.2.tgz",
+      "integrity": "sha512-q7tWyCVaV9f8iQyIA5Mkj/S6AoJ9KBN8IeUSf3XEmBrOtxOZnfTg5s4KClbZBCK3GtnT/+RyCLZyDHuZwTuBjg==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.3.4",
+        "eslint-scope": "^7.1.1",
+        "eslint-visitor-keys": "^3.3.0",
+        "espree": "^9.3.1",
+        "esquery": "^1.4.0",
+        "lodash": "^4.17.21",
+        "semver": "^7.3.6"
+      },
+      "engines": {
+        "node": "^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      },
+      "peerDependencies": {
+        "eslint": ">=6.0.0"
+      }
+    },
+    "node_modules/vue-eslint-parser/node_modules/eslint-scope": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/w3c-hr-time": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
+      "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
+      "deprecated": "Use your platform's native performance.now() and performance.timeOrigin.",
+      "dev": true,
+      "dependencies": {
+        "browser-process-hrtime": "^1.0.0"
+      }
+    },
+    "node_modules/w3c-xmlserializer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
+      "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
+      "dev": true,
+      "dependencies": {
+        "xml-name-validator": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/watchpack": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
@@ -11902,10 +15453,19 @@
         "defaults": "^1.0.3"
       }
     },
+    "node_modules/webidl-conversions": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
+      "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.4"
+      }
+    },
     "node_modules/webpack": {
-      "version": "5.86.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.86.0.tgz",
-      "integrity": "sha512-3BOvworZ8SO/D4GVP+GoRC3fVeg5MO4vzmq8TJJEkdmopxyazGDxN8ClqN12uzrZW9Tv8EED8v5VSb6Sqyi0pg==",
+      "version": "5.88.2",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.2.tgz",
+      "integrity": "sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==",
       "dev": true,
       "dependencies": {
         "@types/eslint-scope": "^3.7.3",
@@ -11917,7 +15477,7 @@
         "acorn-import-assertions": "^1.9.0",
         "browserslist": "^4.14.5",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.14.1",
+        "enhanced-resolve": "^5.15.0",
         "es-module-lexer": "^1.2.1",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
@@ -11927,7 +15487,7 @@
         "loader-runner": "^4.2.0",
         "mime-types": "^2.1.27",
         "neo-async": "^2.6.2",
-        "schema-utils": "^3.1.2",
+        "schema-utils": "^3.2.0",
         "tapable": "^2.1.1",
         "terser-webpack-plugin": "^5.3.7",
         "watchpack": "^2.4.0",
@@ -11978,9 +15538,9 @@
       }
     },
     "node_modules/webpack-dev-server": {
-      "version": "4.15.0",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.0.tgz",
-      "integrity": "sha512-HmNB5QeSl1KpulTBQ8UT4FPrByYyaLxpJoQ0+s7EvUrMc16m0ZS1sgb1XGqzmgCPk0c9y+aaXxn11tbLzuM7NQ==",
+      "version": "4.15.1",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz",
+      "integrity": "sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==",
       "dev": true,
       "dependencies": {
         "@types/bonjour": "^3.5.9",
@@ -11989,7 +15549,7 @@
         "@types/serve-index": "^1.9.1",
         "@types/serve-static": "^1.13.10",
         "@types/sockjs": "^0.3.33",
-        "@types/ws": "^8.5.1",
+        "@types/ws": "^8.5.5",
         "ansi-html-community": "^0.0.8",
         "bonjour-service": "^1.0.11",
         "chokidar": "^3.5.3",
@@ -12060,9 +15620,9 @@
       }
     },
     "node_modules/webpack-dev-server/node_modules/ws": {
-      "version": "8.13.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
-      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
+      "version": "8.14.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz",
+      "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==",
       "dev": true,
       "engines": {
         "node": ">=10.0.0"
@@ -12195,19 +15755,45 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/whatwg-encoding": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
+      "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
+      "dev": true,
+      "dependencies": {
+        "iconv-lite": "0.4.24"
+      }
+    },
+    "node_modules/whatwg-mimetype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
+      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
+      "dev": true
+    },
+    "node_modules/whatwg-url": {
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
+      "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^4.7.0",
+        "tr46": "^2.1.0",
+        "webidl-conversions": "^6.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
       "dev": true,
       "dependencies": {
         "isexe": "^2.0.0"
       },
       "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
+        "which": "bin/which"
       }
     },
     "node_modules/wide-align": {
@@ -12333,12 +15919,12 @@
       "dev": true
     },
     "node_modules/ws": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
-      "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
+      "version": "7.5.9",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
+      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
       "dev": true,
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=8.3.0"
       },
       "peerDependencies": {
         "bufferutil": "^4.0.1",
@@ -12353,6 +15939,18 @@
         }
       }
     },
+    "node_modules/xml-name-validator": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
+      "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
+      "dev": true
+    },
+    "node_modules/xmlchars": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
+      "dev": true
+    },
     "node_modules/y18n": {
       "version": "5.0.8",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
@@ -12395,10 +15993,22 @@
         "node": ">=12"
       }
     },
+    "node_modules/yocto-queue": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
+      "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/zone.js": {
-      "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.13.1.tgz",
-      "integrity": "sha512-+bIeDAFEBYuXRuU3qGQvzdPap+N1zjM4KkBAiiQuVVCrHrhjDuY6VkUhNa5+U27+9w0q3fbKiMCbpJ0XzMmSWA==",
+      "version": "0.13.3",
+      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.13.3.tgz",
+      "integrity": "sha512-MKPbmZie6fASC/ps4dkmIhaT5eonHkEt6eAy80K42tAm0G2W+AahLJjbfi6X9NPdciOE9GRFTTM8u2IiF6O3ww==",
       "dependencies": {
         "tslib": "^2.3.0"
       }
diff --git a/modules/ui/package.json b/modules/ui/package.json
index 05add0189..c7ce21ec7 100644
--- a/modules/ui/package.json
+++ b/modules/ui/package.json
@@ -8,35 +8,53 @@
     "watch": "ng build --watch --configuration development",
     "test": "ng test",
     "test:coverage": "ng test --code-coverage",
-    "docker": "docker rm -f test-run-ui && docker rmi test-run-ui && docker build -t test-run-ui . &&  docker run -d -p 80:80 --name test-run-ui test-run-ui"
+    "test-headless": "ng test --browsers=ChromeHeadless --watch=false",
+    "docker": "docker rm -f test-run-ui && docker rmi test-run-ui && docker build -t test-run-ui . &&  docker run -d -p 80:80 --name test-run-ui test-run-ui",
+    "lint": "ng lint",
+    "lint:fix": "ng lint --fix",
+    "format": "npx prettier --check .",
+    "format:fix": "npx prettier --write ."
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^16.1.0",
-    "@angular/cdk": "^16.1.4",
-    "@angular/common": "^16.1.0",
-    "@angular/compiler": "^16.1.0",
-    "@angular/core": "^16.1.0",
-    "@angular/forms": "^16.1.0",
-    "@angular/material": "^16.1.4",
-    "@angular/platform-browser": "^16.1.0",
-    "@angular/platform-browser-dynamic": "^16.1.0",
-    "@angular/router": "^16.1.0",
+    "@angular/animations": "^16.2.10",
+    "@angular/cdk": "^16.2.9",
+    "@angular/common": "^16.2.10",
+    "@angular/compiler": "^16.2.10",
+    "@angular/core": "^16.2.10",
+    "@angular/forms": "^16.2.10",
+    "@angular/material": "^16.2.9",
+    "@angular/platform-browser": "^16.2.10",
+    "@angular/platform-browser-dynamic": "^16.2.10",
+    "@angular/router": "^16.2.10",
+    "ngx-mask": "^16.3.9",
     "rxjs": "~7.8.0",
-    "tslib": "^2.3.0",
-    "zone.js": "~0.13.0"
+    "tslib": "^2.6.2",
+    "zone.js": "~0.13.3"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^16.1.3",
-    "@angular/cli": "~16.1.3",
-    "@angular/compiler-cli": "^16.1.0",
-    "@types/jasmine": "~4.3.0",
+    "@angular-devkit/build-angular": "^16.2.6",
+    "@angular-eslint/builder": "16.2.0",
+    "@angular-eslint/eslint-plugin": "16.2.0",
+    "@angular-eslint/eslint-plugin-template": "16.2.0",
+    "@angular-eslint/schematics": "16.2.0",
+    "@angular-eslint/template-parser": "16.2.0",
+    "@angular/cli": "~16.1.8",
+    "@angular/compiler-cli": "^16.2.10",
+    "@types/jasmine": "~4.3.6",
+    "@typescript-eslint/eslint-plugin": "5.62.0",
+    "@typescript-eslint/parser": "5.62.0",
+    "eslint": "^8.49.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-prettier": "^5.0.1",
     "jasmine-core": "~4.6.0",
     "karma": "~6.4.0",
     "karma-chrome-launcher": "~3.2.0",
     "karma-coverage": "~2.2.0",
     "karma-jasmine": "~5.1.0",
     "karma-jasmine-html-reporter": "~2.1.0",
+    "prettier": "^3.0.3",
+    "prettier-eslint": "^16.1.1",
     "typescript": "~5.1.3"
   }
 }
diff --git a/modules/ui/src/app/app-routing.module.ts b/modules/ui/src/app/app-routing.module.ts
index 7624dca4b..59be3e59d 100644
--- a/modules/ui/src/app/app-routing.module.ts
+++ b/modules/ui/src/app/app-routing.module.ts
@@ -13,37 +13,36 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {NgModule} from '@angular/core';
-import {RouterModule, Routes} from '@angular/router';
-import {allowToRunTestGuard} from './guards/allow-to-run-test.guard';
-import { HashLocationStrategy, LocationStrategy } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
 
 const routes: Routes = [
   {
-    path: 'runtime',
-    canActivate: [allowToRunTestGuard],
-    loadChildren: () => import('./progress/progress.module').then(m => m.ProgressModule)
+    path: 'testrun',
+    loadChildren: () =>
+      import('./progress/progress.module').then(m => m.ProgressModule),
   },
   {
-    path: 'device-repository',
-    loadChildren: () => import('./device-repository/device-repository.module').then(m => m.DeviceRepositoryModule)
+    path: 'devices',
+    loadChildren: () =>
+      import('./device-repository/device-repository.module').then(
+        m => m.DeviceRepositoryModule
+      ),
   },
   {
-    path: 'results',
-    canActivate: [allowToRunTestGuard],
-    loadChildren: () => import('./history/history.module').then(m => m.HistoryModule)
+    path: 'reports',
+    loadChildren: () =>
+      import('./history/history.module').then(m => m.HistoryModule),
   },
   {
     path: '',
-    redirectTo: 'runtime',
-    pathMatch: 'full'
-  }
+    redirectTo: 'devices',
+    pathMatch: 'full',
+  },
 ];
 
 @NgModule({
-  imports: [RouterModule.forRoot(routes)],
+  imports: [RouterModule.forRoot(routes, { useHash: true })],
   exports: [RouterModule],
-  providers: [{provide: LocationStrategy, useClass: HashLocationStrategy}]
 })
-export class AppRoutingModule {
-}
+export class AppRoutingModule {}
diff --git a/modules/ui/src/app/app.component.html b/modules/ui/src/app/app.component.html
index d4632736c..9b78ec850 100644
--- a/modules/ui/src/app/app.component.html
+++ b/modules/ui/src/app/app.component.html
@@ -13,41 +13,121 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<mat-drawer-container hasBackdrop="false" class="app-container">
+<app-bypass></app-bypass>
+<mat-drawer-container hasBackdrop="false" class="app-container" autosize>
   <mat-drawer mode="side" role="navigation" opened cdkFocusInitial>
-    <div class="app-sidebar">
+    <div class="app-sidebar" #navigation>
       <ng-container
-        *ngTemplateOutlet="navButton;context:{icon: 'menu', label: 'Menu', name: 'menu'}">
+        *ngTemplateOutlet="
+          navButtonRoute;
+          context: {
+            route: Routes.Testrun,
+            svgIcon: 'testrun_logo_small',
+            label: 'Testrun',
+            name: 'testrun'
+          }
+        ">
       </ng-container>
       <ng-container
-        *ngTemplateOutlet="navButtonRoute;context:{route: '/runtime', svgIcon: 'testrun_logo_small', label: 'Runtime', name: 'runtime'}">
+        *ngTemplateOutlet="
+          navButtonRoute;
+          context: {
+            route: Routes.Devices,
+            svgIcon: 'devices',
+            label: 'Devices',
+            name: 'devices'
+          }
+        ">
       </ng-container>
       <ng-container
-        *ngTemplateOutlet="navButtonRoute;context:{route: '/device-repository',svgIcon: 'devices', label: 'Device repository', name: 'device-repository'}">
-      </ng-container>
-      <ng-container
-        *ngTemplateOutlet="navButtonRoute;context:{route: '/results',svgIcon: 'reports', label: 'Results', name: 'results'}">
+        *ngTemplateOutlet="
+          navButtonRoute;
+          context: {
+            route: Routes.Reports,
+            svgIcon: 'reports',
+            label: 'Reports',
+            name: 'reports'
+          }
+        ">
       </ng-container>
+      <app-version></app-version>
     </div>
   </mat-drawer>
 
   <mat-drawer-content class="app-content" role="region">
     <mat-toolbar class="app-toolbar">
-      <a class="logo-link" routerLink="/runtime" aria-label="Test run ui logo">
+      <button
+        mat-button
+        class="app-toolbar-button app-toolbar-button-menu"
+        aria-label="Menu"
+        (click)="toggleMenu($event)"
+        (keydown.tab)="skipToNavigation($event)">
+        <mat-icon>menu</mat-icon>
+      </button>
+      <a class="logo-link" routerLink="/runtime" aria-label="Testrun ui logo">
         <mat-icon svgIcon="testrun_logo_color"></mat-icon>
-        <span>Testrun</span>
+        <h1 class="main-heading">Testrun</h1>
       </a>
       <span class="spacer"></span>
       <button
         #toggleSettingsBtn
         class="app-toolbar-button app-toolbar-button-general-settings"
         mat-icon-button
-        aria-label="General settings"
-        (click)="settingsDrawer.toggle()">
+        aria-label="Connection settings"
+        (click)="openGeneralSettings()">
         <mat-icon>tune</mat-icon>
       </button>
     </mat-toolbar>
-    <div class="app-content-main">
+    <div class="app-content-main" role="main" id="main">
+      <app-callout
+        [type]="CalloutType.Info"
+        *ngIf="
+          (hasConnectionSetting$ | async) !== true && isConnectionSettingsLoaded
+        ">
+        Step 1: To perform a device test, please, select ports in Connection
+        settings.
+      </app-callout>
+      <app-callout
+        [type]="CalloutType.Info"
+        *ngIf="
+          (hasConnectionSetting$ | async) === true &&
+          !(devices$ | async)?.length &&
+          isDevicesLoaded
+        ">
+        Step 2: To perform a device test please
+        <a
+          (click)="navigateToDeviceRepository()"
+          (keydown.enter)="navigateToDeviceRepository()"
+          (keydown.space)="navigateToDeviceRepository()"
+          tabindex="0"
+          role="button"
+          class="message-link"
+          >Create a Device</a
+        >
+        first.
+      </app-callout>
+      <app-callout
+        [type]="CalloutType.Info"
+        *ngIf="
+          (hasConnectionSetting$ | async) === true &&
+          (devices$ | async)?.length &&
+          (!(systemStatus$ | async)?.status ||
+            (systemStatus$ | async)?.status === StatusOfTestrun.Idle) &&
+          isStatusLoaded &&
+          (isTestrunStarted$ | async) === false
+        ">
+        Step 3: Once device is created navigate to
+        <a
+          (click)="navigateToRuntime()"
+          (keydown.enter)="navigateToRuntime()"
+          (keydown.space)="navigateToRuntime()"
+          tabindex="0"
+          role="button"
+          class="message-link"
+          >Testrun</a
+        >
+        tab.
+      </app-callout>
       <router-outlet></router-outlet>
     </div>
   </mat-drawer-content>
@@ -57,31 +137,30 @@
     position="end"
     class="settings-drawer">
     <app-general-settings
+      [interfaces]="interfaces"
       (closeSettingEvent)="closeSetting()"
-      (openSettingEvent)="openSetting()">
+      (openSettingEvent)="openSetting()"
+      (reloadInterfacesEvent)="reloadInterfaces()">
     </app-general-settings>
   </mat-drawer>
 </mat-drawer-container>
 
-<ng-template #navButton let-svgIcon="svgIcon" let-icon="icon" let-label="label" let-name="name" >
+<ng-template
+  #navButtonRoute
+  let-icon="icon"
+  let-label="label"
+  let-name="name"
+  let-route="route"
+  let-svgIcon="svgIcon">
   <button
+    class="app-sidebar-button app-sidebar-button-{{ name }}"
     mat-button
-    class="app-sidebar-button app-sidebar-button-{{name}}"
-    [attr.aria-label]="label">
-    <mat-icon *ngIf="svgIcon" svgIcon="{{svgIcon}}"></mat-icon>
-    <mat-icon *ngIf="icon">{{icon}}</mat-icon>
-  </button>
-</ng-template>
-<ng-template #navButtonRoute let-icon="icon" let-label="label" let-name="name"
-             let-route="route" let-svgIcon="svgIcon">
-  <button
-    [attr.aria-label]="label"
-    disabled="{{route !== '/device-repository' && !(devices$| async)?.length}}"
-    class="app-sidebar-button app-sidebar-button-{{name}}"
-    mat-button
-    routerLink="{{route}}"
+    routerLink="{{ route }}"
     routerLinkActive="app-sidebar-button-active">
-    <mat-icon *ngIf="svgIcon" svgIcon="{{svgIcon}}"></mat-icon>
-    <mat-icon *ngIf="icon">{{icon}}</mat-icon>
+    <mat-icon *ngIf="svgIcon" svgIcon="{{ svgIcon }}"></mat-icon>
+    <mat-icon *ngIf="icon">{{ icon }}</mat-icon>
+    <span class="sidebar-button-label">{{ label }}</span>
   </button>
 </ng-template>
+
+<app-spinner class="global-spinner"></app-spinner>
diff --git a/modules/ui/src/app/app.component.scss b/modules/ui/src/app/app.component.scss
index d0a1f2cd4..6060205f1 100644
--- a/modules/ui/src/app/app.component.scss
+++ b/modules/ui/src/app/app.component.scss
@@ -14,7 +14,14 @@
  * limitations under the License.
  */
 @use '@angular/material' as mat;
-@import "../theming/colors";
+@import '../theming/colors';
+@import '../theming/variables';
+
+$toolbar-height: 56px;
+$nav-close-width: 80px;
+$nav-open-width: 236px;
+$nav-close-btn-width: 48px;
+$nav-open-btn-width: 210px;
 
 .app-container {
   height: 100%;
@@ -25,46 +32,106 @@
 }
 
 .mat-drawer-content {
+  height: calc(100% - 56px);
   background: $white;
 }
 
 .mat-drawer-side {
-  border-right: none;
+  margin-top: $toolbar-height;
+}
+
+:host.active-menu {
+  .app-sidebar {
+    width: $nav-open-width;
+    align-items: start;
+  }
+
+  .app-sidebar-button {
+    width: $nav-open-btn-width;
+    height: $toolbar-height;
+    border-radius: 0 100px 100px 0;
+    margin: 0;
+    padding: 0 16px;
+  }
+
+  .app-sidebar-button:first-child {
+    margin-top: 8px;
+  }
+
+  .app-sidebar-button-active {
+    border: 1px solid mat.get-color-from-palette($color-primary, 50);
+    background-color: mat.get-color-from-palette($color-primary, 50);
+  }
+
+  .app-sidebar-button-active > .mat-icon,
+  .sidebar-button-label {
+    color: $grey-800;
+  }
+
+  .sidebar-button-label {
+    font-size: 14px;
+    font-weight: 500;
+    line-height: 20px;
+    letter-spacing: 0.25px;
+  }
+
+  app-version {
+    padding: 0 16px;
+  }
 }
 
 .app-sidebar {
   display: flex;
   flex-direction: column;
-  background-color: $color-background-grey;
+  background-color: $white;
   height: 100%;
   gap: 8px;
-  width: 80px;
+  width: $nav-close-width;
   align-items: center;
 }
 
-.app-sidebar-button, .app-toolbar-button {
+.app-sidebar-button,
+.app-toolbar-button {
   border-radius: 20px;
   border: 1px solid transparent;
   min-width: 48px;
   padding: 0;
   box-sizing: border-box;
   height: 34px;
-  margin: 6px 0;
+  margin: 11px 0;
   line-height: 50%;
 }
 
+.app-sidebar-button {
+  width: $nav-close-btn-width;
+  display: flex;
+  justify-content: flex-start;
+}
+
+.app-sidebar-button:first-child {
+  margin-top: 19px;
+}
+
+.app-toolbar-button-menu {
+  margin: 11px 17px 11px 16px;
+}
+
 .app-sidebar-button:disabled {
   background: rgba(0, 0, 0, 0.12);
 }
 
-.app-sidebar-button > .mat-icon, .app-toolbar-button > .mat-icon {
+.app-sidebar-button > .mat-icon,
+.app-toolbar-button > .mat-icon {
   margin-right: 0;
   width: 24px;
   font-size: 24px;
   color: $dark-grey;
+  height: 24px;
 }
 
 .app-sidebar-button > .mat-icon {
+  margin: 0 11px;
+  min-width: 24px;
   line-height: 18px;
 }
 
@@ -86,6 +153,7 @@
   align-items: center;
   justify-content: center;
   gap: 16px;
+  width: 120px;
 }
 
 .logo-link .mat-icon {
@@ -93,20 +161,32 @@
   height: 23px;
 }
 
+.main-heading {
+  font-size: 18px;
+  line-height: 24px;
+}
+
 .app-toolbar {
-  height: 56px;
-  padding: 0 6px 0 16px;
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 3;
+  height: $toolbar-height;
+  padding: 0;
   background-color: $white;
   border-bottom: 1px solid $light-grey;
   color: $grey-800;
 }
 
 .app-content {
+  position: static;
   display: grid;
-  grid-template-rows: auto 1fr;
+  grid-template-rows: 1fr;
+  margin-top: $toolbar-height;
 }
 
 .app-content-main {
+  position: relative;
   display: grid;
   grid-template-rows: 0 auto;
   overflow: hidden;
@@ -117,3 +197,13 @@
   box-shadow: none;
   border-left: 1px solid $light-grey;
 }
+
+.app-toolbar-button-general-settings {
+  margin-left: 72px;
+}
+
+app-version {
+  margin-top: auto;
+  margin-bottom: 16px;
+  max-width: 100%;
+}
diff --git a/modules/ui/src/app/app.component.spec.ts b/modules/ui/src/app/app.component.spec.ts
index 265cf12ec..68bcc31c5 100644
--- a/modules/ui/src/app/app.component.spec.ts
+++ b/modules/ui/src/app/app.component.spec.ts
@@ -13,23 +13,39 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {HttpClientTestingModule} from '@angular/common/http/testing';
-import {ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/testing';
-import {Router} from '@angular/router';
-import {RouterTestingModule} from '@angular/router/testing';
-import {AppComponent} from './app.component';
-import {TestRunService} from './test-run.service';
-import {BehaviorSubject} from 'rxjs/internal/BehaviorSubject';
-import {Device} from './model/device';
-import {device} from './mocks/device.mock';
-import {Component, EventEmitter, Output} from '@angular/core';
-import {MatButtonModule} from '@angular/material/button';
-import {MatIconModule} from '@angular/material/icon';
-import {MatToolbarModule} from '@angular/material/toolbar';
-import {MatSidenavModule} from '@angular/material/sidenav';
-import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
-import {AppRoutingModule} from './app-routing.module';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import {
+  ComponentFixture,
+  fakeAsync,
+  flush,
+  TestBed,
+  tick,
+} from '@angular/core/testing';
+import { Router } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { AppComponent } from './app.component';
+import { TestRunService } from './services/test-run.service';
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { Device } from './model/device';
+import { device } from './mocks/device.mock';
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { MatButtonModule } from '@angular/material/button';
+import { MatIconModule } from '@angular/material/icon';
+import { MatToolbarModule } from '@angular/material/toolbar';
+import { MatSidenavModule } from '@angular/material/sidenav';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { AppRoutingModule } from './app-routing.module';
+import { of } from 'rxjs/internal/observable/of';
 import SpyObj = jasmine.SpyObj;
+import { BypassComponent } from './components/bypass/bypass.component';
+import { VersionComponent } from './components/version/version.component';
+import { CalloutComponent } from './components/callout/callout.component';
+import {
+  MOCK_PROGRESS_DATA_IDLE,
+  MOCK_PROGRESS_DATA_IN_PROGRESS,
+} from './mocks/progress.mock';
+import { LoaderService } from './services/loader.service';
+import { Routes } from './model/routes';
 
 describe('AppComponent', () => {
   let component: AppComponent;
@@ -37,16 +53,68 @@ describe('AppComponent', () => {
   let compiled: HTMLElement;
   let router: Router;
   let mockService: SpyObj<TestRunService>;
+  let mockLoaderService: SpyObj<LoaderService>;
+
+  const enterKeyEvent = new KeyboardEvent('keydown', {
+    key: 'Enter',
+  });
+
+  const spaceKeyEvent = new KeyboardEvent('keydown', {
+    key: 'Space',
+  });
+
+  const keyboardCases = [
+    { name: 'enter', event: enterKeyEvent },
+    { name: 'space', event: spaceKeyEvent },
+  ];
 
   beforeEach(() => {
-    mockService = jasmine.createSpyObj(['getDevices', 'fetchDevices', 'getSystemStatus', 'fetchHistory']);
-    mockService.getDevices.and.returnValue(new BehaviorSubject<Device[] | null>([device]));
+    mockService = jasmine.createSpyObj([
+      'getDevices',
+      'fetchDevices',
+      'getSystemStatus',
+      'fetchHistory',
+      'getSystemInterfaces',
+      'getVersion',
+      'fetchVersion',
+      'setIsOpenAddDevice',
+      'systemStatus$',
+      'isTestrunStarted$',
+      'hasConnectionSetting$',
+    ]);
+
+    mockLoaderService = jasmine.createSpyObj(['setLoading']);
+    mockService.getDevices.and.returnValue(
+      new BehaviorSubject<Device[] | null>([device])
+    );
+    mockService.getSystemInterfaces.and.returnValue(of([]));
+    (mockService.systemStatus$ as unknown) = of({});
+    mockService.isTestrunStarted$ = of(true);
+    mockService.hasConnectionSetting$ = of(true);
 
     TestBed.configureTestingModule({
-      imports: [RouterTestingModule, HttpClientTestingModule, AppRoutingModule, MatButtonModule,
-        BrowserAnimationsModule, MatIconModule, MatToolbarModule, MatSidenavModule],
-      providers: [{provide: TestRunService, useValue: mockService}],
-      declarations: [AppComponent, FakeGeneralSettingsComponent]
+      imports: [
+        RouterTestingModule,
+        HttpClientTestingModule,
+        AppRoutingModule,
+        MatButtonModule,
+        BrowserAnimationsModule,
+        MatIconModule,
+        MatToolbarModule,
+        MatSidenavModule,
+        BypassComponent,
+        VersionComponent,
+        CalloutComponent,
+      ],
+      providers: [
+        { provide: TestRunService, useValue: mockService },
+        { provide: LoaderService, useValue: mockLoaderService },
+      ],
+      declarations: [
+        AppComponent,
+        FakeGeneralSettingsComponent,
+        FakeSpinnerComponent,
+      ],
     });
 
     fixture = TestBed.createComponent(AppComponent);
@@ -113,50 +181,51 @@ describe('AppComponent', () => {
     expect(generalSettingsButton).toBeDefined();
   });
 
-  it('should navigate to the device repository when "device repository" button is clicked', fakeAsync(() => {
+  it('should navigate to the devices when "devices" button is clicked', fakeAsync(() => {
     const button = compiled.querySelector(
-      '.app-sidebar-button-device-repository'
+      '.app-sidebar-button-devices'
     ) as HTMLButtonElement;
 
     button?.click();
     tick();
 
-    expect(router.url).toBe(`/device-repository`);
+    expect(router.url).toBe(Routes.Devices);
   }));
 
-  it('should navigate to the runtime when "runtime" button is clicked', fakeAsync(() => {
+  it('should navigate to the testrun when "testrun" button is clicked', fakeAsync(() => {
     const button = compiled.querySelector(
-      '.app-sidebar-button-runtime'
+      '.app-sidebar-button-testrun'
     ) as HTMLButtonElement;
 
     button?.click();
     tick();
 
-    expect(router.url).toBe(`/runtime`);
+    expect(router.url).toBe(Routes.Testrun);
   }));
 
-  it('should navigate to the results when "results" button is clicked', fakeAsync(() => {
+  it('should navigate to the reports when "reports" button is clicked', fakeAsync(() => {
     const button = compiled.querySelector(
-      '.app-sidebar-button-results'
+      '.app-sidebar-button-reports'
     ) as HTMLButtonElement;
 
     button?.click();
     tick();
 
-    expect(router.url).toBe(`/results`);
+    expect(router.url).toBe(Routes.Reports);
   }));
 
   it('should call toggleSettingsBtn focus when settingsDrawer close on closeSetting', fakeAsync(() => {
-    spyOn(component.settingsDrawer, 'close').and.returnValue(Promise.resolve('close'));
+    spyOn(component.settingsDrawer, 'close').and.returnValue(
+      Promise.resolve('close')
+    );
     spyOn(component.toggleSettingsBtn, 'focus');
 
     component.closeSetting();
     tick();
 
     component.settingsDrawer.close().then(() => {
-        expect(component.toggleSettingsBtn.focus).toHaveBeenCalled();
-      }
-    )
+      expect(component.toggleSettingsBtn.focus).toHaveBeenCalled();
+    });
   }));
 
   it('should call settingsDrawer open on openSetting', fakeAsync(() => {
@@ -168,48 +237,280 @@ describe('AppComponent', () => {
     expect(component.settingsDrawer.open).toHaveBeenCalledTimes(1);
   }));
 
-  it('should call settingsDrawer toggle on click settings button', () => {
+  it('should call settingsDrawer open on click settings button', () => {
     const settingsBtn = compiled.querySelector(
       '.app-toolbar-button-general-settings'
     ) as HTMLButtonElement;
-    spyOn(component.settingsDrawer, 'toggle');
+    spyOn(component.settingsDrawer, 'open');
 
     settingsBtn.click();
 
-    expect(component.settingsDrawer.toggle).toHaveBeenCalledTimes(1);
+    expect(component.settingsDrawer.open).toHaveBeenCalledTimes(1);
+  });
+
+  it('#reloadInterfaces should call setLoading in loaderService', () => {
+    component.reloadInterfaces();
+
+    expect(mockLoaderService.setLoading).toHaveBeenCalledWith(true);
+  });
+
+  describe('menu button', () => {
+    it('should toggle menu open state on click', () => {
+      const menuBtn = compiled.querySelector(
+        '.app-toolbar-button-menu'
+      ) as HTMLButtonElement;
+
+      menuBtn.click();
+
+      expect(component.isMenuOpen).toBeTrue();
+
+      menuBtn.click();
+
+      expect(component.isMenuOpen).toBeFalse();
+    });
+
+    it('should set flag focusNavigation if menu opens on click', () => {
+      component.isMenuOpen = false;
+      const menuBtn = compiled.querySelector(
+        '.app-toolbar-button-menu'
+      ) as HTMLButtonElement;
+
+      menuBtn.click();
+
+      expect(component.focusNavigation).toBeTrue();
+    });
+
+    it('should focus navigation on tab press if menu button was clicked', () => {
+      const menuBtn = compiled.querySelector(
+        '.app-toolbar-button-menu'
+      ) as HTMLButtonElement;
+
+      menuBtn.click();
+      menuBtn.dispatchEvent(new KeyboardEvent('keydown', { key: 'Tab' }));
+      const navigationButton = compiled.querySelectorAll('.app-sidebar-button');
+
+      expect(component.focusNavigation).toBeFalse();
+      expect(document.activeElement).toBe(navigationButton[0]);
+    });
+
+    it('should not focus navigation button on tab press if menu button was not clicked', () => {
+      component.focusNavigation = false;
+      const menuBtn = compiled.querySelector(
+        '.app-toolbar-button-menu'
+      ) as HTMLButtonElement;
+
+      menuBtn.dispatchEvent(new KeyboardEvent('keydown', { key: 'Tab' }));
+
+      expect(component.focusNavigation).toBeFalse();
+      expect(document.activeElement).toBe(document.body);
+    });
+  });
+
+  it('should have spinner', () => {
+    const spinner = compiled.querySelector('app-spinner');
+
+    expect(spinner).toBeTruthy();
+  });
+
+  it('should have bypass', () => {
+    const bypass = compiled.querySelector('app-bypass');
+
+    expect(bypass).toBeTruthy();
+  });
+
+  it('should have version', () => {
+    const version = compiled.querySelector('app-version');
+
+    expect(version).toBeTruthy();
+  });
+
+  describe('with no connection settings', () => {
+    beforeEach(() => {
+      mockService.hasConnectionSetting$ = of(false);
+      component.ngOnInit();
+      fixture.detectChanges();
+    });
+
+    it('should have callout component with "Step 1" text', () => {
+      const callout = compiled.querySelector('app-callout');
+      const calloutContent = callout?.innerHTML.trim();
+
+      expect(callout).toBeTruthy();
+      expect(calloutContent).toContain('Step 1');
+    });
+  });
+
+  describe('with system status as "Idle"', () => {
+    beforeEach(() => {
+      mockService.hasConnectionSetting$ = of(true);
+      mockService.getDevices.and.returnValue(
+        new BehaviorSubject<Device[] | null>([device])
+      );
+      mockService.systemStatus$ = of(MOCK_PROGRESS_DATA_IDLE);
+      mockService.isTestrunStarted$ = of(false);
+      component.ngOnInit();
+      fixture.detectChanges();
+    });
+
+    it('should have callout component with "Step 3" text', () => {
+      const callout = compiled.querySelector('app-callout');
+      const calloutContent = callout?.innerHTML.trim();
+
+      expect(callout).toBeTruthy();
+      expect(calloutContent).toContain('Step 3');
+    });
   });
 
   describe('with no devices setted', () => {
     beforeEach(() => {
-      mockService.getDevices.and.returnValue(new BehaviorSubject<Device[] | null>(null));
+      mockService.getDevices.and.returnValue(
+        new BehaviorSubject<Device[] | null>(null)
+      );
       component.ngOnInit();
       fixture.detectChanges();
     });
 
-    it('should have "results" and "runtime" buttons disabled', fakeAsync(() => {
-      const resultBtn = compiled.querySelector('.app-sidebar-button-results') as HTMLButtonElement;
-      const runtimeBtn = compiled.querySelector('.app-sidebar-button-runtime') as HTMLButtonElement;
+    it('should have callout component', () => {
+      const callout = compiled.querySelector('app-callout');
 
-      expect(resultBtn.disabled).toBe(true);
-      expect(runtimeBtn.disabled).toBe(true);
-    }));
+      expect(callout).toBeTruthy();
+    });
 
-    it('should have "device repository" button disabled', fakeAsync(() => {
-      const deviceRepositorytBtn = compiled.querySelector(
-        '.app-sidebar-button-device-repository'
-      ) as HTMLButtonElement;
+    it('should have callout component with "Step 2" text', () => {
+      const callout = compiled.querySelector('app-callout');
+      const calloutContent = callout?.innerHTML.trim();
+
+      expect(callout).toBeTruthy();
+      expect(calloutContent).toContain('Step 2');
+    });
+
+    it('should have callout content with "Create a Device" link ', () => {
+      const calloutLinkEl = compiled.querySelector(
+        '.message-link'
+      ) as HTMLAnchorElement;
+      const calloutLinkContent = calloutLinkEl.innerHTML.trim();
+
+      expect(calloutLinkEl).toBeTruthy();
+      expect(calloutLinkContent).toContain('Create a Device');
+    });
 
-      expect(deviceRepositorytBtn.disabled).toBe(false);
+    keyboardCases.forEach(testCase => {
+      it(`should navigate to the device-repository on keydown ${testCase.name} "Create a Device" link`, fakeAsync(() => {
+        const calloutLinkEl = compiled.querySelector(
+          '.message-link'
+        ) as HTMLAnchorElement;
+
+        calloutLinkEl.dispatchEvent(testCase.event);
+        flush();
+
+        expect(router.url).toBe(Routes.Devices);
+      }));
+    });
+
+    it('should navigate to the device-repository on click "Create a Device" link', fakeAsync(() => {
+      const calloutLinkEl = compiled.querySelector(
+        '.message-link'
+      ) as HTMLAnchorElement;
+
+      calloutLinkEl.click();
+      flush();
+
+      expect(router.url).toBe(Routes.Devices);
+      expect(mockService.setIsOpenAddDevice).toHaveBeenCalledWith(true);
     }));
   });
 
+  describe('with devices setted but without systemStatus data', () => {
+    beforeEach(() => {
+      mockService.getDevices.and.returnValue(
+        new BehaviorSubject<Device[] | null>([device])
+      );
+      mockService.isTestrunStarted$ = of(false);
+      component.ngOnInit();
+      fixture.detectChanges();
+    });
+
+    it('should have callout component with "Step 3" text', () => {
+      const callout = compiled.querySelector('app-callout');
+      const calloutContent = callout?.innerHTML.trim();
+
+      expect(callout).toBeTruthy();
+      expect(calloutContent).toContain('Step 3');
+    });
+
+    it('should have callout component with "Testrun" link', () => {
+      const callout = compiled.querySelector('app-callout');
+      const calloutLinkEl = compiled.querySelector(
+        '.message-link'
+      ) as HTMLAnchorElement;
+      const calloutLinkContent = calloutLinkEl.innerHTML.trim();
+
+      expect(callout).toBeTruthy();
+      expect(calloutLinkContent).toContain('Testrun');
+    });
+
+    keyboardCases.forEach(testCase => {
+      it(`should navigate to the runtime on keydown ${testCase.name} "Run the Test" link`, fakeAsync(() => {
+        const calloutLinkEl = compiled.querySelector(
+          '.message-link'
+        ) as HTMLAnchorElement;
+
+        calloutLinkEl.dispatchEvent(testCase.event);
+        flush();
+
+        expect(router.url).toBe(Routes.Testrun);
+      }));
+    });
+  });
+
+  describe('with devices setted, without systemStatus data, but run the tests ', () => {
+    beforeEach(() => {
+      mockService.getDevices.and.returnValue(
+        new BehaviorSubject<Device[] | null>([device])
+      );
+      mockService.isTestrunStarted$ = of(true);
+      component.ngOnInit();
+      fixture.detectChanges();
+    });
+
+    it('should not have callout component', () => {
+      const callout = compiled.querySelector('app-callout');
+
+      expect(callout).toBeNull();
+    });
+  });
+
+  describe('with devices setted and systemStatus data ', () => {
+    beforeEach(() => {
+      mockService.getDevices.and.returnValue(
+        new BehaviorSubject<Device[] | null>([device])
+      );
+      mockService.systemStatus$ = of(MOCK_PROGRESS_DATA_IN_PROGRESS);
+      component.ngOnInit();
+      fixture.detectChanges();
+    });
+
+    it('should not have callout component', () => {
+      const callout = compiled.querySelector('app-callout');
+
+      expect(callout).toBeNull();
+    });
+  });
 });
 
 @Component({
   selector: 'app-general-settings',
-  template: '<div></div>'
+  template: '<div></div>',
 })
 class FakeGeneralSettingsComponent {
+  @Input() interfaces = [];
   @Output() closeSettingEvent = new EventEmitter<void>();
   @Output() openSettingEvent = new EventEmitter<void>();
+  @Output() reloadInterfacesEvent = new EventEmitter<void>();
 }
+
+@Component({
+  selector: 'app-spinner',
+  template: '<div></div>',
+})
+class FakeSpinnerComponent {}
diff --git a/modules/ui/src/app/app.component.ts b/modules/ui/src/app/app.component.ts
index 9b3f243e9..41eb73ab2 100644
--- a/modules/ui/src/app/app.component.ts
+++ b/modules/ui/src/app/app.component.ts
@@ -13,13 +13,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {Component, OnInit, ViewChild} from '@angular/core';
-import {MatIconRegistry} from '@angular/material/icon';
-import {DomSanitizer} from '@angular/platform-browser';
-import {MatDrawer, MatDrawerToggleResult} from '@angular/material/sidenav';
-import {TestRunService} from './test-run.service';
-import {Observable} from 'rxjs/internal/Observable';
-import {Device} from './model/device';
+import {
+  Component,
+  ElementRef,
+  HostBinding,
+  OnInit,
+  ViewChild,
+} from '@angular/core';
+import { MatIconRegistry } from '@angular/material/icon';
+import { DomSanitizer } from '@angular/platform-browser';
+import { MatDrawer } from '@angular/material/sidenav';
+import { TestRunService } from './services/test-run.service';
+import { Observable } from 'rxjs/internal/Observable';
+import { Device } from './model/device';
+import { take } from 'rxjs';
+import { TestrunStatus, StatusOfTestrun } from './model/testrun-status';
+import { Router } from '@angular/router';
+import { LoaderService } from './services/loader.service';
+import { CalloutType } from './model/callout-type';
+import { tap } from 'rxjs/internal/operators/tap';
+import { shareReplay } from 'rxjs/internal/operators/shareReplay';
+import { Routes } from './model/routes';
 
 const DEVICES_LOGO_URL = '/assets/icons/devices.svg';
 const REPORTS_LOGO_URL = '/assets/icons/reports.svg';
@@ -30,19 +44,35 @@ const CLOSE_URL = '/assets/icons/close.svg';
 @Component({
   selector: 'app-root',
   templateUrl: './app.component.html',
-  styleUrls: ['./app.component.scss']
+  styleUrls: ['./app.component.scss'],
 })
 export class AppComponent implements OnInit {
+  public readonly CalloutType = CalloutType;
   devices$!: Observable<Device[] | null>;
+  systemStatus$!: Observable<TestrunStatus>;
+  isTestrunStarted$!: Observable<boolean>;
+  hasConnectionSetting$!: Observable<boolean | null>;
+  interfaces: string[] = [];
+  isDevicesLoaded = false;
+  isStatusLoaded = false;
+  isConnectionSettingsLoaded = false;
+  public readonly StatusOfTestrun = StatusOfTestrun;
+  public readonly Routes = Routes;
+
   @ViewChild('settingsDrawer') public settingsDrawer!: MatDrawer;
   @ViewChild('toggleSettingsBtn') public toggleSettingsBtn!: HTMLButtonElement;
+  @ViewChild('navigation') public navigation!: ElementRef;
+  @HostBinding('class.active-menu') isMenuOpen = false;
 
   constructor(
     private matIconRegistry: MatIconRegistry,
     private domSanitizer: DomSanitizer,
-    private testRunService: TestRunService
+    private testRunService: TestRunService,
+    private readonly loaderService: LoaderService,
+    private route: Router
   ) {
-    testRunService.fetchDevices();
+    this.testRunService.fetchDevices();
+    this.testRunService.getSystemStatus();
     this.matIconRegistry.addSvgIcon(
       'devices',
       this.domSanitizer.bypassSecurityTrustResourceUrl(DEVICES_LOGO_URL)
@@ -66,15 +96,99 @@ export class AppComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    this.devices$ = this.testRunService.getDevices();
+    this.devices$ = this.testRunService.getDevices().pipe(
+      tap(result => {
+        if (result !== null) {
+          this.isDevicesLoaded = true;
+        }
+      }),
+      shareReplay({ refCount: true, bufferSize: 1 })
+    );
+
+    this.systemStatus$ = this.testRunService.systemStatus$.pipe(
+      tap(() => (this.isStatusLoaded = true))
+    );
+
+    this.isTestrunStarted$ = this.testRunService.isTestrunStarted$;
+
+    this.hasConnectionSetting$ = this.testRunService.hasConnectionSetting$.pipe(
+      tap(result => {
+        if (result !== null) {
+          this.isConnectionSettingsLoaded = true;
+        }
+      }),
+      shareReplay({ refCount: true, bufferSize: 1 })
+    );
+  }
+
+  navigateToDeviceRepository(): void {
+    this.route.navigate([Routes.Devices]);
+    this.testRunService.setIsOpenAddDevice(true);
+  }
+
+  navigateToRuntime(): void {
+    this.route.navigate([Routes.Testrun]);
   }
 
   async closeSetting(): Promise<void> {
-    return await this.settingsDrawer.close().then(() => this.toggleSettingsBtn.focus());
+    return await this.settingsDrawer
+      .close()
+      .then(() => this.toggleSettingsBtn.focus());
+  }
+
+  async openSetting(): Promise<void> {
+    return await this.openGeneralSettings();
   }
 
-  async openSetting(): Promise<MatDrawerToggleResult> {
-    return await this.settingsDrawer.open();
+  reloadInterfaces(): void {
+    this.showLoading();
+    this.getSystemInterfaces();
   }
 
+  /**
+   * Indicates, if side menu should be focused on keyboard navigation after menu is opened
+   */
+  focusNavigation = false;
+
+  public toggleMenu(event: MouseEvent) {
+    event.stopPropagation();
+    this.isMenuOpen = !this.isMenuOpen;
+    if (this.isMenuOpen) {
+      this.focusNavigation = true; // user will be navigated to side menu on tab
+    }
+  }
+
+  /**
+   * When side menu is opened
+   */
+  skipToNavigation(event: Event) {
+    if (this.focusNavigation) {
+      event.preventDefault(); // if not prevented, second element will be focused
+      this.navigation.nativeElement.firstChild.focus(); // focus first button on side
+      this.focusNavigation = false; // user will be navigated according to normal flow on tab
+    }
+  }
+
+  async openGeneralSettings() {
+    this.getSystemInterfaces();
+    await this.settingsDrawer.open();
+  }
+
+  private getSystemInterfaces(): void {
+    this.testRunService
+      .getSystemInterfaces()
+      .pipe(take(1))
+      .subscribe(interfaces => {
+        this.interfaces = interfaces;
+        this.hideLoading();
+      });
+  }
+
+  private showLoading() {
+    this.loaderService.setLoading(true);
+  }
+
+  private hideLoading() {
+    this.loaderService.setLoading(false);
+  }
 }
diff --git a/modules/ui/src/app/app.module.ts b/modules/ui/src/app/app.module.ts
index 89c2d3eb9..67d4c3464 100644
--- a/modules/ui/src/app/app.module.ts
+++ b/modules/ui/src/app/app.module.ts
@@ -13,23 +13,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {HttpClientModule} from '@angular/common/http';
-import {NgModule} from '@angular/core';
-import {MatButtonModule} from '@angular/material/button';
-import {MatButtonToggleModule} from '@angular/material/button-toggle';
-import {MatIconModule} from '@angular/material/icon';
-import {MatSidenavModule} from '@angular/material/sidenav';
-import {MatToolbarModule} from '@angular/material/toolbar';
-import {MatRadioModule} from '@angular/material/radio';
-import {BrowserModule} from '@angular/platform-browser';
-import {NoopAnimationsModule} from '@angular/platform-browser/animations';
+import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
+import { NgModule } from '@angular/core';
+import { MatButtonModule } from '@angular/material/button';
+import { MatButtonToggleModule } from '@angular/material/button-toggle';
+import { MatIconModule } from '@angular/material/icon';
+import { MatSidenavModule } from '@angular/material/sidenav';
+import { MatToolbarModule } from '@angular/material/toolbar';
+import { MatRadioModule } from '@angular/material/radio';
+import { BrowserModule } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 
-import {AppRoutingModule} from './app-routing.module';
-import {AppComponent} from './app.component';
-import {GeneralSettingsComponent} from './components/general-settings/general-settings.component';
-import {ReactiveFormsModule} from '@angular/forms';
-import {MatFormFieldModule} from '@angular/material/form-field';
-import {MatSnackBarModule} from '@angular/material/snack-bar';
+import { AppRoutingModule } from './app-routing.module';
+import { AppComponent } from './app.component';
+import { GeneralSettingsComponent } from './components/general-settings/general-settings.component';
+import { ReactiveFormsModule } from '@angular/forms';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
+import { ErrorInterceptor } from './interceptors/error.interceptor';
+import { LoadingInterceptor } from './interceptors/loading.interceptor';
+import { SpinnerComponent } from './components/spinner/spinner.component';
+import { BypassComponent } from './components/bypass/bypass.component';
+import { VersionComponent } from './components/version/version.component';
+import { CalloutComponent } from './components/callout/callout.component';
 
 @NgModule({
   declarations: [AppComponent, GeneralSettingsComponent],
@@ -47,9 +53,23 @@ import {MatSnackBarModule} from '@angular/material/snack-bar';
     ReactiveFormsModule,
     MatFormFieldModule,
     MatSnackBarModule,
+    SpinnerComponent,
+    BypassComponent,
+    VersionComponent,
+    CalloutComponent,
   ],
-  providers: [],
-  bootstrap: [AppComponent]
+  providers: [
+    {
+      provide: HTTP_INTERCEPTORS,
+      useClass: ErrorInterceptor,
+      multi: true,
+    },
+    {
+      provide: HTTP_INTERCEPTORS,
+      useClass: LoadingInterceptor,
+      multi: true,
+    },
+  ],
+  bootstrap: [AppComponent],
 })
-export class AppModule {
-}
+export class AppModule {}
diff --git a/modules/ui/src/app/components/bypass/bypass.component.html b/modules/ui/src/app/components/bypass/bypass.component.html
new file mode 100644
index 000000000..b2c7305f3
--- /dev/null
+++ b/modules/ui/src/app/components/bypass/bypass.component.html
@@ -0,0 +1,26 @@
+<!--
+Copyright 2023 Google LLC
+
+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
+
+    https://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.
+-->
+<div class="navigation-bypass-container" tabindex="-1">
+  <button
+    tabindex="0"
+    mat-button
+    class="navigation-bypass-button"
+    (click)="skipToMainContent($event)"
+    (keydown.enter)="skipToMainContent($event)"
+    (keydown.space)="skipToMainContent($event)">
+    Skip to main content
+  </button>
+</div>
diff --git a/modules/ui/src/app/components/bypass/bypass.component.scss b/modules/ui/src/app/components/bypass/bypass.component.scss
new file mode 100644
index 000000000..ea55dc9b5
--- /dev/null
+++ b/modules/ui/src/app/components/bypass/bypass.component.scss
@@ -0,0 +1,43 @@
+/**
+ * Copyright 2023 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+:host {
+  position: absolute;
+  top: 0;
+  left: 0;
+  display: flex;
+  z-index: 10;
+  width: 100%;
+}
+.navigation-bypass-container {
+  margin: 0 auto 16px;
+  box-shadow:
+    0 3px 4px 0 rgb(0 0 0 / 14%),
+    0 3px 3px -2px rgb(0 0 0 / 12%),
+    0 1px 8px 0 rgb(0 0 0 / 20%);
+  background-color: white;
+  padding: 0 16px;
+  overflow: hidden;
+  display: flex;
+  &:focus-within .navigation-bypass-button {
+    max-height: 64px;
+    margin-top: 16px;
+    margin-bottom: 16px;
+  }
+}
+
+.navigation-bypass-button {
+  max-height: 0;
+}
diff --git a/modules/ui/src/app/components/bypass/bypass.component.spec.ts b/modules/ui/src/app/components/bypass/bypass.component.spec.ts
new file mode 100644
index 000000000..ab8919049
--- /dev/null
+++ b/modules/ui/src/app/components/bypass/bypass.component.spec.ts
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2023 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { BypassComponent } from './bypass.component';
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-test-bypass',
+  template:
+    '<app-bypass></app-bypass>' +
+    '<div id="main"><button id="test-button"></button></div>',
+})
+class TestBypassComponent {}
+
+describe('BypassComponent', () => {
+  let component: TestBypassComponent;
+  let fixture: ComponentFixture<TestBypassComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [BypassComponent],
+      declarations: [TestBypassComponent],
+    });
+    fixture = TestBed.createComponent(TestBypassComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  describe('DOM tests', () => {
+    it('should emit event on button click', () => {
+      const button = fixture.nativeElement.querySelector(
+        '.navigation-bypass-button'
+      ) as HTMLButtonElement;
+      const testButton = fixture.nativeElement.querySelector(
+        '#test-button'
+      ) as HTMLButtonElement;
+
+      button?.click();
+
+      expect(document.activeElement).toBe(testButton);
+    });
+  });
+});
diff --git a/modules/ui/src/app/components/bypass/bypass.component.ts b/modules/ui/src/app/components/bypass/bypass.component.ts
new file mode 100644
index 000000000..218a0b3c5
--- /dev/null
+++ b/modules/ui/src/app/components/bypass/bypass.component.ts
@@ -0,0 +1,37 @@
+/**
+ * Copyright 2023 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+import { Component } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { MatButtonModule } from '@angular/material/button';
+
+@Component({
+  selector: 'app-bypass',
+  standalone: true,
+  imports: [CommonModule, MatButtonModule],
+  templateUrl: './bypass.component.html',
+  styleUrls: ['./bypass.component.scss'],
+})
+export class BypassComponent {
+  skipToMainContent(event: Event) {
+    event.preventDefault();
+    const firstControl: HTMLElement | null = window.document.querySelector(
+      '#main button:not(disabled), #main table'
+    );
+    if (firstControl) {
+      firstControl.focus();
+    }
+  }
+}
diff --git a/modules/ui/src/app/components/callout/callout.component.html b/modules/ui/src/app/components/callout/callout.component.html
new file mode 100644
index 000000000..a3fb7930c
--- /dev/null
+++ b/modules/ui/src/app/components/callout/callout.component.html
@@ -0,0 +1,26 @@
+<!--
+Copyright 2023 Google LLC
+
+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
+
+    https://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.
+-->
+<div class="callout-container" [ngClass]="type">
+  <mat-icon
+    class="callout-icon"
+    fontSet="material-icons-outlined"
+    color="primary">
+    {{ type }}
+  </mat-icon>
+  <p class="callout-context">
+    <ng-content></ng-content>
+  </p>
+</div>
diff --git a/modules/ui/src/app/components/callout/callout.component.scss b/modules/ui/src/app/components/callout/callout.component.scss
new file mode 100644
index 000000000..dc7d78e5d
--- /dev/null
+++ b/modules/ui/src/app/components/callout/callout.component.scss
@@ -0,0 +1,69 @@
+/**
+ * Copyright 2023 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+@use '@angular/material' as mat;
+@import '../../../theming/colors';
+@import '../../../theming/variables';
+
+:host {
+  width: 100%;
+}
+
+:host:has(.callout-container.info) {
+  position: absolute;
+}
+
+.callout-container {
+  display: flex;
+  box-sizing: border-box;
+  height: auto;
+  min-height: 48px;
+  padding: 6px 24px;
+  border-radius: 8px;
+  align-items: flex-start;
+  gap: 16px;
+}
+
+.callout-icon {
+  flex-shrink: 0;
+  padding: 4px 0;
+}
+
+.callout-container.info {
+  margin: 24px 32px;
+  background-color: mat.get-color-from-palette($color-primary, 50);
+
+  .callout-icon {
+    color: mat.get-color-from-palette($color-primary, 700);
+  }
+}
+
+.callout-container.warning_amber {
+  background-color: $yellow-50;
+
+  .callout-icon {
+    color: $orange-700;
+  }
+}
+
+.callout-context {
+  margin: 0;
+  padding: 6px 0;
+  color: $grey-800;
+  font-family: $font-secondary;
+  font-size: 14px;
+  line-height: 20px;
+  letter-spacing: 0.2px;
+}
diff --git a/modules/ui/src/app/components/callout/callout.component.spec.ts b/modules/ui/src/app/components/callout/callout.component.spec.ts
new file mode 100644
index 000000000..28215ec7c
--- /dev/null
+++ b/modules/ui/src/app/components/callout/callout.component.spec.ts
@@ -0,0 +1,45 @@
+/**
+ * Copyright 2023 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CalloutComponent } from './callout.component';
+
+describe('CalloutComponent', () => {
+  let component: CalloutComponent;
+  let fixture: ComponentFixture<CalloutComponent>;
+  let compiled: HTMLElement;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [CalloutComponent],
+    }).compileComponents();
+    fixture = TestBed.createComponent(CalloutComponent);
+    component = fixture.componentInstance;
+    component.type = 'mockValue';
+    compiled = fixture.nativeElement as HTMLElement;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should have class provided from type', () => {
+    const calloutContainerdEl = compiled.querySelector('.callout-container');
+
+    expect(calloutContainerdEl?.classList).toContain('mockValue');
+  });
+});
diff --git a/modules/ui/src/app/components/callout/callout.component.ts b/modules/ui/src/app/components/callout/callout.component.ts
new file mode 100644
index 000000000..bfb6ea9bf
--- /dev/null
+++ b/modules/ui/src/app/components/callout/callout.component.ts
@@ -0,0 +1,30 @@
+/**
+ * Copyright 2023 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { MatIconModule } from '@angular/material/icon';
+
+@Component({
+  selector: 'app-callout',
+  standalone: true,
+  imports: [CommonModule, MatIconModule],
+  templateUrl: './callout.component.html',
+  styleUrls: ['./callout.component.scss'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class CalloutComponent {
+  @Input() type = '';
+}
diff --git a/modules/ui/src/app/components/delete-form/delete-form.component.html b/modules/ui/src/app/components/delete-form/delete-form.component.html
new file mode 100644
index 000000000..cafeba26c
--- /dev/null
+++ b/modules/ui/src/app/components/delete-form/delete-form.component.html
@@ -0,0 +1,28 @@
+<!--
+Copyright 2023 Google LLC
+
+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
+
+    https://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.
+-->
+<span class="delete-form-title">{{ data.title }}?</span>
+<p class="delete-form-content">
+  {{ data.content }}
+</p>
+
+<mat-dialog-actions align="end" class="delete-form-actions">
+  <button (click)="cancel()" class="cancel-button" mat-flat-button>
+    Cancel
+  </button>
+  <button (click)="confirm()" class="confirm-button" mat-flat-button>
+    Confirm
+  </button>
+</mat-dialog-actions>
diff --git a/modules/ui/src/app/guards/allow-to-run-test.guard.ts b/modules/ui/src/app/components/delete-form/delete-form.component.scss
similarity index 53%
rename from modules/ui/src/app/guards/allow-to-run-test.guard.ts
rename to modules/ui/src/app/components/delete-form/delete-form.component.scss
index 5b6fe33e5..144c15ea0 100644
--- a/modules/ui/src/app/guards/allow-to-run-test.guard.ts
+++ b/modules/ui/src/app/components/delete-form/delete-form.component.scss
@@ -13,21 +13,31 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {inject} from '@angular/core';
-import {TestRunService} from '../test-run.service';
-import {Router} from '@angular/router';
-import {Device} from '../model/device';
-import {map} from 'rxjs';
+@import '../../../theming/colors';
 
-export const allowToRunTestGuard = () => {
-  const testRunService = inject(TestRunService);
-  const router = inject(Router);
+:host {
+  display: grid;
+  overflow: hidden;
+  width: 570px;
+  padding: 24px 16px 8px 24px;
+  gap: 10px;
+}
 
-  return testRunService.getDevices().pipe(
-    map((devices: Device[] | null) => {
-      return !(devices?.length)
-        ? router.parseUrl('/device-repository')
-        : !!devices;
-    }),
-  );
-};
+.delete-form-title {
+  color: #202124;
+  font-size: 18px;
+  line-height: 24px;
+}
+
+.delete-form-content {
+  font-family: Roboto, sans-serif;
+  font-size: 14px;
+  line-height: 20px;
+  letter-spacing: 0.2px;
+  color: $grey-800;
+}
+
+.delete-form-actions {
+  padding: 0;
+  min-height: 30px;
+}
diff --git a/modules/ui/src/app/components/delete-form/delete-form.component.spec.ts b/modules/ui/src/app/components/delete-form/delete-form.component.spec.ts
new file mode 100644
index 000000000..db70c1d96
--- /dev/null
+++ b/modules/ui/src/app/components/delete-form/delete-form.component.spec.ts
@@ -0,0 +1,99 @@
+/**
+ * Copyright 2023 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { DeleteFormComponent } from './delete-form.component';
+import {
+  MAT_DIALOG_DATA,
+  MatDialogModule,
+  MatDialogRef,
+} from '@angular/material/dialog';
+import { MatButtonModule } from '@angular/material/button';
+import { of } from 'rxjs';
+
+describe('DeleteFormComponent', () => {
+  let component: DeleteFormComponent;
+  let fixture: ComponentFixture<DeleteFormComponent>;
+  let compiled: HTMLElement;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [DeleteFormComponent, MatDialogModule, MatButtonModule],
+      providers: [
+        {
+          provide: MatDialogRef,
+          useValue: {
+            keydownEvents: () => of(new KeyboardEvent('keydown', { code: '' })),
+            close: () => ({}),
+          },
+        },
+        { provide: MAT_DIALOG_DATA, useValue: {} },
+      ],
+    });
+    fixture = TestBed.createComponent(DeleteFormComponent);
+    component = fixture.componentInstance;
+    component.data = {
+      title: 'title',
+      content: 'content',
+    };
+    compiled = fixture.nativeElement as HTMLElement;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should has title', () => {
+    const title = compiled.querySelector('.delete-form-title') as HTMLElement;
+
+    expect(title.innerHTML).toEqual('title?');
+  });
+
+  it('should has content', () => {
+    const content = compiled.querySelector(
+      '.delete-form-content'
+    ) as HTMLElement;
+
+    expect(content.innerHTML.trim()).toEqual('content');
+  });
+
+  it('should close dialog on "cancel" click', () => {
+    const closeSpy = spyOn(component.dialogRef, 'close');
+    const closeButton = compiled.querySelector(
+      '.cancel-button'
+    ) as HTMLButtonElement;
+
+    closeButton?.click();
+
+    expect(closeSpy).toHaveBeenCalledWith();
+
+    closeSpy.calls.reset();
+  });
+
+  it('should close dialog with true on "confirm" click', () => {
+    const closeSpy = spyOn(component.dialogRef, 'close');
+    const confirmButton = compiled.querySelector(
+      '.confirm-button'
+    ) as HTMLButtonElement;
+
+    confirmButton?.click();
+
+    expect(closeSpy).toHaveBeenCalledWith(true);
+
+    closeSpy.calls.reset();
+  });
+});
diff --git a/modules/ui/src/app/components/delete-form/delete-form.component.ts b/modules/ui/src/app/components/delete-form/delete-form.component.ts
new file mode 100644
index 000000000..fcc3dce8d
--- /dev/null
+++ b/modules/ui/src/app/components/delete-form/delete-form.component.ts
@@ -0,0 +1,52 @@
+/**
+ * Copyright 2023 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+import { Component, Inject } from '@angular/core';
+import {
+  MAT_DIALOG_DATA,
+  MatDialogModule,
+  MatDialogRef,
+} from '@angular/material/dialog';
+import { MatButtonModule } from '@angular/material/button';
+import { EscapableDialogComponent } from '../escapable-dialog/escapable-dialog.component';
+
+interface DialogData {
+  title?: string;
+  content?: string;
+}
+
+@Component({
+  selector: 'app-delete-form',
+  templateUrl: './delete-form.component.html',
+  styleUrls: ['./delete-form.component.scss'],
+  standalone: true,
+  imports: [MatDialogModule, MatButtonModule],
+})
+export class DeleteFormComponent extends EscapableDialogComponent {
+  constructor(
+    public override dialogRef: MatDialogRef<DeleteFormComponent>,
+    @Inject(MAT_DIALOG_DATA) public data: DialogData
+  ) {
+    super(dialogRef);
+  }
+
+  confirm() {
+    this.dialogRef.close(true);
+  }
+
+  cancel() {
+    this.dialogRef.close();
+  }
+}
diff --git a/modules/ui/src/app/components/delete-report/delete-report.component.html b/modules/ui/src/app/components/delete-report/delete-report.component.html
new file mode 100644
index 000000000..51458b23b
--- /dev/null
+++ b/modules/ui/src/app/components/delete-report/delete-report.component.html
@@ -0,0 +1,24 @@
+<!--
+Copyright 2023 Google LLC
+
+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
+
+    https://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.
+-->
+<ng-container *ngIf="data">
+  <a
+    class="delete-report-button"
+    href="#"
+    title="Delete report for Test Run # {{ getTestRunId(data) }}"
+    (click)="deleteReport($event)">
+    <ng-content></ng-content>
+  </a>
+</ng-container>
diff --git a/modules/ui/src/app/components/delete-report/delete-report.component.scss b/modules/ui/src/app/components/delete-report/delete-report.component.scss
new file mode 100644
index 000000000..54464931e
--- /dev/null
+++ b/modules/ui/src/app/components/delete-report/delete-report.component.scss
@@ -0,0 +1,26 @@
+/**
+ * Copyright 2023 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+:host {
+  display: inline-block;
+}
+
+.delete-report-button {
+  cursor: pointer;
+  display: inline-block;
+  & ::ng-deep .mdc-icon-button__ripple {
+    display: none;
+  }
+}
diff --git a/modules/ui/src/app/components/delete-report/delete-report.component.spec.ts b/modules/ui/src/app/components/delete-report/delete-report.component.spec.ts
new file mode 100644
index 000000000..766bf8b4e
--- /dev/null
+++ b/modules/ui/src/app/components/delete-report/delete-report.component.spec.ts
@@ -0,0 +1,108 @@
+/**
+ * Copyright 2023 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { DeleteReportComponent } from './delete-report.component';
+import { of } from 'rxjs';
+import { MatDialogModule, MatDialogRef } from '@angular/material/dialog';
+import { DeleteFormComponent } from '../delete-form/delete-form.component';
+import { TestRunService } from '../../services/test-run.service';
+import SpyObj = jasmine.SpyObj;
+import { MOCK_PROGRESS_DATA_COMPLIANT } from '../../mocks/progress.mock';
+
+describe('DeleteReportComponent', () => {
+  let compiled: HTMLElement;
+  let component: DeleteReportComponent;
+  let fixture: ComponentFixture<DeleteReportComponent>;
+  let mockService: SpyObj<TestRunService>;
+
+  beforeEach(() => {
+    mockService = jasmine.createSpyObj(['deleteReport', 'removeReport']);
+    TestBed.configureTestingModule({
+      imports: [DeleteReportComponent, MatDialogModule],
+      providers: [
+        { provide: TestRunService, useValue: mockService },
+        {
+          provide: MatDialogRef,
+          useValue: {
+            close: () => ({}),
+          },
+        },
+      ],
+    });
+    fixture = TestBed.createComponent(DeleteReportComponent);
+    component = fixture.componentInstance;
+    component.data = MOCK_PROGRESS_DATA_COMPLIANT;
+    compiled = fixture.nativeElement as HTMLElement;
+  });
+
+  describe('Class tests', () => {
+    it('should create', () => {
+      expect(component).toBeTruthy();
+    });
+
+    it('#deleteReport should open delete dialog', () => {
+      spyOn(component.dialog, 'open').and.returnValue({
+        afterClosed: () => of(true),
+      } as MatDialogRef<typeof DeleteFormComponent>);
+      mockService.deleteReport.and.returnValue(of(true));
+      mockService.removeReport.and.callThrough();
+
+      component.deleteReport(new Event('click'));
+
+      expect(mockService.deleteReport).toHaveBeenCalledWith(
+        '01:02:03:04:05:06',
+        '2023-06-22T09:20:00.123Z'
+      );
+      expect(mockService.removeReport).toHaveBeenCalledWith(
+        '01:02:03:04:05:06',
+        '2023-06-22T09:20:00.123Z'
+      );
+    });
+  });
+
+  describe('DOM tests', () => {
+    describe('with not data provided', () => {
+      beforeEach(() => {
+        (component.data as unknown) = null;
+        fixture.detectChanges();
+      });
+
+      it('should not have content', () => {
+        const deleteReportButton = compiled.querySelector(
+          '.delete-report-button'
+        );
+
+        expect(deleteReportButton).toBeNull();
+      });
+    });
+
+    describe('with data provided', () => {
+      beforeEach(() => {
+        component.data = MOCK_PROGRESS_DATA_COMPLIANT;
+        fixture.detectChanges();
+      });
+
+      it('should have delete report button', () => {
+        const deleteReportButton = compiled.querySelector(
+          '.delete-report-button'
+        );
+
+        expect(deleteReportButton).toBeTruthy();
+      });
+    });
+  });
+});
diff --git a/modules/ui/src/app/components/delete-report/delete-report.component.ts b/modules/ui/src/app/components/delete-report/delete-report.component.ts
new file mode 100644
index 000000000..16d82ac52
--- /dev/null
+++ b/modules/ui/src/app/components/delete-report/delete-report.component.ts
@@ -0,0 +1,83 @@
+/**
+ * Copyright 2023 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+import { ChangeDetectionStrategy, Component, OnDestroy } from '@angular/core';
+import { CommonModule, DatePipe } from '@angular/common';
+import { MatButtonModule } from '@angular/material/button';
+import { ReportActionComponent } from '../report-action/report-action.component';
+import { TestRunService } from '../../services/test-run.service';
+import { MatDialog } from '@angular/material/dialog';
+import { DeleteFormComponent } from '../delete-form/delete-form.component';
+import { takeUntil } from 'rxjs/internal/operators/takeUntil';
+import { Subject } from 'rxjs';
+
+@Component({
+  selector: 'app-delete-report',
+  standalone: true,
+  imports: [CommonModule, MatButtonModule],
+  templateUrl: './delete-report.component.html',
+  styleUrls: ['./delete-report.component.scss'],
+  providers: [DatePipe],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class DeleteReportComponent
+  extends ReportActionComponent
+  implements OnDestroy
+{
+  private destroy$: Subject<boolean> = new Subject<boolean>();
+  constructor(
+    private testRunService: TestRunService,
+    public dialog: MatDialog,
+    datePipe: DatePipe
+  ) {
+    super(datePipe);
+  }
+
+  ngOnDestroy() {
+    this.destroy$.next(true);
+    this.destroy$.unsubscribe();
+  }
+
+  deleteReport(event: Event) {
+    event.preventDefault();
+    const dialogRef = this.dialog.open(DeleteFormComponent, {
+      ariaLabel: 'Delete report',
+      data: {
+        title: 'Delete report',
+        content: this.getTestRunId(this.data),
+      },
+      autoFocus: true,
+      hasBackdrop: true,
+      disableClose: true,
+      panelClass: 'delete-form-dialog',
+    });
+
+    dialogRef
+      ?.afterClosed()
+      .pipe(takeUntil(this.destroy$))
+      .subscribe(deleteReport => {
+        if (deleteReport) {
+          this.testRunService
+            .deleteReport(this.data.device.mac_addr, this.data.started || '')
+            .subscribe(() => {
+              this.testRunService.removeReport(
+                this.data.device.mac_addr,
+                this.data.started || ''
+              );
+            });
+        }
+      });
+  }
+}
diff --git a/modules/ui/src/app/components/device-item/device-item.component.html b/modules/ui/src/app/components/device-item/device-item.component.html
index 535eb66c8..19683b6f1 100644
--- a/modules/ui/src/app/components/device-item/device-item.component.html
+++ b/modules/ui/src/app/components/device-item/device-item.component.html
@@ -13,11 +13,20 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<button (click)="itemClick()" [attr.aria-label]="'Edit device {{device.model}}'"
-        class="device-item" type="button">
-  <div [attr.aria-label]="device.model" class="item-name">{{device.model}}</div>
-  <div [attr.aria-label]="device.manufacturer"
-       class="item-manufacturer">{{device.manufacturer}}</div>
-  <div [attr.aria-label]="device.mac_addr" class="item-mac-address">{{device.mac_addr}}</div>
-  <div aria-label="Device icon" class="item-icon"></div>
+<button
+  [tabIndex]="tabIndex"
+  (click)="itemClick()"
+  [attr.aria-label]="label"
+  class="device-item"
+  type="button">
+  <div [attr.aria-label]="device.model" class="item-name">
+    {{ device.model }}
+  </div>
+  <div [attr.aria-label]="device.manufacturer" class="item-manufacturer">
+    {{ device.manufacturer }}
+  </div>
+  <div [attr.aria-label]="device.mac_addr" class="item-mac-address">
+    {{ device.mac_addr }}
+  </div>
+  <div class="item-icon"></div>
 </button>
diff --git a/modules/ui/src/app/components/device-item/device-item.component.scss b/modules/ui/src/app/components/device-item/device-item.component.scss
index 51713ba78..4e9e88b49 100644
--- a/modules/ui/src/app/components/device-item/device-item.component.scss
+++ b/modules/ui/src/app/components/device-item/device-item.component.scss
@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@import "../../../theming/colors";
-@import "../../../theming/variables";
+@import '../../../theming/colors';
+@import '../../../theming/variables';
 
 $icon-width: 80px;
 $border-radius: 12px;
@@ -23,7 +23,7 @@ $border-radius: 12px;
   display: grid;
   width: $device-item-width;
   border-radius: $border-radius;
-  border: 1px solid #C4C7C5;
+  border: 1px solid #c4c7c5;
   background: $white;
   box-sizing: border-box;
   grid-template-columns: 1fr 1fr $icon-width;
@@ -32,8 +32,8 @@ $border-radius: 12px;
   grid-row-gap: 4px;
   font-family: 'Open Sans', sans-serif;
   grid-template-areas:
-    "name name icon"
-    "manufacturer address icon";
+    'name name icon'
+    'manufacturer address icon';
 
   &:hover {
     cursor: pointer;
@@ -45,7 +45,7 @@ $border-radius: 12px;
   grid-area: name;
   justify-self: start;
   align-self: end;
-  color: #1F1F1F;
+  color: #1f1f1f;
   justify-content: start;
   font-size: 16px;
   font-weight: 500;
@@ -87,7 +87,7 @@ $border-radius: 12px;
   grid-area: icon;
   width: $icon-width;
   height: calc($icon-width - 2px);
-  background-color: #E8F0FE;
+  background-color: #e8f0fe;
   justify-self: end;
   border-top-right-radius: $border-radius;
   border-bottom-right-radius: $border-radius;
diff --git a/modules/ui/src/app/components/device-item/device-item.component.spec.ts b/modules/ui/src/app/components/device-item/device-item.component.spec.ts
index cb83ebb4b..2105fd66e 100644
--- a/modules/ui/src/app/components/device-item/device-item.component.spec.ts
+++ b/modules/ui/src/app/components/device-item/device-item.component.spec.ts
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {ComponentFixture, TestBed} from '@angular/core/testing';
-import {Device} from '../../model/device';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { Device } from '../../model/device';
 
-import {DeviceItemComponent} from './device-item.component';
-import {DeviceRepositoryModule} from '../../device-repository/device-repository.module';
+import { DeviceItemComponent } from './device-item.component';
+import { DeviceRepositoryModule } from '../../device-repository/device-repository.module';
 
 describe('DeviceItemComponent', () => {
   let component: DeviceItemComponent;
@@ -26,20 +26,20 @@ describe('DeviceItemComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [DeviceRepositoryModule, DeviceItemComponent]
+      imports: [DeviceRepositoryModule, DeviceItemComponent],
     });
     fixture = TestBed.createComponent(DeviceItemComponent);
     component = fixture.componentInstance;
     compiled = fixture.nativeElement as HTMLElement;
     component.device = {
-      "manufacturer": "Delta",
-      "model": "O3-DIN-CPU",
-      "mac_addr": "00:1e:42:35:73:c4",
-      "test_modules": {
-        "dns": {
-          "enabled": true,
-        }
-      }
+      manufacturer: 'Delta',
+      model: 'O3-DIN-CPU',
+      mac_addr: '00:1e:42:35:73:c4',
+      test_modules: {
+        dns: {
+          enabled: true,
+        },
+      },
     } as Device;
     fixture.detectChanges();
   });
@@ -53,9 +53,9 @@ describe('DeviceItemComponent', () => {
     const manufacturer = compiled.querySelector('.item-manufacturer');
     const mac = compiled.querySelector('.item-mac-address');
 
-    expect(name?.textContent).toEqual("O3-DIN-CPU");
-    expect(manufacturer?.textContent).toEqual("Delta");
-    expect(mac?.textContent).toEqual("00:1e:42:35:73:c4");
+    expect(name?.textContent?.trim()).toEqual('O3-DIN-CPU');
+    expect(manufacturer?.textContent?.trim()).toEqual('Delta');
+    expect(mac?.textContent?.trim()).toEqual('00:1e:42:35:73:c4');
   });
 
   it('should emit mac address', () => {
@@ -65,4 +65,12 @@ describe('DeviceItemComponent', () => {
 
     expect(clickSpy).toHaveBeenCalledWith(component.device);
   });
+
+  it('should have tabindex', () => {
+    component.tabIndex = -2;
+    fixture.detectChanges();
+    const item = compiled.querySelector('.device-item') as HTMLElement;
+
+    expect(item.tabIndex).toBe(-2);
+  });
 });
diff --git a/modules/ui/src/app/components/device-item/device-item.component.ts b/modules/ui/src/app/components/device-item/device-item.component.ts
index 757d4cbe1..a72d2516d 100644
--- a/modules/ui/src/app/components/device-item/device-item.component.ts
+++ b/modules/ui/src/app/components/device-item/device-item.component.ts
@@ -13,20 +13,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {Component, EventEmitter, Input, Output} from '@angular/core';
-import {Device} from '../../model/device';
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { Device } from '../../model/device';
 
 @Component({
   selector: 'app-device-item',
   templateUrl: './device-item.component.html',
   styleUrls: ['./device-item.component.scss'],
-  standalone: true
+  standalone: true,
 })
 export class DeviceItemComponent {
   @Input() device!: Device;
+  @Input() tabIndex = 0;
   @Output() itemClicked = new EventEmitter<Device>();
 
   itemClick(): void {
     this.itemClicked.emit(this.device);
   }
+
+  get label() {
+    return `${this.device.model} ${this.device.manufacturer} ${this.device.mac_addr}`;
+  }
 }
diff --git a/modules/ui/src/app/components/device-tests/device-tests.component.html b/modules/ui/src/app/components/device-tests/device-tests.component.html
index 7c8cbbf28..7f939de9a 100644
--- a/modules/ui/src/app/components/device-tests/device-tests.component.html
+++ b/modules/ui/src/app/components/device-tests/device-tests.component.html
@@ -13,12 +13,17 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<form [class.disabled]="disabled" [formGroup]="deviceForm">
+<form [formGroup]="deviceForm" class="device-tests-form">
+  <p class="device-tests-title">Test modules</p>
+  <p class="device-tests-description">
+    All modules are required to pass for qualification
+  </p>
   <section class="device-form-test-modules" formArrayName="test_modules">
-    <p class="device-tests-title">Device options</p>
-    <p *ngFor="let test of test_modules.controls; let i = index">
-      <mat-checkbox [formControlName]="i">
-        {{testModules[i].displayName}}
+    <p
+      *ngFor="let test of test_modules.controls; let i = index"
+      [class.disabled]="disabled">
+      <mat-checkbox [formControlName]="i" [tabIndex]="disabled ? -1 : 0">
+        {{ testModules[i].displayName }}
       </mat-checkbox>
     </p>
   </section>
diff --git a/modules/ui/src/app/components/device-tests/device-tests.component.scss b/modules/ui/src/app/components/device-tests/device-tests.component.scss
index a37d0e320..e7529f269 100644
--- a/modules/ui/src/app/components/device-tests/device-tests.component.scss
+++ b/modules/ui/src/app/components/device-tests/device-tests.component.scss
@@ -13,10 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@import "../../../theming/colors";
+@import '../../../theming/colors';
+@import '../../../theming/variables';
 
 :host {
-  overflow: auto;
+  overflow: hidden;
+}
+
+.device-tests-form {
+  height: 100%;
+  display: grid;
+  grid-template-rows: repeat(3, auto);
 }
 
 .disabled {
@@ -25,8 +32,21 @@
 }
 
 .device-tests-title {
-  margin-top: 20px;
+  margin: 20px 0 8px;
   font-size: 18px;
   line-height: 24px;
   color: $grey-800;
 }
+
+.device-tests-description {
+  margin: 0;
+  font-family: $font-secondary;
+  font-size: 14px;
+  line-height: 20px;
+  letter-spacing: 0.2px;
+  color: $grey-800;
+}
+
+.device-form-test-modules {
+  overflow: auto;
+}
diff --git a/modules/ui/src/app/components/device-tests/device-tests.component.spec.ts b/modules/ui/src/app/components/device-tests/device-tests.component.spec.ts
index b038d533e..0599af372 100644
--- a/modules/ui/src/app/components/device-tests/device-tests.component.spec.ts
+++ b/modules/ui/src/app/components/device-tests/device-tests.component.spec.ts
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {ComponentFixture, TestBed} from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import {DeviceTestsComponent} from './device-tests.component';
-import {TestModule} from '../../model/device';
-import {FormArray, FormBuilder} from '@angular/forms';
+import { DeviceTestsComponent } from './device-tests.component';
+import { TestModule } from '../../model/device';
+import { FormArray, FormBuilder } from '@angular/forms';
 
 describe('DeviceTestsComponent', () => {
   let component: DeviceTestsComponent;
@@ -27,32 +27,33 @@ describe('DeviceTestsComponent', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [DeviceTestsComponent],
-      providers: [
-        FormBuilder
-      ]
+      providers: [FormBuilder],
     });
     fixture = TestBed.createComponent(DeviceTestsComponent);
     component = fixture.componentInstance;
     component.testModules = [
       {
-        displayName: "Connection",
-        name: "connection",
-        enabled: true
+        displayName: 'Connection',
+        name: 'connection',
+        enabled: true,
       },
       {
-        displayName: "DNS",
-        name: "dns",
-        enabled: false
+        displayName: 'DNS',
+        name: 'dns',
+        enabled: false,
       },
     ] as TestModule[];
     component.deviceForm = new FormBuilder().group({
-      test_modules: new FormArray([])
+      test_modules: new FormArray([]),
     });
-    fixture.detectChanges();
     compiled = fixture.nativeElement;
   });
 
   describe('component tests', () => {
+    beforeEach(() => {
+      fixture.detectChanges();
+    });
+
     it('should create', () => {
       expect(component).toBeTruthy();
     });
@@ -65,24 +66,25 @@ describe('DeviceTestsComponent', () => {
 
     it('should fill tests with device test values if device not present', () => {
       component.deviceTestModules = {
-        "connection": {
-          "enabled": false,
+        connection: {
+          enabled: false,
+        },
+        dns: {
+          enabled: true,
         },
-        "dns": {
-          "enabled": true,
-        }
       };
       component.ngOnInit();
 
       expect(component.test_modules.controls[0].value).toEqual(false);
       expect(component.test_modules.controls[1].value).toEqual(true);
     });
-  })
+  });
 
   describe('DOM tests', () => {
     it('should have checkboxes', () => {
-      const test = compiled.querySelectorAll('mat-checkbox input')!;
-      const testLabel = compiled.querySelectorAll('mat-checkbox label')!;
+      fixture.detectChanges();
+      const test = compiled.querySelectorAll('mat-checkbox input');
+      const testLabel = compiled.querySelectorAll('mat-checkbox label');
 
       expect(test.length).toEqual(2);
       expect((test[0] as HTMLInputElement).checked).toBeTrue();
@@ -90,5 +92,21 @@ describe('DeviceTestsComponent', () => {
       expect(testLabel[0].innerHTML.trim()).toEqual('Connection');
       expect(testLabel[1].innerHTML.trim()).toEqual('DNS');
     });
+
+    it('should have tabindex -1 if disabled', () => {
+      component.disabled = true;
+      fixture.detectChanges();
+      const test = compiled.querySelectorAll('mat-checkbox input');
+
+      expect((test[0] as HTMLElement).tabIndex).toEqual(-1);
+    });
+
+    it('should have tabindex 0 if enabled', () => {
+      component.disabled = false;
+      fixture.detectChanges();
+      const test = compiled.querySelectorAll('mat-checkbox input');
+
+      expect((test[0] as HTMLElement).tabIndex).toEqual(0);
+    });
   });
 });
diff --git a/modules/ui/src/app/components/device-tests/device-tests.component.ts b/modules/ui/src/app/components/device-tests/device-tests.component.ts
index 1d0475a0b..58e1a3c4d 100644
--- a/modules/ui/src/app/components/device-tests/device-tests.component.ts
+++ b/modules/ui/src/app/components/device-tests/device-tests.component.ts
@@ -13,19 +13,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {ChangeDetectionStrategy, Component, Input, OnInit} from '@angular/core';
-import {CommonModule} from '@angular/common';
-import {FormArray, FormControl, FormGroup, ReactiveFormsModule} from '@angular/forms';
-import {TestModule, TestModules} from '../../model/device';
-import {MatCheckboxModule} from '@angular/material/checkbox';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import { CommonModule } from '@angular/common';
+import {
+  FormArray,
+  FormControl,
+  FormGroup,
+  ReactiveFormsModule,
+} from '@angular/forms';
+import { TestModule, TestModules } from '../../model/device';
+import { MatCheckboxModule } from '@angular/material/checkbox';
 
 @Component({
   selector: 'app-device-tests',
   standalone: true,
-  imports: [CommonModule, MatCheckboxModule, ReactiveFormsModule,],
+  imports: [CommonModule, MatCheckboxModule, ReactiveFormsModule],
   templateUrl: './device-tests.component.html',
   styleUrls: ['./device-tests.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class DeviceTestsComponent implements OnInit {
   @Input() deviceForm!: FormGroup;
@@ -35,18 +45,22 @@ export class DeviceTestsComponent implements OnInit {
   @Input() disabled = false;
 
   get test_modules() {
-    return this.deviceForm?.controls['test_modules']! as FormArray;
+    return this.deviceForm?.controls['test_modules'] as FormArray;
   }
 
   ngOnInit() {
-    this.fillTestModulesFormControls()
+    this.fillTestModulesFormControls();
   }
 
   fillTestModulesFormControls() {
     this.test_modules.controls = [];
     if (this.deviceTestModules) {
       this.testModules.forEach(test => {
-        this.test_modules.push(new FormControl(this.deviceTestModules![test.name]?.enabled || false));
+        this.test_modules.push(
+          new FormControl(
+            (this.deviceTestModules as TestModules)[test.name]?.enabled || false
+          )
+        );
       });
     } else {
       this.testModules.forEach(test => {
@@ -54,5 +68,4 @@ export class DeviceTestsComponent implements OnInit {
       });
     }
   }
-
 }
diff --git a/modules/ui/src/app/components/download-report/download-report.component.html b/modules/ui/src/app/components/download-report/download-report.component.html
index edb142486..fb84bbf7d 100644
--- a/modules/ui/src/app/components/download-report/download-report.component.html
+++ b/modules/ui/src/app/components/download-report/download-report.component.html
@@ -16,11 +16,10 @@
 <ng-container *ngIf="data">
   <a
     class="download-report-link"
-    download="{{getReportTitle(data)}}"
-    href="{{data.report}}"
+    download="{{ getReportTitle(data) }}"
+    href="{{ data.report }}"
     target="_blank"
-    title="Download report for Test Run # {{getTestRunId(data)}}"
-  >
+    title="Download report for Test Run # {{ getTestRunId(data) }}">
     <ng-content></ng-content>
   </a>
 </ng-container>
diff --git a/modules/ui/src/app/components/download-report/download-report.component.spec.ts b/modules/ui/src/app/components/download-report/download-report.component.spec.ts
index 454ce564e..40acf92b0 100644
--- a/modules/ui/src/app/components/download-report/download-report.component.spec.ts
+++ b/modules/ui/src/app/components/download-report/download-report.component.spec.ts
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {ComponentFixture, TestBed} from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import {DownloadReportComponent} from './download-report.component';
-import {MOCK_PROGRESS_DATA_COMPLIANT} from '../../mocks/progress.mock';
+import { DownloadReportComponent } from './download-report.component';
+import { MOCK_PROGRESS_DATA_COMPLIANT } from '../../mocks/progress.mock';
 
 describe('DownloadReportComponent', () => {
   let component: DownloadReportComponent;
@@ -25,7 +25,7 @@ describe('DownloadReportComponent', () => {
   describe('Class tests', () => {
     beforeEach(() => {
       TestBed.configureTestingModule({
-        imports: [DownloadReportComponent]
+        imports: [DownloadReportComponent],
       });
       fixture = TestBed.createComponent(DownloadReportComponent);
       component = fixture.componentInstance;
@@ -35,37 +35,14 @@ describe('DownloadReportComponent', () => {
       expect(component).toBeTruthy();
     });
 
-    it('#getTestRunId should return data for title of link', () => {
-      const expectedResult = 'Delta 03-DIN-CPU 1.2.2 22 Jun 2023 9:20';
-
-      const result = component.getTestRunId(MOCK_PROGRESS_DATA_COMPLIANT);
-
-      expect(result).toEqual(expectedResult);
-    });
-
     it('#getReportTitle should return data for download property of link', () => {
-      const expectedResult = 'delta_03-din-cpu_1.2.2_compliant_22_jun_2023_9:20';
+      const expectedResult =
+        'delta_03-din-cpu_1.2.2_compliant_22_jun_2023_9:20';
 
       const result = component.getReportTitle(MOCK_PROGRESS_DATA_COMPLIANT);
 
       expect(result).toEqual(expectedResult);
     });
-
-    it('#getFormattedDateString should return date as string in the format "d MMM y H:mm"', () => {
-      const expectedResult = '22 Jun 2023 9:20';
-
-      const result = component.getFormattedDateString(MOCK_PROGRESS_DATA_COMPLIANT.started);
-
-      expect(result).toEqual(expectedResult);
-    });
-
-    it('#getFormattedDateString should return empty string when no date', () => {
-      const expectedResult = '';
-
-      const result = component.getFormattedDateString(null);
-
-      expect(result).toEqual(expectedResult);
-    });
   });
 
   describe('DOM tests', () => {
@@ -73,7 +50,7 @@ describe('DownloadReportComponent', () => {
 
     beforeEach(async () => {
       await TestBed.configureTestingModule({
-        imports: [DownloadReportComponent]
+        imports: [DownloadReportComponent],
       }).compileComponents();
       fixture = TestBed.createComponent(DownloadReportComponent);
       compiled = fixture.nativeElement as HTMLElement;
@@ -82,12 +59,14 @@ describe('DownloadReportComponent', () => {
 
     describe('with not data provided', () => {
       beforeEach(() => {
-        (component.data as any) = null;
+        (component.data as unknown) = null;
         fixture.detectChanges();
       });
 
       it('should not have content', () => {
-        const downloadReportLink = compiled.querySelector('.download-report-link');
+        const downloadReportLink = compiled.querySelector(
+          '.download-report-link'
+        );
 
         expect(downloadReportLink).toBeNull();
       });
@@ -95,19 +74,26 @@ describe('DownloadReportComponent', () => {
 
     describe('with data provided', () => {
       beforeEach(() => {
-        (component.data) = MOCK_PROGRESS_DATA_COMPLIANT;
+        component.data = MOCK_PROGRESS_DATA_COMPLIANT;
         fixture.detectChanges();
       });
 
       it('should have download report link', () => {
-        const downloadReportLink = compiled.querySelector('.download-report-link') as HTMLAnchorElement;
+        const downloadReportLink = compiled.querySelector(
+          '.download-report-link'
+        ) as HTMLAnchorElement;
 
         expect(downloadReportLink).not.toBeNull();
-        expect(downloadReportLink.href).toEqual('https://api.testrun.io/report.pdf');
-        expect(downloadReportLink.download).toEqual('delta_03-din-cpu_1.2.2_compliant_22_jun_2023_9:20');
-        expect(downloadReportLink.title).toEqual('Download report for Test Run # Delta 03-DIN-CPU 1.2.2 22 Jun 2023 9:20');
+        expect(downloadReportLink.href).toEqual(
+          'https://api.testrun.io/report.pdf'
+        );
+        expect(downloadReportLink.download).toEqual(
+          'delta_03-din-cpu_1.2.2_compliant_22_jun_2023_9:20'
+        );
+        expect(downloadReportLink.title).toEqual(
+          'Download report for Test Run # Delta 03-DIN-CPU 1.2.2 22 Jun 2023 9:20'
+        );
       });
     });
   });
-
 });
diff --git a/modules/ui/src/app/components/download-report/download-report.component.ts b/modules/ui/src/app/components/download-report/download-report.component.ts
index eb8e2e3b5..13c735115 100644
--- a/modules/ui/src/app/components/download-report/download-report.component.ts
+++ b/modules/ui/src/app/components/download-report/download-report.component.ts
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {ChangeDetectionStrategy, Component, Input} from '@angular/core';
-import {TestrunStatus} from '../../model/testrun-status';
-import {CommonModule, DatePipe} from '@angular/common';
+import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { TestrunStatus } from '../../model/testrun-status';
+import { CommonModule, DatePipe } from '@angular/common';
+import { ReportActionComponent } from '../report-action/report-action.component';
 
 @Component({
   selector: 'app-download-report',
@@ -24,24 +25,14 @@ import {CommonModule, DatePipe} from '@angular/common';
   standalone: true,
   imports: [CommonModule],
   providers: [DatePipe],
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class DownloadReportComponent {
-  @Input() data!: TestrunStatus;
-
-  constructor(private datePipe: DatePipe) {
-  }
-
-  getTestRunId(data: TestrunStatus) {
-    return `${data.device.manufacturer} ${data.device.model} ${data.device.firmware} ${this.getFormattedDateString(data.started)}`;
-  }
-
+export class DownloadReportComponent extends ReportActionComponent {
   getReportTitle(data: TestrunStatus) {
-    return `${data.device.manufacturer} ${data.device.model} ${data.device.firmware} ${data.status} ${this.getFormattedDateString(data.started)}`.replace(/ /g, "_").toLowerCase();
-  }
-
-  getFormattedDateString(date: string | null) {
-    return date ? this.datePipe.transform(date, 'd MMM y H:mm') : '';
+    return `${data.device.manufacturer} ${data.device.model} ${
+      data.device.firmware
+    } ${data.status} ${this.getFormattedDateString(data.started)}`
+      .replace(/ /g, '_')
+      .toLowerCase();
   }
-
 }
diff --git a/modules/ui/src/app/components/escapable-dialog/escapable-dialog.component.spec.ts b/modules/ui/src/app/components/escapable-dialog/escapable-dialog.component.spec.ts
new file mode 100644
index 000000000..5d18f9b3a
--- /dev/null
+++ b/modules/ui/src/app/components/escapable-dialog/escapable-dialog.component.spec.ts
@@ -0,0 +1,72 @@
+/**
+ * Copyright 2023 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { EscapableDialogComponent } from './escapable-dialog.component';
+import { MatDialogRef } from '@angular/material/dialog';
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+
+describe('EscapableDialogComponent', () => {
+  let component: EscapableDialogComponent;
+  let fixture: ComponentFixture<EscapableDialogComponent>;
+  const keyboardEvent = new BehaviorSubject<KeyboardEvent>(
+    new KeyboardEvent('keydown', { code: '' })
+  );
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [EscapableDialogComponent],
+      providers: [
+        {
+          provide: MatDialogRef,
+          useValue: {
+            keydownEvents: () => keyboardEvent.asObservable(),
+            close: () => ({}),
+          },
+        },
+      ],
+    });
+    fixture = TestBed.createComponent(EscapableDialogComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should close dialog on escape', () => {
+    const closeSpy = spyOn(component.dialogRef, 'close');
+
+    keyboardEvent.next(new KeyboardEvent('keydown', { code: 'Escape' }));
+    fixture.detectChanges();
+
+    expect(closeSpy).toHaveBeenCalled();
+
+    closeSpy.calls.reset();
+  });
+
+  it('should not close dialog on enter', () => {
+    const closeSpy = spyOn(component.dialogRef, 'close');
+
+    keyboardEvent.next(new KeyboardEvent('keydown', { code: 'Enter' }));
+    fixture.detectChanges();
+
+    expect(closeSpy).not.toHaveBeenCalled();
+
+    closeSpy.calls.reset();
+  });
+});
diff --git a/modules/ui/src/app/components/escapable-dialog/escapable-dialog.component.ts b/modules/ui/src/app/components/escapable-dialog/escapable-dialog.component.ts
new file mode 100644
index 000000000..d1a842dab
--- /dev/null
+++ b/modules/ui/src/app/components/escapable-dialog/escapable-dialog.component.ts
@@ -0,0 +1,39 @@
+/**
+ * Copyright 2023 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+import { Component } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { filter, take } from 'rxjs';
+import { MatDialogRef } from '@angular/material/dialog';
+
+@Component({
+  selector: 'app-escapable-dialog',
+  standalone: true,
+  imports: [CommonModule],
+  template: '',
+})
+export class EscapableDialogComponent {
+  constructor(public dialogRef: MatDialogRef<EscapableDialogComponent>) {
+    this.dialogRef
+      .keydownEvents()
+      .pipe(
+        filter((e: KeyboardEvent) => e.code === 'Escape'),
+        take(1)
+      )
+      .subscribe(() => {
+        dialogRef.close();
+      });
+  }
+}
diff --git a/modules/ui/src/app/components/filter-chips/filter-chips.component.html b/modules/ui/src/app/components/filter-chips/filter-chips.component.html
new file mode 100644
index 000000000..512862023
--- /dev/null
+++ b/modules/ui/src/app/components/filter-chips/filter-chips.component.html
@@ -0,0 +1,47 @@
+<!--
+Copyright 2023 Google LLC
+
+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
+
+    https://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.
+-->
+<mat-chip-set aria-label="Filters" role="grid">
+  <ng-container *ngFor="let item of filters | keyvalue">
+    <mat-chip-row
+      tabindex="0"
+      class="filter-chip"
+      *ngIf="!isValueEmpty(item.value)"
+      (removed)="clearFilter(item.key)">
+      <ng-container *ngIf="item.key === 'deviceInfo'">Device</ng-container>
+      <ng-container *ngIf="item.key === 'deviceFirmware'">
+        Firmware
+      </ng-container>
+      {{ item.value }}
+      <button
+        class="filter-chip-remove"
+        [attr.aria-label]="'clear filter ' + item.value"
+        matChipRemove
+        [tabIndex]="0">
+        <mat-icon fontSet="material-icons-outlined">close</mat-icon>
+      </button>
+    </mat-chip-row>
+  </ng-container>
+</mat-chip-set>
+<a
+  type="button"
+  (click)="clearAllFilters()"
+  (keydown.enter)="clearAllFilters()"
+  (keydown.space)="clearAllFilters()"
+  aria-label="Clear all filters"
+  class="clear-all"
+  tabindex="0"
+  >Clear all filters</a
+>
diff --git a/modules/ui/src/app/components/filter-chips/filter-chips.component.scss b/modules/ui/src/app/components/filter-chips/filter-chips.component.scss
new file mode 100644
index 000000000..3b3eeddb0
--- /dev/null
+++ b/modules/ui/src/app/components/filter-chips/filter-chips.component.scss
@@ -0,0 +1,60 @@
+/**
+ * Copyright 2023 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+@import '../../../theming/colors';
+
+:host {
+  display: flex;
+}
+
+.clear-all {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 0 16px;
+  cursor: pointer;
+  color: $primary;
+  font-weight: 400;
+  height: 32px;
+  margin: 4px 0 4px 8px;
+  border-radius: 16px;
+  flex-shrink: 0;
+}
+
+.filter-chip.mat-mdc-chip {
+  background: $white;
+  border: 1px solid $primary;
+}
+
+.filter-chip.mat-mdc-chip ::ng-deep .mat-mdc-chip-action-label {
+  color: $primary;
+  font-weight: 500;
+}
+
+.filter-chip.mat-mdc-chip ::ng-deep .mat-mdc-chip-remove {
+  color: $primary;
+}
+
+.filter-chip.cdk-keyboard-focused,
+.filter-chip-remove:focus-visible {
+  outline: $black solid 2px;
+}
+
+.filter-chip .filter-chip-remove {
+  margin: 0 8px;
+  padding-left: 0;
+  padding-right: 0;
+  border-radius: 8px;
+}
diff --git a/modules/ui/src/app/components/filter-chips/filter-chips.component.spec.ts b/modules/ui/src/app/components/filter-chips/filter-chips.component.spec.ts
new file mode 100644
index 000000000..34cb9459f
--- /dev/null
+++ b/modules/ui/src/app/components/filter-chips/filter-chips.component.spec.ts
@@ -0,0 +1,138 @@
+/**
+ * Copyright 2023 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { FilterChipsComponent } from './filter-chips.component';
+
+describe('FilterChipsComponent', () => {
+  let component: FilterChipsComponent;
+  let fixture: ComponentFixture<FilterChipsComponent>;
+  let compiled: HTMLElement;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [FilterChipsComponent],
+    });
+    fixture = TestBed.createComponent(FilterChipsComponent);
+    component = fixture.componentInstance;
+    compiled = fixture.nativeElement as HTMLElement;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  describe('DOM tests', () => {
+    describe('"Clear all filters" button', () => {
+      it('should exist', () => {
+        const button = compiled.querySelector('.clear-all');
+
+        expect(button).toBeTruthy();
+      });
+
+      it('should clear all filters on click', () => {
+        const clearAllFiltersSpy = spyOn(component, 'clearAllFilters');
+        const button = compiled.querySelector(
+          '.clear-all'
+        ) as HTMLButtonElement;
+        button.click();
+
+        expect(clearAllFiltersSpy).toHaveBeenCalled();
+      });
+    });
+
+    describe('filter chips', () => {
+      describe('with no filter data', () => {
+        beforeEach(() => {
+          component.filters = {
+            deviceInfo: '',
+            deviceFirmware: '',
+            results: [],
+            dateRange: '',
+          };
+          fixture.detectChanges();
+        });
+        it('should not be displayed', () => {
+          const chips = compiled.querySelectorAll('.filter-chip');
+
+          expect(chips.length).toEqual(0);
+        });
+      });
+
+      describe('with filter data', () => {
+        beforeEach(() => {
+          component.filters = {
+            deviceInfo: 'Delta',
+            deviceFirmware: '03',
+            results: ['Compliant'],
+            dateRange: '',
+          };
+          fixture.detectChanges();
+        });
+        it('should be displayed', () => {
+          const chips = compiled.querySelectorAll('.filter-chip');
+
+          expect(chips.length).toEqual(3);
+        });
+
+        it('should call clearFilter on close button click', () => {
+          const clearFilterSpy = spyOn(component, 'clearFilter');
+          const chipRemoveButtons = compiled.querySelectorAll(
+            '.filter-chip button'
+          );
+          (chipRemoveButtons[1] as HTMLButtonElement).click();
+
+          expect(clearFilterSpy).toHaveBeenCalledWith('deviceInfo');
+        });
+      });
+    });
+  });
+
+  describe('Class tests', () => {
+    beforeEach(() => {
+      component.filters = {
+        deviceInfo: 'Delta',
+        deviceFirmware: '03',
+        results: ['Compliant'],
+        dateRange: '',
+      };
+      fixture.detectChanges();
+    });
+
+    it('should clear filters on clearAllFilters', () => {
+      component.clearAllFilters();
+
+      expect(component.filters).toEqual({
+        deviceInfo: '',
+        deviceFirmware: '',
+        results: [],
+        dateRange: '',
+      });
+    });
+
+    it('should filter by kay on clearFilter', () => {
+      component.clearFilter('deviceInfo');
+
+      expect(component.filters).toEqual({
+        deviceInfo: '',
+        deviceFirmware: '03',
+        results: ['Compliant'],
+        dateRange: '',
+      });
+    });
+  });
+});
diff --git a/modules/ui/src/app/components/filter-chips/filter-chips.component.ts b/modules/ui/src/app/components/filter-chips/filter-chips.component.ts
new file mode 100644
index 000000000..3a6d0c9e3
--- /dev/null
+++ b/modules/ui/src/app/components/filter-chips/filter-chips.component.ts
@@ -0,0 +1,66 @@
+/**
+ * Copyright 2023 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { MatIconModule } from '@angular/material/icon';
+import { MatChipsModule } from '@angular/material/chips';
+import { CommonModule, KeyValuePipe } from '@angular/common';
+import { DateRange, FilterName, Filters } from '../../model/filters';
+
+@Component({
+  selector: 'app-filter-chips',
+  templateUrl: './filter-chips.component.html',
+  styleUrls: ['./filter-chips.component.scss'],
+  standalone: true,
+  imports: [MatIconModule, MatChipsModule, KeyValuePipe, CommonModule],
+})
+export class FilterChipsComponent {
+  @Input() filters!: Filters;
+
+  @Output() filterCleared = new EventEmitter<Filters>();
+
+  isValueEmpty(value: string | string[] | DateRange) {
+    if (value instanceof DateRange) {
+      return !value.start && !value.end;
+    }
+    return value === null || value.length === 0;
+  }
+
+  clearFilter(filter: string) {
+    switch (filter) {
+      case FilterName.DeviceInfo:
+        this.filters.deviceInfo = '';
+        break;
+      case FilterName.DeviceFirmware:
+        this.filters.deviceFirmware = '';
+        break;
+      case FilterName.Results:
+        this.filters.results = [];
+        break;
+      case FilterName.DateRange:
+        this.filters.dateRange = '';
+        break;
+    }
+    this.filterCleared.emit(this.filters);
+  }
+
+  clearAllFilters() {
+    this.filters.deviceInfo = '';
+    this.filters.deviceFirmware = '';
+    this.filters.results = [];
+    this.filters.dateRange = '';
+    this.filterCleared.emit(this.filters);
+  }
+}
diff --git a/modules/ui/src/app/components/filter-dialog/filter-dialog.component.html b/modules/ui/src/app/components/filter-dialog/filter-dialog.component.html
new file mode 100644
index 000000000..b422d051a
--- /dev/null
+++ b/modules/ui/src/app/components/filter-dialog/filter-dialog.component.html
@@ -0,0 +1,74 @@
+<!--
+Copyright 2023 Google LLC
+
+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
+
+    https://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.
+-->
+<mat-dialog-content
+  class="filter-dialog-content"
+  [ngStyle]="{ 'max-height': 'calc(100vh - ' + topPosition + 'px)' }">
+  <form [formGroup]="filterForm">
+    <mat-form-field
+      appearance="outline"
+      class="text-field"
+      *ngIf="data.filter === FilterName.DeviceInfo">
+      <input class="text-field-input" formControlName="deviceInfo" matInput />
+    </mat-form-field>
+    <mat-form-field
+      appearance="outline"
+      class="text-field"
+      *ngIf="data.filter === FilterName.DeviceFirmware">
+      <input
+        class="text-field-input"
+        formControlName="deviceFirmware"
+        matInput />
+    </mat-form-field>
+    <div formArrayName="results" *ngIf="data.filter === FilterName.Results">
+      <p
+        *ngFor="let result of results.controls; let i = index"
+        class="filter-result-item">
+        <mat-checkbox [formControlName]="i">
+          {{ resultList[i].value }}
+        </mat-checkbox>
+      </p>
+    </div>
+  </form>
+  <ng-container *ngIf="data.filter === FilterName.Started">
+    <mat-form-field appearance="outline" class="date-field">
+      <mat-date-range-input>
+        <input
+          matStartDate
+          placeholder="mm/dd/yyyy"
+          [(ngModel)]="range.start"
+          (dateChange)="startDateChanged($event)" />
+        <input
+          matEndDate
+          placeholder="mm/dd/yyyy"
+          [(ngModel)]="range.end"
+          (dateChange)="endDateChanged($event)" />
+      </mat-date-range-input>
+    </mat-form-field>
+
+    <mat-calendar
+      [selected]="selectedRangeValue"
+      (selectedChange)="selectedChange($event)"
+      [maxDate]="today"
+      class="date-calendar">
+    </mat-calendar>
+  </ng-container>
+</mat-dialog-content>
+<mat-dialog-actions align="end" class="filter-dialog-actions">
+  <button (click)="cancel()" class="cancel-button" mat-flat-button>
+    Cancel
+  </button>
+  <button (click)="confirm()" class="confirm-button" mat-flat-button>Ok</button>
+</mat-dialog-actions>
diff --git a/modules/ui/src/app/components/filter-dialog/filter-dialog.component.scss b/modules/ui/src/app/components/filter-dialog/filter-dialog.component.scss
new file mode 100644
index 000000000..e8f24fcc8
--- /dev/null
+++ b/modules/ui/src/app/components/filter-dialog/filter-dialog.component.scss
@@ -0,0 +1,66 @@
+/**
+ * Copyright 2023 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+@use '@angular/material' as mat;
+@import '../../../theming/colors';
+
+.filter-dialog-content {
+  display: flex;
+  flex-direction: column;
+  padding: 16px 16px 0 16px;
+}
+
+.date-field {
+  flex-shrink: 0;
+}
+
+.date-calendar {
+  flex-grow: 1;
+  overflow: auto;
+  min-height: 2em;
+}
+
+.filter-dialog-actions {
+  border-top: 1px solid $lighter-grey;
+  gap: 16px;
+
+  button {
+    min-width: 38px;
+    margin: 0;
+    padding: 0 8px;
+    color: mat.get-color-from-palette($color-primary, 600);
+    font-weight: 500;
+    line-height: 20px;
+    letter-spacing: 0.25px;
+  }
+}
+
+.text-field,
+.date-field {
+  width: 100%;
+}
+
+.filter-result-item {
+  padding: 4px 0;
+  margin: 0;
+
+  &:first-child {
+    padding-top: 0;
+  }
+
+  &:last-child {
+    padding-bottom: 20px;
+  }
+}
diff --git a/modules/ui/src/app/components/filter-dialog/filter-dialog.component.spec.ts b/modules/ui/src/app/components/filter-dialog/filter-dialog.component.spec.ts
new file mode 100644
index 000000000..4ecc15e52
--- /dev/null
+++ b/modules/ui/src/app/components/filter-dialog/filter-dialog.component.spec.ts
@@ -0,0 +1,208 @@
+/**
+ * Copyright 2023 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { FilterDialogComponent } from './filter-dialog.component';
+import { CommonModule } from '@angular/common';
+import {
+  MAT_DIALOG_DATA,
+  MatDialogModule,
+  MatDialogRef,
+} from '@angular/material/dialog';
+import { MatButtonModule } from '@angular/material/button';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatInputModule } from '@angular/material/input';
+import { MatSelectModule } from '@angular/material/select';
+import { MatCheckboxModule } from '@angular/material/checkbox';
+import {
+  MatDatepickerInputEvent,
+  MatDatepickerModule,
+} from '@angular/material/datepicker';
+import { MatNativeDateModule } from '@angular/material/core';
+import { DateRange, FilterName } from '../../model/filters';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { of } from 'rxjs';
+
+describe('FilterDialogComponent', () => {
+  let component: FilterDialogComponent;
+  let fixture: ComponentFixture<FilterDialogComponent>;
+  let compiled: HTMLElement;
+  const mockData = { left: 0, bottom: 0 };
+  const mockClientRest = {
+    nativeElement: {
+      getBoundingClientRect: () => mockData,
+    },
+  };
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        FilterDialogComponent,
+        CommonModule,
+        NoopAnimationsModule,
+        MatDialogModule,
+        MatButtonModule,
+        FormsModule,
+        ReactiveFormsModule,
+        MatFormFieldModule,
+        MatInputModule,
+        MatSelectModule,
+        MatCheckboxModule,
+        MatDatepickerModule,
+        MatNativeDateModule,
+      ],
+      providers: [
+        {
+          provide: MatDialogRef,
+          useValue: {
+            keydownEvents: () => of(new KeyboardEvent('keydown', { code: '' })),
+            close: () => ({}),
+            updateSize: () => ({}),
+            updatePosition: () => ({}),
+          },
+        },
+        { provide: MAT_DIALOG_DATA, useValue: {} },
+      ],
+    });
+    fixture = TestBed.createComponent(FilterDialogComponent);
+    component = fixture.componentInstance;
+
+    component.data = {
+      trigger: mockClientRest,
+      filter: FilterName.DeviceInfo,
+    };
+    component.data.trigger.nativeElement = {
+      getBoundingClientRect: () => mockData,
+    };
+    compiled = fixture.nativeElement as HTMLElement;
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should close dialog on "cancel" click', () => {
+    const closeSpy = spyOn(component.dialogRef, 'close');
+    const closeButton = compiled.querySelector(
+      '.cancel-button'
+    ) as HTMLButtonElement;
+
+    closeButton?.click();
+
+    expect(closeSpy).toHaveBeenCalledWith();
+
+    closeSpy.calls.reset();
+  });
+
+  it('should close dialog with data on "confirm" click', () => {
+    fixture.detectChanges();
+    component.filterForm.get('deviceInfo')?.setValue('deviceInfo  ');
+    const mockFormData = {
+      deviceInfo: 'deviceInfo',
+      deviceFirmware: '',
+      results: [],
+      dateRange: new DateRange(),
+    };
+    const closeSpy = spyOn(component.dialogRef, 'close');
+    const confirmButton = compiled.querySelector(
+      '.confirm-button'
+    ) as HTMLButtonElement;
+
+    confirmButton?.click();
+
+    expect(closeSpy).toHaveBeenCalledWith(mockFormData);
+
+    closeSpy.calls.reset();
+  });
+
+  describe('date filter', () => {
+    beforeEach(() => {
+      component.data = {
+        trigger: mockClientRest,
+        filter: FilterName.Started,
+      };
+      fixture.detectChanges();
+    });
+
+    it('#selectedChange should set date range data', () => {
+      const mockDate = new Date('Wed Jun 21 2023 00:00:00 GMT+0000');
+      const mockDate2 = new Date('Thu Jun 22 2023 00:00:00 GMT+0000');
+      const range = new DateRange();
+      range.start = mockDate;
+      range.end = null;
+
+      component.selectedChange(mockDate);
+
+      expect(component.range).toEqual(range);
+
+      range.end = mockDate2;
+      component.selectedChange(mockDate2);
+
+      expect(component.range).toEqual(range);
+    });
+
+    it('#startDateChanged should set date range data', () => {
+      const mockDate = new Date('Wed Jun 21 2023 00:00:00 GMT+0000');
+      component.startDateChanged({
+        value: mockDate,
+      } as MatDatepickerInputEvent<Date>);
+
+      expect(component.selectedRangeValue?.end).toEqual(null);
+      expect(component.selectedRangeValue?.start).toEqual(mockDate);
+    });
+
+    it('#startDateChanged should replace year if selected year later than current', () => {
+      const mockDate = new Date('Wed Jun 21 99999 00:00:00 GMT+0000');
+      const currentDate = new Date(mockDate);
+      currentDate.setFullYear(new Date().getFullYear());
+
+      component.startDateChanged({
+        value: mockDate,
+      } as MatDatepickerInputEvent<Date>);
+
+      expect(component.selectedRangeValue?.start).toEqual(currentDate);
+      expect(component.range.start).toEqual(currentDate);
+    });
+
+    it('#endDateChanged should set date range data', () => {
+      const mockDate = new Date('Wed Jun 21 2023 00:00:00 GMT+0000');
+      component.endDateChanged({
+        value: mockDate,
+      } as MatDatepickerInputEvent<Date>);
+
+      expect(component.selectedRangeValue?.start).toEqual(null);
+      expect(component.selectedRangeValue?.end).toEqual(mockDate);
+    });
+
+    it('#endDateChanged should replace year if selected year later than current', () => {
+      const mockDate = new Date('Wed Jun 21 99999 00:00:00 GMT+0000');
+      const currentDate = new Date(mockDate);
+      currentDate.setFullYear(new Date().getFullYear());
+
+      component.endDateChanged({
+        value: mockDate,
+      } as MatDatepickerInputEvent<Date>);
+
+      expect(component.selectedRangeValue?.end).toEqual(currentDate);
+      expect(component.range.end).toEqual(currentDate);
+    });
+
+    it('should max date as today', () => {
+      expect(component.calendar.maxDate?.getDate()).toBe(new Date().getDate());
+    });
+  });
+});
diff --git a/modules/ui/src/app/components/filter-dialog/filter-dialog.component.ts b/modules/ui/src/app/components/filter-dialog/filter-dialog.component.ts
new file mode 100644
index 000000000..d8ed991ae
--- /dev/null
+++ b/modules/ui/src/app/components/filter-dialog/filter-dialog.component.ts
@@ -0,0 +1,233 @@
+/**
+ * Copyright 2023 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+import {
+  ChangeDetectionStrategy,
+  Component,
+  ElementRef,
+  HostListener,
+  Inject,
+  OnInit,
+  ViewChild,
+} from '@angular/core';
+import { CommonModule } from '@angular/common';
+import {
+  MAT_DIALOG_DATA,
+  MatDialogConfig,
+  MatDialogModule,
+  MatDialogRef,
+} from '@angular/material/dialog';
+import { MatButtonModule } from '@angular/material/button';
+import {
+  FormArray,
+  FormBuilder,
+  FormControl,
+  FormGroup,
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatInputModule } from '@angular/material/input';
+import { MatSelectModule } from '@angular/material/select';
+import { MatCheckboxModule } from '@angular/material/checkbox';
+import {
+  DateRange,
+  DefaultMatCalendarRangeStrategy,
+  MAT_DATE_RANGE_SELECTION_STRATEGY,
+  MatCalendar,
+  MatDatepickerInputEvent,
+  MatDatepickerModule,
+} from '@angular/material/datepicker';
+import { MatNativeDateModule } from '@angular/material/core';
+import { FilterName, DateRange as LocalDateRange } from '../../model/filters';
+import { EscapableDialogComponent } from '../escapable-dialog/escapable-dialog.component';
+
+interface DialogData {
+  trigger: ElementRef;
+  filter: string;
+}
+
+@Component({
+  selector: 'app-filter-dialog',
+  standalone: true,
+  imports: [
+    CommonModule,
+    MatDialogModule,
+    MatButtonModule,
+    FormsModule,
+    ReactiveFormsModule,
+    MatFormFieldModule,
+    MatInputModule,
+    MatSelectModule,
+    MatCheckboxModule,
+    MatDatepickerModule,
+    MatNativeDateModule,
+  ],
+  templateUrl: './filter-dialog.component.html',
+  styleUrls: ['./filter-dialog.component.scss'],
+  providers: [
+    {
+      provide: MAT_DATE_RANGE_SELECTION_STRATEGY,
+      useClass: DefaultMatCalendarRangeStrategy,
+    },
+  ],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class FilterDialogComponent
+  extends EscapableDialogComponent
+  implements OnInit
+{
+  resultList = [
+    { value: 'Compliant', enabled: false },
+    { value: 'Non-Compliant', enabled: false },
+  ];
+  filterForm!: FormGroup;
+  selectedRangeValue!: DateRange<Date> | undefined;
+
+  public readonly FilterName = FilterName;
+
+  range: LocalDateRange = new LocalDateRange();
+
+  topPosition = 0;
+
+  today = new Date();
+
+  private dialog_actions_height = 50;
+
+  @HostListener('window:resize', ['$event'])
+  onResize() {
+    this.setDialogView();
+  }
+
+  @ViewChild(MatCalendar) calendar!: MatCalendar<Date>;
+
+  constructor(
+    public override dialogRef: MatDialogRef<FilterDialogComponent>,
+    @Inject(MAT_DIALOG_DATA) public data: DialogData,
+    private fb: FormBuilder
+  ) {
+    super(dialogRef);
+  }
+
+  ngOnInit() {
+    this.setDialogView();
+    this.createFilterForm();
+  }
+
+  private setDialogView(): void {
+    const matDialogConfig: MatDialogConfig = new MatDialogConfig();
+    const rect = this.data.trigger?.nativeElement.getBoundingClientRect();
+
+    matDialogConfig.position = {
+      left: `${rect.left - 80}px`,
+      top: `${rect.bottom + 0}px`,
+    };
+
+    this.topPosition = rect.bottom + this.dialog_actions_height;
+    matDialogConfig.width = this.data.filter === 'results' ? '240px' : '328px';
+
+    this.dialogRef.updateSize(matDialogConfig.width);
+    this.dialogRef.updatePosition(matDialogConfig.position);
+  }
+  private createFilterForm() {
+    this.filterForm = this.fb.group({
+      deviceInfo: [''],
+      deviceFirmware: [''],
+      results: new FormArray(this.resultList.map(() => new FormControl(false))),
+    });
+  }
+
+  get results() {
+    return this.filterForm.controls['results'] as FormArray;
+  }
+
+  selectedChange(date: Date): void {
+    if (!this.selectedRangeValue?.start || this.selectedRangeValue?.end) {
+      this.selectedRangeValue = new DateRange<Date>(date, null);
+    } else {
+      const start = this.selectedRangeValue.start;
+      const end = date;
+      if (end < start) {
+        this.selectedRangeValue = new DateRange<Date>(end, start);
+      } else {
+        this.selectedRangeValue = new DateRange<Date>(start, end);
+      }
+    }
+
+    this.range.start = this.selectedRangeValue.start;
+    this.range.end = this.selectedRangeValue.end;
+  }
+
+  confirm(): void {
+    const formData = this.filterForm.value;
+    const results = this.resultList
+      .filter((item, i) => {
+        return !!this.results.controls[i].value;
+      })
+      .map(item => item.value);
+
+    if (
+      this.range.start &&
+      (this.range.end === null || this.range.end === '')
+    ) {
+      this.range.end = new Date();
+    }
+
+    const filtersData = {
+      deviceInfo: formData.deviceInfo.trim(),
+      deviceFirmware: formData.deviceFirmware.trim(),
+      results,
+      dateRange: this.range,
+    };
+
+    this.dialogRef.close(filtersData);
+  }
+
+  cancel(): void {
+    this.dialogRef.close();
+  }
+
+  startDateChanged(event: MatDatepickerInputEvent<Date>) {
+    const date = event.value;
+    if (date && date.getFullYear() > this.today.getFullYear()) {
+      date.setFullYear(this.today.getFullYear());
+      this.range.start = date;
+    }
+    this.selectedRangeValue = new DateRange<Date>(
+      date,
+      this.selectedRangeValue?.end || null
+    );
+    if (this.selectedRangeValue.start) {
+      this.calendar.activeDate = this.selectedRangeValue.start;
+      this.calendar.updateTodaysDate();
+    }
+  }
+
+  endDateChanged(event: MatDatepickerInputEvent<Date>) {
+    const date = event.value;
+    if (date && date.getFullYear() > this.today.getFullYear()) {
+      date.setFullYear(this.today.getFullYear());
+      this.range.end = date;
+    }
+    this.selectedRangeValue = new DateRange<Date>(
+      this.selectedRangeValue?.start || null,
+      event.value
+    );
+    if (this.selectedRangeValue?.end) {
+      this.calendar.activeDate = this.selectedRangeValue.end;
+      this.calendar.updateTodaysDate();
+    }
+  }
+}
diff --git a/modules/ui/src/app/components/general-settings/general-settings.component.html b/modules/ui/src/app/components/general-settings/general-settings.component.html
index ff7301a5d..4e1954a2b 100644
--- a/modules/ui/src/app/components/general-settings/general-settings.component.html
+++ b/modules/ui/src/app/components/general-settings/general-settings.component.html
@@ -13,63 +13,107 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<div class="setting-container-content">
-  <div class="settings-drawer-header">
-    <h4 class="settings-drawer-header-title">Settings</h4>
-    <button
-      mat-button
-      class="settings-drawer-header-button"
-      aria-label="close"
-      (click)="closeSetting()"
-      [disabled]="!isFormValues || !hasSetting">
-      <mat-icon
-        svgIcon="close"
-        class="close-button-icon"
-      ></mat-icon>
-    </button>
-  </div>
-  <div class="setting-drawer-content">
-    <form [formGroup]="settingForm" *ngIf="systemInterfaces$ | async as interfaces">
-      <label id="internet-radio-group-label" class="setting-form-label"> Internet settings </label>
-      <mat-radio-group
-        formControlName="internet_intf"
-        aria-labelledby="internet-radio-group-label"
-        class="setting-radio-group">
-        <mat-radio-button *ngFor="let interface of interfaces" [value]="interface"
-                          class="setting-radio-button">
-          {{ interface }}
-        </mat-radio-button>
-      </mat-radio-group>
-      <label id="device-radio-group-label" class="setting-form-label device-label"> Device
-        settings</label>
-      <mat-radio-group
-        formControlName="device_intf"
-        aria-labelledby="device-radio-group-label"
-        class="setting-radio-group">
-        <mat-radio-button *ngFor="let interface of interfaces" [value]="interface"
-                          class="setting-radio-button">
-          {{ interface }}
-        </mat-radio-button>
-      </mat-radio-group>
-      <mat-error *ngIf="isSubmitting && isFormError" class="error-message-container">
-        <span>
-          Both interfaces must have different values
-        </span>
-      </mat-error>
-    </form>
-  </div>
+<div class="settings-drawer-header">
+  <h2 class="settings-drawer-header-title">Connection settings</h2>
+  <button
+    (click)="closeSetting()"
+    [disabled]="!isFormValues || (hasConnectionSetting$ | async) !== true"
+    aria-label="close"
+    class="settings-drawer-header-button"
+    mat-button>
+    <mat-icon class="close-button-icon" svgIcon="close"></mat-icon>
+  </button>
+</div>
+<div class="setting-drawer-content">
+  <form
+    *ngIf="interfaces.length; else warning_message"
+    [formGroup]="settingForm">
+    <app-callout
+      [type]="CalloutType.Warning"
+      *ngIf="interfaces.length === 1"
+      class="two-ports-message">
+      Warning! Testrun requires two ports to operate correctly.
+    </app-callout>
+    <label
+      class="setting-form-label internet-label"
+      id="internet-radio-group-label"
+      for="internet-group">
+      Select port used for Internet connection
+    </label>
+    <p class="setting-label-description">
+      Choose one of the following ports on your Laptop or Desktop
+    </p>
+    <mat-radio-group
+      aria-labelledby="internet-radio-group-label"
+      id="internet-group"
+      class="setting-radio-group"
+      formControlName="internet_intf">
+      <mat-radio-button
+        *ngFor="let interface of interfaces"
+        [value]="interface"
+        class="setting-radio-button">
+        {{ interface }}
+      </mat-radio-button>
+    </mat-radio-group>
+    <label
+      class="setting-form-label device-label"
+      id="device-radio-group-label"
+      for="device-group">
+      Select port where you’ll connect the tested device
+    </label>
+    <p class="setting-label-description">
+      Choose one of the options where you’ll connect IoT device for testing
+    </p>
+    <mat-radio-group
+      aria-labelledby="device-radio-group-label"
+      id="device-group"
+      class="setting-radio-group"
+      formControlName="device_intf">
+      <mat-radio-button
+        *ngFor="let interface of interfaces"
+        [value]="interface"
+        class="setting-radio-button">
+        {{ interface }}
+      </mat-radio-button>
+    </mat-radio-group>
+  </form>
+  <ng-template #warning_message>
+    <app-callout [type]="CalloutType.Warning">
+      Warning! No ports is detected.
+    </app-callout>
+  </ng-template>
 </div>
+<p class="message">
+  If a port is missing from this list, you can
+  <a
+    (click)="reloadSetting()"
+    (keydown.enter)="reloadSetting()"
+    (keydown.space)="reloadSetting()"
+    role="button"
+    tabindex="0"
+    class="message-link">
+    Refresh
+  </a>
+  the Connection settings
+</p>
+<mat-error *ngIf="isSubmitting && isFormError" class="error-message-container">
+  <span> Both interfaces must have different values </span>
+</mat-error>
 <div class="setting-drawer-footer">
-  <button mat-flat-button (click)="closeSetting()" [disabled]="!isFormValues || !hasSetting" class="close-button">
+  <button
+    mat-flat-button
+    (click)="closeSetting()"
+    [disabled]="!isFormValues || (hasConnectionSetting$ | async) !== true"
+    class="close-button">
     Cancel
   </button>
   <button
     mat-raised-button
+    class="save-button"
     color="primary"
     (click)="saveSetting()"
-    [disabled]="!isFormValues"
-    class="save-button">
+    [disabled]="!isFormValues || isLessThanTwoInterfaces">
     Save
   </button>
 </div>
-
+<app-spinner class="connection-settings-spinner"></app-spinner>
diff --git a/modules/ui/src/app/components/general-settings/general-settings.component.scss b/modules/ui/src/app/components/general-settings/general-settings.component.scss
index 02dfcd107..84d49e514 100644
--- a/modules/ui/src/app/components/general-settings/general-settings.component.scss
+++ b/modules/ui/src/app/components/general-settings/general-settings.component.scss
@@ -14,15 +14,13 @@
  * limitations under the License.
  */
 @use '@angular/material' as mat;
-@import "../../../theming/colors";
+@import '../../../theming/colors';
+@import '../../../theming/variables';
 
 :host {
   display: flex;
   flex-direction: column;
   height: 100%;
-}
-
-.setting-container-content {
   flex: 1 0 auto;
 }
 
@@ -38,6 +36,7 @@
     font-style: normal;
     font-weight: 400;
     line-height: 28px;
+    color: $dark-grey;
   }
 
   &-button {
@@ -58,14 +57,28 @@
 
 .setting-drawer-content {
   padding: 11px 16px 16px;
+  overflow: hidden;
+
+  form {
+    display: grid;
+    grid-template-rows: repeat(4, auto);
+    height: 100%;
+  }
 }
 
 .error-message-container {
   display: block;
+  margin-top: auto;
+  padding: 0 16px;
+}
+
+.error-message-container + .setting-drawer-footer {
+  margin-top: 0;
 }
 
 .setting-form-label {
   font-size: 18px;
+  color: $dark-grey;
 
   &.device-label {
     display: inline-block;
@@ -73,11 +86,25 @@
   }
 }
 
+:host:has(.two-ports-message) .internet-label {
+  padding-top: 16px;
+}
+
+.setting-label-description {
+  font-family: $font-secondary;
+  font-size: 14px;
+  line-height: 20px;
+  letter-spacing: 0.2px;
+  margin: 10px 0 0;
+  color: $dark-grey;
+}
+
 .setting-radio-group {
   display: flex;
   flex-direction: column;
   margin-left: -10px;
   align-items: flex-start;
+  overflow: scroll;
 }
 
 .setting-radio-button {
@@ -97,13 +124,25 @@
   }
 }
 
+.message {
+  margin: 0;
+  padding: 0 16px 16px;
+  color: $grey-800;
+  font-family: $font-secondary;
+  font-size: 14px;
+  line-height: 20px;
+  letter-spacing: 0.2px;
+}
+
 .setting-drawer-footer {
+  margin-top: auto;
   display: flex;
   flex-shrink: 0;
   justify-content: flex-end;
   padding: 16px 24px 8px 24px;
 
-  .close-button, .save-button {
+  .close-button,
+  .save-button {
     padding: 0 24px;
     font-size: 14px;
     font-weight: 500;
diff --git a/modules/ui/src/app/components/general-settings/general-settings.component.spec.ts b/modules/ui/src/app/components/general-settings/general-settings.component.spec.ts
index b3cc6de6f..6448b80a1 100644
--- a/modules/ui/src/app/components/general-settings/general-settings.component.spec.ts
+++ b/modules/ui/src/app/components/general-settings/general-settings.component.spec.ts
@@ -13,73 +13,161 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {ComponentFixture, TestBed} from '@angular/core/testing';
-
-import {GeneralSettingsComponent} from './general-settings.component';
-import {TestRunService} from '../../test-run.service';
-import {of} from 'rxjs';
-import {SystemConfig} from '../../model/setting';
-import {MatRadioModule} from '@angular/material/radio';
-import {ReactiveFormsModule} from '@angular/forms';
-import {MatButtonModule} from '@angular/material/button';
-import {MatIcon, MatIconModule} from '@angular/material/icon';
-import {MatIconTestingModule} from '@angular/material/icon/testing';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+} from '@angular/core/testing';
+
+import { GeneralSettingsComponent } from './general-settings.component';
+import { TestRunService } from '../../services/test-run.service';
+import { of } from 'rxjs';
+import { SystemConfig } from '../../model/setting';
+import { MatRadioModule } from '@angular/material/radio';
+import { ReactiveFormsModule } from '@angular/forms';
+import { MatButtonModule } from '@angular/material/button';
+import { MatIcon, MatIconModule } from '@angular/material/icon';
+import { MatIconTestingModule } from '@angular/material/icon/testing';
+import { Component, Input } from '@angular/core';
 
 const MOCK_SYSTEM_CONFIG_EMPTY: SystemConfig = {
   network: {
     device_intf: '',
-    internet_intf: ''
-  }
-}
+    internet_intf: '',
+  },
+};
 
 const MOCK_SYSTEM_CONFIG_WITH_DATA: SystemConfig = {
   network: {
     device_intf: 'mockDeviceValue',
-    internet_intf: 'mockInternetValue'
-  }
+    internet_intf: 'mockInternetValue',
+  },
+};
+
+const MOCK_SYSTEM_CONFIG_WITH_ONE_SETTING: SystemConfig = {
+  network: {
+    device_intf: 'mockDeviceValue',
+  },
 };
 
 describe('GeneralSettingsComponent', () => {
   let component: GeneralSettingsComponent;
   let fixture: ComponentFixture<GeneralSettingsComponent>;
   let testRunServiceMock: jasmine.SpyObj<TestRunService>;
+  let compiled: HTMLElement;
 
   beforeEach(async () => {
-    testRunServiceMock = jasmine.createSpyObj(['getSystemInterfaces', 'getSystemConfig', 'setSystemConfig', 'createSystemConfig']);
+    testRunServiceMock = jasmine.createSpyObj([
+      'getSystemInterfaces',
+      'getSystemConfig',
+      'setSystemConfig',
+      'createSystemConfig',
+      'setIsOpenAddDevice',
+      'hasConnectionSetting$',
+      'setHasConnectionSetting',
+    ]);
     testRunServiceMock.getSystemInterfaces.and.returnValue(of([]));
-    testRunServiceMock.getSystemConfig.and.returnValue(of(MOCK_SYSTEM_CONFIG_EMPTY));
-    testRunServiceMock.createSystemConfig.and.returnValue(of({}));
+    testRunServiceMock.getSystemConfig.and.returnValue(
+      of(MOCK_SYSTEM_CONFIG_EMPTY)
+    );
+    testRunServiceMock.createSystemConfig.and.returnValue(
+      of(MOCK_SYSTEM_CONFIG_WITH_DATA)
+    );
+    testRunServiceMock.hasConnectionSetting$ = of(true);
 
     await TestBed.configureTestingModule({
-      declarations: [GeneralSettingsComponent, MatIcon],
-      providers: [{provide: TestRunService, useValue: testRunServiceMock}],
-      imports: [MatButtonModule, MatIconModule, MatRadioModule, ReactiveFormsModule, MatIconTestingModule]
+      declarations: [
+        GeneralSettingsComponent,
+        MatIcon,
+        FakeSpinnerComponent,
+        FakeCalloutComponent,
+      ],
+      providers: [{ provide: TestRunService, useValue: testRunServiceMock }],
+      imports: [
+        MatButtonModule,
+        MatIconModule,
+        MatRadioModule,
+        ReactiveFormsModule,
+        MatIconTestingModule,
+      ],
     }).compileComponents();
 
     fixture = TestBed.createComponent(GeneralSettingsComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
+    compiled = fixture.nativeElement as HTMLElement;
   });
 
   it('should create', () => {
     expect(component).toBeTruthy();
   });
 
-  it('should call openSetting if not systemConfig data', () => {
-    spyOn(component.openSettingEvent, 'emit');
+  it('should set default values to form if systemConfig data', () => {
+    testRunServiceMock.getSystemConfig.and.returnValue(
+      of(MOCK_SYSTEM_CONFIG_WITH_DATA)
+    );
 
     component.ngOnInit();
 
-    expect(component.openSettingEvent.emit).toHaveBeenCalled();
+    expect(component.deviceControl.value).toBe(
+      MOCK_SYSTEM_CONFIG_WITH_DATA?.network?.device_intf
+    );
+    expect(component.internetControl.value).toBe(
+      MOCK_SYSTEM_CONFIG_WITH_DATA?.network?.internet_intf
+    );
   });
 
-  it('should set default values to form if systemConfig data', () => {
-    testRunServiceMock.getSystemConfig.and.returnValue(of(MOCK_SYSTEM_CONFIG_WITH_DATA));
+  it('#reloadSetting should emit reloadInterfacesEvent', () => {
+    spyOn(component.reloadInterfacesEvent, 'emit');
 
-    component.ngOnInit();
+    component.reloadSetting();
 
-    expect(component.deviceControl.value).toBe(MOCK_SYSTEM_CONFIG_WITH_DATA.network.device_intf);
-    expect(component.internetControl.value).toBe(MOCK_SYSTEM_CONFIG_WITH_DATA.network.internet_intf);
+    expect(component.reloadInterfacesEvent.emit).toHaveBeenCalled();
+  });
+
+  describe('#openSetting', () => {
+    it('should call openSetting if device and internet data are unavailable', () => {
+      spyOn(component.openSettingEvent, 'emit');
+
+      component.ngOnInit();
+
+      expect(component.openSettingEvent.emit).toHaveBeenCalled();
+    });
+
+    it('should call openSetting if not systemConfig data', fakeAsync(() => {
+      spyOn(component.openSettingEvent, 'emit');
+      testRunServiceMock.getSystemConfig.and.returnValue(of({}));
+      tick();
+
+      component.ngOnInit();
+
+      expect(component.openSettingEvent.emit).toHaveBeenCalled();
+    }));
+
+    it('should call openSetting if only one setting available', fakeAsync(() => {
+      spyOn(component.openSettingEvent, 'emit');
+      testRunServiceMock.getSystemConfig.and.returnValue(
+        of(MOCK_SYSTEM_CONFIG_WITH_ONE_SETTING)
+      );
+      tick();
+
+      component.ngOnInit();
+
+      expect(component.openSettingEvent.emit).toHaveBeenCalled();
+    }));
+
+    it('should not call openSetting if device and internet data are available', fakeAsync(() => {
+      spyOn(component.openSettingEvent, 'emit');
+      testRunServiceMock.getSystemConfig.and.returnValue(
+        of(MOCK_SYSTEM_CONFIG_WITH_DATA)
+      );
+      tick();
+
+      component.ngOnInit();
+
+      expect(component.openSettingEvent.emit).not.toHaveBeenCalled();
+    }));
   });
 
   describe('#closeSetting', () => {
@@ -106,7 +194,9 @@ describe('GeneralSettingsComponent', () => {
     it('should set value of settingForm on setSystemSetting', () => {
       component.closeSetting();
 
-      expect(component.settingForm.value).toEqual(MOCK_SYSTEM_CONFIG_WITH_DATA.network);
+      expect(component.settingForm.value).toEqual(
+        MOCK_SYSTEM_CONFIG_WITH_DATA.network
+      );
     });
   });
 
@@ -128,14 +218,133 @@ describe('GeneralSettingsComponent', () => {
     });
 
     it('should call createSystemConfig when setting form valid', () => {
-      const {device_intf, internet_intf} = MOCK_SYSTEM_CONFIG_WITH_DATA.network;
-      component.deviceControl.setValue(device_intf);
-      component.internetControl.setValue(internet_intf);
+      component.deviceControl.setValue(
+        MOCK_SYSTEM_CONFIG_WITH_DATA?.network?.device_intf
+      );
+      component.internetControl.setValue(
+        MOCK_SYSTEM_CONFIG_WITH_DATA?.network?.internet_intf
+      );
 
       component.saveSetting();
 
       expect(component.settingForm.invalid).toBeFalse();
-      expect(testRunServiceMock.createSystemConfig).toHaveBeenCalledWith(MOCK_SYSTEM_CONFIG_WITH_DATA);
+      expect(testRunServiceMock.createSystemConfig).toHaveBeenCalledWith(
+        MOCK_SYSTEM_CONFIG_WITH_DATA
+      );
+    });
+
+    it('should setIsOpenAddDevice as true on first save setting', () => {
+      component.deviceControl.setValue(
+        MOCK_SYSTEM_CONFIG_WITH_DATA.network?.device_intf
+      );
+      component.internetControl.setValue(
+        MOCK_SYSTEM_CONFIG_WITH_DATA.network?.internet_intf
+      );
+
+      component.saveSetting();
+
+      expect(testRunServiceMock.setIsOpenAddDevice).toHaveBeenCalledWith(true);
+    });
+  });
+
+  describe('with no intefaces data', () => {
+    beforeEach(() => {
+      component.interfaces = [];
+      fixture.detectChanges();
+    });
+
+    it('should have callout component', () => {
+      const callout = compiled.querySelector('app-callout');
+
+      expect(callout).toBeTruthy();
+    });
+
+    it('should have disabled "Save" button', () => {
+      const saveBtn = compiled.querySelector(
+        '.save-button'
+      ) as HTMLButtonElement;
+
+      expect(saveBtn.disabled).toBeTrue();
+    });
+  });
+
+  describe('with intefaces lenght less then two', () => {
+    beforeEach(() => {
+      component.interfaces = ['mockDeviceValue'];
+      testRunServiceMock.systemConfig$ = of(MOCK_SYSTEM_CONFIG_WITH_DATA);
+      testRunServiceMock.getSystemConfig.and.returnValue(
+        of(MOCK_SYSTEM_CONFIG_WITH_DATA)
+      );
+      fixture.detectChanges();
+    });
+
+    it('should have callout component', () => {
+      const callout = compiled.querySelector('app-callout');
+
+      expect(callout).toBeTruthy();
+    });
+
+    it('should have disabled "Save" button', () => {
+      component.deviceControl.setValue(
+        MOCK_SYSTEM_CONFIG_WITH_DATA?.network?.device_intf
+      );
+      component.internetControl.setValue(
+        MOCK_SYSTEM_CONFIG_WITH_DATA?.network?.internet_intf
+      );
+      fixture.detectChanges();
+
+      const saveBtn = compiled.querySelector(
+        '.save-button'
+      ) as HTMLButtonElement;
+
+      expect(saveBtn.disabled).toBeTrue();
+    });
+  });
+
+  describe('with intefaces lenght more then one', () => {
+    beforeEach(() => {
+      component.interfaces = ['mockDeviceValue', 'mockInternetValue'];
+      testRunServiceMock.systemConfig$ = of(MOCK_SYSTEM_CONFIG_WITH_DATA);
+      testRunServiceMock.getSystemConfig.and.returnValue(
+        of(MOCK_SYSTEM_CONFIG_WITH_DATA)
+      );
+      fixture.detectChanges();
+    });
+
+    it('should not have callout component', () => {
+      const callout = compiled.querySelector('app-callout');
+
+      expect(callout).toBeFalsy();
+    });
+
+    it('should not have disabled "Save" button', () => {
+      component.deviceControl.setValue(
+        MOCK_SYSTEM_CONFIG_WITH_DATA?.network?.device_intf
+      );
+      component.internetControl.setValue(
+        MOCK_SYSTEM_CONFIG_WITH_DATA?.network?.internet_intf
+      );
+      fixture.detectChanges();
+
+      const saveBtn = compiled.querySelector(
+        '.save-button'
+      ) as HTMLButtonElement;
+
+      expect(saveBtn.disabled).toBeFalse();
     });
   });
 });
+
+@Component({
+  selector: 'app-spinner',
+  template: '<div></div>',
+})
+class FakeSpinnerComponent {}
+
+@Component({
+  selector: 'app-callout',
+  template: '<div></div>',
+})
+class FakeCalloutComponent {
+  @Input() type = '';
+}
diff --git a/modules/ui/src/app/components/general-settings/general-settings.component.ts b/modules/ui/src/app/components/general-settings/general-settings.component.ts
index 1d19ad462..1d19d0e56 100644
--- a/modules/ui/src/app/components/general-settings/general-settings.component.ts
+++ b/modules/ui/src/app/components/general-settings/general-settings.component.ts
@@ -13,24 +13,41 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {Component, EventEmitter, OnDestroy, OnInit, Output} from '@angular/core';
-import {FormBuilder, FormControl, FormGroup, Validators} from '@angular/forms';
-import {Subject, takeUntil, tap} from 'rxjs';
-import {TestRunService} from '../../test-run.service';
-import {OnlyDifferentValuesValidator} from './only-different-values.validator';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
+import {
+  FormBuilder,
+  FormControl,
+  FormGroup,
+  Validators,
+} from '@angular/forms';
+import { Subject, takeUntil, tap } from 'rxjs';
+import { TestRunService } from '../../services/test-run.service';
+import { OnlyDifferentValuesValidator } from './only-different-values.validator';
+import { CalloutType } from '../../model/callout-type';
+import { Observable } from 'rxjs/internal/Observable';
+import { shareReplay } from 'rxjs/internal/operators/shareReplay';
 
 @Component({
   selector: 'app-general-settings',
   templateUrl: './general-settings.component.html',
-  styleUrls: ['./general-settings.component.scss']
+  styleUrls: ['./general-settings.component.scss'],
 })
 export class GeneralSettingsComponent implements OnInit, OnDestroy {
+  @Input() interfaces: string[] = [];
   @Output() closeSettingEvent = new EventEmitter<void>();
   @Output() openSettingEvent = new EventEmitter<void>();
-  public readonly systemInterfaces$ = this.testRunService.getSystemInterfaces();
+  @Output() reloadInterfacesEvent = new EventEmitter<void>();
+  public readonly CalloutType = CalloutType;
   public settingForm!: FormGroup;
   public isSubmitting = false;
-  public hasSetting = false;
+  hasConnectionSetting$!: Observable<boolean | null>;
   private destroy$: Subject<boolean> = new Subject<boolean>();
 
   get deviceControl(): FormControl {
@@ -49,21 +66,30 @@ export class GeneralSettingsComponent implements OnInit, OnDestroy {
     return this.settingForm.hasError('hasSameValues');
   }
 
+  get isLessThanTwoInterfaces(): boolean {
+    return !this.interfaces.length || this.interfaces?.length < 2;
+  }
+
   constructor(
     private readonly testRunService: TestRunService,
     private readonly fb: FormBuilder,
     private readonly onlyDifferentValuesValidator: OnlyDifferentValuesValidator
-  ) {
-  }
+  ) {}
 
   ngOnInit() {
-    this.createSettingForm();
+    this.hasConnectionSetting$ = this.testRunService.hasConnectionSetting$.pipe(
+      shareReplay({ refCount: true, bufferSize: 1 })
+    );
 
+    this.createSettingForm();
     this.setSettingView();
-
     this.cleanFormErrorMessage();
   }
 
+  reloadSetting(): void {
+    this.reloadInterfacesEvent.emit();
+  }
+
   closeSetting(): void {
     this.resetForm();
     this.closeSettingEvent.emit();
@@ -80,7 +106,8 @@ export class GeneralSettingsComponent implements OnInit, OnDestroy {
   }
 
   private createSettingForm(): FormGroup {
-    return this.settingForm = this.fb.group({
+    return (this.settingForm = this.fb.group(
+      {
         device_intf: ['', Validators.required],
         internet_intf: ['', Validators.required],
       },
@@ -88,27 +115,35 @@ export class GeneralSettingsComponent implements OnInit, OnDestroy {
         validators: [this.onlyDifferentValuesValidator.onlyDifferentSetting()],
         updateOn: 'change',
       }
-    )
+    ));
   }
 
   private setSettingView(): void {
-    this.testRunService.getSystemConfig()
+    this.testRunService
+      .getSystemConfig()
       .pipe(takeUntil(this.destroy$))
-      .subscribe(
-        config => {
-          const {device_intf, internet_intf} = config.network;
+      .subscribe(config => {
+        if (config?.network) {
+          const { device_intf, internet_intf } = config.network;
           if (device_intf && internet_intf) {
-            this.setDefaultFormValues(device_intf, internet_intf);
-            this.hasSetting = true;
+            this.testRunService.setHasConnectionSetting(true);
           } else {
+            this.testRunService.setHasConnectionSetting(false);
             this.openSetting();
           }
-          this.testRunService.setSystemConfig(config);
+          this.setDefaultFormValues(device_intf, internet_intf);
+        } else {
+          this.testRunService.setHasConnectionSetting(false);
+          this.openSetting();
         }
-      );
+        this.testRunService.setSystemConfig(config);
+      });
   }
 
-  private setDefaultFormValues(device: string, internet: string): void {
+  private setDefaultFormValues(
+    device: string | undefined,
+    internet: string | undefined
+  ): void {
     this.deviceControl.setValue(device);
     this.internetControl.setValue(internet);
   }
@@ -117,25 +152,28 @@ export class GeneralSettingsComponent implements OnInit, OnDestroy {
     this.settingForm.valueChanges
       .pipe(
         takeUntil(this.destroy$),
-        tap(() => this.isSubmitting = false),
-      ).subscribe();
+        tap(() => (this.isSubmitting = false))
+      )
+      .subscribe();
   }
 
   private createSystemConfig(): void {
-    const {device_intf, internet_intf} = this.settingForm.value;
+    const { device_intf, internet_intf } = this.settingForm.value;
     const data = {
       network: {
         device_intf,
-        internet_intf
-      }
-    }
+        internet_intf,
+      },
+    };
 
-    this.testRunService.createSystemConfig(data)
+    this.testRunService
+      .createSystemConfig(data)
       .pipe(takeUntil(this.destroy$))
       .subscribe(() => {
         this.closeSetting();
         this.testRunService.setSystemConfig(data);
-        this.hasSetting = true;
+        this.testRunService.setIsOpenAddDevice(true);
+        this.testRunService.setHasConnectionSetting(true);
       });
   }
 
@@ -147,11 +185,13 @@ export class GeneralSettingsComponent implements OnInit, OnDestroy {
     this.testRunService.systemConfig$
       .pipe(takeUntil(this.destroy$))
       .subscribe(config => {
-        const {device_intf, internet_intf} = config.network;
-        if (device_intf && internet_intf) {
-          this.setDefaultFormValues(device_intf, internet_intf);
+        if (config?.network) {
+          const { device_intf, internet_intf } = config.network;
+          if (device_intf && internet_intf) {
+            this.setDefaultFormValues(device_intf, internet_intf);
+          }
         }
-      })
+      });
   }
 
   private resetForm(): void {
diff --git a/modules/ui/src/app/components/general-settings/only-different-values.validator.ts b/modules/ui/src/app/components/general-settings/only-different-values.validator.ts
index 3509062a1..dea0c50dc 100644
--- a/modules/ui/src/app/components/general-settings/only-different-values.validator.ts
+++ b/modules/ui/src/app/components/general-settings/only-different-values.validator.ts
@@ -13,11 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {Injectable} from '@angular/core';
-import {AbstractControl, FormControl, ValidationErrors, ValidatorFn} from '@angular/forms';
-
-@Injectable({providedIn: 'root'})
+import { Injectable } from '@angular/core';
+import {
+  AbstractControl,
+  FormControl,
+  ValidationErrors,
+  ValidatorFn,
+} from '@angular/forms';
 
+@Injectable({ providedIn: 'root' })
 export class OnlyDifferentValuesValidator {
   public onlyDifferentSetting(): ValidatorFn {
     return (form: AbstractControl): ValidationErrors | null => {
@@ -36,9 +40,9 @@ export class OnlyDifferentValuesValidator {
       }
 
       if (deviceControlValue === internetControlValue) {
-        return {'hasSameValues': true}
+        return { hasSameValues: true };
       }
       return null;
-    }
+    };
   }
 }
diff --git a/modules/ui/src/app/components/report-action/report-action.component.spec.ts b/modules/ui/src/app/components/report-action/report-action.component.spec.ts
new file mode 100644
index 000000000..2e5bedf84
--- /dev/null
+++ b/modules/ui/src/app/components/report-action/report-action.component.spec.ts
@@ -0,0 +1,50 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ReportActionComponent } from './report-action.component';
+import { MOCK_PROGRESS_DATA_COMPLIANT } from '../../mocks/progress.mock';
+
+describe('ReportActionComponent', () => {
+  let component: ReportActionComponent;
+  let fixture: ComponentFixture<ReportActionComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [ReportActionComponent],
+    });
+    fixture = TestBed.createComponent(ReportActionComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  describe('Class tests', () => {
+    it('should create', () => {
+      expect(component).toBeTruthy();
+    });
+
+    it('#getTestRunId should return data for title of link', () => {
+      const expectedResult = 'Delta 03-DIN-CPU 1.2.2 22 Jun 2023 9:20';
+
+      const result = component.getTestRunId(MOCK_PROGRESS_DATA_COMPLIANT);
+
+      expect(result).toEqual(expectedResult);
+    });
+
+    it('#getFormattedDateString should return date as string in the format "d MMM y H:mm"', () => {
+      const expectedResult = '22 Jun 2023 9:20';
+
+      const result = component.getFormattedDateString(
+        MOCK_PROGRESS_DATA_COMPLIANT.started
+      );
+
+      expect(result).toEqual(expectedResult);
+    });
+
+    it('#getFormattedDateString should return empty string when no date', () => {
+      const expectedResult = '';
+
+      const result = component.getFormattedDateString(null);
+
+      expect(result).toEqual(expectedResult);
+    });
+  });
+});
diff --git a/modules/ui/src/app/components/report-action/report-action.component.ts b/modules/ui/src/app/components/report-action/report-action.component.ts
new file mode 100644
index 000000000..62dc39d58
--- /dev/null
+++ b/modules/ui/src/app/components/report-action/report-action.component.ts
@@ -0,0 +1,26 @@
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { CommonModule, DatePipe } from '@angular/common';
+import { TestrunStatus } from '../../model/testrun-status';
+
+@Component({
+  selector: 'app-report-action',
+  standalone: true,
+  imports: [CommonModule],
+  template: '',
+  providers: [DatePipe],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class ReportActionComponent {
+  @Input() data!: TestrunStatus;
+  constructor(private datePipe: DatePipe) {}
+
+  getTestRunId(data: TestrunStatus) {
+    return `${data.device.manufacturer} ${data.device.model} ${
+      data.device.firmware
+    } ${this.getFormattedDateString(data.started)}`;
+  }
+
+  getFormattedDateString(date: string | null) {
+    return date ? this.datePipe.transform(date, 'd MMM y H:mm') : '';
+  }
+}
diff --git a/modules/ui/src/app/components/spinner/spinner.component.html b/modules/ui/src/app/components/spinner/spinner.component.html
new file mode 100644
index 000000000..436fe6c2e
--- /dev/null
+++ b/modules/ui/src/app/components/spinner/spinner.component.html
@@ -0,0 +1,3 @@
+<div *ngIf="loader$ | async" class="spinner-container">
+  <span class="loader"></span>
+</div>
diff --git a/modules/ui/src/app/components/spinner/spinner.component.scss b/modules/ui/src/app/components/spinner/spinner.component.scss
new file mode 100644
index 000000000..5358b9874
--- /dev/null
+++ b/modules/ui/src/app/components/spinner/spinner.component.scss
@@ -0,0 +1,36 @@
+@use '@angular/material' as mat;
+@import '../../../theming/colors';
+
+.spinner-container {
+  position: absolute;
+  width: 100%;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  background-color: rgba(255, 255, 255, 0.7);
+  z-index: 9999;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.loader {
+  width: 36px;
+  height: 36px;
+  border: 4px solid mat.get-color-from-palette($color-primary, 500);
+  border-bottom-color: transparent;
+  border-radius: 50%;
+  display: inline-block;
+  box-sizing: border-box;
+  animation: rotation 1s linear infinite;
+}
+
+@keyframes rotation {
+  0% {
+    transform: rotate(0deg);
+  }
+  100% {
+    transform: rotate(360deg);
+  }
+}
diff --git a/modules/ui/src/app/components/spinner/spinner.component.spec.ts b/modules/ui/src/app/components/spinner/spinner.component.spec.ts
new file mode 100644
index 000000000..273e41b16
--- /dev/null
+++ b/modules/ui/src/app/components/spinner/spinner.component.spec.ts
@@ -0,0 +1,43 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { SpinnerComponent } from './spinner.component';
+import { LoaderService } from '../../services/loader.service';
+import { of } from 'rxjs';
+
+describe('SpinnerComponent', () => {
+  let component: SpinnerComponent;
+  let fixture: ComponentFixture<SpinnerComponent>;
+  const loaderServiceMock: jasmine.SpyObj<LoaderService> = jasmine.createSpyObj(
+    ['getLoading']
+  );
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [SpinnerComponent],
+      providers: [{ provide: LoaderService, useValue: loaderServiceMock }],
+    });
+    fixture = TestBed.createComponent(SpinnerComponent);
+    component = fixture.componentInstance;
+  });
+
+  it('should create', () => {
+    fixture.detectChanges();
+    expect(component).toBeTruthy();
+  });
+
+  it('should not show spinner if loading is false', () => {
+    loaderServiceMock.getLoading.and.returnValue(of(false));
+    fixture.detectChanges();
+    const spinner = fixture.nativeElement.querySelector('.spinner-container');
+
+    expect(spinner).toBeNull();
+  });
+
+  it('should not show spinner if loading is true', () => {
+    loaderServiceMock.getLoading.and.returnValue(of(true));
+    fixture.detectChanges();
+    const spinner = fixture.nativeElement.querySelector('.spinner-container');
+
+    expect(spinner).toBeTruthy();
+  });
+});
diff --git a/modules/ui/src/app/components/spinner/spinner.component.ts b/modules/ui/src/app/components/spinner/spinner.component.ts
new file mode 100644
index 000000000..de45b59e9
--- /dev/null
+++ b/modules/ui/src/app/components/spinner/spinner.component.ts
@@ -0,0 +1,21 @@
+import { Component, OnInit } from '@angular/core';
+import { LoaderService } from '../../services/loader.service';
+import { CommonModule } from '@angular/common';
+import { Observable } from 'rxjs/internal/Observable';
+
+@Component({
+  selector: 'app-spinner',
+  templateUrl: './spinner.component.html',
+  styleUrls: ['./spinner.component.scss'],
+  standalone: true,
+  imports: [CommonModule],
+})
+export class SpinnerComponent implements OnInit {
+  loader$!: Observable<boolean>;
+
+  constructor(public loaderService: LoaderService) {}
+
+  ngOnInit() {
+    this.loader$ = this.loaderService.getLoading();
+  }
+}
diff --git a/modules/ui/src/app/components/version/update-dialog/update-dialog.component.html b/modules/ui/src/app/components/version/update-dialog/update-dialog.component.html
new file mode 100644
index 000000000..61b507282
--- /dev/null
+++ b/modules/ui/src/app/components/version/update-dialog/update-dialog.component.html
@@ -0,0 +1,39 @@
+<!--
+Copyright 2023 Google LLC
+
+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
+
+    https://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.
+-->
+<span class="version-update-title">Software is outdated!</span>
+<p class="version-update-content">
+  You are currently using an outdated software (<b>{{
+    data.installed_version
+  }}</b
+  >).
+  <br />
+  The actual version number is <b>{{ data.latest_version }}</b
+  >. Please consider to update or continue at your own risk.
+</p>
+
+<mat-dialog-actions align="end" class="version-update-actions">
+  <button (click)="cancel()" class="cancel-button" mat-flat-button>
+    Ignore
+  </button>
+  <a
+    href="{{ data.latest_version_url }}"
+    target="_blank"
+    class="download-link"
+    mat-flat-button
+    (click)="cancel()">
+    Download
+  </a>
+</mat-dialog-actions>
diff --git a/modules/ui/src/app/components/version/update-dialog/update-dialog.component.scss b/modules/ui/src/app/components/version/update-dialog/update-dialog.component.scss
new file mode 100644
index 000000000..e340a6192
--- /dev/null
+++ b/modules/ui/src/app/components/version/update-dialog/update-dialog.component.scss
@@ -0,0 +1,43 @@
+/**
+ * Copyright 2023 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+@import '../../../../theming/colors';
+
+:host {
+  display: grid;
+  overflow: hidden;
+  width: 570px;
+  padding: 24px 16px 8px 24px;
+  gap: 10px;
+}
+
+.version-update-title {
+  color: #202124;
+  font-size: 18px;
+  line-height: 24px;
+}
+
+.version-update-content {
+  font-family: Roboto, sans-serif;
+  font-size: 14px;
+  line-height: 20px;
+  letter-spacing: 0.2px;
+  color: $grey-800;
+}
+
+.version-update-actions {
+  padding: 0;
+  min-height: 30px;
+}
diff --git a/modules/ui/src/app/components/version/update-dialog/update-dialog.component.spec.ts b/modules/ui/src/app/components/version/update-dialog/update-dialog.component.spec.ts
new file mode 100644
index 000000000..72fee490b
--- /dev/null
+++ b/modules/ui/src/app/components/version/update-dialog/update-dialog.component.spec.ts
@@ -0,0 +1,107 @@
+/**
+ * Copyright 2023 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { UpdateDialogComponent } from './update-dialog.component';
+import {
+  MAT_DIALOG_DATA,
+  MatDialogModule,
+  MatDialogRef,
+} from '@angular/material/dialog';
+import { MatButtonModule } from '@angular/material/button';
+import { NEW_VERSION } from '../../../mocks/version.mock';
+import { of } from 'rxjs';
+
+describe('UpdateDialogComponent', () => {
+  let component: UpdateDialogComponent;
+  let fixture: ComponentFixture<UpdateDialogComponent>;
+  let compiled: HTMLElement;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [UpdateDialogComponent, MatDialogModule, MatButtonModule],
+      providers: [
+        {
+          provide: MatDialogRef,
+          useValue: {
+            keydownEvents: () => of(new KeyboardEvent('keydown', { code: '' })),
+            close: () => ({}),
+          },
+        },
+        { provide: MAT_DIALOG_DATA, useValue: {} },
+      ],
+    });
+    fixture = TestBed.createComponent(UpdateDialogComponent);
+    component = fixture.componentInstance;
+    component.data = NEW_VERSION;
+    fixture.detectChanges();
+    compiled = fixture.nativeElement as HTMLElement;
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should has title', () => {
+    const title = compiled.querySelector(
+      '.version-update-title'
+    ) as HTMLElement;
+
+    expect(title.innerHTML).toEqual('Software is outdated!');
+  });
+
+  it('should has content', () => {
+    const content = compiled.querySelector(
+      '.version-update-content'
+    ) as HTMLElement;
+
+    const innerContent = content.innerHTML.trim();
+    expect(innerContent).toContain(
+      'You are currently using an outdated software'
+    );
+    expect(innerContent).toContain('v1');
+    expect(innerContent).toContain('v2');
+    expect(innerContent).toContain(
+      'Please consider to update or continue at your own risk.'
+    );
+  });
+
+  it('should close dialog on "cancel" click', () => {
+    const closeSpy = spyOn(component.dialogRef, 'close');
+    const closeButton = compiled.querySelector(
+      '.cancel-button'
+    ) as HTMLButtonElement;
+
+    closeButton?.click();
+
+    expect(closeSpy).toHaveBeenCalledWith();
+
+    closeSpy.calls.reset();
+  });
+
+  it('should close dialog on download link click', () => {
+    const closeSpy = spyOn(component.dialogRef, 'close');
+    const confirmButton = compiled.querySelector(
+      '.download-link'
+    ) as HTMLAnchorElement;
+
+    confirmButton?.click();
+
+    expect(closeSpy).toHaveBeenCalledWith();
+
+    closeSpy.calls.reset();
+  });
+});
diff --git a/modules/ui/src/app/components/version/update-dialog/update-dialog.component.ts b/modules/ui/src/app/components/version/update-dialog/update-dialog.component.ts
new file mode 100644
index 000000000..86ed5db43
--- /dev/null
+++ b/modules/ui/src/app/components/version/update-dialog/update-dialog.component.ts
@@ -0,0 +1,44 @@
+/**
+ * Copyright 2023 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+import { Component, Inject } from '@angular/core';
+import {
+  MAT_DIALOG_DATA,
+  MatDialogModule,
+  MatDialogRef,
+} from '@angular/material/dialog';
+import { MatButtonModule } from '@angular/material/button';
+import { Version } from '../../../model/version';
+import { EscapableDialogComponent } from '../../escapable-dialog/escapable-dialog.component';
+
+@Component({
+  selector: 'app-update-dialog',
+  standalone: true,
+  imports: [MatDialogModule, MatButtonModule],
+  templateUrl: './update-dialog.component.html',
+  styleUrls: ['./update-dialog.component.scss'],
+})
+export class UpdateDialogComponent extends EscapableDialogComponent {
+  constructor(
+    public override dialogRef: MatDialogRef<UpdateDialogComponent>,
+    @Inject(MAT_DIALOG_DATA) public data: Version
+  ) {
+    super(dialogRef);
+  }
+
+  cancel() {
+    this.dialogRef.close();
+  }
+}
diff --git a/modules/ui/src/app/components/version/version.component.html b/modules/ui/src/app/components/version/version.component.html
new file mode 100644
index 000000000..7d396e169
--- /dev/null
+++ b/modules/ui/src/app/components/version/version.component.html
@@ -0,0 +1,41 @@
+<!--
+Copyright 2023 Google LLC
+
+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
+
+    https://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.
+-->
+<ng-container *ngIf="version$ | async as version">
+  <button
+    mat-button
+    *ngIf="!version.update_available"
+    class="version-content"
+    [attr.aria-label]="version?.installed_version">
+    {{ version?.installed_version }}
+  </button>
+  <button
+    mat-button
+    *ngIf="version.update_available"
+    class="version-content-update"
+    [attr.aria-label]="
+      version?.installed_version +
+      ' New version is available. Click here to update'
+    "
+    (click)="openUpdateWindow()">
+    {{ version?.installed_version }}
+    <span
+      role="alert"
+      aria-live="assertive"
+      class="version-content-update-text">
+      New version is available
+    </span>
+  </button>
+</ng-container>
diff --git a/modules/ui/src/app/components/version/version.component.scss b/modules/ui/src/app/components/version/version.component.scss
new file mode 100644
index 000000000..54f29b9a8
--- /dev/null
+++ b/modules/ui/src/app/components/version/version.component.scss
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+@import '../../../theming/colors';
+
+:host {
+  position: relative;
+}
+
+.version-content,
+.version-content-update {
+  min-width: 48px;
+  height: 34px;
+  max-width: 100%;
+  & ::ng-deep .mdc-button__label {
+    text-overflow: ellipsis;
+    overflow: hidden;
+  }
+}
+
+.version-content {
+  pointer-events: none;
+}
+
+.version-content-update {
+  background: $color-background-grey;
+  border-radius: 20px;
+  cursor: pointer;
+  &:after {
+    content: '';
+    position: absolute;
+    width: 8px;
+    height: 8px;
+    border-radius: 100%;
+    background: $red-800;
+    top: 3px;
+    right: 3px;
+  }
+}
+
+.version-content-update-text {
+  display: inline-block;
+  height: 0;
+  width: 0;
+  overflow: hidden;
+}
diff --git a/modules/ui/src/app/components/version/version.component.spec.ts b/modules/ui/src/app/components/version/version.component.spec.ts
new file mode 100644
index 000000000..45c85e127
--- /dev/null
+++ b/modules/ui/src/app/components/version/version.component.spec.ts
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { VersionComponent } from './version.component';
+import { TestRunService } from '../../services/test-run.service';
+import SpyObj = jasmine.SpyObj;
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { Version } from '../../model/version';
+import { NEW_VERSION, VERSION } from '../../mocks/version.mock';
+
+describe('VersionComponent', () => {
+  let component: VersionComponent;
+  let fixture: ComponentFixture<VersionComponent>;
+  let compiled: HTMLElement;
+  let mockService: SpyObj<TestRunService>;
+
+  const versionBehaviorSubject$ = new BehaviorSubject<Version | null>(null);
+
+  beforeEach(() => {
+    mockService = jasmine.createSpyObj(['getVersion', 'fetchVersion']);
+    mockService.getVersion.and.returnValue(versionBehaviorSubject$);
+    TestBed.configureTestingModule({
+      imports: [VersionComponent],
+      providers: [{ provide: TestRunService, useValue: mockService }],
+    });
+    fixture = TestBed.createComponent(VersionComponent);
+    component = fixture.componentInstance;
+    compiled = fixture.nativeElement as HTMLElement;
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  describe('update is not available', () => {
+    beforeEach(() => {
+      versionBehaviorSubject$.next(VERSION);
+      fixture.detectChanges();
+    });
+
+    it('display button with information', () => {
+      const button = compiled.querySelector(
+        '.version-content'
+      ) as HTMLButtonElement;
+
+      expect(button.innerHTML).toContain('v1');
+    });
+  });
+
+  describe('update is available', () => {
+    beforeEach(() => {
+      versionBehaviorSubject$.next(NEW_VERSION);
+      fixture.detectChanges();
+    });
+
+    it('display button with information', () => {
+      const button = compiled.querySelector(
+        '.version-content-update'
+      ) as HTMLButtonElement;
+
+      expect(button.innerHTML).toContain('v1');
+    });
+
+    it('has version update text', () => {
+      const text = compiled.querySelector(
+        '.version-content-update-text'
+      ) as HTMLSpanElement;
+
+      expect(text.innerHTML.trim()).toEqual('New version is available');
+    });
+  });
+});
diff --git a/modules/ui/src/app/components/version/version.component.ts b/modules/ui/src/app/components/version/version.component.ts
new file mode 100644
index 000000000..e102ecaf6
--- /dev/null
+++ b/modules/ui/src/app/components/version/version.component.ts
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+import { Component, OnInit } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { TestRunService } from '../../services/test-run.service';
+import { Version } from '../../model/version';
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { MatButtonModule } from '@angular/material/button';
+import { MatDialog, MatDialogModule } from '@angular/material/dialog';
+import { UpdateDialogComponent } from './update-dialog/update-dialog.component';
+
+@Component({
+  selector: 'app-version',
+  standalone: true,
+  imports: [CommonModule, MatButtonModule, MatDialogModule],
+  templateUrl: './version.component.html',
+  styleUrls: ['./version.component.scss'],
+})
+export class VersionComponent implements OnInit {
+  version$: BehaviorSubject<Version | null>;
+
+  constructor(
+    private testRunService: TestRunService,
+    public dialog: MatDialog
+  ) {
+    this.version$ = testRunService.getVersion();
+  }
+
+  ngOnInit() {
+    this.testRunService.fetchVersion();
+  }
+
+  openUpdateWindow() {
+    this.dialog.open(UpdateDialogComponent, {
+      ariaLabel: 'Update version',
+      data: this.version$.value,
+      autoFocus: true,
+      hasBackdrop: true,
+      disableClose: true,
+      panelClass: 'version-update-dialog',
+    });
+  }
+}
diff --git a/modules/ui/src/app/device-repository/device-form/device-form.component.html b/modules/ui/src/app/device-repository/device-form/device-form.component.html
index e8245d74d..ef888451a 100644
--- a/modules/ui/src/app/device-repository/device-form/device-form.component.html
+++ b/modules/ui/src/app/device-repository/device-form/device-form.component.html
@@ -14,10 +14,13 @@
 limitations under the License.
 -->
 <form [formGroup]="deviceForm" class="device-form">
-  <span class="device-form-title">{{data.title}}</span>
+  <span class="device-form-title">{{ data.title }}</span>
   <mat-form-field appearance="outline">
     <mat-label>Device Manufacturer</mat-label>
-    <input class="device-form-manufacturer" formControlName="manufacturer" matInput>
+    <input
+      class="device-form-manufacturer"
+      formControlName="manufacturer"
+      matInput />
     <mat-hint>Please enter device manufacturer name</mat-hint>
     <mat-error *ngIf="manufacturer.errors?.['required']">
       <span>Device Manufacturer is <strong>required</strong></span>
@@ -25,7 +28,7 @@
   </mat-form-field>
   <mat-form-field appearance="outline">
     <mat-label>Device Model</mat-label>
-    <input class="device-form-model" formControlName="model" matInput>
+    <input class="device-form-model" formControlName="model" matInput />
     <mat-hint>Please enter device name</mat-hint>
     <mat-error *ngIf="model.errors?.['required']">
       <span>Device Model is <strong>required</strong></span>
@@ -33,17 +36,34 @@
   </mat-form-field>
   <mat-form-field appearance="outline">
     <mat-label>MAC address</mat-label>
-    <input class="device-form-mac-address" formControlName="mac_addr" matInput
-           placeholder="xx:xx:xx:xx:xx:xx">
+    <input
+      class="device-form-mac-address"
+      formControlName="mac_addr"
+      matInput
+      [dropSpecialCharacters]="false"
+      [showMaskTyped]="true"
+      [specialCharacters]="[':']"
+      mask="AA:AA:AA:AA:AA:AA"
+      shownMaskExpression="__:__:__:__:__:__"
+      type="text" />
     <mat-hint>Please enter MAC address</mat-hint>
-    <mat-error *ngIf="mac_addr.errors?.['required'] && !mac_addr.errors?.['pattern']">
+    <mat-error
+      *ngIf="mac_addr.errors?.['required'] && !mac_addr.errors?.['pattern']">
       <span>MAC address is <strong>required</strong></span>
     </mat-error>
-    <mat-error *ngIf="mac_addr.errors?.['pattern']" class="device-form-mac-address-error">
-      <span>Please, check. A MAC address consists of 12 hexadecimal digits (0 to 9, a to f, or A to F).</span>
+    <mat-error
+      *ngIf="mac_addr.errors?.['pattern']"
+      class="device-form-mac-address-error">
+      <span
+        >Please, check. A MAC address consists of 12 hexadecimal digits (0 to 9,
+        a to f, or A to F).</span
+      >
     </mat-error>
     <mat-error *ngIf="mac_addr.errors?.['has_same_mac_address']">
-      <span>This MAC address is already used for another device in the repository.</span>
+      <span
+        >This MAC address is already used for another device in the
+        repository.</span
+      >
     </mat-error>
   </mat-form-field>
   <app-device-tests
@@ -52,12 +72,35 @@
     [testModules]="testModules">
   </app-device-tests>
 
-  <mat-error *ngIf="error$| async">
-    <span>{{error$| async}}</span>
+  <mat-error *ngIf="error$ | async">
+    <span>{{ error$ | async }}</span>
   </mat-error>
 
   <mat-dialog-actions align="end" class="device-form-actions">
-    <button (click)="cancel()" class="close-button" mat-flat-button>Cancel</button>
-    <button (click)="saveDevice()" class="save-button" color="primary" mat-flat-button>Save</button>
+    <button
+      (click)="delete()"
+      *ngIf="data.device"
+      class="delete-button"
+      mat-flat-button
+      type="button">
+      Delete
+    </button>
+    <button
+      (click)="cancel()"
+      class="close-button"
+      mat-flat-button
+      type="button">
+      Cancel
+    </button>
+    <button
+      (click)="saveDevice()"
+      class="save-button"
+      color="primary"
+      mat-flat-button
+      type="button">
+      Save
+    </button>
   </mat-dialog-actions>
+
+  <app-spinner></app-spinner>
 </form>
diff --git a/modules/ui/src/app/device-repository/device-form/device-form.component.scss b/modules/ui/src/app/device-repository/device-form/device-form.component.scss
index 1b3acc3c3..ee0d87326 100644
--- a/modules/ui/src/app/device-repository/device-form/device-form.component.scss
+++ b/modules/ui/src/app/device-repository/device-form/device-form.component.scss
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@import "../../../theming/colors";
+@import '../../../theming/colors';
 
-$device-form-max-width: 549px;
+$device-form-max-width: 580px;
 $device-form-min-width: 285px;
 
 :host {
@@ -57,5 +57,9 @@ $device-form-min-width: 285px;
 
 .device-form-mac-address-error {
   white-space: nowrap;
-  margin-left: -22px;
+}
+
+.delete-button {
+  color: $grey-700;
+  margin-right: auto;
 }
diff --git a/modules/ui/src/app/device-repository/device-form/device-form.component.spec.ts b/modules/ui/src/app/device-repository/device-form/device-form.component.spec.ts
index f9b2930b7..2d0c7a423 100644
--- a/modules/ui/src/app/device-repository/device-form/device-form.component.spec.ts
+++ b/modules/ui/src/app/device-repository/device-form/device-form.component.spec.ts
@@ -13,19 +13,30 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {ComponentFixture, fakeAsync, flush, TestBed} from '@angular/core/testing';
-
-import {DeviceFormComponent} from './device-form.component';
-import {TestRunService} from '../../test-run.service';
-import {MatButtonModule} from '@angular/material/button';
-import {FormControl, ReactiveFormsModule} from '@angular/forms';
-import {MatCheckboxModule} from '@angular/material/checkbox';
-import {MatInputModule} from '@angular/material/input';
-import {MAT_DIALOG_DATA, MatDialogModule, MatDialogRef} from '@angular/material/dialog';
-import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
-import {Device} from '../../model/device';
-import {of, throwError} from 'rxjs';
-import {DeviceTestsComponent} from '../../components/device-tests/device-tests.component';
+import {
+  ComponentFixture,
+  fakeAsync,
+  flush,
+  TestBed,
+} from '@angular/core/testing';
+
+import { DeviceFormComponent, FormAction } from './device-form.component';
+import { TestRunService } from '../../services/test-run.service';
+import { MatButtonModule } from '@angular/material/button';
+import { FormControl, ReactiveFormsModule } from '@angular/forms';
+import { MatCheckboxModule } from '@angular/material/checkbox';
+import { MatInputModule } from '@angular/material/input';
+import {
+  MAT_DIALOG_DATA,
+  MatDialogModule,
+  MatDialogRef,
+} from '@angular/material/dialog';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { Device } from '../../model/device';
+import { of, throwError } from 'rxjs';
+import { DeviceTestsComponent } from '../../components/device-tests/device-tests.component';
+import { SpinnerComponent } from '../../components/spinner/spinner.component';
+import { NgxMaskDirective, NgxMaskPipe, provideNgxMask } from 'ngx-mask';
 
 describe('DeviceFormComponent', () => {
   let component: DeviceFormComponent;
@@ -34,17 +45,21 @@ describe('DeviceFormComponent', () => {
   let compiled: HTMLElement;
 
   beforeEach(() => {
-    testRunServiceMock = jasmine.createSpyObj(['getTestModules', 'hasDevice', 'saveDevice']);
+    testRunServiceMock = jasmine.createSpyObj([
+      'getTestModules',
+      'hasDevice',
+      'saveDevice',
+    ]);
     testRunServiceMock.getTestModules.and.returnValue([
       {
-        displayName: "Connection",
-        name: "connection",
-        enabled: true
+        displayName: 'Connection',
+        name: 'connection',
+        enabled: true,
       },
       {
-        displayName: "Smart Ready",
-        name: "udmi",
-        enabled: false
+        displayName: 'Smart Ready',
+        name: 'udmi',
+        enabled: false,
       },
     ]);
     TestBed.configureTestingModule({
@@ -52,17 +67,30 @@ describe('DeviceFormComponent', () => {
       providers: [
         {
           provide: TestRunService,
-          useValue: testRunServiceMock
+          useValue: testRunServiceMock,
         },
         {
           provide: MatDialogRef,
           useValue: {
-            close: (result: any) => {
-            }
-          }
+            keydownEvents: () => of(new KeyboardEvent('keydown', { code: '' })),
+            close: () => ({}),
+          },
         },
-        {provide: MAT_DIALOG_DATA, useValue: {}},],
-      imports: [MatButtonModule, ReactiveFormsModule, MatCheckboxModule, MatInputModule, MatDialogModule, BrowserAnimationsModule, DeviceTestsComponent]
+        { provide: MAT_DIALOG_DATA, useValue: {} },
+        provideNgxMask(),
+      ],
+      imports: [
+        MatButtonModule,
+        ReactiveFormsModule,
+        MatCheckboxModule,
+        MatInputModule,
+        MatDialogModule,
+        BrowserAnimationsModule,
+        DeviceTestsComponent,
+        SpinnerComponent,
+        NgxMaskDirective,
+        NgxMaskPipe,
+      ],
     });
     fixture = TestBed.createComponent(DeviceFormComponent);
     component = fixture.componentInstance;
@@ -83,7 +111,9 @@ describe('DeviceFormComponent', () => {
 
   it('should close dialog on "cancel" click', () => {
     const closeSpy = spyOn(component.dialogRef, 'close');
-    const closeButton = compiled.querySelector('.close-button') as HTMLButtonElement;
+    const closeButton = compiled.querySelector(
+      '.close-button'
+    ) as HTMLButtonElement;
 
     closeButton?.click();
 
@@ -94,10 +124,18 @@ describe('DeviceFormComponent', () => {
 
   it('should not save data when fields are empty', () => {
     const closeSpy = spyOn(component.dialogRef, 'close');
-    const saveButton = compiled.querySelector('.save-button') as HTMLButtonElement;
-    const model: HTMLInputElement = compiled.querySelector('.device-form-model')!;
-    const manufacturer: HTMLInputElement = compiled.querySelector('.device-form-manufacturer')!;
-    const macAddress: HTMLInputElement = compiled.querySelector('.device-form-mac-address')!;
+    const saveButton = compiled.querySelector(
+      '.save-button'
+    ) as HTMLButtonElement;
+    const model: HTMLInputElement = compiled.querySelector(
+      '.device-form-model'
+    ) as HTMLInputElement;
+    const manufacturer: HTMLInputElement = compiled.querySelector(
+      '.device-form-manufacturer'
+    ) as HTMLInputElement;
+    const macAddress: HTMLInputElement = compiled.querySelector(
+      '.device-form-mac-address'
+    ) as HTMLInputElement;
 
     ['', '                     '].forEach(value => {
       model.value = value;
@@ -110,12 +148,12 @@ describe('DeviceFormComponent', () => {
       fixture.detectChanges();
 
       fixture.whenStable().then(() => {
-        const requiredErrors = compiled.querySelectorAll('mat-error')!;
-        expect(requiredErrors.length).toEqual(3);
+        const requiredErrors = compiled.querySelectorAll('mat-error');
+        expect(requiredErrors?.length).toEqual(3);
 
         requiredErrors.forEach(error => {
           expect(error?.innerHTML).toContain('required');
-        })
+        });
       });
 
       expect(closeSpy).not.toHaveBeenCalled();
@@ -136,8 +174,10 @@ describe('DeviceFormComponent', () => {
     fixture.detectChanges();
 
     fixture.whenStable().then(() => {
-      const error = compiled.querySelector('mat-error')!;
-      expect(error.innerHTML).toContain('At least one test has to be selected.');
+      const error = compiled.querySelector('mat-error');
+      expect(error?.innerHTML).toContain(
+        'At least one test has to be selected to save a Device.'
+      );
     });
 
     expect(closeSpy).not.toHaveBeenCalled();
@@ -152,14 +192,16 @@ describe('DeviceFormComponent', () => {
     component.manufacturer.setValue('manufacturer');
     component.mac_addr.setValue('07:07:07:07:07:07');
     testRunServiceMock.hasDevice.and.returnValue(false);
-    testRunServiceMock.saveDevice.and.returnValue(throwError({error: 'some error'}));
+    testRunServiceMock.saveDevice.and.returnValue(
+      throwError({ error: 'some error' })
+    );
 
     component.saveDevice();
     fixture.detectChanges();
 
     fixture.whenStable().then(() => {
-      const error = compiled.querySelector('mat-error')!;
-      expect(error.innerHTML).toContain('some error');
+      const error = compiled.querySelector('mat-error');
+      expect(error?.innerHTML).toContain('some error');
     });
     expect(closeSpy).not.toHaveBeenCalled();
 
@@ -169,17 +211,17 @@ describe('DeviceFormComponent', () => {
 
   it('should save data when form is valid', () => {
     const device: Device = {
-      "manufacturer": "manufacturer",
-      "model": "model",
-      "mac_addr": "07:07:07:07:07:07",
-      "test_modules": {
-        "connection": {
-          "enabled": true
+      manufacturer: 'manufacturer',
+      model: 'model',
+      mac_addr: '07:07:07:07:07:07',
+      test_modules: {
+        connection: {
+          enabled: true,
+        },
+        udmi: {
+          enabled: false,
         },
-        "udmi": {
-          "enabled": false
-        }
-      }
+      },
     };
     const closeSpy = spyOn(component.dialogRef, 'close');
     component.model.setValue('model');
@@ -191,7 +233,10 @@ describe('DeviceFormComponent', () => {
     component.saveDevice();
 
     expect(closeSpy).toHaveBeenCalledTimes(1);
-    expect(closeSpy).toHaveBeenCalledWith(device);
+    expect(closeSpy).toHaveBeenCalledWith({
+      action: FormAction.Save,
+      device,
+    });
 
     closeSpy.calls.reset();
   });
@@ -204,55 +249,48 @@ describe('DeviceFormComponent', () => {
     });
 
     it('should be enabled', () => {
-      const testsForm = compiled.querySelector('app-device-tests form');
+      const tests = compiled.querySelectorAll('.device-form-test-modules p');
 
-      expect(testsForm?.classList.contains('disabled')).toEqual(false);
+      expect(tests[0].classList.contains('disabled')).toEqual(false);
     });
   });
 
   describe('device model', () => {
-    it('should not contain errors when input is correct', fakeAsync(() => {
-      const model: HTMLInputElement = compiled.querySelector('.device-form-model')!;
+    it('should not contain errors when input is correct', () => {
+      const model: HTMLInputElement = compiled.querySelector(
+        '.device-form-model'
+      ) as HTMLInputElement;
       ['model', 'Gebäude', 'jardín'].forEach(value => {
         model.value = value;
         model.dispatchEvent(new Event('input'));
 
-        fixture.detectChanges();
-
-        fixture.whenStable().then(() => {
-          const errors = component.model.errors;
-          const uiValue = model.value;
-          const formValue = component.model.value;
+        const errors = component.model.errors;
+        const uiValue = model.value;
+        const formValue = component.model.value;
 
-          expect(uiValue).toEqual(formValue);
-          expect(errors).toBeNull();
-        });
-
-        flush();
+        expect(uiValue).toEqual(formValue);
+        expect(errors).toBeNull();
       });
-
-    }));
+    });
   });
 
   describe('device manufacturer', () => {
-    it('should not contain errors when input is correct', fakeAsync(() => {
-      const manufacturer: HTMLInputElement = compiled.querySelector('.device-form-manufacturer')!;
+    it('should not contain errors when input is correct', () => {
+      const manufacturer: HTMLInputElement = compiled.querySelector(
+        '.device-form-manufacturer'
+      ) as HTMLInputElement;
       ['manufacturer', 'Gebäude', 'jardín'].forEach(value => {
         manufacturer.value = value;
         manufacturer.dispatchEvent(new Event('input'));
 
-        fixture.whenStable().then(() => {
-          const errors = component.manufacturer.errors;
-          const uiValue = manufacturer.value;
-          const formValue = component.manufacturer.value;
-
-          expect(uiValue).toEqual(formValue);
-          expect(errors).toBeNull();
-        });
+        const errors = component.manufacturer.errors;
+        const uiValue = manufacturer.value;
+        const formValue = component.manufacturer.value;
 
-        flush();
-      })
-    }));
+        expect(uiValue).toEqual(formValue);
+        expect(errors).toBeNull();
+      });
+    });
   });
 
   describe('mac address', () => {
@@ -260,94 +298,101 @@ describe('DeviceFormComponent', () => {
       expect(component.mac_addr.disabled).toBeFalse();
     });
 
-    it('should not contain errors when input is correct', fakeAsync(() => {
-      const macAddress: HTMLInputElement = compiled.querySelector('.device-form-mac-address')!;
+    it('should not contain errors when input is correct', () => {
+      const macAddress: HTMLInputElement = compiled.querySelector(
+        '.device-form-mac-address'
+      ) as HTMLInputElement;
       ['07:07:07:07:07:07', '     07:07:07:07:07:07     '].forEach(value => {
         macAddress.value = value;
         macAddress.dispatchEvent(new Event('input'));
 
-        fixture.detectChanges();
-
-        fixture.whenStable().then(() => {
-          const errors = component.mac_addr.errors;
-          const uiValue = macAddress.value;
-          const formValue = component.mac_addr.value;
-
-          expect(uiValue).toEqual(formValue);
-          expect(errors).toBeNull();
-        });
+        const errors = component.mac_addr.errors;
+        const formValue = component.mac_addr.value;
 
-        flush();
-      })
-    }));
+        expect(macAddress.value).toEqual(formValue);
+        expect(errors).toBeNull();
+      });
+    });
 
-    it('should have "pattern" error when field does not satisfy pattern', fakeAsync(() => {
-      const macAddress: HTMLInputElement = compiled.querySelector('.device-form-mac-address')!;
-      ['value', '001e423573c4', '          '].forEach(value => {
+    it('should have "pattern" error when field does not satisfy pattern', () => {
+      ['value', 'q01e423573c4'].forEach(value => {
+        const macAddress: HTMLInputElement = compiled.querySelector(
+          '.device-form-mac-address'
+        ) as HTMLInputElement;
         macAddress.value = value;
         macAddress.dispatchEvent(new Event('input'));
         component.mac_addr.markAsTouched();
-
         fixture.detectChanges();
 
-        fixture.whenStable().then(() => {
-          const macAddressError = compiled.querySelector('mat-error')!.innerHTML;
-          const error = component.mac_addr.errors!['pattern'];
+        const macAddressError = compiled.querySelector('mat-error')?.innerHTML;
+        const error = component.mac_addr.hasError('pattern');
 
-          expect(error).toBeTruthy();
-          expect(macAddressError).toContain('Please, check. A MAC address consists of 12 hexadecimal digits (0 to 9, a to f, or A to F).');
-        });
-
-        flush();
-      })
-    }));
+        expect(error).toBeTruthy();
+        expect(macAddressError).toContain(
+          'Please, check. A MAC address consists of 12 hexadecimal digits (0 to 9, a to f, or A to F).'
+        );
+      });
+    });
 
-    it('should have "has_same_mac_address" error when MAC address is already used', fakeAsync(() => {
+    it('should have "has_same_mac_address" error when MAC address is already used', () => {
       testRunServiceMock.hasDevice.and.returnValue(true);
-      const macAddress: HTMLInputElement = compiled.querySelector('.device-form-mac-address')!;
+      const macAddress: HTMLInputElement = compiled.querySelector(
+        '.device-form-mac-address'
+      ) as HTMLInputElement;
       macAddress.value = '07:07:07:07:07:07';
       macAddress.dispatchEvent(new Event('input'));
       component.mac_addr.markAsTouched();
       fixture.detectChanges();
 
-      fixture.whenStable().then(() => {
-        const macAddressError = compiled.querySelector('mat-error')!.innerHTML;
-        const error = component.mac_addr.errors!['has_same_mac_address'];
+      const macAddressError = compiled.querySelector('mat-error')?.innerHTML;
+      const error = component.mac_addr.hasError('has_same_mac_address');
 
-        expect(error).toBeTruthy();
-        expect(macAddressError).toContain('This MAC address is already used for another device in the repository.');
-      });
+      expect(error).toBeTruthy();
+      expect(macAddressError).toContain(
+        'This MAC address is already used for another device in the repository.'
+      );
+    });
+  });
 
-      flush();
-    }));
+  it('should have no delete device button', () => {
+    const deleteButton = compiled.querySelector(
+      '.delete-button'
+    ) as HTMLButtonElement;
+
+    expect(deleteButton).toBeNull();
   });
 
   describe('when device is present', () => {
     beforeEach(() => {
       component.data = {
         device: {
-          "manufacturer": "Delta",
-          "model": "O3-DIN-CPU",
-          "mac_addr": "00:1e:42:35:73:c4",
-          "test_modules": {
-            "udmi": {
-              "enabled": true,
-            }
-          }
-        }
-      }
+          manufacturer: 'Delta',
+          model: 'O3-DIN-CPU',
+          mac_addr: '00:1e:42:35:73:c4',
+          test_modules: {
+            udmi: {
+              enabled: true,
+            },
+          },
+        },
+      };
       component.ngOnInit();
       fixture.detectChanges();
     });
 
     it('should fill form values with device values', () => {
-      const model: HTMLInputElement = compiled.querySelector('.device-form-model')!;
-      const manufacturer: HTMLInputElement = compiled.querySelector('.device-form-manufacturer')!;
-      const macAddress: HTMLInputElement = compiled.querySelector('.device-form-mac-address')!;
-
+      const model: HTMLInputElement = compiled.querySelector(
+        '.device-form-model'
+      ) as HTMLInputElement;
+      const manufacturer: HTMLInputElement = compiled.querySelector(
+        '.device-form-manufacturer'
+      ) as HTMLInputElement;
+      const macAddress: HTMLInputElement = compiled.querySelector(
+        '.device-form-mac-address'
+      ) as HTMLInputElement;
       expect(model.value).toEqual('O3-DIN-CPU');
       expect(manufacturer.value).toEqual('Delta');
-      expect(macAddress.value).toEqual('00:1e:42:35:73:c4');
+      expect(macAddress.disabled).toBeTrue();
     });
 
     it('should save data even mac address already exist', fakeAsync(() => {
@@ -361,22 +406,25 @@ describe('DeviceFormComponent', () => {
       fixture.detectChanges();
 
       fixture.whenStable().then(() => {
-        const error = compiled.querySelector('mat-error')!;
+        const error = compiled.querySelector('mat-error');
         expect(error).toBeFalse();
       });
 
       expect(closeSpy).toHaveBeenCalledWith({
-        "manufacturer": "Delta",
-        "model": "O3-DIN-CPU",
-        "mac_addr": "00:1e:42:35:73:c4",
-        "test_modules": {
-          "connection": {
-            "enabled": false,
+        action: FormAction.Save,
+        device: {
+          manufacturer: 'Delta',
+          model: 'O3-DIN-CPU',
+          mac_addr: '00:1e:42:35:73:c4',
+          test_modules: {
+            connection: {
+              enabled: false,
+            },
+            udmi: {
+              enabled: true,
+            },
           },
-          "udmi": {
-            "enabled": true,
-          }
-        }
+        },
       });
 
       closeSpy.calls.reset();
@@ -386,5 +434,32 @@ describe('DeviceFormComponent', () => {
     it('should disable mac address', () => {
       expect(component.mac_addr.disabled).toBeTrue();
     });
+
+    it('should have delete device button', () => {
+      const deleteButton = compiled.querySelector(
+        '.delete-button'
+      ) as HTMLButtonElement;
+
+      expect(deleteButton).toBeTruthy();
+    });
+
+    it('should close dialog with delete action on "delete" click', () => {
+      const closeSpy = spyOn(component.dialogRef, 'close');
+      const closeButton = compiled.querySelector(
+        '.delete-button'
+      ) as HTMLButtonElement;
+
+      closeButton?.click();
+
+      expect(closeSpy).toHaveBeenCalledWith({ action: FormAction.Delete });
+
+      closeSpy.calls.reset();
+    });
+  });
+
+  it('should has loader element', () => {
+    const spinner = compiled.querySelector('app-spinner');
+
+    expect(spinner).toBeTruthy();
   });
 });
diff --git a/modules/ui/src/app/device-repository/device-form/device-form.component.ts b/modules/ui/src/app/device-repository/device-form/device-form.component.ts
index 42eaf44dd..4cb53c258 100644
--- a/modules/ui/src/app/device-repository/device-form/device-form.component.ts
+++ b/modules/ui/src/app/device-repository/device-form/device-form.component.ts
@@ -13,56 +13,80 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {Component, Inject, OnDestroy, OnInit} from '@angular/core';
-import {AbstractControl, FormArray, FormBuilder, FormGroup, Validators} from '@angular/forms';
-import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
-import {Device, TestModule} from '../../model/device';
-import {TestRunService} from '../../test-run.service';
-import {DeviceValidators} from './device.validators';
-import {catchError, of, retry, Subject, takeUntil} from 'rxjs';
-import {BehaviorSubject} from 'rxjs/internal/BehaviorSubject';
-
-const MAC_ADDRESS_PATTERN = '^[\\s]*[a-fA-F0-9]{2}(?:[:][a-fA-F0-9]{2}){5}[\\s]*$';
+import { Component, Inject, OnDestroy, OnInit } from '@angular/core';
+import {
+  AbstractControl,
+  FormArray,
+  FormBuilder,
+  FormGroup,
+  Validators,
+} from '@angular/forms';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { Device, TestModule } from '../../model/device';
+import { TestRunService } from '../../services/test-run.service';
+import { DeviceValidators } from './device.validators';
+import { catchError, of, Subject, takeUntil } from 'rxjs';
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { EscapableDialogComponent } from '../../components/escapable-dialog/escapable-dialog.component';
+
+const MAC_ADDRESS_PATTERN =
+  '^[\\s]*[a-fA-F0-9]{2}(?:[:][a-fA-F0-9]{2}){5}[\\s]*$';
 
 interface DialogData {
   title?: string;
   device?: Device;
 }
 
+export enum FormAction {
+  Delete = 'Delete',
+  Save = 'Save',
+}
+
+export interface FormResponse {
+  device?: Device;
+  action: FormAction;
+}
+
 @Component({
   selector: 'app-device-form',
   templateUrl: './device-form.component.html',
-  styleUrls: ['./device-form.component.scss']
+  styleUrls: ['./device-form.component.scss'],
 })
-export class DeviceFormComponent implements OnInit, OnDestroy {
+export class DeviceFormComponent
+  extends EscapableDialogComponent
+  implements OnInit, OnDestroy
+{
   deviceForm!: FormGroup;
   testModules: TestModule[] = [];
-  error$: BehaviorSubject<string | null> = new BehaviorSubject<string | null>(null);
+  error$: BehaviorSubject<string | null> = new BehaviorSubject<string | null>(
+    null
+  );
   private destroy$: Subject<boolean> = new Subject<boolean>();
 
   constructor(
-    public dialogRef: MatDialogRef<DeviceFormComponent>,
+    public override dialogRef: MatDialogRef<DeviceFormComponent>,
     @Inject(MAT_DIALOG_DATA) public data: DialogData,
     private fb: FormBuilder,
     private testRunService: TestRunService,
-    private deviceValidators: DeviceValidators,
+    private deviceValidators: DeviceValidators
   ) {
+    super(dialogRef);
   }
 
   get model() {
-    return this.deviceForm.get('model')!;
+    return this.deviceForm.get('model') as AbstractControl;
   }
 
   get manufacturer() {
-    return this.deviceForm.get('manufacturer')!;
+    return this.deviceForm.get('manufacturer') as AbstractControl;
   }
 
   get mac_addr() {
-    return this.deviceForm.get('mac_addr')!;
+    return this.deviceForm.get('mac_addr') as AbstractControl;
   }
 
   get test_modules() {
-    return this.deviceForm.controls['test_modules']! as FormArray;
+    return this.deviceForm.controls['test_modules'] as FormArray;
   }
 
   ngOnInit() {
@@ -80,6 +104,10 @@ export class DeviceFormComponent implements OnInit, OnDestroy {
     this.destroy$.unsubscribe();
   }
 
+  delete(): void {
+    this.dialogRef.close({ action: FormAction.Delete } as FormResponse);
+  }
+
   cancel(): void {
     this.dialogRef.close();
   }
@@ -92,23 +120,29 @@ export class DeviceFormComponent implements OnInit, OnDestroy {
     }
 
     if (this.isAllTestsDisabled()) {
-      this.error$.next('At least one test has to be selected.');
+      this.error$.next(
+        'At least one test has to be selected to save a Device.'
+      );
       return;
     }
 
     const device = this.createDeviceFromForm();
 
-    this.testRunService.saveDevice(device)
+    this.testRunService
+      .saveDevice(device)
       .pipe(
         takeUntil(this.destroy$),
-        retry(1),
         catchError(error => {
           this.error$.next(error.error);
           return of(null);
-        }))
+        })
+      )
       .subscribe((deviceSaved: boolean | null) => {
         if (deviceSaved) {
-          this.dialogRef.close(device);
+          this.dialogRef.close({
+            action: FormAction.Save,
+            device,
+          } as FormResponse);
         }
       });
   }
@@ -121,16 +155,18 @@ export class DeviceFormComponent implements OnInit, OnDestroy {
 
   private createDeviceFromForm(): Device {
     const testModules: { [key: string]: { enabled: boolean } } = {};
-    this.deviceForm.value.test_modules.forEach((enabled: boolean, i: number) => {
-      testModules[this.testModules[i]?.name] = {
-        enabled: enabled
+    this.deviceForm.value.test_modules.forEach(
+      (enabled: boolean, i: number) => {
+        testModules[this.testModules[i]?.name] = {
+          enabled: enabled,
+        };
       }
-    });
+    );
     return {
       model: this.model.value.trim(),
       manufacturer: this.manufacturer.value.trim(),
       mac_addr: this.mac_addr.value.trim(),
-      test_modules: testModules
+      test_modules: testModules,
     } as Device;
   }
 
@@ -146,7 +182,7 @@ export class DeviceFormComponent implements OnInit, OnDestroy {
 
   private setRequiredErrorIfEmpty(control: AbstractControl) {
     if (!control.value.trim()) {
-      control.setErrors({required: true});
+      control.setErrors({ required: true });
     }
   }
 
@@ -155,11 +191,13 @@ export class DeviceFormComponent implements OnInit, OnDestroy {
       model: ['', [this.deviceValidators.deviceStringFormat()]],
       manufacturer: ['', [this.deviceValidators.deviceStringFormat()]],
       mac_addr: [
-        {value: '', disabled: this.data.device}, [
+        { value: '', disabled: this.data.device },
+        [
           Validators.pattern(MAC_ADDRESS_PATTERN),
-          this.deviceValidators.differentMACAddress(this.data.device)
-        ]],
-      test_modules: new FormArray([])
+          this.deviceValidators.differentMACAddress(this.data.device),
+        ],
+      ],
+      test_modules: new FormArray([]),
     });
   }
 }
diff --git a/modules/ui/src/app/device-repository/device-form/device.validators.ts b/modules/ui/src/app/device-repository/device-form/device.validators.ts
index 7be18e917..51264b135 100644
--- a/modules/ui/src/app/device-repository/device-form/device.validators.ts
+++ b/modules/ui/src/app/device-repository/device-form/device.validators.ts
@@ -13,42 +13,43 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {Injectable} from '@angular/core';
-import {AbstractControl, ValidationErrors, ValidatorFn} from '@angular/forms';
-import {TestRunService} from '../../test-run.service';
-import {Device} from '../../model/device';
+import { Injectable } from '@angular/core';
+import { AbstractControl, ValidationErrors, ValidatorFn } from '@angular/forms';
+import { TestRunService } from '../../services/test-run.service';
+import { Device } from '../../model/device';
 
-@Injectable({providedIn: 'root'})
+@Injectable({ providedIn: 'root' })
 
 /**
  * Validator uses for Device Name and Device Manufacturer inputs
  */
 export class DeviceValidators {
+  constructor(private testRunService: TestRunService) {}
 
-  constructor(private testRunService: TestRunService) {
-  }
-
-  readonly STRING_FORMAT_REGEXP = new RegExp('^([a-z0-9\\p{L}\\p{M}.\',-_ ]{1,64})$', 'u');
+  readonly STRING_FORMAT_REGEXP = new RegExp(
+    "^([a-z0-9\\p{L}\\p{M}.',-_ ]{1,64})$",
+    'u'
+  );
 
   public deviceStringFormat(): ValidatorFn {
     return (control: AbstractControl): ValidationErrors | null => {
       const value = control.value?.trim();
       if (value) {
-        let result = this.STRING_FORMAT_REGEXP.test(value);
-        return !result ? {'invalid_format': true} : null;
+        const result = this.STRING_FORMAT_REGEXP.test(value);
+        return !result ? { invalid_format: true } : null;
       }
       return null;
-    }
+    };
   }
 
   public differentMACAddress(device?: Device): ValidatorFn {
     return (control: AbstractControl): ValidationErrors | null => {
       const value = control.value?.trim();
       if (value && !device) {
-        let result = this.testRunService.hasDevice(value)
-        return result ? {'has_same_mac_address': true} : null;
+        const result = this.testRunService.hasDevice(value);
+        return result ? { has_same_mac_address: true } : null;
       }
       return null;
-    }
+    };
   }
 }
diff --git a/modules/ui/src/app/device-repository/device-repository-routing.module.ts b/modules/ui/src/app/device-repository/device-repository-routing.module.ts
index aca5be67d..f376c89de 100644
--- a/modules/ui/src/app/device-repository/device-repository-routing.module.ts
+++ b/modules/ui/src/app/device-repository/device-repository-routing.module.ts
@@ -13,15 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {NgModule} from '@angular/core';
-import {RouterModule, Routes} from '@angular/router';
-import {DeviceRepositoryComponent} from './device-repository.component';
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { DeviceRepositoryComponent } from './device-repository.component';
 
-const routes: Routes = [{path: '', component: DeviceRepositoryComponent}];
+const routes: Routes = [{ path: '', component: DeviceRepositoryComponent }];
 
 @NgModule({
   imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule]
+  exports: [RouterModule],
 })
-export class DeviceRepositoryRoutingModule {
-}
+export class DeviceRepositoryRoutingModule {}
diff --git a/modules/ui/src/app/device-repository/device-repository.component.html b/modules/ui/src/app/device-repository/device-repository.component.html
index 16dac47bf..00679934b 100644
--- a/modules/ui/src/app/device-repository/device-repository.component.html
+++ b/modules/ui/src/app/device-repository/device-repository.component.html
@@ -13,14 +13,16 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<ng-container *ngIf="(devices$| async)?.length;  else empty">
+<ng-container *ngIf="(devices$ | async)?.length; else empty">
   <mat-toolbar class="device-repository-toolbar">
-    <h2 class="title">Device Repository</h2>
+    <h2 class="title">Devices</h2>
     <ng-container *ngTemplateOutlet="addDeviceButton"></ng-container>
   </mat-toolbar>
   <div class="device-repository-content">
-    <ng-container *ngFor="let device of (devices$| async)">
-      <app-device-item (itemClicked)="openDialog($event)" [device]="device"></app-device-item>
+    <ng-container *ngFor="let device of devices$ | async">
+      <app-device-item
+        (itemClicked)="openDialog($event)"
+        [device]="device"></app-device-item>
     </ng-container>
   </div>
 </ng-container>
@@ -32,8 +34,12 @@ <h2 class="title">Device Repository</h2>
 </ng-template>
 
 <ng-template #addDeviceButton>
-  <button (click)="openDialog()" aria-label="Add device" class="device-add-button" color="primary"
-          mat-flat-button>
+  <button
+    (click)="openDialog()"
+    aria-label="Add device"
+    class="device-add-button"
+    color="primary"
+    mat-flat-button>
     <mat-icon>add</mat-icon>
     Add device
   </button>
diff --git a/modules/ui/src/app/device-repository/device-repository.component.scss b/modules/ui/src/app/device-repository/device-repository.component.scss
index 1dcf8f80e..d83737755 100644
--- a/modules/ui/src/app/device-repository/device-repository.component.scss
+++ b/modules/ui/src/app/device-repository/device-repository.component.scss
@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@import "../../theming/colors";
-@import "../../theming/variables";
+@import '../../theming/colors';
+@import '../../theming/variables';
 
 :host {
   overflow: hidden;
@@ -30,7 +30,7 @@
 }
 
 .device-repository-toolbar {
-  padding-left: 40px;
+  padding-left: 32px;
   gap: 16px;
   background: $white;
   height: 72px;
@@ -38,7 +38,7 @@
 
 .device-repository-content {
   align-content: start;
-  padding: 24px;
+  padding: 24px 32px;
   display: grid;
   grid-template-columns: repeat(auto-fit, $device-item-width);
   gap: 16px;
diff --git a/modules/ui/src/app/device-repository/device-repository.component.spec.ts b/modules/ui/src/app/device-repository/device-repository.component.spec.ts
index 357c17d29..e348729ee 100644
--- a/modules/ui/src/app/device-repository/device-repository.component.spec.ts
+++ b/modules/ui/src/app/device-repository/device-repository.component.spec.ts
@@ -13,52 +13,66 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {ComponentFixture, fakeAsync, TestBed} from '@angular/core/testing';
-import {of} from 'rxjs';
-import {Device} from '../model/device';
-import {TestRunService} from '../test-run.service';
-
-import {DeviceRepositoryComponent} from './device-repository.component';
-import {DeviceRepositoryModule} from './device-repository.module';
-import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
-import {DeviceFormComponent} from './device-form/device-form.component';
-import {MatDialogRef} from '@angular/material/dialog';
-import {BehaviorSubject} from 'rxjs/internal/BehaviorSubject';
-import {device} from '../mocks/device.mock';
+import { ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing';
+import { of } from 'rxjs';
+import { Device } from '../model/device';
+import { TestRunService } from '../services/test-run.service';
+
+import { DeviceRepositoryComponent } from './device-repository.component';
+import { DeviceRepositoryModule } from './device-repository.module';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  DeviceFormComponent,
+  FormAction,
+} from './device-form/device-form.component';
+import { MatDialogRef } from '@angular/material/dialog';
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { device } from '../mocks/device.mock';
+import { DeleteFormComponent } from '../components/delete-form/delete-form.component';
 import SpyObj = jasmine.SpyObj;
 
 describe('DeviceRepositoryComponent', () => {
-  let service: TestRunService;
   let component: DeviceRepositoryComponent;
   let fixture: ComponentFixture<DeviceRepositoryComponent>;
   let compiled: HTMLElement;
   let mockService: SpyObj<TestRunService>;
 
   beforeEach(() => {
-    mockService = jasmine.createSpyObj(['getDevices', 'fetchDevices', 'setDevices', 'getTestModules', 'addDevice', 'updateDevice']);
-    mockService.getDevices.and.returnValue(new BehaviorSubject<Device[] | null>([]));
+    mockService = jasmine.createSpyObj([
+      'getDevices',
+      'fetchDevices',
+      'setDevices',
+      'getTestModules',
+      'addDevice',
+      'updateDevice',
+      'deleteDevice',
+      'removeDevice',
+      'isOpenAddDevice$',
+    ]);
+    mockService.isOpenAddDevice$ = new BehaviorSubject(false);
+    mockService.getDevices.and.returnValue(
+      new BehaviorSubject<Device[] | null>([])
+    );
     mockService.getTestModules.and.returnValue([
       {
-        displayName: "Connection",
-        name: "connection",
-        enabled: true
+        displayName: 'Connection',
+        name: 'connection',
+        enabled: true,
       },
       {
-        displayName: "Smart Ready",
-        name: "udmi",
-        enabled: false
+        displayName: 'Smart Ready',
+        name: 'udmi',
+        enabled: false,
       },
     ]);
-
     TestBed.configureTestingModule({
       imports: [DeviceRepositoryModule, BrowserAnimationsModule],
-      providers: [{provide: TestRunService, useValue: mockService}],
-      declarations: [DeviceRepositoryComponent]
+      providers: [{ provide: TestRunService, useValue: mockService }],
+      declarations: [DeviceRepositoryComponent],
     });
     fixture = TestBed.createComponent(DeviceRepositoryComponent);
     component = fixture.componentInstance;
     compiled = fixture.nativeElement as HTMLElement;
-    service = fixture.debugElement.injector.get(TestRunService);
     fixture.detectChanges();
   });
 
@@ -69,20 +83,33 @@ describe('DeviceRepositoryComponent', () => {
   describe('with no devices devices', () => {
     beforeEach(() => {
       mockService.getDevices = jasmine.createSpy().and.returnValue(of([]));
+      mockService.isOpenAddDevice$ = new BehaviorSubject(true);
       component.ngOnInit();
     });
 
     it('should show only add device button if no device added', () => {
       fixture.detectChanges();
-      const button = compiled.querySelector('.device-repository-content-empty button');
+      const button = compiled.querySelector(
+        '.device-repository-content-empty button'
+      );
 
       expect(button).toBeTruthy();
     });
+
+    it('should open the modal if isOpenAddDevice$ as true', () => {
+      const openDialogSpy = spyOn(component, 'openDialog');
+
+      component.ngOnInit();
+
+      expect(openDialogSpy).toHaveBeenCalled();
+    });
   });
 
   describe('with devices', () => {
     beforeEach(() => {
-      mockService.getDevices.and.returnValue(new BehaviorSubject<Device[] | null>([device, device, device]));
+      mockService.getDevices.and.returnValue(
+        new BehaviorSubject<Device[] | null>([device, device, device])
+      );
       component.ngOnInit();
     });
 
@@ -94,57 +121,58 @@ describe('DeviceRepositoryComponent', () => {
     }));
 
     it('should open device dialog on item click', () => {
-      const openSpy = spyOn(component.dialog, 'open').and
-        .returnValue({
-          afterClosed: () => of(true)
-        } as MatDialogRef<typeof DeviceFormComponent>);
+      const openSpy = spyOn(component.dialog, 'open').and.returnValue({
+        afterClosed: () => of(true),
+      } as MatDialogRef<typeof DeviceFormComponent>);
       fixture.detectChanges();
 
       component.openDialog(device);
 
       expect(openSpy).toHaveBeenCalled();
       expect(openSpy).toHaveBeenCalledWith(DeviceFormComponent, {
+        ariaLabel: 'Edit device',
         data: {
           device: device,
-          title: 'Edit device'
+          title: 'Edit device',
         },
         autoFocus: true,
         hasBackdrop: true,
         disableClose: true,
-        panelClass: 'device-form-dialog'
+        panelClass: 'device-form-dialog',
       });
 
       openSpy.calls.reset();
     });
   });
 
-  it('should open device dialog on "add device button click"', () => {
-    const openSpy = spyOn(component.dialog, 'open').and
-      .returnValue({
-        afterClosed: () => of(true)
-      } as MatDialogRef<typeof DeviceFormComponent>);
+  it('should open device dialog on "add device button" click', () => {
+    const openSpy = spyOn(component.dialog, 'open').and.returnValue({
+      afterClosed: () => of(true),
+    } as MatDialogRef<typeof DeviceFormComponent>);
     fixture.detectChanges();
-    const button = compiled.querySelector('.device-repository-content-empty button') as HTMLButtonElement;
+    const button = compiled.querySelector(
+      '.device-repository-content-empty button'
+    ) as HTMLButtonElement;
     button?.click();
 
     expect(button).toBeTruthy();
     expect(openSpy).toHaveBeenCalled();
     expect(openSpy).toHaveBeenCalledWith(DeviceFormComponent, {
-      data: {device: null, title: 'Create device'},
+      ariaLabel: 'Create device',
+      data: { device: null, title: 'Create device' },
       autoFocus: true,
       hasBackdrop: true,
       disableClose: true,
-      panelClass: 'device-form-dialog'
+      panelClass: 'device-form-dialog',
     });
 
     openSpy.calls.reset();
   });
 
   it('should not add device if dialog closes with null', () => {
-    spyOn(component.dialog, 'open').and
-      .returnValue({
-        afterClosed: () => of(null)
-      } as MatDialogRef<typeof DeviceFormComponent>);
+    spyOn(component.dialog, 'open').and.returnValue({
+      afterClosed: () => of(null),
+    } as MatDialogRef<typeof DeviceFormComponent>);
     mockService.addDevice.and.callThrough();
 
     component.openDialog();
@@ -152,33 +180,14 @@ describe('DeviceRepositoryComponent', () => {
     expect(mockService.addDevice).not.toHaveBeenCalled();
   });
 
-  it('should add device if dialog closes with object', () => {
-    const device = {
-      "manufacturer": "Delta",
-      "model": "O3-DIN-CPU",
-      "mac_addr": "00:1e:42:35:73:c4",
-      "test_modules": {
-        "dns": {
-          "enabled": false
-        },
-        "connection": {
-          "enabled": true
-        },
-        "ntp": {
-          "enabled": false
-        },
-        "baseline": {
-          "enabled": false
-        },
-        "nmap": {
-          "enabled": false
-        }
-      }
-    } as Device;
-    spyOn(component.dialog, 'open').and
-      .returnValue({
-        afterClosed: () => of(device)
-      } as MatDialogRef<typeof DeviceFormComponent>);
+  it('should add device if dialog closes with object and save action', () => {
+    spyOn(component.dialog, 'open').and.returnValue({
+      afterClosed: () =>
+        of({
+          device,
+          action: FormAction.Save,
+        }),
+    } as MatDialogRef<typeof DeviceFormComponent>);
     mockService.addDevice.and.callThrough();
 
     component.openDialog();
@@ -186,4 +195,59 @@ describe('DeviceRepositoryComponent', () => {
     expect(mockService.addDevice).toHaveBeenCalledWith(device);
   });
 
+  it('should update device if dialog closes with object, action save and selected device', () => {
+    spyOn(component.dialog, 'open').and.returnValue({
+      afterClosed: () =>
+        of({
+          device,
+          action: FormAction.Save,
+        }),
+    } as MatDialogRef<typeof DeviceFormComponent>);
+    mockService.updateDevice.and.callThrough();
+
+    component.openDialog(device);
+
+    expect(mockService.updateDevice).toHaveBeenCalledWith(device, device);
+  });
+
+  it('should delete device if dialog closes with object, action delete and selected device', () => {
+    const openDeleteDialogSpy = spyOn(component, 'openDeleteDialog');
+    spyOn(component.dialog, 'open').and.returnValue({
+      afterClosed: () =>
+        of({
+          device,
+          action: FormAction.Delete,
+        }),
+    } as MatDialogRef<typeof DeviceFormComponent>);
+
+    component.openDialog(device);
+
+    expect(openDeleteDialogSpy).toHaveBeenCalledWith(device);
+  });
+
+  describe('delete device dialog', () => {
+    it('should delete device when dialog return true', () => {
+      spyOn(component.dialog, 'open').and.returnValue({
+        afterClosed: () => of(true),
+      } as MatDialogRef<typeof DeleteFormComponent>);
+      mockService.deleteDevice.and.returnValue(of(true));
+      mockService.removeDevice.and.callThrough();
+
+      component.openDeleteDialog(device);
+
+      expect(mockService.deleteDevice).toHaveBeenCalledWith(device);
+      expect(mockService.removeDevice).toHaveBeenCalledWith(device);
+    });
+
+    it('should open device dialog when dialog return null', () => {
+      const openDeleteDialogSpy = spyOn(component, 'openDialog');
+      spyOn(component.dialog, 'open').and.returnValue({
+        afterClosed: () => of(null),
+      } as MatDialogRef<typeof DeleteFormComponent>);
+
+      component.openDeleteDialog(device);
+
+      expect(openDeleteDialogSpy).toHaveBeenCalledWith(device);
+    });
+  });
 });
diff --git a/modules/ui/src/app/device-repository/device-repository.component.ts b/modules/ui/src/app/device-repository/device-repository.component.ts
index 54fb8abeb..0578ce2ef 100644
--- a/modules/ui/src/app/device-repository/device-repository.component.ts
+++ b/modules/ui/src/app/device-repository/device-repository.component.ts
@@ -13,28 +13,44 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {Component, OnInit} from '@angular/core';
-import {MatDialog} from '@angular/material/dialog';
-import {Observable} from 'rxjs/internal/Observable';
-import {Device} from '../model/device';
-import {TestRunService} from '../test-run.service';
-import {DeviceFormComponent} from './device-form/device-form.component';
-import {Subject, takeUntil} from 'rxjs';
+import { Component, OnDestroy, OnInit } from '@angular/core';
+import { MatDialog } from '@angular/material/dialog';
+import { Observable } from 'rxjs/internal/Observable';
+import { Device } from '../model/device';
+import { TestRunService } from '../services/test-run.service';
+import {
+  DeviceFormComponent,
+  FormAction,
+  FormResponse,
+} from './device-form/device-form.component';
+import { Subject, takeUntil } from 'rxjs';
+import { DeleteFormComponent } from '../components/delete-form/delete-form.component';
+import { combineLatest } from 'rxjs/internal/observable/combineLatest';
 
 @Component({
   selector: 'app-device-repository',
   templateUrl: './device-repository.component.html',
   styleUrls: ['./device-repository.component.scss'],
 })
-export class DeviceRepositoryComponent implements OnInit {
+export class DeviceRepositoryComponent implements OnInit, OnDestroy {
   devices$!: Observable<Device[] | null>;
   private destroy$: Subject<boolean> = new Subject<boolean>();
 
-  constructor(private testRunService: TestRunService, public dialog: MatDialog) {
-  }
+  constructor(
+    private testRunService: TestRunService,
+    public dialog: MatDialog
+  ) {}
 
   ngOnInit(): void {
     this.devices$ = this.testRunService.getDevices();
+
+    combineLatest([this.devices$, this.testRunService.isOpenAddDevice$])
+      .pipe(takeUntil(this.destroy$))
+      .subscribe(([devices, isOpenAddDevice]) => {
+        if (!devices?.length && isOpenAddDevice) {
+          this.openDialog();
+        }
+      });
   }
 
   ngOnDestroy() {
@@ -44,24 +60,69 @@ export class DeviceRepositoryComponent implements OnInit {
 
   openDialog(selectedDevice?: Device): void {
     const dialogRef = this.dialog.open(DeviceFormComponent, {
+      ariaLabel: selectedDevice ? 'Edit device' : 'Create device',
       data: {
         device: selectedDevice || null,
-        title: selectedDevice ? 'Edit device' : 'Create device'
+        title: selectedDevice ? 'Edit device' : 'Create device',
       },
       autoFocus: true,
       hasBackdrop: true,
       disableClose: true,
-      panelClass: 'device-form-dialog'
+      panelClass: 'device-form-dialog',
     });
 
-    dialogRef?.afterClosed()
+    dialogRef
+      ?.afterClosed()
       .pipe(takeUntil(this.destroy$))
-      .subscribe(device => {
-        if (!selectedDevice && device) {
-          this.testRunService.addDevice(device);
+      .subscribe((response: FormResponse) => {
+        if (!response) return;
+
+        if (
+          response.action === FormAction.Save &&
+          response.device &&
+          !selectedDevice
+        ) {
+          this.testRunService.addDevice(response.device);
+        }
+        if (
+          response.action === FormAction.Save &&
+          response.device &&
+          selectedDevice
+        ) {
+          this.testRunService.updateDevice(selectedDevice, response.device);
+        }
+        if (response.action === FormAction.Delete && selectedDevice) {
+          this.openDeleteDialog(selectedDevice);
         }
-        if (selectedDevice && device) {
-          this.testRunService.updateDevice(selectedDevice, device);
+      });
+  }
+
+  openDeleteDialog(device: Device) {
+    const dialogRef = this.dialog.open(DeleteFormComponent, {
+      ariaLabel: 'Delete device',
+      data: {
+        title: 'Delete device',
+        content: `You are about to delete ${
+          device.manufacturer + ' ' + device.model
+        }. Are you sure?`,
+        device: device,
+      },
+      autoFocus: true,
+      hasBackdrop: true,
+      disableClose: true,
+      panelClass: 'delete-form-dialog',
+    });
+
+    dialogRef
+      ?.afterClosed()
+      .pipe(takeUntil(this.destroy$))
+      .subscribe(deleteDevice => {
+        if (deleteDevice) {
+          this.testRunService.deleteDevice(device).subscribe(() => {
+            this.testRunService.removeDevice(device);
+          });
+        } else {
+          this.openDialog(device);
         }
       });
   }
diff --git a/modules/ui/src/app/device-repository/device-repository.module.ts b/modules/ui/src/app/device-repository/device-repository.module.ts
index 002a8ca2c..bc7935875 100644
--- a/modules/ui/src/app/device-repository/device-repository.module.ts
+++ b/modules/ui/src/app/device-repository/device-repository.module.ts
@@ -13,29 +13,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {ScrollingModule} from '@angular/cdk/scrolling';
-import {CommonModule} from '@angular/common';
-import {HttpClientModule} from '@angular/common/http';
-import {NgModule} from '@angular/core';
-import {ReactiveFormsModule} from '@angular/forms';
-import {MatButtonModule} from '@angular/material/button';
-import {MatCheckboxModule} from '@angular/material/checkbox';
-import {MatDialogModule} from '@angular/material/dialog';
-import {MatIconModule} from '@angular/material/icon';
-import {MatInputModule} from '@angular/material/input';
-import {MatToolbarModule} from '@angular/material/toolbar';
-import {DeviceFormComponent} from './device-form/device-form.component';
+import { ScrollingModule } from '@angular/cdk/scrolling';
+import { CommonModule } from '@angular/common';
+import { HttpClientModule } from '@angular/common/http';
+import { NgModule } from '@angular/core';
+import { ReactiveFormsModule } from '@angular/forms';
+import { MatButtonModule } from '@angular/material/button';
+import { MatCheckboxModule } from '@angular/material/checkbox';
+import { MatDialogModule } from '@angular/material/dialog';
+import { MatIconModule } from '@angular/material/icon';
+import { MatInputModule } from '@angular/material/input';
+import { MatToolbarModule } from '@angular/material/toolbar';
+import { DeviceFormComponent } from './device-form/device-form.component';
 
-import {DeviceRepositoryRoutingModule} from './device-repository-routing.module';
-import {DeviceRepositoryComponent} from './device-repository.component';
-import {DeviceItemComponent} from '../components/device-item/device-item.component';
-import {DeviceTestsComponent} from '../components/device-tests/device-tests.component';
+import { DeviceRepositoryRoutingModule } from './device-repository-routing.module';
+import { DeviceRepositoryComponent } from './device-repository.component';
+import { DeviceItemComponent } from '../components/device-item/device-item.component';
+import { DeviceTestsComponent } from '../components/device-tests/device-tests.component';
+import { SpinnerComponent } from '../components/spinner/spinner.component';
+import { DeleteFormComponent } from '../components/delete-form/delete-form.component';
+import { NgxMaskDirective, NgxMaskPipe, provideNgxMask } from 'ngx-mask';
 
 @NgModule({
-  declarations: [
-    DeviceRepositoryComponent,
-    DeviceFormComponent,
-  ],
+  declarations: [DeviceRepositoryComponent, DeviceFormComponent],
   imports: [
     CommonModule,
     DeviceRepositoryRoutingModule,
@@ -50,7 +50,11 @@ import {DeviceTestsComponent} from '../components/device-tests/device-tests.comp
     MatInputModule,
     DeviceItemComponent,
     DeviceTestsComponent,
+    SpinnerComponent,
+    DeleteFormComponent,
+    NgxMaskDirective,
+    NgxMaskPipe,
   ],
+  providers: [provideNgxMask()],
 })
-export class DeviceRepositoryModule {
-}
+export class DeviceRepositoryModule {}
diff --git a/modules/ui/src/app/guards/allow-to-run-test.guard.spec.ts b/modules/ui/src/app/guards/allow-to-run-test.guard.spec.ts
deleted file mode 100644
index b200a9d4f..000000000
--- a/modules/ui/src/app/guards/allow-to-run-test.guard.spec.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Copyright 2023 Google LLC
- *
- * 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
- *
- *     https://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.
- */
-import {TestBed} from '@angular/core/testing';
-import {Router} from '@angular/router';
-
-import {allowToRunTestGuard} from './allow-to-run-test.guard';
-import {TestRunService} from '../test-run.service';
-import {Device} from '../model/device';
-import {BehaviorSubject} from 'rxjs/internal/BehaviorSubject';
-import {device} from '../mocks/device.mock';
-
-describe('allowToRunTestGuard', () => {
-  const mockRouter = jasmine.createSpyObj<Router>(['parseUrl'])
-
-  const setup = (testRunServiceMock: unknown) => {
-    TestBed.configureTestingModule({
-      providers: [
-        allowToRunTestGuard,
-        {provide: TestRunService, useValue: testRunServiceMock},
-        {provide: Router, useValue: mockRouter}
-      ]
-    });
-
-    return TestBed.runInInjectionContext(allowToRunTestGuard);
-  }
-
-  it('should allow to continue', () => {
-    const mockTestRunService: unknown = {getDevices: () => new BehaviorSubject<Device[] | null>([device])}
-
-    const guard = setup(mockTestRunService)
-
-    guard.subscribe(res => {
-      expect(res).toBeTrue();
-    });
-  });
-
-  it('should redirect to the "/device-repository" path', () => {
-
-    const mockTestRunService: unknown = {getDevices: () => new BehaviorSubject<Device[] | null>([])}
-
-    const guard = setup(mockTestRunService)
-
-    guard.subscribe(res => {
-      expect(res).toBeFalsy();
-      expect(mockRouter.parseUrl).toHaveBeenCalledWith('/device-repository');
-    });
-  });
-});
diff --git a/modules/ui/src/app/history/history-routing.module.ts b/modules/ui/src/app/history/history-routing.module.ts
index cd2c77e4a..da66ba3bf 100644
--- a/modules/ui/src/app/history/history-routing.module.ts
+++ b/modules/ui/src/app/history/history-routing.module.ts
@@ -13,15 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {NgModule} from '@angular/core';
-import {RouterModule, Routes} from '@angular/router';
-import {HistoryComponent} from './history.component';
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { HistoryComponent } from './history.component';
 
-const routes: Routes = [{path: '', component: HistoryComponent}];
+const routes: Routes = [{ path: '', component: HistoryComponent }];
 
 @NgModule({
   imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule]
+  exports: [RouterModule],
 })
-export class HistoryRoutingModule {
-}
+export class HistoryRoutingModule {}
diff --git a/modules/ui/src/app/history/history.component.html b/modules/ui/src/app/history/history.component.html
index e3a8840c3..25fdff3b5 100644
--- a/modules/ui/src/app/history/history.component.html
+++ b/modules/ui/src/app/history/history.component.html
@@ -13,70 +13,209 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<ng-container *ngIf="(history$| async)?.length;  else empty">
-  <mat-toolbar class="history-toolbar">
-    <h2 class="title">Results</h2>
-  </mat-toolbar>
+<ng-container *ngIf="dataLoaded">
+  <ng-container *ngIf="this.dataSource?.data?.length; else empty">
+    <mat-toolbar class="history-toolbar">
+      <h2 class="title">Reports</h2>
+    </mat-toolbar>
 
-  <div class="history-content">
-    <table [dataSource]="history$" mat-table tabindex="0">
+    <div
+      class="history-content"
+      [class.history-content-empty]="dataSource.filteredData.length === 0">
+      <table
+        (matSortChange)="sortData($event)"
+        [dataSource]="dataSource"
+        mat-table
+        matSort
+        tabindex="0">
+        <!-- Started Column -->
+        <ng-container matColumnDef="started">
+          <th
+            *matHeaderCellDef
+            mat-header-cell
+            mat-sort-header
+            sortActionDescription="Sort by started date">
+            Started
+            <ng-container
+              *ngTemplateOutlet="
+                filterButton;
+                context: { name: FilterName.Started }
+              ">
+            </ng-container>
+          </th>
+          <td *matCellDef="let data" class="text-nowrap" mat-cell>
+            {{ getFormattedDateString(data.started) }}
+          </td>
+        </ng-container>
 
-      <!-- Started Column -->
-      <ng-container matColumnDef="started">
-        <th *matHeaderCellDef mat-header-cell>Started</th>
-        <td *matCellDef="let data" mat-cell>{{getFormattedDateString(data.started)}}</td>
-      </ng-container>
+        <!-- Duration Column -->
+        <ng-container matColumnDef="duration">
+          <th
+            *matHeaderCellDef
+            mat-header-cell
+            mat-sort-header
+            sortActionDescription="Sort by duration time">
+            Duration
+          </th>
+          <td *matCellDef="let data" class="text-nowrap" mat-cell>
+            {{ data.duration }}
+          </td>
+        </ng-container>
 
-      <!-- Duration Column -->
-      <ng-container matColumnDef="duration">
-        <th *matHeaderCellDef mat-header-cell>Duration</th>
-        <td *matCellDef="let data" mat-cell>{{getDuration(data.started, data.finished)}}</td>
-      </ng-container>
+        <!-- Device Column -->
+        <ng-container matColumnDef="deviceInfo">
+          <th
+            *matHeaderCellDef
+            mat-header-cell
+            mat-sort-header
+            sortActionDescription="Sort by device">
+            Device
+            <ng-container
+              *ngTemplateOutlet="
+                filterButton;
+                context: { name: FilterName.DeviceInfo }
+              ">
+            </ng-container>
+          </th>
+          <td *matCellDef="let data" mat-cell>{{ data.deviceInfo }}</td>
+        </ng-container>
 
-      <!-- Device Column -->
-      <ng-container matColumnDef="device">
-        <th *matHeaderCellDef mat-header-cell>Device</th>
-        <td *matCellDef="let data" mat-cell> {{data.device.manufacturer}} {{data.device.model}} </td>
-      </ng-container>
+        <!-- Firmware Column -->
+        <ng-container matColumnDef="deviceFirmware">
+          <th
+            *matHeaderCellDef
+            mat-header-cell
+            mat-sort-header
+            sortActionDescription="Sort by firmware">
+            Firmware
+            <ng-container
+              *ngTemplateOutlet="
+                filterButton;
+                context: { name: FilterName.DeviceFirmware }
+              ">
+            </ng-container>
+          </th>
+          <td *matCellDef="let data" mat-cell>{{ data.deviceFirmware }}</td>
+        </ng-container>
 
-      <!-- Firmware Column -->
-      <ng-container matColumnDef="firmware">
-        <th *matHeaderCellDef mat-header-cell>Firmware</th>
-        <td *matCellDef="let data" mat-cell> {{data.device.firmware}} </td>
-      </ng-container>
+        <!-- Result Column -->
+        <ng-container matColumnDef="status">
+          <th
+            *matHeaderCellDef
+            mat-header-cell
+            mat-sort-header
+            sortActionDescription="Sort by result">
+            Result
+            <ng-container
+              *ngTemplateOutlet="
+                filterButton;
+                context: { name: FilterName.Results }
+              ">
+            </ng-container>
+          </th>
+          <td *matCellDef="let data" mat-cell>
+            <span
+              [ngClass]="getResultClass(data.status)"
+              class="table-cell-result-text">
+              {{ data.status }}
+            </span>
+          </td>
+        </ng-container>
 
-      <!-- Result Column -->
-      <ng-container matColumnDef="result">
-        <th *matHeaderCellDef mat-header-cell>Result</th>
-        <td *matCellDef="let data" mat-cell>
-          <span class="table-cell-result-text" [ngClass]="getResultClass(data.status)">
-            {{data.status}}
-          </span>
-        </td>
-      </ng-container>
+        <ng-container matColumnDef="report">
+          <th *matHeaderCellDef mat-header-cell>Actions</th>
+          <td *matCellDef="let data" class="table-cell-actions" mat-cell>
+            <app-download-report *ngIf="data?.device" [data]="data">
+              <mat-icon
+                class="download-report-icon"
+                fontSet="material-icons-outlined">
+                file_download
+              </mat-icon>
+            </app-download-report>
+            <app-delete-report *ngIf="data?.device" [data]="data">
+              <mat-icon
+                class="delete-report-icon"
+                fontSet="material-icons-outlined">
+                delete
+              </mat-icon>
+            </app-delete-report>
+          </td>
+        </ng-container>
 
-      <ng-container matColumnDef="report">
-        <th *matHeaderCellDef mat-header-cell>Download</th>
-        <td *matCellDef="let data" mat-cell class="table-cell-report">
-          <app-download-report [data]="data">
-            <mat-icon class="download-report-icon" fontSet="material-icons-outlined">
-              file_download
-            </mat-icon>
-          </app-download-report>
-        </td>
-      </ng-container>
+        <ng-container matColumnDef="chips">
+          <th
+            *matHeaderCellDef
+            [attr.colspan]="displayedColumns.length"
+            mat-header-cell>
+            <div>
+              <app-filter-chips
+                [filters]="filteredValues"
+                (filterCleared)="filterCleared($event)"></app-filter-chips>
+            </div>
+          </th>
+        </ng-container>
 
-      <tr *matHeaderRowDef="displayedColumns" mat-header-row></tr>
-      <tr *matRowDef="let row; columns: displayedColumns;" mat-row></tr>
-    </table>
-  </div>
-</ng-container>
+        <tr *matHeaderRowDef="displayedColumns" mat-header-row></tr>
+        <tr
+          *matHeaderRowDef="chips"
+          mat-header-row
+          [class.hidden]="isFiltersEmpty()"></tr>
+
+        <tr class="mat-row" *matNoDataRow>
+          <td class="mat-cell" [attr.colspan]="displayedColumns.length">
+            <div class="results-content-filter-empty">
+              <ng-container
+                *ngTemplateOutlet="
+                  emptyMessage;
+                  context: {
+                    header:
+                      'Sorry, there are no reports matching the search criteria.',
+                    message: 'Please consider change or clear filters.'
+                  }
+                "></ng-container>
+            </div>
+          </td>
+        </tr>
 
+        <tr *matRowDef="let row; columns: displayedColumns" mat-row></tr>
+      </table>
+    </div>
+  </ng-container>
+</ng-container>
 <ng-template #empty>
   <div class="results-content-empty">
-    <div class="results-content-empty-message">
-      <span class="results-content-empty-message-header">Sorry, there are no reports yet!</span>
-      <span class="results-content-empty-message-main">Reports will automatically generate following a test run completion.</span>
-    </div>
+    <ng-container
+      *ngTemplateOutlet="
+        emptyMessage;
+        context: {
+          header: 'Sorry, there are no reports yet!',
+          message:
+            'Reports will automatically generate following a test attempt completion.'
+        }
+      "></ng-container>
+  </div>
+</ng-template>
+
+<ng-template #filterButton let-name="name">
+  <button
+    mat-button
+    (click)="openFilter($event, name)"
+    (keydown.enter)="openFilter($event, name)"
+    (keydown.space)="openFilter($event, name)"
+    class="filter-button filter-button-{{ name }}"
+    [ngClass]="filterOpened && activeFilter === name ? 'active' : ''"
+    attr.aria-label="filter by {{ name }}"
+    mat-button>
+    <mat-icon fontSet="material-icons-outlined" class="filter-icon"
+      >filter_list</mat-icon
+    >
+  </button>
+</ng-template>
+
+<ng-template #emptyMessage let-header="header" let-message="message">
+  <div class="results-content-empty-message">
+    <div class="results-content-empty-message-img"></div>
+    <span class="results-content-empty-message-header">{{ header }}</span>
+    <span class="results-content-empty-message-main">{{ message }}</span>
   </div>
 </ng-template>
diff --git a/modules/ui/src/app/history/history.component.scss b/modules/ui/src/app/history/history.component.scss
index 26be45926..d74335db4 100644
--- a/modules/ui/src/app/history/history.component.scss
+++ b/modules/ui/src/app/history/history.component.scss
@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@import "../../theming/colors";
-@import "../../theming/variables";
+@use '@angular/material' as mat;
+@import '../../theming/colors';
+@import '../../theming/variables';
 
 :host {
   overflow: hidden;
@@ -42,6 +43,11 @@
   max-height: stretch;
 }
 
+.history-content-empty,
+.history-content-empty table {
+  height: 100%;
+}
+
 .history-content table {
   th {
     font-weight: 700;
@@ -51,19 +57,50 @@
     font-weight: 400;
   }
 
-  th, td {
+  th,
+  td {
     font-family: Roboto, sans-serif;
     font-size: 14px;
     line-height: 20px;
     letter-spacing: 0.2px;
   }
 
-  .table-cell-report {
-    padding-left: 36px;
+  .table-cell-actions {
+    padding-left: 8px;
+    white-space: nowrap;
+  }
+
+  .table-cell-actions * {
+    margin: 0 4px;
+  }
+
+  .filter-button {
+    display: flex;
+    width: 24px;
+    height: 24px;
+    justify-content: center;
+    align-items: center;
+    flex-shrink: 0;
+    margin: 0 2px 0 8px;
+    padding: 0;
+    border: none;
+    background: $white;
+    cursor: pointer;
+    &:hover {
+      background-color: rgba(0, 0, 0, 0.04);
+    }
+    &:active {
+      background-color: rgba(0, 0, 0, 0.12);
+    }
+  }
+
+  .filter-button.active .mat-icon {
+    color: mat.get-color-from-palette($color-primary, 600);
   }
 }
 
-.results-content-empty {
+.results-content-empty,
+.results-content-filter-empty {
   display: flex;
   align-items: center;
   justify-content: center;
@@ -93,6 +130,22 @@
   color: #202124;
 }
 
-.download-report-icon {
+.download-report-icon,
+.delete-report-icon {
   color: $dark-grey;
 }
+
+.hidden {
+  display: none;
+}
+
+.results-content-empty-message-img {
+  width: 293px;
+  height: 154px;
+  background-image: url(/assets/icons/desktop.svg);
+}
+
+.results-content-filter-empty .results-content-empty-message-main {
+  line-height: 20px;
+  font-size: 14px;
+}
diff --git a/modules/ui/src/app/history/history.component.spec.ts b/modules/ui/src/app/history/history.component.spec.ts
index 2d4b29959..57b83267a 100644
--- a/modules/ui/src/app/history/history.component.spec.ts
+++ b/modules/ui/src/app/history/history.component.spec.ts
@@ -13,63 +13,113 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {ComponentFixture, TestBed} from '@angular/core/testing';
-
-import {HistoryComponent} from './history.component';
-import {TestRunService} from '../test-run.service';
-import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
-import {HistoryModule} from './history.module';
-import {of} from 'rxjs';
-import {TestrunStatus} from '../model/testrun-status';
+import { ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing';
+
+import { HistoryComponent } from './history.component';
+import { TestRunService } from '../services/test-run.service';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { HistoryModule } from './history.module';
+import { of } from 'rxjs';
+import { TestrunStatus } from '../model/testrun-status';
+import { LiveAnnouncer } from '@angular/cdk/a11y';
+import { MatDialogRef } from '@angular/material/dialog';
+import { FilterDialogComponent } from '../components/filter-dialog/filter-dialog.component';
+import { ElementRef } from '@angular/core';
+import { FilterName, ReportFilters } from '../model/filters';
 import SpyObj = jasmine.SpyObj;
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { MatSort } from '@angular/material/sort';
 
-const history = [{
-  "status": "compliant",
-  "device": {
-    "manufacturer": "Delta",
-    "model": "03-DIN-SRC",
-    "mac_addr": "01:02:03:04:05:06",
-    "firmware": "1.2.2"
+const history = [
+  {
+    status: 'compliant',
+    device: {
+      manufacturer: 'Delta',
+      model: '03-DIN-SRC',
+      mac_addr: '01:02:03:04:05:06',
+      firmware: '1.2.2',
+    },
+    report: 'https://api.testrun.io/report.pdf',
+    started: '2023-06-23T10:11:00.123Z',
+    finished: '2023-06-23T10:17:10.123Z',
   },
-  "report": "https://api.testrun.io/report.pdf",
-  "started": "2023-06-23T10:11:00.123Z",
-  "finished": "2023-06-23T10:17:10.123Z"
-}] as TestrunStatus[];
+] as TestrunStatus[];
 
 describe('HistoryComponent', () => {
   let component: HistoryComponent;
   let fixture: ComponentFixture<HistoryComponent>;
   let compiled: HTMLElement;
   let mockService: SpyObj<TestRunService>;
+  let mockLiveAnnouncer: SpyObj<LiveAnnouncer>;
 
   beforeEach(() => {
-    mockService = jasmine.createSpyObj(['fetchHistory', 'getHistory', 'getResultClass']);
+    mockService = jasmine.createSpyObj([
+      'fetchHistory',
+      'getHistory',
+      'getResultClass',
+    ]);
+    mockLiveAnnouncer = jasmine.createSpyObj(['announce']);
+
     TestBed.configureTestingModule({
       imports: [HistoryModule, BrowserAnimationsModule],
-      providers: [{provide: TestRunService, useValue: mockService}],
-      declarations: [HistoryComponent]
+      providers: [
+        { provide: TestRunService, useValue: mockService },
+        { provide: LiveAnnouncer, useValue: mockLiveAnnouncer },
+      ],
+      declarations: [HistoryComponent],
     });
     fixture = TestBed.createComponent(HistoryComponent);
     component = fixture.componentInstance;
     compiled = fixture.nativeElement as HTMLElement;
-    fixture.detectChanges();
   });
 
   describe('Class tests', () => {
     beforeEach(() => {
-      mockService.getHistory.and.returnValue(of(history));
-    })
+      mockService.getHistory.and.returnValue(
+        new BehaviorSubject<TestrunStatus[] | null>(history)
+      );
+    });
 
     it('should create', () => {
       expect(component).toBeTruthy();
     });
 
-    it('should set history value', () => {
-      component.ngOnInit();
+    describe('ngOnInit', () => {
+      it('should set dataSource data', () => {
+        component.ngOnInit();
+
+        expect(component.dataSource.data).toBeTruthy();
+      });
+
+      it('should update sort', fakeAsync(() => {
+        const sort = new MatSort();
+        component.sort = sort;
+        component.ngOnInit();
+
+        expect(component.dataSource.sort).toBeTruthy();
+      }));
+
+      it('should update filter', fakeAsync(() => {
+        component.ngOnInit();
+
+        expect(component.dataSource.filter).toBeTruthy();
+      }));
+    });
+
+    it('#sortData should call liveAnnouncer with sorted direction message', () => {
+      component.sortData({ active: '', direction: 'desc' });
 
-      component.history$.subscribe(res => {
-        expect(res).toEqual(history)
-      })
+      expect(mockLiveAnnouncer.announce).toHaveBeenCalledWith(
+        'Sorted descending'
+      );
+    });
+
+    it('#sortData should call liveAnnouncer with "Sorting cleared" message', () => {
+      component.sortData({ active: '', direction: '' });
+
+      expect(mockLiveAnnouncer.announce).toHaveBeenCalledWith(
+        'Sorting cleared'
+      );
     });
 
     it('#getFormattedDateString should return string in the format "d MMM y H:mm"', () => {
@@ -91,7 +141,10 @@ describe('HistoryComponent', () => {
     it('#getDuration should return dates duration in minutes and seconds', () => {
       const expectedResult = '06m 10s';
 
-      const result = component.getDuration(history[0].started, history[0].finished);
+      const result = component.getDuration(
+        history[0].started,
+        history[0].finished
+      );
 
       expect(result).toEqual(expectedResult);
     });
@@ -103,14 +156,92 @@ describe('HistoryComponent', () => {
 
       expect(result).toEqual(expectedResult);
     });
+
+    it('should open filter dialog with data', () => {
+      const event = {
+        currentTarget: null,
+        stopPropagation: () => undefined,
+      } as Event;
+      const openSpy = spyOn(component.dialog, 'open').and.returnValue({
+        afterClosed: () => of(true),
+      } as MatDialogRef<typeof FilterDialogComponent>);
+      fixture.detectChanges();
+
+      component.openFilter(event, '');
+
+      expect(openSpy).toHaveBeenCalled();
+      expect(openSpy).toHaveBeenCalledWith(FilterDialogComponent, {
+        ariaLabel: 'Filters',
+        data: {
+          filter: '',
+          trigger: new ElementRef(event.currentTarget),
+        },
+        autoFocus: true,
+        hasBackdrop: true,
+        disableClose: true,
+        panelClass: 'filter-form-dialog',
+      });
+
+      openSpy.calls.reset();
+    });
+
+    it('should update filteredValues when filter dialog closes with data', () => {
+      const event = {
+        currentTarget: null,
+        stopPropagation: () => undefined,
+      } as Event;
+
+      const mockFilteredData = {
+        results: ['compliant'],
+        deviceInfo: 'mockDevice',
+        deviceFirmware: 'mockFirmware',
+        dateRange: {
+          start: 'Wed Jun 21 2023 00:00:00',
+          end: 'Thu Jun 22 2023 00:00:00',
+        },
+      };
+
+      spyOn(component.dialog, 'open').and.returnValue({
+        afterClosed: () => of(mockFilteredData),
+      } as MatDialogRef<typeof FilterDialogComponent>);
+      fixture.detectChanges();
+
+      component.openFilter(event, FilterName.Started);
+      component.openFilter(event, FilterName.Results);
+      component.openFilter(event, FilterName.DeviceFirmware);
+      component.openFilter(event, FilterName.DeviceInfo);
+      expect(component.filteredValues as ReportFilters).toEqual(
+        mockFilteredData
+      );
+    });
   });
 
   describe('DOM tests', () => {
+    describe('data is not fetched', () => {
+      beforeEach(() => {
+        mockService.getHistory.and.returnValue(
+          new BehaviorSubject<TestrunStatus[] | null>(null)
+        );
+        component.ngOnInit();
+      });
+
+      it('should have empty page if data not fetched yet', () => {
+        const empty = compiled.querySelector('.results-content-empty');
+        const table = compiled.querySelector('table');
+
+        expect(table).toBeNull();
+        expect(empty).toBeNull();
+      });
+    });
+
     describe('with no devices', () => {
       beforeEach(() => {
-        mockService.getHistory.and.returnValue(of([]));
+        mockService.getHistory.and.returnValue(
+          new BehaviorSubject<TestrunStatus[] | null>([])
+        );
+        component.ngOnInit();
         fixture.detectChanges();
-      })
+      });
 
       it('should have empty message', () => {
         const empty = compiled.querySelector('.results-content-empty');
@@ -120,13 +251,18 @@ describe('HistoryComponent', () => {
 
     describe('with devices', () => {
       beforeEach(() => {
-        mockService.getHistory.and.returnValue(of(history));
-        mockService.getResultClass.and.returnValue(
-          { green: false, red: true, blue: false, grey: false }
+        mockService.getHistory.and.returnValue(
+          new BehaviorSubject<TestrunStatus[] | null>(history)
         );
+        mockService.getResultClass.and.returnValue({
+          green: false,
+          red: true,
+          blue: false,
+          grey: false,
+        });
         component.ngOnInit();
         fixture.detectChanges();
-      })
+      });
 
       it('should have data table', () => {
         const table = compiled.querySelector('table');
@@ -135,17 +271,46 @@ describe('HistoryComponent', () => {
       });
 
       it('should have addition valid class on table cell "Status"', () => {
-        const statusResultEl = compiled.querySelector('.table-cell-result-text');
+        const statusResultEl = compiled.querySelector(
+          '.table-cell-result-text'
+        );
 
         expect(statusResultEl?.classList).toContain('red');
       });
 
       it('should have report link', () => {
-        const link = compiled.querySelector('.download-report-link') as HTMLAnchorElement;
+        const link = compiled.querySelector(
+          '.download-report-link'
+        ) as HTMLAnchorElement;
 
         expect(link.href).toEqual('https://api.testrun.io/report.pdf');
-        expect(link.download).toEqual('delta_03-din-src_1.2.2_compliant_23_jun_2023_10:11');
-        expect(link.title).toEqual('Download report for Test Run # Delta 03-DIN-SRC 1.2.2 23 Jun 2023 10:11');
+        expect(link.download).toEqual(
+          'delta_03-din-src_1.2.2_compliant_23_jun_2023_10:11'
+        );
+        expect(link.title).toEqual(
+          'Download report for Test Run # Delta 03-DIN-SRC 1.2.2 23 Jun 2023 10:11'
+        );
+      });
+
+      it('should have filter chips', () => {
+        const chips = compiled.querySelector('app-filter-chips');
+
+        expect(chips).toBeTruthy();
+      });
+
+      it('should have empty state when no data satisfy filters', () => {
+        component.dataSource.filter = JSON.stringify({
+          deviceInfo: 'some not existing data',
+          deviceFirmware: 'some not existing data',
+          results: [],
+          dateRange: '',
+        });
+        fixture.detectChanges();
+        const emptyMessage = compiled.querySelector(
+          '.results-content-filter-empty'
+        );
+
+        expect(emptyMessage).toBeTruthy();
       });
     });
   });
diff --git a/modules/ui/src/app/history/history.component.ts b/modules/ui/src/app/history/history.component.ts
index 9f6050e94..ebcfb3bda 100644
--- a/modules/ui/src/app/history/history.component.ts
+++ b/modules/ui/src/app/history/history.component.ts
@@ -13,32 +13,191 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {Component, OnInit} from '@angular/core';
-import {TestRunService} from '../test-run.service';
-import {Observable} from 'rxjs/internal/Observable';
-import {StatusResultClassName, TestrunStatus} from '../model/testrun-status';
-import {DatePipe} from '@angular/common';
+import {
+  Component,
+  ElementRef,
+  OnDestroy,
+  OnInit,
+  ViewChild,
+} from '@angular/core';
+import { LiveAnnouncer } from '@angular/cdk/a11y';
+import { TestRunService } from '../services/test-run.service';
+import {
+  HistoryTestrun,
+  StatusResultClassName,
+  TestrunStatus,
+} from '../model/testrun-status';
+import { DatePipe } from '@angular/common';
+import { MatSort, Sort } from '@angular/material/sort';
+import { Subject, takeUntil } from 'rxjs';
+import { MatTableDataSource } from '@angular/material/table';
+import { FilterDialogComponent } from '../components/filter-dialog/filter-dialog.component';
+import { MatDialog } from '@angular/material/dialog';
+import { tap } from 'rxjs/internal/operators/tap';
+import { DateRange, FilterName, Filters } from '../model/filters';
 
 @Component({
   selector: 'app-history',
   templateUrl: './history.component.html',
-  styleUrls: ['./history.component.scss']
+  styleUrls: ['./history.component.scss'],
 })
-export class HistoryComponent implements OnInit {
-  history$!: Observable<TestrunStatus[]>;
-  displayedColumns: string[] = ['started', 'duration', 'device', 'firmware', 'result', 'report'];
+export class HistoryComponent implements OnInit, OnDestroy {
+  displayedColumns: string[] = [
+    'started',
+    'duration',
+    'deviceInfo',
+    'deviceFirmware',
+    'status',
+    'report',
+  ];
+  chips: string[] = ['chips'];
+  dataSource: MatTableDataSource<HistoryTestrun> =
+    new MatTableDataSource<HistoryTestrun>([]);
 
-  constructor(private testRunService: TestRunService, private datePipe: DatePipe) {
+  public readonly FilterName = FilterName;
+  public filterOpened = false;
+  public activeFilter = '';
+  public resultList = ['Compliant', 'Non-Compliant'];
+  filteredValues: Filters = {
+    deviceInfo: '',
+    deviceFirmware: '',
+    results: [],
+    dateRange: '',
+  };
+  private destroy$: Subject<boolean> = new Subject<boolean>();
+  @ViewChild(MatSort, { static: false }) sort!: MatSort;
+  dataLoaded = false;
+  constructor(
+    private testRunService: TestRunService,
+    private datePipe: DatePipe,
+    private liveAnnouncer: LiveAnnouncer,
+    public dialog: MatDialog
+  ) {
     this.testRunService.fetchHistory();
   }
 
   ngOnInit() {
-    this.history$ = this.testRunService.getHistory();
+    this.testRunService
+      .getHistory()
+      .pipe(takeUntil(this.destroy$))
+      .subscribe(res => {
+        if (!res) {
+          return;
+        }
+        const data = this.formateData(res);
+
+        this.dataSource = new MatTableDataSource(data);
+
+        this.dataSource.sortingDataAccessor = (
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          data: any,
+          sortHeaderId: string
+        ): string => {
+          const value = data[sortHeaderId];
+          return typeof value === 'string' ? value.toLocaleLowerCase() : value;
+        };
+        this.dataSource.filterPredicate = this.customFilterPredicate();
+        this.dataSource.filter = JSON.stringify(this.filteredValues);
+        this.dataSource.sort = this.sort;
+        this.dataLoaded = true;
+      });
+  }
+
+  customFilterPredicate() {
+    const filterPredicate = (data: HistoryTestrun, filter: string): boolean => {
+      const searchString = JSON.parse(filter);
+      const isIncludeDeviceInfo = this.filterStringData(
+        data.deviceInfo,
+        searchString.deviceInfo
+      );
+      const isIncludeDeviceFirmware = this.filterStringData(
+        data.deviceFirmware,
+        searchString.deviceFirmware
+      );
+
+      const isIncludeStatus =
+        searchString.results?.length === 0 ||
+        searchString.results?.includes(data.status);
+      const isIncludeStartedDate = this.filterStartedDateRange(
+        data.started,
+        searchString
+      );
+
+      return (
+        isIncludeDeviceInfo &&
+        isIncludeDeviceFirmware &&
+        isIncludeStatus &&
+        isIncludeStartedDate
+      );
+    };
+    return filterPredicate;
+  }
+
+  private filterStringData(data: string, searchString: string): boolean {
+    return (
+      data
+        .toString()
+        .trim()
+        .toLowerCase()
+        .indexOf(searchString.trim().toLowerCase()) !== -1
+    );
+  }
+
+  private filterStartedDateRange(
+    startedDate: string | null,
+    searchString: { dateRange: DateRange }
+  ): boolean {
+    let isIncludeDate = true;
+
+    if (!searchString.dateRange || !startedDate) {
+      return isIncludeDate;
+    }
+
+    const startDate = searchString.dateRange.start
+      ? typeof searchString.dateRange.start === 'string'
+        ? Date.parse(searchString.dateRange.start)
+        : searchString.dateRange.start.getDate()
+      : 0;
+    const endDate = searchString.dateRange.end
+      ? typeof searchString.dateRange.end === 'string'
+        ? Date.parse(searchString.dateRange.end)
+        : searchString.dateRange.end.getDate()
+      : 0;
+
+    const startedDateWithoutTime = new Date(startedDate).toDateString();
+    const dateToFilter = Date.parse(startedDateWithoutTime);
+
+    if (startDate && endDate && dateToFilter) {
+      isIncludeDate = dateToFilter >= startDate && dateToFilter <= endDate;
+    } else if (startDate && dateToFilter) {
+      isIncludeDate = dateToFilter >= startDate;
+    }
+
+    return isIncludeDate;
+  }
+
+  private formateData(data: TestrunStatus[]): HistoryTestrun[] {
+    return data.map(item => {
+      return {
+        ...item,
+        deviceFirmware: item.device.firmware,
+        deviceInfo: item.device.manufacturer + ' ' + item.device.model,
+        duration: this.getDuration(item.started, item.finished),
+      };
+    });
   }
 
   getFormattedDateString(date: string | null) {
     return date ? this.datePipe.transform(date, 'd MMM y H:mm') : '';
   }
+  sortData(sortState: Sort) {
+    this.dataSource.sort = this.sort;
+    if (sortState.direction) {
+      this.liveAnnouncer.announce(`Sorted ${sortState.direction}ending`);
+    } else {
+      this.liveAnnouncer.announce('Sorting cleared');
+    }
+  }
 
   private transformDate(date: number, format: string) {
     return this.datePipe.transform(date, format);
@@ -55,10 +214,79 @@ export class HistoryComponent implements OnInit {
     const durationMinuts = this.transformDate(durationMillisecond, 'mm');
     const durationSeconds = this.transformDate(durationMillisecond, 'ss');
 
-    return `${durationMinuts}m ${durationSeconds}s`
+    return `${durationMinuts}m ${durationSeconds}s`;
   }
 
   public getResultClass(status: string): StatusResultClassName {
     return this.testRunService.getResultClass(status);
   }
+
+  openFilter(event: Event, filter: string) {
+    event.stopPropagation();
+    const target = new ElementRef(event.currentTarget);
+
+    if (!this.filterOpened) {
+      this.openFilterDialog(target, filter);
+    }
+  }
+
+  openFilterDialog(target: ElementRef<EventTarget | null>, filter: string) {
+    this.filterOpened = true;
+    this.activeFilter = filter;
+    const dialogRef = this.dialog.open(FilterDialogComponent, {
+      ariaLabel: 'Filters',
+      data: {
+        filter,
+        trigger: target,
+      },
+      autoFocus: true,
+      hasBackdrop: true,
+      disableClose: true,
+      panelClass: 'filter-form-dialog',
+    });
+
+    dialogRef
+      ?.afterClosed()
+      .pipe(
+        takeUntil(this.destroy$),
+        tap(() => {
+          this.filterOpened = false;
+          this.activeFilter = '';
+        })
+      )
+      .subscribe(filteredData => {
+        if (filteredData) {
+          if (filter === FilterName.Results) {
+            this.filteredValues.results = filteredData.results;
+          }
+          if (filter === FilterName.DeviceInfo) {
+            this.filteredValues.deviceInfo = filteredData.deviceInfo;
+          }
+          if (filter === FilterName.DeviceFirmware) {
+            this.filteredValues.deviceFirmware = filteredData.deviceFirmware;
+          }
+          if (filter === FilterName.Started) {
+            this.filteredValues.dateRange = filteredData.dateRange;
+          }
+
+          this.dataSource.filter = JSON.stringify(this.filteredValues);
+        }
+      });
+  }
+
+  filterCleared(filters: Filters) {
+    this.filteredValues = filters;
+    this.dataSource.filter = JSON.stringify(this.filteredValues);
+  }
+
+  ngOnDestroy() {
+    this.destroy$.next(true);
+    this.destroy$.unsubscribe();
+  }
+
+  isFiltersEmpty() {
+    return Object.values(this.filteredValues).every(
+      value => value.length === 0
+    );
+  }
 }
diff --git a/modules/ui/src/app/history/history.module.ts b/modules/ui/src/app/history/history.module.ts
index 458e617ac..288f4e048 100644
--- a/modules/ui/src/app/history/history.module.ts
+++ b/modules/ui/src/app/history/history.module.ts
@@ -13,28 +13,33 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {NgModule} from '@angular/core';
-import {CommonModule, DatePipe} from '@angular/common';
-import {HistoryComponent} from './history.component';
-import {HistoryRoutingModule} from './history-routing.module';
-import {MatTableModule} from '@angular/material/table';
-import {MatIconModule} from '@angular/material/icon';
-import {MatToolbarModule} from '@angular/material/toolbar';
-import {DownloadReportComponent} from '../components/download-report/download-report.component';
+import { NgModule } from '@angular/core';
+import { CommonModule, DatePipe } from '@angular/common';
+import { HistoryComponent } from './history.component';
+import { HistoryRoutingModule } from './history-routing.module';
+import { MatTableModule } from '@angular/material/table';
+import { MatIconModule } from '@angular/material/icon';
+import { MatToolbarModule } from '@angular/material/toolbar';
+import { DownloadReportComponent } from '../components/download-report/download-report.component';
+import { MatSortModule } from '@angular/material/sort';
+import { FilterDialogComponent } from '../components/filter-dialog/filter-dialog.component';
+import { FilterChipsComponent } from '../components/filter-chips/filter-chips.component';
+import { DeleteReportComponent } from '../components/delete-report/delete-report.component';
 
 @NgModule({
-  declarations: [
-    HistoryComponent,
-  ],
+  declarations: [HistoryComponent],
   imports: [
     CommonModule,
     HistoryRoutingModule,
     MatTableModule,
     MatIconModule,
     MatToolbarModule,
-    DownloadReportComponent
+    MatSortModule,
+    DownloadReportComponent,
+    FilterDialogComponent,
+    FilterChipsComponent,
+    DeleteReportComponent,
   ],
-  providers: [DatePipe]
+  providers: [DatePipe],
 })
-export class HistoryModule {
-}
+export class HistoryModule {}
diff --git a/modules/ui/src/app/interceptors/error-handler.interceptor.spec.ts b/modules/ui/src/app/interceptors/error-handler.interceptor.spec.ts
new file mode 100644
index 000000000..89289f2f9
--- /dev/null
+++ b/modules/ui/src/app/interceptors/error-handler.interceptor.spec.ts
@@ -0,0 +1,50 @@
+/**
+ * Copyright 2023 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+import { TestBed } from '@angular/core/testing';
+
+import {
+  ErrorHandlerInterceptor,
+  WINDOW_TOKEN,
+} from './error-handler.interceptor';
+
+const windowMock = {
+  location: {
+    reload: jasmine.createSpy('reload'),
+  },
+};
+describe('ErrorHandlerInterceptor', () => {
+  let interceptor: ErrorHandlerInterceptor;
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [
+        ErrorHandlerInterceptor,
+        { provide: WINDOW_TOKEN, useValue: windowMock },
+      ],
+    });
+    interceptor = TestBed.inject(ErrorHandlerInterceptor);
+    window.onbeforeunload = () => 'Oh no!';
+  });
+
+  it('should be created', () => {
+    expect(interceptor).toBeTruthy();
+  });
+
+  it('should reload page if chunk error happens', () => {
+    interceptor.handleError(new Error('Loading chunk 123 failed'));
+
+    expect(windowMock.location.reload).toHaveBeenCalled();
+  });
+});
diff --git a/modules/ui/src/app/interceptors/error-handler.interceptor.ts b/modules/ui/src/app/interceptors/error-handler.interceptor.ts
new file mode 100644
index 000000000..07b1fb3f7
--- /dev/null
+++ b/modules/ui/src/app/interceptors/error-handler.interceptor.ts
@@ -0,0 +1,42 @@
+/**
+ * Copyright 2023 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+import {
+  ErrorHandler,
+  Inject,
+  Injectable,
+  InjectionToken,
+  Optional,
+} from '@angular/core';
+export const WINDOW_TOKEN = new InjectionToken('Window');
+
+/**
+ * Interceptor to fix chunk error https://medium.com/@kamrankhatti/angular-lazy-routes-loading-chunk-failed-42b16c22a377
+ */
+@Injectable()
+export class ErrorHandlerInterceptor implements ErrorHandler {
+  constructor(
+    @Optional()
+    @Inject(WINDOW_TOKEN)
+    private window: Window = window
+  ) {}
+  handleError(error: Error): void {
+    const chunkFailedMessage = /Loading chunk [\d]+ failed/;
+
+    if (chunkFailedMessage.test(error.message)) {
+      this.window.location.reload();
+    }
+  }
+}
diff --git a/modules/ui/src/app/interceptors/error.interceptor.spec.ts b/modules/ui/src/app/interceptors/error.interceptor.spec.ts
new file mode 100644
index 000000000..9fff32863
--- /dev/null
+++ b/modules/ui/src/app/interceptors/error.interceptor.spec.ts
@@ -0,0 +1,108 @@
+/**
+ * Copyright 2023 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+import { TestBed } from '@angular/core/testing';
+
+import { ErrorInterceptor } from './error.interceptor';
+import { NotificationService } from '../services/notification.service';
+import {
+  HttpErrorResponse,
+  HttpHandler,
+  HttpRequest,
+  HttpResponse,
+} from '@angular/common/http';
+import { throwError } from 'rxjs/internal/observable/throwError';
+import { delay } from 'rxjs/internal/operators/delay';
+import { of } from 'rxjs/internal/observable/of';
+
+describe('ErrorInterceptor', () => {
+  const notificationServiceMock: jasmine.SpyObj<NotificationService> =
+    jasmine.createSpyObj(['notify']);
+  let interceptor: ErrorInterceptor;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [
+        ErrorInterceptor,
+        { provide: NotificationService, useValue: notificationServiceMock },
+      ],
+    });
+    interceptor = TestBed.inject(ErrorInterceptor);
+  });
+
+  it('should be created', () => {
+    expect(interceptor).toBeTruthy();
+  });
+
+  it('should notify about backend errors', done => {
+    const next: HttpHandler = {
+      handle: () => {
+        return throwError(
+          new HttpErrorResponse({ error: { error: 'error' }, status: 500 })
+        );
+      },
+    };
+
+    const requestMock = new HttpRequest('GET', '/test');
+
+    interceptor.intercept(requestMock, next).subscribe(
+      () => ({}),
+      () => {
+        expect(notificationServiceMock.notify).toHaveBeenCalledWith('error');
+        done();
+      }
+    );
+  });
+
+  it('should notify about other errors', done => {
+    const next: HttpHandler = {
+      handle: () => {
+        return throwError(new HttpErrorResponse({ status: 0 }));
+      },
+    };
+
+    const requestMock = new HttpRequest('GET', '/test');
+
+    interceptor.intercept(requestMock, next).subscribe(
+      () => ({}),
+      () => {
+        expect(notificationServiceMock.notify).toHaveBeenCalledWith(
+          'Back End is not responding. Please, try again later.'
+        );
+        done();
+      }
+    );
+  });
+
+  it('should throw timeout error when timeout is exceeded', done => {
+    const next: HttpHandler = {
+      handle: () => {
+        return of(new HttpResponse()).pipe(delay(2000));
+      },
+    };
+
+    const requestMock = new HttpRequest('GET', '/test');
+
+    interceptor.intercept(requestMock, next, 1000).subscribe(
+      () => ({}),
+      () => {
+        expect(notificationServiceMock.notify).toHaveBeenCalledWith(
+          'Back End is not responding. Please, try again later.'
+        );
+        done();
+      }
+    );
+  });
+});
diff --git a/modules/ui/src/app/interceptors/error.interceptor.ts b/modules/ui/src/app/interceptors/error.interceptor.ts
new file mode 100644
index 000000000..6eb651c2f
--- /dev/null
+++ b/modules/ui/src/app/interceptors/error.interceptor.ts
@@ -0,0 +1,64 @@
+/**
+ * Copyright 2023 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+import { Injectable } from '@angular/core';
+import {
+  HttpErrorResponse,
+  HttpEvent,
+  HttpHandler,
+  HttpInterceptor,
+  HttpRequest,
+} from '@angular/common/http';
+import {
+  catchError,
+  Observable,
+  throwError,
+  timeout,
+  TimeoutError,
+} from 'rxjs';
+import { NotificationService } from '../services/notification.service';
+
+@Injectable()
+export class ErrorInterceptor implements HttpInterceptor {
+  constructor(private notificationService: NotificationService) {}
+
+  intercept(
+    request: HttpRequest<unknown>,
+    next: HttpHandler,
+    timeoutMs = 5000
+  ): Observable<HttpEvent<unknown>> {
+    return next.handle(request).pipe(
+      timeout(timeoutMs),
+      catchError((error: HttpErrorResponse | TimeoutError) => {
+        if (error instanceof TimeoutError) {
+          this.notificationService.notify(
+            'Back End is not responding. Please, try again later.'
+          );
+        } else {
+          if (error.status === 0) {
+            this.notificationService.notify(
+              'Back End is not responding. Please, try again later.'
+            );
+          } else {
+            this.notificationService.notify(
+              error.error?.error || error.message
+            );
+          }
+        }
+        return throwError(error);
+      })
+    );
+  }
+}
diff --git a/modules/ui/src/app/interceptors/loading.interceptor.spec.ts b/modules/ui/src/app/interceptors/loading.interceptor.spec.ts
new file mode 100644
index 000000000..1ecb6a714
--- /dev/null
+++ b/modules/ui/src/app/interceptors/loading.interceptor.spec.ts
@@ -0,0 +1,90 @@
+/**
+ * Copyright 2023 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+import { TestBed } from '@angular/core/testing';
+
+import { LoadingInterceptor } from './loading.interceptor';
+import { of } from 'rxjs/internal/observable/of';
+import { HttpHandler, HttpRequest, HttpResponse } from '@angular/common/http';
+import { LoaderService } from '../services/loader.service';
+
+describe('LoadingInterceptor', () => {
+  const loaderServiceMock: jasmine.SpyObj<LoaderService> = jasmine.createSpyObj(
+    ['setLoading']
+  );
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [
+        LoadingInterceptor,
+        { provide: LoaderService, useValue: loaderServiceMock },
+      ],
+    });
+  });
+
+  afterEach(() => {
+    loaderServiceMock.setLoading.calls.reset();
+  });
+
+  it('should be created', () => {
+    const interceptor: LoadingInterceptor = TestBed.inject(LoadingInterceptor);
+    expect(interceptor).toBeTruthy();
+  });
+
+  it('should call setLoader with true when request intercepted', done => {
+    const interceptor: LoadingInterceptor = TestBed.inject(LoadingInterceptor);
+
+    const next: HttpHandler = {
+      handle: () => {
+        return of(new HttpResponse());
+      },
+    };
+
+    const requestMock = new HttpRequest('GET', '/test');
+
+    interceptor.intercept(requestMock, next).subscribe(() => {
+      expect(loaderServiceMock.setLoading).toHaveBeenCalledWith(true);
+      done();
+    });
+  });
+
+  it('should not call setLoader with false if more than one request is in process', done => {
+    const interceptor: LoadingInterceptor = TestBed.inject(LoadingInterceptor);
+
+    const next: HttpHandler = {
+      handle: () => {
+        return of(new HttpResponse());
+      },
+    };
+
+    const requestMock = new HttpRequest('GET', '/test');
+
+    interceptor.intercept(requestMock, next).subscribe(() => {
+      expect(loaderServiceMock.setLoading).toHaveBeenCalledWith(true);
+
+      loaderServiceMock.setLoading.calls.reset();
+      interceptor.intercept(requestMock, next).subscribe(() => {
+        expect(loaderServiceMock.setLoading).toHaveBeenCalledWith(true);
+
+        loaderServiceMock.setLoading.calls.reset();
+        done();
+      });
+
+      expect(loaderServiceMock.setLoading).not.toHaveBeenCalled();
+    });
+
+    expect(loaderServiceMock.setLoading).toHaveBeenCalledWith(false);
+  });
+});
diff --git a/modules/ui/src/app/interceptors/loading.interceptor.ts b/modules/ui/src/app/interceptors/loading.interceptor.ts
new file mode 100644
index 000000000..6a00847d4
--- /dev/null
+++ b/modules/ui/src/app/interceptors/loading.interceptor.ts
@@ -0,0 +1,48 @@
+/**
+ * Copyright 2023 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+import { Injectable } from '@angular/core';
+import {
+  HttpEvent,
+  HttpHandler,
+  HttpInterceptor,
+  HttpRequest,
+} from '@angular/common/http';
+import { Observable } from 'rxjs';
+import { finalize } from 'rxjs/operators';
+import { LoaderService } from '../services/loader.service';
+
+@Injectable()
+export class LoadingInterceptor implements HttpInterceptor {
+  private totalRequests = 0;
+
+  constructor(private loadingService: LoaderService) {}
+
+  intercept(
+    request: HttpRequest<unknown>,
+    next: HttpHandler
+  ): Observable<HttpEvent<unknown>> {
+    this.totalRequests++;
+    this.loadingService.setLoading(true);
+    return next.handle(request).pipe(
+      finalize(() => {
+        this.totalRequests--;
+        if (this.totalRequests === 0) {
+          this.loadingService.setLoading(false);
+        }
+      })
+    );
+  }
+}
diff --git a/modules/ui/src/app/mocks/device.mock.ts b/modules/ui/src/app/mocks/device.mock.ts
index 3bb32e683..94796fbd6 100644
--- a/modules/ui/src/app/mocks/device.mock.ts
+++ b/modules/ui/src/app/mocks/device.mock.ts
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {Device} from '../model/device';
+import { Device } from '../model/device';
 
 export const device = {
-  "manufacturer": "Delta",
-  "model": "O3-DIN-CPU",
-  "mac_addr": "00:1e:42:35:73:c4",
-  "test_modules": {
-    "dns": {
-      "enabled": true,
-    }
-  }
+  manufacturer: 'Delta',
+  model: 'O3-DIN-CPU',
+  mac_addr: '00:1e:42:35:73:c4',
+  test_modules: {
+    dns: {
+      enabled: true,
+    },
+  },
 } as Device;
diff --git a/modules/ui/src/app/mocks/progress.mock.ts b/modules/ui/src/app/mocks/progress.mock.ts
index 5a9678851..f39ba4ba7 100644
--- a/modules/ui/src/app/mocks/progress.mock.ts
+++ b/modules/ui/src/app/mocks/progress.mock.ts
@@ -13,57 +13,96 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {IResult, StatusOfTestrun, TestrunStatus, TestsData} from '../model/testrun-status';
+import {
+  IResult,
+  StatusOfTestrun,
+  TestrunStatus,
+  TestsData,
+} from '../model/testrun-status';
 
 const TEST_DATA_RESULT: IResult[] = [
   {
     name: 'dns.network.hostname_resolution',
     description: 'The device should resolve hostnames',
-    result: 'Compliant'
+    result: 'Compliant',
   },
   {
     name: 'dns.network.from_dhcp',
-    description: 'The device should use the DNS server provided by the DHCP server',
-    result: 'Non-Compliant'
-  }
-]
+    description:
+      'The device should use the DNS server provided by the DHCP server',
+    result: 'Non-Compliant',
+  },
+];
+
+export const TEST_DATA_TABLE_RESULT: IResult[] = [
+  ...TEST_DATA_RESULT,
+  ...new Array(24).fill(null).map(() => ({}) as IResult),
+];
+
+export const EMPTY_RESULT = new Array(100)
+  .fill(null)
+  .map(() => ({}) as IResult);
 
 export const TEST_DATA: TestsData = {
   total: 26,
-  results: TEST_DATA_RESULT
-}
+  results: TEST_DATA_RESULT,
+};
 
-const PROGRESS_DATA_RESPONSE = ((status: string, finished: string | null, tests: TestsData | IResult[], report?: string) => {
+const PROGRESS_DATA_RESPONSE = (
+  status: string,
+  finished: string | null,
+  tests: TestsData | IResult[],
+  report?: string
+) => {
   return {
     status,
     device: {
       manufacturer: 'Delta',
       model: '03-DIN-CPU',
       mac_addr: '01:02:03:04:05:06',
-      firmware: '1.2.2'
+      firmware: '1.2.2',
     },
     started: '2023-06-22T09:20:00.123Z',
     finished,
     tests,
-    report
-  }
-});
+    report,
+  };
+};
 
-export const MOCK_PROGRESS_DATA_IN_PROGRESS: TestrunStatus = PROGRESS_DATA_RESPONSE(StatusOfTestrun.InProgress, null, TEST_DATA);
-export const MOCK_PROGRESS_DATA_COMPLIANT: TestrunStatus = PROGRESS_DATA_RESPONSE(
-  StatusOfTestrun.Compliant, '2023-06-22T09:20:00.123Z', TEST_DATA_RESULT, 'https://api.testrun.io/report.pdf'
-);
+export const MOCK_PROGRESS_DATA_CANCELLING: TestrunStatus =
+  PROGRESS_DATA_RESPONSE(StatusOfTestrun.Cancelling, null, TEST_DATA);
+export const MOCK_PROGRESS_DATA_IN_PROGRESS: TestrunStatus =
+  PROGRESS_DATA_RESPONSE(StatusOfTestrun.InProgress, null, TEST_DATA);
+export const MOCK_PROGRESS_DATA_IN_PROGRESS_EMPTY: TestrunStatus =
+  PROGRESS_DATA_RESPONSE(StatusOfTestrun.InProgress, null, []);
+export const MOCK_PROGRESS_DATA_COMPLIANT: TestrunStatus =
+  PROGRESS_DATA_RESPONSE(
+    StatusOfTestrun.Compliant,
+    '2023-06-22T09:20:00.123Z',
+    TEST_DATA_RESULT,
+    'https://api.testrun.io/report.pdf'
+  );
+
+export const MOCK_PROGRESS_DATA_CANCELLED: TestrunStatus =
+  PROGRESS_DATA_RESPONSE(StatusOfTestrun.Cancelled, null, TEST_DATA);
 
-export const MOCK_PROGRESS_DATA_CANCELLED: TestrunStatus = PROGRESS_DATA_RESPONSE(StatusOfTestrun.Cancelled, null, TEST_DATA);
+export const MOCK_PROGRESS_DATA_MONITORING: TestrunStatus =
+  PROGRESS_DATA_RESPONSE(StatusOfTestrun.Monitoring, null, TEST_DATA);
+
+export const MOCK_PROGRESS_DATA_IDLE: TestrunStatus = PROGRESS_DATA_RESPONSE(
+  StatusOfTestrun.Idle,
+  null,
+  []
+);
 
 export const MOCK_PROGRESS_DATA_NOT_STARTED: TestrunStatus = {
   ...MOCK_PROGRESS_DATA_IN_PROGRESS,
   status: StatusOfTestrun.Idle,
-  started: null
+  started: null,
 };
 
 export const MOCK_PROGRESS_DATA_WAITING_FOR_DEVICE: TestrunStatus = {
   ...MOCK_PROGRESS_DATA_IN_PROGRESS,
   status: StatusOfTestrun.WaitingForDevice,
-  started: null
+  started: null,
 };
diff --git a/modules/ui/src/app/mocks/version.mock.ts b/modules/ui/src/app/mocks/version.mock.ts
new file mode 100644
index 000000000..41c35d7de
--- /dev/null
+++ b/modules/ui/src/app/mocks/version.mock.ts
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+export const VERSION = {
+  installed_version: 'v1',
+  latest_version: 'v1',
+  latest_version_url: '',
+  update_available: false,
+};
+
+export const NEW_VERSION = {
+  installed_version: 'v1',
+  latest_version: 'v2',
+  latest_version_url: 'test-url',
+  update_available: true,
+};
diff --git a/modules/ui/src/app/model/callout-type.ts b/modules/ui/src/app/model/callout-type.ts
new file mode 100644
index 000000000..49a2b73c6
--- /dev/null
+++ b/modules/ui/src/app/model/callout-type.ts
@@ -0,0 +1,19 @@
+/**
+ * Copyright 2023 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+export enum CalloutType {
+  Info = 'info',
+  Warning = 'warning_amber',
+}
diff --git a/modules/ui/src/app/model/device.ts b/modules/ui/src/app/model/device.ts
index 2f5314037..1ac0b8b28 100644
--- a/modules/ui/src/app/model/device.ts
+++ b/modules/ui/src/app/model/device.ts
@@ -27,14 +27,14 @@ export interface Device {
 export interface TestModules {
   [key: string]: {
     enabled: boolean;
-  }
+  };
 }
 
 /**
  * Test Module interface used on ui
  */
 export interface TestModule {
-  displayName: string,
-  name: string,
-  enabled: boolean,
+  displayName: string;
+  name: string;
+  enabled: boolean;
 }
diff --git a/modules/ui/src/app/model/filters.ts b/modules/ui/src/app/model/filters.ts
new file mode 100644
index 000000000..15144349e
--- /dev/null
+++ b/modules/ui/src/app/model/filters.ts
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2023 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+export enum FilterName {
+  DeviceInfo = 'deviceInfo',
+  DeviceFirmware = 'deviceFirmware',
+  Results = 'results',
+  Started = 'started',
+  DateRange = 'dateRange',
+}
+
+export interface ReportFilters {
+  deviceInfo: string;
+  deviceFirmware: string;
+  results: string[];
+  dateRange: DateRange | string;
+}
+
+export class DateRange {
+  start: string | Date | null = '';
+  end: string | Date | null = '';
+  toString() {
+    if (this.start && this.end) {
+      return getDateString(this.start) + '-' + getDateString(this.end);
+    }
+    if (this.start && !this.end) {
+      return getDateString(this.start);
+    }
+    if (!this.start && this.end) {
+      return getDateString(this.end);
+    }
+    return '';
+  }
+}
+
+export class Filters {
+  deviceInfo = '';
+  deviceFirmware = '';
+  results: string[] = [];
+  dateRange: DateRange | string = '';
+}
+
+function getDateString(date: string | Date) {
+  if (typeof date === 'string') {
+    return date;
+  }
+
+  return `${date.getMonth() + 1}/${date.getDate()}/${date.getFullYear()}`;
+}
diff --git a/modules/ui/src/app/model/routes.ts b/modules/ui/src/app/model/routes.ts
new file mode 100644
index 000000000..97c7beb85
--- /dev/null
+++ b/modules/ui/src/app/model/routes.ts
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+
+export enum Routes {
+  Devices = '/devices',
+  Testrun = '/testrun',
+  Reports = '/reports',
+}
diff --git a/modules/ui/src/app/model/setting.ts b/modules/ui/src/app/model/setting.ts
index 843efad0d..5d9c768e0 100644
--- a/modules/ui/src/app/model/setting.ts
+++ b/modules/ui/src/app/model/setting.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 export interface SystemConfig {
-  network: {
+  network?: {
     device_intf?: string;
     internet_intf?: string;
-  }
+  };
 }
diff --git a/modules/ui/src/app/model/testrun-status.ts b/modules/ui/src/app/model/testrun-status.ts
index 592255f79..989d48491 100644
--- a/modules/ui/src/app/model/testrun-status.ts
+++ b/modules/ui/src/app/model/testrun-status.ts
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {Device} from './device';
+import { Device } from './device';
 
 export interface TestrunStatus {
   status: string;
@@ -24,12 +24,18 @@ export interface TestrunStatus {
   report?: string;
 }
 
+export interface HistoryTestrun extends TestrunStatus {
+  deviceFirmware: string;
+  deviceInfo: string;
+  duration: string;
+}
+
 export interface TestsData {
   total?: number;
   results?: IResult[];
 }
 
-type TestsResponse = TestsData | IResult[];
+export type TestsResponse = TestsData | IResult[];
 
 export interface IDevice extends Device {
   firmware: string;
@@ -45,11 +51,13 @@ export enum StatusOfTestrun {
   InProgress = 'In Progress',
   WaitingForDevice = 'Waiting for Device',
   Cancelled = 'Cancelled',
+  Cancelling = 'Cancelling',
   Failed = 'Failed',
   Compliant = 'Compliant', // used for Completed
   NonCompliant = 'Non-Compliant', // used for Completed
   SmartReady = 'Smart Ready', // used for Completed
-  Idle = 'Idle'
+  Idle = 'Idle',
+  Monitoring = 'Monitoring',
 }
 
 export enum StatusOfTestResult {
@@ -59,17 +67,17 @@ export enum StatusOfTestResult {
   Skipped = 'Skipped',
   NotStarted = 'Not Started',
   Error = 'Error', // test failed to run
-  Info = 'Informational' // nice to know information, not necessarily compliant/non-compliant
+  Info = 'Informational', // nice to know information, not necessarily compliant/non-compliant
 }
 
 export interface StatusResultClassName {
-  green: boolean,
-  red: boolean,
-  blue: boolean,
-  grey: boolean
+  green: boolean;
+  red: boolean;
+  blue: boolean;
+  grey: boolean;
 }
 
 export type TestrunStatusKey = keyof typeof StatusOfTestrun;
-export type TestrunStatusValue = typeof StatusOfTestrun[TestrunStatusKey];
+export type TestrunStatusValue = (typeof StatusOfTestrun)[TestrunStatusKey];
 export type TestResultKey = keyof typeof StatusOfTestResult;
-export type TestResultValue = typeof StatusOfTestResult[TestResultKey];
+export type TestResultValue = (typeof StatusOfTestResult)[TestResultKey];
diff --git a/modules/ui/src/app/model/version.ts b/modules/ui/src/app/model/version.ts
new file mode 100644
index 000000000..22064bc05
--- /dev/null
+++ b/modules/ui/src/app/model/version.ts
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+
+export interface Version {
+  installed_version: string;
+  update_available: boolean;
+  latest_version: string;
+  latest_version_url: string;
+}
diff --git a/modules/ui/src/app/progress/progress-breadcrumbs/progress-breadcrumbs.component.html b/modules/ui/src/app/progress/progress-breadcrumbs/progress-breadcrumbs.component.html
index d51097652..0e28c84f7 100644
--- a/modules/ui/src/app/progress/progress-breadcrumbs/progress-breadcrumbs.component.html
+++ b/modules/ui/src/app/progress/progress-breadcrumbs/progress-breadcrumbs.component.html
@@ -15,13 +15,12 @@
 -->
 <ul class="progress-breadcrumbs">
   <li class="breadcrumb-item first">
-    <mat-icon fontSet="material-icons-outlined" class="icon-home">home</mat-icon>
+    <mat-icon fontSet="material-icons-outlined" class="icon-home"
+      >home</mat-icon
+    >
   </li>
-  <li *ngFor="let breadcrumb of (breadcrumbs$ | async)" class="breadcrumb-item">
-    <mat-icon class="icon">
-      keyboard_arrow_right
-    </mat-icon>
-    <span class="breadcrumb-text">{{breadcrumb}}</span>
+  <li *ngFor="let breadcrumb of breadcrumbs$ | async" class="breadcrumb-item">
+    <mat-icon class="icon"> keyboard_arrow_right </mat-icon>
+    <span class="breadcrumb-text">{{ breadcrumb }}</span>
   </li>
 </ul>
-
diff --git a/modules/ui/src/app/progress/progress-breadcrumbs/progress-breadcrumbs.component.scss b/modules/ui/src/app/progress/progress-breadcrumbs/progress-breadcrumbs.component.scss
index 80f4d45e3..8abbab97b 100644
--- a/modules/ui/src/app/progress/progress-breadcrumbs/progress-breadcrumbs.component.scss
+++ b/modules/ui/src/app/progress/progress-breadcrumbs/progress-breadcrumbs.component.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 @use '@angular/material' as mat;
-@import "../../../theming/colors";
+@import '../../../theming/colors';
 
 :host {
   width: 100%;
diff --git a/modules/ui/src/app/progress/progress-breadcrumbs/progress-breadcrumbs.component.spec.ts b/modules/ui/src/app/progress/progress-breadcrumbs/progress-breadcrumbs.component.spec.ts
index 18ea87fa5..8dde292e5 100644
--- a/modules/ui/src/app/progress/progress-breadcrumbs/progress-breadcrumbs.component.spec.ts
+++ b/modules/ui/src/app/progress/progress-breadcrumbs/progress-breadcrumbs.component.spec.ts
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {ComponentFixture, TestBed} from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import {ProgressBreadcrumbsComponent} from './progress-breadcrumbs.component';
-import {MatIconModule} from '@angular/material/icon';
+import { ProgressBreadcrumbsComponent } from './progress-breadcrumbs.component';
+import { MatIconModule } from '@angular/material/icon';
 
 describe('ProgressBreadcrumbsComponent', () => {
   let component: ProgressBreadcrumbsComponent;
@@ -25,7 +25,7 @@ describe('ProgressBreadcrumbsComponent', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
       declarations: [ProgressBreadcrumbsComponent],
-      imports: [MatIconModule]
+      imports: [MatIconModule],
     });
     fixture = TestBed.createComponent(ProgressBreadcrumbsComponent);
     component = fixture.componentInstance;
diff --git a/modules/ui/src/app/progress/progress-breadcrumbs/progress-breadcrumbs.component.ts b/modules/ui/src/app/progress/progress-breadcrumbs/progress-breadcrumbs.component.ts
index 34ffc18b3..4109c2c57 100644
--- a/modules/ui/src/app/progress/progress-breadcrumbs/progress-breadcrumbs.component.ts
+++ b/modules/ui/src/app/progress/progress-breadcrumbs/progress-breadcrumbs.component.ts
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {ChangeDetectionStrategy, Component, Input} from '@angular/core';
-import {Observable} from 'rxjs/internal/Observable';
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { Observable } from 'rxjs/internal/Observable';
 
 @Component({
   selector: 'app-progress-breadcrumbs',
   templateUrl: './progress-breadcrumbs.component.html',
   styleUrls: ['./progress-breadcrumbs.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class ProgressBreadcrumbsComponent {
   @Input() breadcrumbs$!: Observable<string[]>;
diff --git a/modules/ui/src/app/progress/progress-initiate-form/progress-initiate-form.component.html b/modules/ui/src/app/progress/progress-initiate-form/progress-initiate-form.component.html
index fefc48010..b09a53581 100644
--- a/modules/ui/src/app/progress/progress-initiate-form/progress-initiate-form.component.html
+++ b/modules/ui/src/app/progress/progress-initiate-form/progress-initiate-form.component.html
@@ -16,23 +16,32 @@
 <form [formGroup]="initiateForm" class="progress-initiate-form">
   <span class="progress-initiate-form-title">Start New Testrun</span>
 
-  <section *ngIf="devices$| async as devices" class="progress-initiate-form-content">
-    <ng-container *ngIf="selectedDevice===null">
+  <section
+    *ngIf="devices$ | async as devices"
+    class="progress-initiate-form-content">
+    <ng-container *ngIf="selectedDevice === null">
       <ng-container *ngFor="let device of devices">
-        <app-device-item (itemClicked)="deviceSelected(device)"
-                         [device]="device"></app-device-item>
+        <app-device-item
+          [class.device-item-focused]="device === prevDevice"
+          (itemClicked)="deviceSelected(device)"
+          [device]="device"></app-device-item>
       </ng-container>
     </ng-container>
-    <app-device-item *ngIf="selectedDevice!=null" [device]="selectedDevice"></app-device-item>
-    <mat-form-field [class.hidden]="selectedDevice===null" appearance="outline">
+    <app-device-item
+      *ngIf="selectedDevice !== null"
+      [tabIndex]="-1"
+      [device]="selectedDevice"></app-device-item>
+    <mat-form-field
+      [class.hidden]="selectedDevice === null"
+      appearance="outline">
       <mat-label>Firmware</mat-label>
-      <input formControlName="firmware" matInput>
+      <input formControlName="firmware" matInput #firmwareInput />
       <mat-hint>Please enter device firmware</mat-hint>
       <mat-error *ngIf="firmware.errors?.['required']">
         <span>Firmware is <strong>required</strong></span>
       </mat-error>
     </mat-form-field>
-    <ng-container *ngIf="selectedDevice!==null">
+    <ng-container *ngIf="selectedDevice !== null">
       <app-device-tests
         [deviceForm]="initiateForm"
         [deviceTestModules]="selectedDevice.test_modules"
@@ -43,10 +52,12 @@
   </section>
 
   <mat-dialog-actions class="progress-initiate-form-actions">
-    <button (click)="cancel()" color="primary" mat-button type="button">Cancel</button>
+    <button (click)="cancel()" color="primary" mat-button type="button">
+      Cancel
+    </button>
     <button
       (click)="changeDevice()"
-      [disabled]="selectedDevice===null"
+      [disabled]="selectedDevice === null"
       class="progress-initiate-form-actions-change-device"
       color="primary"
       mat-button
@@ -55,21 +66,27 @@
     </button>
     <button
       (click)="startTestRun()"
-      [disabled]="selectedDevice===null"
+      [disabled]="selectedDevice === null"
       class="progress-initiate-form-actions-start"
       color="primary"
       mat-flat-button
-      type="button">Start Testrun
+      type="button">
+      Start Testrun
     </button>
   </mat-dialog-actions>
+
+  <app-spinner></app-spinner>
 </form>
 
 <ng-template #selectFirmware>
-  <ng-container *ngIf="selectedDevice!==null">
+  <ng-container *ngIf="selectedDevice !== null">
     <app-device-item [device]="selectedDevice"></app-device-item>
     <mat-form-field appearance="outline">
       <mat-label>Firmware</mat-label>
-      <input class="device-form-manufacturer" formControlName="firmware" matInput>
+      <input
+        class="device-form-manufacturer"
+        formControlName="firmware"
+        matInput />
       <mat-hint>Please enter device firmware</mat-hint>
       <mat-error *ngIf="firmware.errors?.['required']">
         <span>Firmware is <strong>required</strong></span>
diff --git a/modules/ui/src/app/progress/progress-initiate-form/progress-initiate-form.component.scss b/modules/ui/src/app/progress/progress-initiate-form/progress-initiate-form.component.scss
index a92c2671d..b0b7609b9 100644
--- a/modules/ui/src/app/progress/progress-initiate-form/progress-initiate-form.component.scss
+++ b/modules/ui/src/app/progress/progress-initiate-form/progress-initiate-form.component.scss
@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@import "../../../theming/colors";
-@import "../../../theming/variables";
+@import '../../../theming/colors';
+@import '../../../theming/variables';
 
 :host {
   display: grid;
diff --git a/modules/ui/src/app/progress/progress-initiate-form/progress-initiate-form.component.spec.ts b/modules/ui/src/app/progress/progress-initiate-form/progress-initiate-form.component.spec.ts
index 5e4bf3c97..121e51465 100644
--- a/modules/ui/src/app/progress/progress-initiate-form/progress-initiate-form.component.spec.ts
+++ b/modules/ui/src/app/progress/progress-initiate-form/progress-initiate-form.component.spec.ts
@@ -13,46 +13,52 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {ComponentFixture, discardPeriodicTasks, fakeAsync, TestBed, tick} from '@angular/core/testing';
-
-import {ProgressInitiateFormComponent} from './progress-initiate-form.component';
-import {MatDialogModule, MatDialogRef} from '@angular/material/dialog';
-import {TestRunService} from '../../test-run.service';
-import {BehaviorSubject} from 'rxjs/internal/BehaviorSubject';
-import {Device} from '../../model/device';
-import {DeviceItemComponent} from '../../components/device-item/device-item.component';
-import {ReactiveFormsModule} from '@angular/forms';
-import {MatInputModule} from '@angular/material/input';
-import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
-import {DeviceTestsComponent} from '../../components/device-tests/device-tests.component';
-import {device} from '../../mocks/device.mock';
-import {of} from 'rxjs';
-import {MOCK_PROGRESS_DATA_IN_PROGRESS, MOCK_PROGRESS_DATA_WAITING_FOR_DEVICE} from '../../mocks/progress.mock';
-import {throwError} from 'rxjs/internal/observable/throwError';
-import {NotificationService} from '../../notification.service';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ProgressInitiateFormComponent } from './progress-initiate-form.component';
+import { MatDialogModule, MatDialogRef } from '@angular/material/dialog';
+import { TestRunService } from '../../services/test-run.service';
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { Device } from '../../model/device';
+import { DeviceItemComponent } from '../../components/device-item/device-item.component';
+import { ReactiveFormsModule } from '@angular/forms';
+import { MatInputModule } from '@angular/material/input';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { DeviceTestsComponent } from '../../components/device-tests/device-tests.component';
+import { device } from '../../mocks/device.mock';
+import { of } from 'rxjs';
+import { MOCK_PROGRESS_DATA_WAITING_FOR_DEVICE } from '../../mocks/progress.mock';
+import { SpinnerComponent } from '../../components/spinner/spinner.component';
 
 describe('ProgressInitiateFormComponent', () => {
   let component: ProgressInitiateFormComponent;
   let fixture: ComponentFixture<ProgressInitiateFormComponent>;
   let compiled: HTMLElement;
-  let testRunServiceMock: jasmine.SpyObj<TestRunService>;
-  let notificationServiceMock: jasmine.SpyObj<NotificationService>;
 
-  notificationServiceMock = jasmine.createSpyObj(['notify']);
-  testRunServiceMock = jasmine.createSpyObj(['getDevices', 'fetchDevices', 'getTestModules', 'startTestrun', 'systemStatus$', 'getSystemStatus']);
+  const testRunServiceMock = jasmine.createSpyObj([
+    'getDevices',
+    'fetchDevices',
+    'getTestModules',
+    'startTestrun',
+    'systemStatus$',
+    'getSystemStatus',
+    'fetchVersion',
+  ]);
   testRunServiceMock.getTestModules.and.returnValue([
     {
-      displayName: "Connection",
-      name: "connection",
-      enabled: true
+      displayName: 'Connection',
+      name: 'connection',
+      enabled: true,
     },
     {
-      displayName: "DNS",
-      name: "dns",
-      enabled: false
+      displayName: 'DNS',
+      name: 'dns',
+      enabled: false,
     },
   ]);
-  testRunServiceMock.getDevices.and.returnValue(new BehaviorSubject<Device[] | null>([device, device]));
+  testRunServiceMock.getDevices.and.returnValue(
+    new BehaviorSubject<Device[] | null>([device, device])
+  );
   testRunServiceMock.startTestrun.and.returnValue(of(true));
   testRunServiceMock.systemStatus$ = of(MOCK_PROGRESS_DATA_WAITING_FOR_DEVICE);
 
@@ -60,15 +66,15 @@ describe('ProgressInitiateFormComponent', () => {
     TestBed.configureTestingModule({
       declarations: [ProgressInitiateFormComponent],
       providers: [
-        {provide: TestRunService, useValue: testRunServiceMock},
-        {provide: NotificationService, useValue: notificationServiceMock},
+        { provide: TestRunService, useValue: testRunServiceMock },
         {
           provide: MatDialogRef,
           useValue: {
-            close: () => {
-            }
-          }
-        }],
+            keydownEvents: () => of(new KeyboardEvent('keydown', { code: '' })),
+            close: () => ({}),
+          },
+        },
+      ],
       imports: [
         MatDialogModule,
         DeviceItemComponent,
@@ -76,7 +82,8 @@ describe('ProgressInitiateFormComponent', () => {
         MatInputModule,
         BrowserAnimationsModule,
         DeviceTestsComponent,
-      ]
+        SpinnerComponent,
+      ],
     });
     fixture = TestBed.createComponent(ProgressInitiateFormComponent);
     component = fixture.componentInstance;
@@ -85,49 +92,6 @@ describe('ProgressInitiateFormComponent', () => {
 
   afterEach(() => {
     testRunServiceMock.getSystemStatus.calls.reset();
-    notificationServiceMock.notify.calls.reset();
-  });
-
-  describe('when test run started', () => {
-    beforeEach(() => {
-      component.testRunStarted = true;
-    });
-    describe('with status "Waiting for device"', () => {
-      beforeEach(async () => {
-        testRunServiceMock.systemStatus$ = of(MOCK_PROGRESS_DATA_WAITING_FOR_DEVICE);
-      });
-
-      it('should call again getSystemStatus', fakeAsync(() => {
-        fixture.detectChanges();
-        tick(10000);
-
-        expect(testRunServiceMock.getSystemStatus).toHaveBeenCalledTimes(2);
-
-        discardPeriodicTasks();
-      }));
-
-      it('should notify about status', fakeAsync(() => {
-        fixture.detectChanges();
-
-        expect(notificationServiceMock.notify).toHaveBeenCalledWith('Waiting for Device');
-
-        discardPeriodicTasks();
-      }));
-
-    });
-
-    describe('with status not "Waiting for device"', () => {
-      beforeEach(async () => {
-        testRunServiceMock.systemStatus$ = of(MOCK_PROGRESS_DATA_IN_PROGRESS);
-      });
-
-      it('should call again getSystemStatus', fakeAsync(() => {
-        spyOn(component.dialogRef, 'close');
-        fixture.detectChanges();
-
-        expect(component.dialogRef.close).toHaveBeenCalled();
-      }));
-    })
   });
 
   describe('Class tests', () => {
@@ -149,12 +113,12 @@ describe('ProgressInitiateFormComponent', () => {
       component.ngOnInit();
 
       component.devices$.subscribe(res => {
-        expect(res).toEqual([device, device])
-      })
+        expect(res).toEqual([device, device]);
+      });
     });
 
     it('should update selectedDevice on deviceSelected', () => {
-      const newDevice = Object.assign({}, device, {manufacturer: 'Gamma'})
+      const newDevice = Object.assign({}, device, { manufacturer: 'Gamma' });
       component.deviceSelected(newDevice);
 
       expect(component.selectedDevice).toEqual(newDevice);
@@ -173,7 +137,11 @@ describe('ProgressInitiateFormComponent', () => {
         component.startTestRun();
 
         expect(component.firmware.errors).toBeTruthy();
-        expect(component.firmware.errors ? component.firmware.errors['required'] : false).toEqual(true);
+        expect(
+          component.firmware.errors
+            ? component.firmware.errors['required']
+            : false
+        ).toEqual(true);
       });
 
       describe('when selectedDevice is present and firmware is filled', () => {
@@ -186,18 +154,24 @@ describe('ProgressInitiateFormComponent', () => {
           component.startTestRun();
 
           expect(testRunServiceMock.startTestrun).toHaveBeenCalledWith({
-            "manufacturer": "Delta",
-            "model": "O3-DIN-CPU",
-            "mac_addr": "00:1e:42:35:73:c4",
-            "firmware": "firmware",
-            "test_modules": {
-              "dns": {
-                "enabled": true,
-              }
-            }
+            manufacturer: 'Delta',
+            model: 'O3-DIN-CPU',
+            mac_addr: '00:1e:42:35:73:c4',
+            firmware: 'firmware',
+            test_modules: {
+              dns: {
+                enabled: true,
+              },
+            },
           });
         });
 
+        it('should call fetchVersion', () => {
+          component.startTestRun();
+
+          expect(testRunServiceMock.fetchVersion).toHaveBeenCalled();
+        });
+
         describe('when result is success', () => {
           it('should call getSystemStatus', () => {
             testRunServiceMock.startTestrun.and.returnValue(of(true));
@@ -205,20 +179,43 @@ describe('ProgressInitiateFormComponent', () => {
 
             expect(testRunServiceMock.getSystemStatus).toHaveBeenCalled();
           });
-        })
+        });
+      });
+    });
 
-        describe('when error happened', () => {
-          it('should notify about error', () => {
-            testRunServiceMock.startTestrun.and.returnValue(throwError('error'));
+    describe('#ngAfterViewChecked', () => {
+      it('should focus button with previously selected device', () => {
+        component.prevDevice = device;
+        const buttonSpy = spyOn(component, 'focusButton');
+        component.ngAfterViewChecked();
+        fixture.detectChanges();
 
-            component.startTestRun();
+        expect(component.prevDevice).toBeNull();
+        expect(buttonSpy).toHaveBeenCalled();
+      });
 
-            expect(component.startInterval).toEqual(false);
-            expect(notificationServiceMock.notify).toHaveBeenCalledWith('error');
-          });
-        })
+      it('should focus firmware', () => {
+        component.selectedDevice = device;
+        component.setFirmwareFocus = true;
+        const firmwareSpy = spyOn(
+          component.firmwareInput.nativeElement,
+          'focus'
+        );
+        component.ngAfterViewChecked();
+        fixture.detectChanges();
+
+        expect(firmwareSpy).toHaveBeenCalled();
+      });
+    });
+
+    it('should focus element on focusButton ', function () {
+      const deviceButton = compiled.querySelector(
+        'app-device-item button'
+      ) as HTMLButtonElement;
+      const buttonFocusSpy = spyOn(deviceButton, 'focus');
+      component.focusButton(deviceButton);
 
-      })
+      expect(buttonFocusSpy).toHaveBeenCalled();
     });
   });
 
@@ -237,20 +234,26 @@ describe('ProgressInitiateFormComponent', () => {
 
       it('should select device on device click', () => {
         spyOn(component, 'deviceSelected');
-        const deviceList = compiled.querySelector('app-device-item button') as HTMLButtonElement;
+        const deviceList = compiled.querySelector(
+          'app-device-item button'
+        ) as HTMLButtonElement;
         deviceList.click();
 
         expect(component.deviceSelected).toHaveBeenCalled();
       });
 
       it('should disable change device and start buttons', () => {
-        const changeDevice = compiled.querySelector('.progress-initiate-form-actions-change-device') as HTMLButtonElement;
-        const start = compiled.querySelector('.progress-initiate-form-actions-start') as HTMLButtonElement;
+        const changeDevice = compiled.querySelector(
+          '.progress-initiate-form-actions-change-device'
+        ) as HTMLButtonElement;
+        const start = compiled.querySelector(
+          '.progress-initiate-form-actions-start'
+        ) as HTMLButtonElement;
 
         expect(changeDevice.disabled).toEqual(true);
         expect(start.disabled).toEqual(true);
       });
-    })
+    });
 
     describe('with device', () => {
       beforeEach(() => {
@@ -264,6 +267,12 @@ describe('ProgressInitiateFormComponent', () => {
         expect(deviceItem).toBeTruthy();
       });
 
+      it('should have tabindex -1 for device item', () => {
+        const deviceItem = compiled.querySelector('app-device-item button');
+
+        expect((deviceItem as HTMLElement).tabIndex).toBe(-1);
+      });
+
       it('should display firmware if device selected', () => {
         const firmware = compiled.querySelector('input');
 
@@ -271,17 +280,19 @@ describe('ProgressInitiateFormComponent', () => {
       });
 
       it('should display tests if device selected', () => {
-        const testsForm = compiled.querySelector('app-device-tests form');
-        const tests = compiled.querySelectorAll('app-device-tests mat-checkbox');
+        const testsForm = compiled.querySelector('.device-form-test-modules');
+        const tests = compiled.querySelectorAll('.device-form-test-modules p');
 
         expect(testsForm).toBeTruthy();
-        expect(testsForm?.classList.contains('disabled')).toEqual(true);
+        expect(tests[0].classList.contains('disabled')).toEqual(true);
         expect(tests.length).toEqual(2);
       });
 
       it('should change device on change device button click', () => {
         spyOn(component, 'changeDevice');
-        const button = compiled.querySelector('.progress-initiate-form-actions-change-device') as HTMLButtonElement;
+        const button = compiled.querySelector(
+          '.progress-initiate-form-actions-change-device'
+        ) as HTMLButtonElement;
         button.click();
 
         expect(component.changeDevice).toHaveBeenCalled();
@@ -289,12 +300,19 @@ describe('ProgressInitiateFormComponent', () => {
 
       it('should start test run on start button click', () => {
         spyOn(component, 'startTestRun');
-        const button = compiled.querySelector('.progress-initiate-form-actions-start') as HTMLButtonElement;
+        const button = compiled.querySelector(
+          '.progress-initiate-form-actions-start'
+        ) as HTMLButtonElement;
         button.click();
 
         expect(component.startTestRun).toHaveBeenCalled();
       });
+    });
+
+    it('should has loader element', () => {
+      const spinner = compiled.querySelector('app-spinner');
 
+      expect(spinner).toBeTruthy();
     });
   });
 });
diff --git a/modules/ui/src/app/progress/progress-initiate-form/progress-initiate-form.component.ts b/modules/ui/src/app/progress/progress-initiate-form/progress-initiate-form.component.ts
index 2e4c9ee4e..b9f9de250 100644
--- a/modules/ui/src/app/progress/progress-initiate-form/progress-initiate-form.component.ts
+++ b/modules/ui/src/app/progress/progress-initiate-form/progress-initiate-form.component.ts
@@ -13,77 +13,73 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {Component, OnDestroy, OnInit} from '@angular/core';
-import {MatDialogRef} from '@angular/material/dialog';
-import {TestRunService} from '../../test-run.service';
-import {Observable} from 'rxjs/internal/Observable';
-import {Device, TestModule} from '../../model/device';
-import {FormArray, FormBuilder, FormGroup} from '@angular/forms';
-import {DeviceValidators} from '../../device-repository/device-form/device.validators';
-import {StatusOfTestrun, TestrunStatus} from '../../model/testrun-status';
-import {tap} from 'rxjs/internal/operators/tap';
-import {interval} from 'rxjs/internal/observable/interval';
-import {takeUntil} from 'rxjs/internal/operators/takeUntil';
-import {Subject} from 'rxjs/internal/Subject';
-import {NotificationService} from '../../notification.service';
+import {
+  AfterViewChecked,
+  ChangeDetectorRef,
+  Component,
+  ElementRef,
+  OnInit,
+  ViewChild,
+} from '@angular/core';
+import { MatDialogRef } from '@angular/material/dialog';
+import { TestRunService } from '../../services/test-run.service';
+import { Observable } from 'rxjs/internal/Observable';
+import { Device, TestModule } from '../../model/device';
+import {
+  AbstractControl,
+  FormArray,
+  FormBuilder,
+  FormGroup,
+} from '@angular/forms';
+import { DeviceValidators } from '../../device-repository/device-form/device.validators';
+import { EscapableDialogComponent } from '../../components/escapable-dialog/escapable-dialog.component';
+import { take } from 'rxjs';
 
 @Component({
   selector: 'app-progress-initiate-form',
   templateUrl: './progress-initiate-form.component.html',
-  styleUrls: ['./progress-initiate-form.component.scss']
+  styleUrls: ['./progress-initiate-form.component.scss'],
 })
-export class ProgressInitiateFormComponent implements OnInit, OnDestroy {
+export class ProgressInitiateFormComponent
+  extends EscapableDialogComponent
+  implements OnInit, AfterViewChecked
+{
+  @ViewChild('firmwareInput') firmwareInput!: ElementRef;
   initiateForm!: FormGroup;
   devices$!: Observable<Device[] | null>;
   selectedDevice: Device | null = null;
   testModules: TestModule[] = [];
-  public systemStatus$!: Observable<TestrunStatus>;
-  startInterval = false;
-  destroy$: Subject<boolean> = new Subject<boolean>();
+  prevDevice: Device | null = null;
+  setFirmwareFocus = false;
 
   constructor(
-    public dialogRef: MatDialogRef<ProgressInitiateFormComponent>,
+    public override dialogRef: MatDialogRef<ProgressInitiateFormComponent>,
     private readonly testRunService: TestRunService,
     private fb: FormBuilder,
     private deviceValidators: DeviceValidators,
-    private notificationService: NotificationService) {
+    private readonly changeDetectorRef: ChangeDetectorRef
+  ) {
+    super(dialogRef);
   }
 
   get firmware() {
-    return this.initiateForm.get('firmware')!;
+    return this.initiateForm.get('firmware') as AbstractControl;
   }
 
   cancel(): void {
     this.dialogRef.close();
   }
 
-  testRunStarted = false;
-
   ngOnInit() {
     this.devices$ = this.testRunService.getDevices();
     this.createInitiateForm();
     this.testModules = this.testRunService.getTestModules();
-
-    this.testRunService.systemStatus$.pipe(
-      tap((res) => {
-        if (this.testRunStarted) {
-          if (res.status === StatusOfTestrun.WaitingForDevice && !this.startInterval) {
-            this.pullingSystemStatusData();
-            this.notify(res.status);
-          }
-          if (res.status !== StatusOfTestrun.WaitingForDevice) {
-            this.destroy$.next(true);
-            this.startInterval = false;
-            this.dialogRef.close();
-          }
-        }
-      }),
-      takeUntil(this.destroy$),
-    ).subscribe();
   }
 
   deviceSelected(device: Device) {
     this.selectedDevice = device;
+    this.prevDevice = device;
+    this.setFirmwareFocus = true;
   }
 
   changeDevice() {
@@ -91,9 +87,30 @@ export class ProgressInitiateFormComponent implements OnInit, OnDestroy {
     this.firmware.setValue('');
   }
 
+  ngAfterViewChecked() {
+    // When change device clicked, previously selected item should be focused
+    const item = window.document.querySelector(
+      '.device-item-focused button'
+    ) as HTMLButtonElement;
+    if (item) {
+      this.focusButton(item);
+      this.prevDevice = null;
+      this.changeDetectorRef.detectChanges();
+    }
+    if (this.setFirmwareFocus) {
+      this.firmwareInput?.nativeElement.focus();
+      this.setFirmwareFocus = false;
+      this.changeDetectorRef.detectChanges();
+    }
+  }
+
+  focusButton(button: HTMLButtonElement) {
+    button.focus();
+  }
+
   startTestRun() {
     if (!this.firmware.value.trim()) {
-      this.firmware.setErrors({required: true});
+      this.firmware.setErrors({ required: true });
     }
 
     if (this.initiateForm.invalid) {
@@ -102,42 +119,22 @@ export class ProgressInitiateFormComponent implements OnInit, OnDestroy {
     }
 
     if (this.selectedDevice) {
+      this.testRunService.fetchVersion();
       this.selectedDevice.firmware = this.firmware.value.trim();
-      this.testRunService.startTestrun(this.selectedDevice)
-        .pipe(takeUntil(this.destroy$))
-        .subscribe(
-          () => {
-            this.testRunStarted = true;
-            this.testRunService.getSystemStatus();
-          },
-          (error: string) => {
-            this.startInterval = false;
-            this.notify(error);
-          });
+      this.testRunService
+        .startTestrun(this.selectedDevice)
+        .pipe(take(1))
+        .subscribe(() => {
+          this.testRunService.getSystemStatus();
+          this.cancel();
+        });
     }
   }
 
   private createInitiateForm() {
     this.initiateForm = this.fb.group({
       firmware: ['', [this.deviceValidators.deviceStringFormat()]],
-      test_modules: new FormArray([])
+      test_modules: new FormArray([]),
     });
   }
-
-  ngOnDestroy() {
-    this.destroy$.next(true);
-    this.destroy$.unsubscribe();
-  }
-
-  private pullingSystemStatusData(): void {
-    this.startInterval = true;
-    interval(5000).pipe(
-      takeUntil(this.destroy$),
-      tap(() => this.testRunService.getSystemStatus()),
-    ).subscribe();
-  }
-
-  private notify(message: string) {
-    this.notificationService.notify(message);
-  }
 }
diff --git a/modules/ui/src/app/progress/progress-routing.module.ts b/modules/ui/src/app/progress/progress-routing.module.ts
index 841792955..50556398e 100644
--- a/modules/ui/src/app/progress/progress-routing.module.ts
+++ b/modules/ui/src/app/progress/progress-routing.module.ts
@@ -13,15 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {NgModule} from '@angular/core';
-import {RouterModule, Routes} from '@angular/router';
-import {ProgressComponent} from './progress.component';
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { ProgressComponent } from './progress.component';
 
-const routes: Routes = [{path: '', component: ProgressComponent}];
+const routes: Routes = [{ path: '', component: ProgressComponent }];
 
 @NgModule({
   imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule]
+  exports: [RouterModule],
 })
-export class ProgressRoutingModule {
-}
+export class ProgressRoutingModule {}
diff --git a/modules/ui/src/app/progress/progress-status-card/progress-status-card.component.html b/modules/ui/src/app/progress/progress-status-card/progress-status-card.component.html
index c8e4430db..971a58430 100644
--- a/modules/ui/src/app/progress/progress-status-card/progress-status-card.component.html
+++ b/modules/ui/src/app/progress/progress-status-card/progress-status-card.component.html
@@ -14,32 +14,99 @@
 limitations under the License.
 -->
 <ng-container *ngIf="systemStatus$ | async as data">
-  <div class="progress-card" [ngClass]="getClass(data.status)">
+  <div
+    class="progress-card"
+    [ngClass]="getClass(data.status)"
+    aria-live="assertive"
+    role="alert">
     <div>
-      <p class="progress-card-status-title">
-        Test status
-      </p>
+      <p class="progress-card-status-title">Test status</p>
       <p class="progress-card-status-text">
-        <span>{{getTestStatus(data)}}</span>
-        <span>{{getTestsResult(data)}}</span>
+        <span>{{ getTestStatus(data) }}</span>
+        <span>{{ getTestsResult(data) }}</span>
       </p>
     </div>
-    <div>
-      <mat-progress-bar
-        *ngIf="data.status === StatusOfTestrun.InProgress"
-        class="progress-bar"
-        mode="determinate"
-        [value]="getProgressValue(data)"
-        [attr.aria-label]="data.status + ' ' + getProgressValue(data) + '%'">
-      </mat-progress-bar>
-      <div *ngIf="data.finished || data.status === StatusOfTestrun.Cancelled">
-        <p class="progress-card-result-title">
-          Test result
-        </p>
-        <p class="progress-card-result-text">
-          <span>{{data.status}}</span>
-        </p>
-      </div>
+    <div *ngIf="!data.finished" [ngSwitch]="data.status">
+      <ng-container
+        *ngSwitchCase="StatusOfTestrun.WaitingForDevice"
+        [ngTemplateOutlet]="WaitingForDevice">
+      </ng-container>
+      <ng-container
+        *ngSwitchCase="StatusOfTestrun.Monitoring"
+        [ngTemplateOutlet]="Monitoring">
+      </ng-container>
+      <ng-container *ngSwitchCase="StatusOfTestrun.InProgress">
+        <ng-container
+          *ngTemplateOutlet="
+            InProgress;
+            context: {
+              data: data
+            }
+          "></ng-container
+      ></ng-container>
+      <ng-container
+        *ngSwitchCase="StatusOfTestrun.Cancelling"
+        [ngTemplateOutlet]="Cancelling">
+      </ng-container>
+      <ng-container *ngSwitchCase="StatusOfTestrun.Cancelled">
+        <ng-container
+          *ngTemplateOutlet="
+            Finished;
+            context: {
+              data: data
+            }
+          "></ng-container
+      ></ng-container>
     </div>
+    <ng-container *ngIf="data.finished">
+      <ng-container
+        *ngTemplateOutlet="
+          Finished;
+          context: {
+            data: data
+          }
+        "></ng-container>
+    </ng-container>
   </div>
 </ng-container>
+<ng-template #InProgress let-data="data">
+  <mat-progress-bar
+    class="progress-bar"
+    mode="determinate"
+    [value]="getProgressValue(data)"
+    [attr.aria-label]="data.status + ' ' + getProgressValue(data) + '%'">
+  </mat-progress-bar>
+</ng-template>
+
+<ng-template #Cancelling>
+  <div>
+    <p class="progress-card-result-title">
+      Please wait, this operation could take up to a minute
+    </p>
+  </div>
+</ng-template>
+
+<ng-template #WaitingForDevice>
+  <div>
+    <p class="progress-card-result-title">
+      Please connect and power on your device
+    </p>
+  </div>
+</ng-template>
+
+<ng-template #Monitoring>
+  <div>
+    <p class="progress-card-result-title">
+      Please wait, this could take a few minutes
+    </p>
+  </div>
+</ng-template>
+
+<ng-template #Finished let-data="data">
+  <div>
+    <p class="progress-card-result-title">Test result</p>
+    <p class="progress-card-result-text">
+      <span>{{ data.status }}</span>
+    </p>
+  </div>
+</ng-template>
diff --git a/modules/ui/src/app/progress/progress-status-card/progress-status-card.component.scss b/modules/ui/src/app/progress/progress-status-card/progress-status-card.component.scss
index b10d8b893..1d929bbbb 100644
--- a/modules/ui/src/app/progress/progress-status-card/progress-status-card.component.scss
+++ b/modules/ui/src/app/progress/progress-status-card/progress-status-card.component.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 @use '@angular/material' as mat;
-@import "../../../theming/colors";
+@import '../../../theming/colors';
 
 :host {
   height: 152px;
@@ -54,6 +54,7 @@
     color: $white;
     font-size: 14px;
     line-height: 20px;
+    white-space: normal;
   }
 
   .progress-card-status-text,
diff --git a/modules/ui/src/app/progress/progress-status-card/progress-status-card.component.spec.ts b/modules/ui/src/app/progress/progress-status-card/progress-status-card.component.spec.ts
index c56957ad2..6252136b1 100644
--- a/modules/ui/src/app/progress/progress-status-card/progress-status-card.component.spec.ts
+++ b/modules/ui/src/app/progress/progress-status-card/progress-status-card.component.spec.ts
@@ -13,13 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {ComponentFixture, TestBed} from '@angular/core/testing';
-
-import {ProgressStatusCardComponent} from './progress-status-card.component';
-import {StatusOfTestrun, TestrunStatus} from '../../model/testrun-status';
-import {MOCK_PROGRESS_DATA_CANCELLED, MOCK_PROGRESS_DATA_COMPLIANT, MOCK_PROGRESS_DATA_IN_PROGRESS} from '../../mocks/progress.mock';
-import {ProgressModule} from '../progress.module';
-import {of} from 'rxjs';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ProgressStatusCardComponent } from './progress-status-card.component';
+import { StatusOfTestrun, TestrunStatus } from '../../model/testrun-status';
+import {
+  MOCK_PROGRESS_DATA_CANCELLED,
+  MOCK_PROGRESS_DATA_COMPLIANT,
+  MOCK_PROGRESS_DATA_IN_PROGRESS,
+  MOCK_PROGRESS_DATA_MONITORING,
+  MOCK_PROGRESS_DATA_WAITING_FOR_DEVICE,
+} from '../../mocks/progress.mock';
+import { ProgressModule } from '../progress.module';
+import { of } from 'rxjs';
 
 describe('ProgressStatusCardComponent', () => {
   let component: ProgressStatusCardComponent;
@@ -28,7 +34,7 @@ describe('ProgressStatusCardComponent', () => {
   describe('Class tests', () => {
     beforeEach(() => {
       TestBed.configureTestingModule({
-        declarations: [ProgressStatusCardComponent]
+        declarations: [ProgressStatusCardComponent],
       });
       fixture = TestBed.createComponent(ProgressStatusCardComponent);
       component = fixture.componentInstance;
@@ -39,17 +45,21 @@ describe('ProgressStatusCardComponent', () => {
     });
 
     describe('#getClass', () => {
-      it('should have class "progress" if status "In Progress"', () => {
+      it('should have class "progress" if status "In Progress", "Waiting for Device", "Monitoring"', () => {
         const expectedResult = {
           progress: true,
           'completed-success': false,
           'completed-failed': false,
-          canceled: false
+          canceled: false,
         };
 
         const result = component.getClass(StatusOfTestrun.InProgress);
+        const result1 = component.getClass(StatusOfTestrun.WaitingForDevice);
+        const result2 = component.getClass(StatusOfTestrun.Monitoring);
 
         expect(result).toEqual(expectedResult);
+        expect(result1).toEqual(expectedResult);
+        expect(result2).toEqual(expectedResult);
       });
 
       it('should have class "completed-success" if status "Compliant"', () => {
@@ -57,7 +67,7 @@ describe('ProgressStatusCardComponent', () => {
           progress: false,
           'completed-success': true,
           'completed-failed': false,
-          canceled: false
+          canceled: false,
         };
 
         const result = component.getClass(StatusOfTestrun.Compliant);
@@ -70,7 +80,7 @@ describe('ProgressStatusCardComponent', () => {
           progress: false,
           'completed-success': false,
           'completed-failed': true,
-          canceled: false
+          canceled: false,
         };
 
         const result = component.getClass(StatusOfTestrun.NonCompliant);
@@ -83,7 +93,7 @@ describe('ProgressStatusCardComponent', () => {
           progress: false,
           'completed-success': false,
           'completed-failed': false,
-          canceled: true
+          canceled: true,
         };
 
         const result = component.getClass(StatusOfTestrun.Cancelled);
@@ -154,9 +164,11 @@ describe('ProgressStatusCardComponent', () => {
 
     describe('#getProgressValue', () => {
       it('should return correct progress value if status "In Progress"', () => {
-        const expectedResult = Math.round(2 / 26 * 100);
+        const expectedResult = Math.round((2 / 26) * 100);
 
-        const result = component.getProgressValue(MOCK_PROGRESS_DATA_IN_PROGRESS);
+        const result = component.getProgressValue(
+          MOCK_PROGRESS_DATA_IN_PROGRESS
+        );
 
         expect(result).toEqual(expectedResult);
       });
@@ -177,7 +189,7 @@ describe('ProgressStatusCardComponent', () => {
     beforeEach(async () => {
       await TestBed.configureTestingModule({
         declarations: [ProgressStatusCardComponent],
-        imports: [ProgressModule]
+        imports: [ProgressModule],
       }).compileComponents();
 
       fixture = TestBed.createComponent(ProgressStatusCardComponent);
@@ -187,7 +199,7 @@ describe('ProgressStatusCardComponent', () => {
 
     describe('with not systemStatus$ data', () => {
       beforeEach(() => {
-        (component.systemStatus$ as any) = of(null);
+        (component.systemStatus$ as unknown) = of(null);
         fixture.detectChanges();
       });
 
@@ -223,14 +235,18 @@ describe('ProgressStatusCardComponent', () => {
       });
 
       it('should have progress card result', () => {
-        const progressCardResultEl = compiled.querySelector('.progress-card-result-text span');
+        const progressCardResultEl = compiled.querySelector(
+          '.progress-card-result-text span'
+        );
 
         expect(progressCardResultEl).not.toBeNull();
         expect(progressCardResultEl?.textContent).toEqual('Cancelled');
       });
 
       it('should have progress card status text as "Incomplete"', () => {
-        const progressCardStatusText = compiled.querySelector('.progress-card-status-text > span');
+        const progressCardStatusText = compiled.querySelector(
+          '.progress-card-status-text > span'
+        );
 
         expect(progressCardStatusText).not.toBeNull();
         expect(progressCardStatusText?.textContent).toEqual('Incomplete');
@@ -243,7 +259,6 @@ describe('ProgressStatusCardComponent', () => {
         fixture.detectChanges();
       });
 
-
       it('should have class "progress" on progress card element', () => {
         const progressCardEl = compiled.querySelector('.progress-card');
 
@@ -257,18 +272,101 @@ describe('ProgressStatusCardComponent', () => {
       });
 
       it('should not have progress card result', () => {
-        const progressCardResultEl = compiled.querySelector('.progress-card-result-text span');
+        const progressCardResultEl = compiled.querySelector(
+          '.progress-card-result-text span'
+        );
 
         expect(progressCardResultEl).toBeNull();
       });
 
       it('should have progress card status text as "In Progress"', () => {
-        const progressCardStatusText = compiled.querySelector('.progress-card-status-text > span');
+        const progressCardStatusText = compiled.querySelector(
+          '.progress-card-status-text > span'
+        );
 
         expect(progressCardStatusText).not.toBeNull();
         expect(progressCardStatusText?.textContent).toEqual('In Progress');
       });
     });
-  });
 
+    describe('with available systemStatus$ data, as Waiting for Device', () => {
+      beforeEach(() => {
+        component.systemStatus$ = of(MOCK_PROGRESS_DATA_WAITING_FOR_DEVICE);
+        fixture.detectChanges();
+      });
+
+      it('should have progress card content', () => {
+        const progressCardEl = compiled.querySelector('.progress-card');
+
+        expect(progressCardEl).not.toBeNull();
+      });
+
+      it('should have class "progress" on progress card element', () => {
+        const progressCardEl = compiled.querySelector('.progress-card');
+
+        expect(progressCardEl?.classList).toContain('progress');
+      });
+
+      it('should have progress card result title', () => {
+        const progressCardResultEl = compiled.querySelector(
+          '.progress-card-result-title'
+        );
+
+        expect(progressCardResultEl).not.toBeNull();
+        expect(progressCardResultEl?.textContent?.trim()).toEqual(
+          'Please connect and power on your device'
+        );
+      });
+
+      it('should have progress card status text as "Waiting for Device"', () => {
+        const progressCardStatusText = compiled.querySelector(
+          '.progress-card-status-text > span'
+        );
+
+        expect(progressCardStatusText).not.toBeNull();
+        expect(progressCardStatusText?.textContent).toEqual(
+          'Waiting for Device'
+        );
+      });
+    });
+
+    describe('with available systemStatus$ data, as Monitoring', () => {
+      beforeEach(() => {
+        component.systemStatus$ = of(MOCK_PROGRESS_DATA_MONITORING);
+        fixture.detectChanges();
+      });
+
+      it('should have progress card content', () => {
+        const progressCardEl = compiled.querySelector('.progress-card');
+
+        expect(progressCardEl).not.toBeNull();
+      });
+
+      it('should have class "progress" on progress card element', () => {
+        const progressCardEl = compiled.querySelector('.progress-card');
+
+        expect(progressCardEl?.classList).toContain('progress');
+      });
+
+      it('should have progress card result title', () => {
+        const progressCardResultEl = compiled.querySelector(
+          '.progress-card-result-title'
+        );
+
+        expect(progressCardResultEl).not.toBeNull();
+        expect(progressCardResultEl?.textContent?.trim()).toEqual(
+          'Please wait, this could take a few minutes'
+        );
+      });
+
+      it('should have progress card status text as "Waiting for Device"', () => {
+        const progressCardStatusText = compiled.querySelector(
+          '.progress-card-status-text > span'
+        );
+
+        expect(progressCardStatusText).not.toBeNull();
+        expect(progressCardStatusText?.textContent).toEqual('Monitoring');
+      });
+    });
+  });
 });
diff --git a/modules/ui/src/app/progress/progress-status-card/progress-status-card.component.ts b/modules/ui/src/app/progress/progress-status-card/progress-status-card.component.ts
index 417de536c..c2ddd2760 100644
--- a/modules/ui/src/app/progress/progress-status-card/progress-status-card.component.ts
+++ b/modules/ui/src/app/progress/progress-status-card/progress-status-card.component.ts
@@ -13,36 +13,64 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {ChangeDetectionStrategy, Component, Input} from '@angular/core';
-import {Observable} from 'rxjs/internal/Observable';
-import {IResult, StatusOfTestrun, TestrunStatus, TestsData} from '../../model/testrun-status';
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { Observable } from 'rxjs/internal/Observable';
+import {
+  IResult,
+  StatusOfTestrun,
+  TestrunStatus,
+  TestsData,
+} from '../../model/testrun-status';
 
 @Component({
   selector: 'app-progress-status-card',
   templateUrl: './progress-status-card.component.html',
   styleUrls: ['./progress-status-card.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class ProgressStatusCardComponent {
   @Input() systemStatus$!: Observable<TestrunStatus>;
 
   public readonly StatusOfTestrun = StatusOfTestrun;
 
-  public getClass(status: string): { progress: boolean, 'completed-success': boolean, 'completed-failed': boolean, canceled: boolean } {
+  public getClass(status: string): {
+    progress: boolean;
+    'completed-success': boolean;
+    'completed-failed': boolean;
+    canceled: boolean;
+  } {
     return {
-      'progress': status === StatusOfTestrun.InProgress,
-      'completed-success': status === StatusOfTestrun.Compliant || status === StatusOfTestrun.SmartReady,
+      progress:
+        status === StatusOfTestrun.InProgress ||
+        status === StatusOfTestrun.WaitingForDevice ||
+        status === StatusOfTestrun.Monitoring,
+      'completed-success':
+        status === StatusOfTestrun.Compliant ||
+        status === StatusOfTestrun.SmartReady,
       'completed-failed': status === StatusOfTestrun.NonCompliant,
-      'canceled': status === StatusOfTestrun.Cancelled
-    }
+      canceled:
+        status === StatusOfTestrun.Cancelled ||
+        status === StatusOfTestrun.Cancelling,
+    };
   }
 
   public getTestsResult(data: TestrunStatus): string {
-    if (data.status === StatusOfTestrun.InProgress || data.status === StatusOfTestrun.Cancelled || data.finished) {
-      if ((data.tests as TestsData)?.results?.length && (data.tests as TestsData)?.total) {
-        return `${(data.tests as TestsData)?.results?.length}/${(data.tests as TestsData)?.total}`
+    if (
+      data.status === StatusOfTestrun.InProgress ||
+      data.status === StatusOfTestrun.Cancelled ||
+      data.status === StatusOfTestrun.Cancelling ||
+      data.finished
+    ) {
+      if (
+        (data.tests as TestsData)?.results?.length &&
+        (data.tests as TestsData)?.total
+      ) {
+        return `${(data.tests as TestsData)?.results?.length}/${(
+          data.tests as TestsData
+        )?.total}`;
       } else if ((data.tests as IResult[])?.length) {
-        return `${(data.tests as IResult[])?.length}/${(data.tests as IResult[])?.length}`
+        return `${(data.tests as IResult[])?.length}/${(data.tests as IResult[])
+          ?.length}`;
       }
     }
     return '';
@@ -62,7 +90,7 @@ export class ProgressStatusCardComponent {
     const testData = data.tests as TestsData;
 
     if (testData && testData.total && testData.results?.length) {
-      return Math.round(testData.results.length / testData.total * 100);
+      return Math.round((testData.results.length / testData.total) * 100);
     }
     return 0;
   }
diff --git a/modules/ui/src/app/progress/progress-table/progress-table.component.html b/modules/ui/src/app/progress/progress-table/progress-table.component.html
index ae6339733..178d2cdb6 100644
--- a/modules/ui/src/app/progress/progress-table/progress-table.component.html
+++ b/modules/ui/src/app/progress/progress-table/progress-table.component.html
@@ -13,30 +13,53 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<ng-container *ngIf="dataSource$ | async as dataSource" class="progress-content">
-  <table mat-table [dataSource]="dataSource" class="progress-table" tabindex="0">
-
+<ng-container
+  *ngIf="dataSource$ | async as dataSource"
+  class="progress-content">
+  <table
+    mat-table
+    [dataSource]="dataSource"
+    class="progress-table"
+    tabindex="0">
     <ng-container matColumnDef="name">
       <th mat-header-cell *matHeaderCellDef class="table-header-cell">Name</th>
-      <td mat-cell *matCellDef="let element" class="table-cell"> {{element.name}} </td>
+      <td mat-cell *matCellDef="let element" class="table-cell">
+        {{ element.name }}
+      </td>
     </ng-container>
 
     <ng-container matColumnDef="description">
-      <th mat-header-cell *matHeaderCellDef class="table-header-cell">Description</th>
-      <td mat-cell *matCellDef="let element" class="table-cell"> {{element.description}} </td>
+      <th mat-header-cell *matHeaderCellDef class="table-header-cell">
+        Description
+      </th>
+      <td mat-cell *matCellDef="let element" class="table-cell">
+        {{ element.description }}
+      </td>
     </ng-container>
 
     <ng-container matColumnDef="result">
-      <th mat-header-cell *matHeaderCellDef class="table-header-cell">Result</th>
-      <td mat-cell *matCellDef="let element" class="table-cell table-cell-result">
-        <span class="table-cell-result-text"
-              [ngClass]="getResultClass(element.result)">
-          {{element.result}}
+      <th mat-header-cell *matHeaderCellDef class="table-header-cell">
+        Result
+      </th>
+      <td
+        mat-cell
+        *matCellDef="let element"
+        class="table-cell table-cell-result">
+        <span
+          class="table-cell-result-text"
+          [ngClass]="getResultClass(element.result)">
+          {{ element.result }}
         </span>
       </td>
     </ng-container>
 
-    <tr mat-header-row *matHeaderRowDef="displayedColumns" class="table-header-row"></tr>
-    <tr mat-row *matRowDef="let row; columns: displayedColumns;" class="table-row"></tr>
+    <tr
+      mat-header-row
+      *matHeaderRowDef="displayedColumns"
+      class="table-header-row"></tr>
+    <tr
+      mat-row
+      *matRowDef="let row; columns: displayedColumns"
+      class="table-row"></tr>
   </table>
 </ng-container>
diff --git a/modules/ui/src/app/progress/progress-table/progress-table.component.scss b/modules/ui/src/app/progress/progress-table/progress-table.component.scss
index 86a2da433..2b608f7e7 100644
--- a/modules/ui/src/app/progress/progress-table/progress-table.component.scss
+++ b/modules/ui/src/app/progress/progress-table/progress-table.component.scss
@@ -13,15 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@import "../../../theming/colors";
-@import "../../../theming/variables";
+@import '../../../theming/colors';
+@import '../../../theming/variables';
 
 :host {
   overflow-y: auto;
-  padding: 10px 0 12px;
+  margin: 16px 0;
 }
 
-table, tr {
+table,
+tr {
   border: 1px solid $lighter-grey;
   border-collapse: collapse;
 }
diff --git a/modules/ui/src/app/progress/progress-table/progress-table.component.spec.ts b/modules/ui/src/app/progress/progress-table/progress-table.component.spec.ts
index c214b85ab..e7f565623 100644
--- a/modules/ui/src/app/progress/progress-table/progress-table.component.spec.ts
+++ b/modules/ui/src/app/progress/progress-table/progress-table.component.spec.ts
@@ -13,27 +13,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {ComponentFixture, TestBed} from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import {ProgressTableComponent} from './progress-table.component';
-import {IResult, StatusOfTestResult} from '../../model/testrun-status';
-import {MatTableModule} from '@angular/material/table';
-import {of} from 'rxjs';
-import {TEST_DATA} from '../../mocks/progress.mock';
-import {TestRunService} from '../../test-run.service';
+import { ProgressTableComponent } from './progress-table.component';
+import { IResult, StatusOfTestResult } from '../../model/testrun-status';
+import { MatTableModule } from '@angular/material/table';
+import { of } from 'rxjs';
+import { TEST_DATA } from '../../mocks/progress.mock';
+import { TestRunService } from '../../services/test-run.service';
 
 describe('ProgressTableComponent', () => {
   let component: ProgressTableComponent;
   let fixture: ComponentFixture<ProgressTableComponent>;
-  let testRunServiceMock: jasmine.SpyObj<TestRunService>;
 
-  testRunServiceMock = jasmine.createSpyObj(['getResultClass']);
+  const testRunServiceMock = jasmine.createSpyObj(['getResultClass']);
 
   describe('Class tests', () => {
     beforeEach(() => {
       TestBed.configureTestingModule({
         declarations: [ProgressTableComponent],
-        providers: [{provide: TestRunService, useValue: testRunServiceMock}],
+        providers: [{ provide: TestRunService, useValue: testRunServiceMock }],
       });
       fixture = TestBed.createComponent(ProgressTableComponent);
       component = fixture.componentInstance;
@@ -46,14 +45,19 @@ describe('ProgressTableComponent', () => {
 
     it('#getResultClass should call the service method getResultClass"', () => {
       const expectedResult = {
-        green: false, red: true, blue: false, grey: false
+        green: false,
+        red: true,
+        blue: false,
+        grey: false,
       };
 
       testRunServiceMock.getResultClass.and.returnValue(expectedResult);
 
       const result = component.getResultClass(StatusOfTestResult.NonCompliant);
 
-      expect(testRunServiceMock.getResultClass).toHaveBeenCalledWith(StatusOfTestResult.NonCompliant);
+      expect(testRunServiceMock.getResultClass).toHaveBeenCalledWith(
+        StatusOfTestResult.NonCompliant
+      );
       expect(result).toEqual(expectedResult);
     });
   });
@@ -64,8 +68,8 @@ describe('ProgressTableComponent', () => {
     beforeEach(async () => {
       await TestBed.configureTestingModule({
         declarations: [ProgressTableComponent],
-        providers: [{provide: TestRunService, useValue: testRunServiceMock}],
-        imports: [MatTableModule]
+        providers: [{ provide: TestRunService, useValue: testRunServiceMock }],
+        imports: [MatTableModule],
       }).compileComponents();
 
       fixture = TestBed.createComponent(ProgressTableComponent);
diff --git a/modules/ui/src/app/progress/progress-table/progress-table.component.ts b/modules/ui/src/app/progress/progress-table/progress-table.component.ts
index 68d12433d..27df71ffc 100644
--- a/modules/ui/src/app/progress/progress-table/progress-table.component.ts
+++ b/modules/ui/src/app/progress/progress-table/progress-table.component.ts
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {ChangeDetectionStrategy, Component, Input} from '@angular/core';
-import {Observable} from 'rxjs/internal/Observable';
-import {IResult, StatusResultClassName} from '../../model/testrun-status';
-import {TestRunService} from '../../test-run.service';
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { Observable } from 'rxjs/internal/Observable';
+import { IResult, StatusResultClassName } from '../../model/testrun-status';
+import { TestRunService } from '../../services/test-run.service';
 
 @Component({
   selector: 'app-progress-table',
   templateUrl: './progress-table.component.html',
   styleUrls: ['./progress-table.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class ProgressTableComponent {
   @Input() dataSource$!: Observable<IResult[] | undefined>;
diff --git a/modules/ui/src/app/progress/progress.component.html b/modules/ui/src/app/progress/progress.component.html
index d107374bd..75b6d57b2 100644
--- a/modules/ui/src/app/progress/progress.component.html
+++ b/modules/ui/src/app/progress/progress.component.html
@@ -13,27 +13,31 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<ng-container *ngIf="systemStatus$ | async as data;  else empty">
+<ng-container *ngIf="systemStatus$ | async as data; else empty">
   <ng-container
-    *ngIf="data.status === StatusOfTestrun.InProgress
-          || data.status === StatusOfTestrun.Cancelled
-          || data.finished">
+    *ngIf="
+      testrunInProgress(data.status) ||
+      data.status === StatusOfTestrun.Cancelled ||
+      data.status === StatusOfTestrun.Cancelling ||
+      data.finished
+    ">
     <mat-toolbar class="progress-toolbar">
       <div class="toolbar-col-left">
         <div class="toolbar-row top">
-          <ng-container *ngTemplateOutlet="startNewTestrunButton"></ng-container>
+          <ng-container
+            *ngTemplateOutlet="startNewTestrunButton"></ng-container>
           <span class="vertical-divider"></span>
           <app-progress-breadcrumbs [breadcrumbs$]="breadcrumbs$">
           </app-progress-breadcrumbs>
         </div>
         <div class="toolbar-row bottom">
-
           <h2 class="title progress-title">
-            {{data.device.manufacturer}} {{data.device.model}} {{data.device.firmware}} {{data.started | date: 'd MMM y H:mm'}}
+            {{ data.device.manufacturer }} {{ data.device.model }}
+            {{ data.device.firmware }} {{ data.started | date: 'd MMM y H:mm' }}
           </h2>
           <button
-            *ngIf="data.status === StatusOfTestrun.InProgress"
-            (click)="stopTestrun()"
+            *ngIf="testrunInProgress(data.status)"
+            (click)="openStopTestrunDialog()"
             class="stop-button"
             aria-label="Stop testrun"
             color="warn"
@@ -42,6 +46,7 @@ <h2 class="title progress-title">
           </button>
           <app-download-report *ngIf="data.report" [data]="data">
             <button
+              tabindex="-1"
               class="report-button"
               aria-label="Download testrun report"
               mat-flat-button>
@@ -53,7 +58,14 @@ <h2 class="title progress-title">
       <app-progress-status-card [systemStatus$]="systemStatus$">
       </app-progress-status-card>
     </mat-toolbar>
-    <app-progress-table [dataSource$]="dataSource$"></app-progress-table>
+    <section
+      class="progress-table"
+      [class.progress-table-progress-empty]="
+        testrunInProgress(data.status) && resultIsEmpty(data.tests)
+      ">
+      <app-progress-table [dataSource$]="dataSource$"></app-progress-table>
+      <app-spinner></app-spinner>
+    </section>
   </ng-container>
   <ng-container *ngIf="!data.started">
     <ng-container *ngTemplateOutlet="empty"></ng-container>
@@ -67,12 +79,16 @@ <h2 class="title progress-title">
 </ng-template>
 
 <ng-template #startNewTestrunButton>
-  <button class="start-button"
-          aria-label="Start new testrun"
-          color="primary"
-          [disabled]="(systemStatus$ | async)?.status === StatusOfTestrun.InProgress"
-          (click)="openTestRunModal()"
-          mat-flat-button>
+  <button
+    class="start-button"
+    aria-label="Start new testrun"
+    color="primary"
+    [disabled]="
+      !(devices$ | async)?.length ||
+      testrunInProgress((systemStatus$ | async)?.status)
+    "
+    (click)="openTestRunModal()"
+    mat-flat-button>
     Start New Testrun
   </button>
 </ng-template>
diff --git a/modules/ui/src/app/progress/progress.component.scss b/modules/ui/src/app/progress/progress.component.scss
index d82596ace..4df37a115 100644
--- a/modules/ui/src/app/progress/progress.component.scss
+++ b/modules/ui/src/app/progress/progress.component.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 @use '@angular/material' as mat;
-@import "../../theming/colors";
+@import '../../theming/colors';
 
 :host {
   display: flex;
@@ -42,7 +42,7 @@
     flex-direction: column;
     flex: 1;
     min-width: 0;
-    padding: 0 32px 0 10px;
+    padding: 0 32px 0 0;
   }
 
   .toolbar-row {
@@ -92,4 +92,22 @@
 .report-button {
   background-color: mat.get-color-from-palette($color-primary, 50);
   color: mat.get-color-from-palette($color-primary, 700);
+  & ::ng-deep .mat-mdc-button-touch-target {
+    height: auto;
+  }
+}
+
+.progress-table {
+  overflow-y: auto;
+  flex: 1;
+  padding-top: 10px;
+}
+
+.progress-table-progress-empty {
+  position: relative;
+  overflow-y: hidden;
+  & ::ng-deep .loader {
+    width: 196px;
+    height: 196px;
+  }
 }
diff --git a/modules/ui/src/app/progress/progress.component.spec.ts b/modules/ui/src/app/progress/progress.component.spec.ts
index 481fd4477..433dc8a45 100644
--- a/modules/ui/src/app/progress/progress.component.spec.ts
+++ b/modules/ui/src/app/progress/progress.component.spec.ts
@@ -13,102 +13,265 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {ComponentFixture, discardPeriodicTasks, fakeAsync, TestBed, tick} from '@angular/core/testing';
-
-import {ProgressComponent} from './progress.component';
-import {TestRunService} from '../test-run.service';
-import {of} from 'rxjs';
-import {MOCK_PROGRESS_DATA_CANCELLED, MOCK_PROGRESS_DATA_COMPLIANT, MOCK_PROGRESS_DATA_IN_PROGRESS, MOCK_PROGRESS_DATA_NOT_STARTED, TEST_DATA} from '../mocks/progress.mock';
-import {MatButtonModule} from '@angular/material/button';
-import {MatIconModule} from '@angular/material/icon';
-import {MatToolbarModule} from '@angular/material/toolbar';
-import {Component, Input} from '@angular/core';
-import {Observable} from 'rxjs/internal/Observable';
-import {IResult, TestrunStatus} from '../model/testrun-status';
-import {MatDialogModule, MatDialogRef} from '@angular/material/dialog';
-import {BehaviorSubject} from 'rxjs/internal/BehaviorSubject';
-import {Device} from '../model/device';
-import {ProgressInitiateFormComponent} from './progress-initiate-form/progress-initiate-form.component';
-import {DownloadReportComponent} from '../components/download-report/download-report.component';
+import {
+  ComponentFixture,
+  discardPeriodicTasks,
+  fakeAsync,
+  TestBed,
+  tick,
+} from '@angular/core/testing';
+
+import { ProgressComponent } from './progress.component';
+import { TestRunService } from '../services/test-run.service';
+import { of } from 'rxjs';
+import {
+  EMPTY_RESULT,
+  MOCK_PROGRESS_DATA_CANCELLED,
+  MOCK_PROGRESS_DATA_CANCELLING,
+  MOCK_PROGRESS_DATA_COMPLIANT,
+  MOCK_PROGRESS_DATA_IN_PROGRESS,
+  MOCK_PROGRESS_DATA_IN_PROGRESS_EMPTY,
+  MOCK_PROGRESS_DATA_MONITORING,
+  MOCK_PROGRESS_DATA_NOT_STARTED,
+  MOCK_PROGRESS_DATA_WAITING_FOR_DEVICE,
+  TEST_DATA_TABLE_RESULT,
+} from '../mocks/progress.mock';
+import { MatButtonModule } from '@angular/material/button';
+import { MatIconModule } from '@angular/material/icon';
+import { MatToolbarModule } from '@angular/material/toolbar';
+import { Component, Input } from '@angular/core';
+import { Observable } from 'rxjs/internal/Observable';
+import { IResult, TestrunStatus } from '../model/testrun-status';
+import { MatDialogModule, MatDialogRef } from '@angular/material/dialog';
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { Device } from '../model/device';
+import { ProgressInitiateFormComponent } from './progress-initiate-form/progress-initiate-form.component';
+import { DownloadReportComponent } from '../components/download-report/download-report.component';
+import { device } from '../mocks/device.mock';
+import { DeleteFormComponent } from '../components/delete-form/delete-form.component';
+import { SpinnerComponent } from '../components/spinner/spinner.component';
+import { LoaderService } from '../services/loader.service';
 
 describe('ProgressComponent', () => {
   let component: ProgressComponent;
   let fixture: ComponentFixture<ProgressComponent>;
   let compiled: HTMLElement;
-  let testRunServiceMock: jasmine.SpyObj<TestRunService>;
 
-  testRunServiceMock = jasmine.createSpyObj(['getSystemStatus', 'setSystemStatus', 'systemStatus$', 'stopTestrun', 'getDevices']);
-  testRunServiceMock.getDevices.and.returnValue(new BehaviorSubject<Device[] | null>([]));
+  const testRunServiceMock: jasmine.SpyObj<TestRunService> =
+    jasmine.createSpyObj([
+      'getSystemStatus',
+      'setSystemStatus',
+      'systemStatus$',
+      'stopTestrun',
+      'getDevices',
+    ]);
+
+  const loaderServiceMock: jasmine.SpyObj<LoaderService> = jasmine.createSpyObj(
+    ['setLoading']
+  );
+
+  testRunServiceMock.getDevices.and.returnValue(
+    new BehaviorSubject<Device[] | null>([])
+  );
 
   describe('Class tests', () => {
     beforeEach(() => {
       testRunServiceMock.systemStatus$ = of(MOCK_PROGRESS_DATA_IN_PROGRESS);
       testRunServiceMock.stopTestrun.and.returnValue(of(true));
+      testRunServiceMock.getDevices.and.returnValue(
+        new BehaviorSubject<Device[] | null>([device])
+      );
 
       TestBed.configureTestingModule({
         declarations: [
           ProgressComponent,
           FakeProgressBreadcrumbsComponent,
           FakeProgressStatusCardComponent,
-          FakeProgressTableComponent
+          FakeProgressTableComponent,
         ],
         providers: [
-          {provide: TestRunService, useValue: testRunServiceMock},
+          { provide: TestRunService, useValue: testRunServiceMock },
           {
             provide: MatDialogRef,
-            useValue: {}
-          },],
-        imports: [MatButtonModule, MatIconModule, MatToolbarModule, MatDialogModule]
-      });
+            useValue: {},
+          },
+        ],
+        imports: [
+          MatButtonModule,
+          MatIconModule,
+          MatToolbarModule,
+          MatDialogModule,
+        ],
+      })
+        .overrideComponent(ProgressComponent, {
+          set: {
+            providers: [
+              { provide: LoaderService, useValue: loaderServiceMock },
+            ],
+          },
+        })
+        .compileComponents();
+
       fixture = TestBed.createComponent(ProgressComponent);
       component = fixture.componentInstance;
     });
 
     afterEach(() => {
       testRunServiceMock.getSystemStatus.calls.reset();
+      testRunServiceMock.getDevices.calls.reset();
     });
 
     it('should create', () => {
       expect(component).toBeTruthy();
     });
 
-    it('#stopTestrun should call service method stopTestrun', () => {
-      component.stopTestrun();
+    describe('#stopTestrun', () => {
+      it('should call service method stopTestrun', () => {
+        component.stopTestrun();
+
+        expect(testRunServiceMock.stopTestrun).toHaveBeenCalled();
+      });
+
+      it('should show loader', () => {
+        component.stopTestrun();
+
+        expect(loaderServiceMock.setLoading).toHaveBeenCalledWith(true);
+      });
+
+      it('should update system status to Cancelling', () => {
+        component.currentStatus = { ...MOCK_PROGRESS_DATA_IN_PROGRESS };
 
-      expect(testRunServiceMock.stopTestrun).toHaveBeenCalled();
-    })
+        component.stopTestrun();
+
+        expect(testRunServiceMock.setSystemStatus).toHaveBeenCalledWith(
+          MOCK_PROGRESS_DATA_CANCELLING
+        );
+      });
+    });
+
+    it('#openStopTestrunDialog should open delete dialog', () => {
+      const stopTestrunSpy = spyOn(component, 'stopTestrun');
+      spyOn(component.dialog, 'open').and.returnValue({
+        afterClosed: () => of(true),
+      } as MatDialogRef<typeof DeleteFormComponent>);
+
+      component.openStopTestrunDialog();
+
+      expect(stopTestrunSpy).toHaveBeenCalled();
+    });
 
     describe('#ngOnInit', () => {
       it('should set systemStatus$ value', () => {
         component.ngOnInit();
 
         component.systemStatus$.subscribe(res => {
-          expect(res).toEqual(MOCK_PROGRESS_DATA_IN_PROGRESS)
-        })
+          expect(res).toEqual(MOCK_PROGRESS_DATA_IN_PROGRESS);
+        });
+      });
+
+      it('should set devices$ value', () => {
+        component.ngOnInit();
+
+        component.devices$.subscribe(res => {
+          expect(res).toEqual([device]);
+        });
       });
 
       it('should set breadcrumbs$ value', () => {
         const expectedResult = [
           MOCK_PROGRESS_DATA_IN_PROGRESS.device.manufacturer,
           MOCK_PROGRESS_DATA_IN_PROGRESS.device.model,
-          MOCK_PROGRESS_DATA_IN_PROGRESS.device.firmware
-        ]
+          MOCK_PROGRESS_DATA_IN_PROGRESS.device.firmware,
+        ];
 
         component.ngOnInit();
 
         component.breadcrumbs$.subscribe(res => {
           expect(res).toEqual(expectedResult);
-        })
+        });
       });
 
-      it('should set dataSource$ value', () => {
-        const expectedResult = TEST_DATA.results;
+      describe('dataSource$', () => {
+        it('should set value with empty values if result length < total for status "In Progress"', () => {
+          const expectedResult = TEST_DATA_TABLE_RESULT;
 
-        component.ngOnInit();
+          testRunServiceMock.systemStatus$ = of(MOCK_PROGRESS_DATA_IN_PROGRESS);
+          component.ngOnInit();
 
-        component.dataSource$.subscribe(res => {
-          expect(res).toEqual(expectedResult);
-        })
+          component.dataSource$.subscribe(res => {
+            expect(res).toEqual(expectedResult);
+          });
+        });
+
+        it('should set value with empty values for status "Monitoring"', () => {
+          const expectedResult = EMPTY_RESULT;
+
+          testRunServiceMock.systemStatus$ = of(MOCK_PROGRESS_DATA_MONITORING);
+          component.ngOnInit();
+
+          component.dataSource$.subscribe(res => {
+            expect(res).toEqual(expectedResult);
+          });
+        });
+
+        it('should set value with empty values for status "Waiting for Device"', () => {
+          const expectedResult = EMPTY_RESULT;
+
+          testRunServiceMock.systemStatus$ = of(
+            MOCK_PROGRESS_DATA_WAITING_FOR_DEVICE
+          );
+          component.ngOnInit();
+
+          component.dataSource$.subscribe(res => {
+            expect(res).toEqual(expectedResult);
+          });
+        });
+      });
+
+      describe('hideLoading', () => {
+        it('should called if testrun is finished', () => {
+          testRunServiceMock.systemStatus$ = of(MOCK_PROGRESS_DATA_COMPLIANT);
+
+          component.ngOnInit();
+
+          component.systemStatus$.subscribe(() => {
+            expect(loaderServiceMock.setLoading).toHaveBeenCalledWith(false);
+          });
+        });
+
+        it('should called if testrun is in progress and have some test finished', () => {
+          testRunServiceMock.systemStatus$ = of(MOCK_PROGRESS_DATA_IN_PROGRESS);
+
+          component.ngOnInit();
+
+          component.systemStatus$.subscribe(() => {
+            expect(loaderServiceMock.setLoading).toHaveBeenCalledWith(false);
+          });
+        });
+      });
+
+      describe('showLoading', () => {
+        it('should be called if testrun is monitoring', () => {
+          testRunServiceMock.systemStatus$ = of(MOCK_PROGRESS_DATA_MONITORING);
+
+          component.ngOnInit();
+
+          component.systemStatus$.subscribe(() => {
+            expect(loaderServiceMock.setLoading).toHaveBeenCalledWith(true);
+          });
+        });
+
+        it('should be called if testrun is in progress and have some test finished', () => {
+          testRunServiceMock.systemStatus$ = of(
+            MOCK_PROGRESS_DATA_IN_PROGRESS_EMPTY
+          );
+
+          component.ngOnInit();
+
+          component.systemStatus$.subscribe(() => {
+            expect(loaderServiceMock.setLoading).toHaveBeenCalledWith(true);
+          });
+        });
       });
     });
   });
@@ -122,13 +285,23 @@ describe('ProgressComponent', () => {
           ProgressComponent,
           FakeProgressBreadcrumbsComponent,
           FakeProgressStatusCardComponent,
-          FakeProgressTableComponent],
+          FakeProgressTableComponent,
+        ],
         providers: [
-          {provide: TestRunService, useValue: testRunServiceMock}, {
+          { provide: TestRunService, useValue: testRunServiceMock },
+          {
             provide: MatDialogRef,
-            useValue: {}
-          },],
-        imports: [MatButtonModule, MatIconModule, MatToolbarModule, MatDialogModule, DownloadReportComponent]
+            useValue: {},
+          },
+        ],
+        imports: [
+          MatButtonModule,
+          MatIconModule,
+          MatToolbarModule,
+          MatDialogModule,
+          DownloadReportComponent,
+          SpinnerComponent,
+        ],
       }).compileComponents();
 
       fixture = TestBed.createComponent(ProgressComponent);
@@ -138,16 +311,40 @@ describe('ProgressComponent', () => {
 
     afterEach(() => {
       testRunServiceMock.getSystemStatus.calls.reset();
+      testRunServiceMock.getDevices.calls.reset();
+    });
+
+    describe('with not devices$ data', () => {
+      beforeEach(() => {
+        (testRunServiceMock.systemStatus$ as unknown) = of(null);
+        testRunServiceMock.getDevices.and.returnValue(
+          new BehaviorSubject<Device[] | null>([])
+        );
+        fixture.detectChanges();
+      });
+
+      it('should have disabled "Start" button', () => {
+        const startBtn = compiled.querySelector(
+          '.start-button'
+        ) as HTMLButtonElement;
+
+        expect(startBtn.disabled).toBeTrue();
+      });
     });
 
     describe('with not systemStatus$ data', () => {
       beforeEach(() => {
-        (testRunServiceMock.systemStatus$ as any) = of(null);
+        (testRunServiceMock.systemStatus$ as unknown) = of(null);
+        testRunServiceMock.getDevices.and.returnValue(
+          new BehaviorSubject<Device[] | null>([device])
+        );
         fixture.detectChanges();
       });
 
       it('should have empty state content', () => {
-        const emptyContentEl = compiled.querySelector('.progress-content-empty');
+        const emptyContentEl = compiled.querySelector(
+          '.progress-content-empty'
+        );
         const toolbarEl = compiled.querySelector('.progress-toolbar');
 
         expect(emptyContentEl).not.toBeNull();
@@ -155,25 +352,29 @@ describe('ProgressComponent', () => {
       });
 
       it('should have enabled "Start" button', () => {
-        const startBtn = compiled.querySelector('.start-button') as HTMLButtonElement;
+        const startBtn = compiled.querySelector(
+          '.start-button'
+        ) as HTMLButtonElement;
 
         expect(startBtn.disabled).toBeFalse();
       });
 
       it('should open initiate test run modal when start button clicked', () => {
-        const openSpy = spyOn(component.dialog, 'open').and
-          .returnValue({
-            afterClosed: () => of(true)
-          } as MatDialogRef<typeof ProgressInitiateFormComponent>);
-        const startBtn = compiled.querySelector('.start-button') as HTMLButtonElement;
+        const openSpy = spyOn(component.dialog, 'open').and.returnValue({
+          afterClosed: () => of(true),
+        } as MatDialogRef<typeof ProgressInitiateFormComponent>);
+        const startBtn = compiled.querySelector(
+          '.start-button'
+        ) as HTMLButtonElement;
         startBtn.click();
 
         expect(openSpy).toHaveBeenCalled();
         expect(openSpy).toHaveBeenCalledWith(ProgressInitiateFormComponent, {
+          ariaLabel: 'Initiate testrun',
           autoFocus: true,
           hasBackdrop: true,
           disableClose: true,
-          panelClass: 'initiate-test-run-dialog'
+          panelClass: 'initiate-test-run-dialog',
         });
 
         openSpy.calls.reset();
@@ -183,11 +384,22 @@ describe('ProgressComponent', () => {
     describe('with available systemStatus$ data, status "In Progress"', () => {
       beforeEach(() => {
         testRunServiceMock.systemStatus$ = of(MOCK_PROGRESS_DATA_IN_PROGRESS);
+        testRunServiceMock.getDevices.and.returnValue(
+          new BehaviorSubject<Device[] | null>([device])
+        );
         fixture.detectChanges();
       });
 
+      it('should have spinner', () => {
+        const spinner = compiled.querySelector('app-spinner');
+
+        expect(spinner).toBeTruthy();
+      });
+
       it('should have toolbar content', () => {
-        const emptyContentEl = compiled.querySelector('.progress-content-empty');
+        const emptyContentEl = compiled.querySelector(
+          '.progress-content-empty'
+        );
         const toolbarEl = compiled.querySelector('.progress-toolbar');
 
         expect(toolbarEl).not.toBeNull();
@@ -201,15 +413,20 @@ describe('ProgressComponent', () => {
       });
 
       it('should call stopTestrun on click "Stop" button', () => {
-        const stopBtn = compiled.querySelector('.stop-button') as HTMLButtonElement;
+        const openDialogSpy = spyOn(component, 'openStopTestrunDialog');
+        const stopBtn = compiled.querySelector(
+          '.stop-button'
+        ) as HTMLButtonElement;
 
         stopBtn.click();
 
-        expect(testRunServiceMock.stopTestrun).toHaveBeenCalled();
-      })
+        expect(openDialogSpy).toHaveBeenCalled();
+      });
 
       it('should have disabled "Start" button', () => {
-        const startBtn = compiled.querySelector('.start-button') as HTMLButtonElement;
+        const startBtn = compiled.querySelector(
+          '.start-button'
+        ) as HTMLButtonElement;
 
         expect(startBtn.disabled).toBeTrue();
       });
@@ -224,17 +441,23 @@ describe('ProgressComponent', () => {
     describe('pullingSystemStatusData with available status "In Progress"', () => {
       it('should call again getSystemStatus)', fakeAsync(() => {
         testRunServiceMock.systemStatus$ = of(MOCK_PROGRESS_DATA_IN_PROGRESS);
+        testRunServiceMock.getDevices.and.returnValue(
+          new BehaviorSubject<Device[] | null>([device])
+        );
         fixture.detectChanges();
         tick(5000);
 
-        expect(testRunServiceMock.getSystemStatus).toHaveBeenCalledTimes(2);
+        expect(testRunServiceMock.getSystemStatus).toHaveBeenCalledTimes(1);
         discardPeriodicTasks();
       }));
-    })
+    });
 
     describe('with available systemStatus$ data, as Completed', () => {
       beforeEach(() => {
         testRunServiceMock.systemStatus$ = of(MOCK_PROGRESS_DATA_COMPLIANT);
+        testRunServiceMock.getDevices.and.returnValue(
+          new BehaviorSubject<Device[] | null>([device])
+        );
         fixture.detectChanges();
       });
 
@@ -244,8 +467,10 @@ describe('ProgressComponent', () => {
         expect(stopBtn).toBeNull();
       });
 
-      it('should have anable "Start" button', () => {
-        const startBtn = compiled.querySelector('.start-button') as HTMLButtonElement;
+      it('should have enabled "Start" button', () => {
+        const startBtn = compiled.querySelector(
+          '.start-button'
+        ) as HTMLButtonElement;
 
         expect(startBtn.disabled).toBeFalse();
       });
@@ -257,22 +482,33 @@ describe('ProgressComponent', () => {
       });
 
       it('should have report link', () => {
-        const link = compiled.querySelector('.download-report-link') as HTMLAnchorElement;
+        const link = compiled.querySelector(
+          '.download-report-link'
+        ) as HTMLAnchorElement;
 
         expect(link.href).toEqual('https://api.testrun.io/report.pdf');
-        expect(link.download).toEqual('delta_03-din-cpu_1.2.2_compliant_22_jun_2023_9:20');
-        expect(link.title).toEqual('Download report for Test Run # Delta 03-DIN-CPU 1.2.2 22 Jun 2023 9:20');
+        expect(link.download).toEqual(
+          'delta_03-din-cpu_1.2.2_compliant_22_jun_2023_9:20'
+        );
+        expect(link.title).toEqual(
+          'Download report for Test Run # Delta 03-DIN-CPU 1.2.2 22 Jun 2023 9:20'
+        );
       });
     });
 
     describe('with available systemStatus$ data, as Cancelled', () => {
       beforeEach(() => {
         testRunServiceMock.systemStatus$ = of(MOCK_PROGRESS_DATA_CANCELLED);
+        testRunServiceMock.getDevices.and.returnValue(
+          new BehaviorSubject<Device[] | null>([device])
+        );
         fixture.detectChanges();
       });
 
-      it('should have anable "Start" button', () => {
-        const startBtn = compiled.querySelector('.start-button') as HTMLButtonElement;
+      it('should have enabled "Start" button', () => {
+        const startBtn = compiled.querySelector(
+          '.start-button'
+        ) as HTMLButtonElement;
 
         expect(startBtn.disabled).toBeFalse();
       });
@@ -284,14 +520,69 @@ describe('ProgressComponent', () => {
       });
     });
 
+    describe('with available systemStatus$ data, as Waiting for Device', () => {
+      beforeEach(() => {
+        testRunServiceMock.systemStatus$ = of(
+          MOCK_PROGRESS_DATA_WAITING_FOR_DEVICE
+        );
+        testRunServiceMock.getDevices.and.returnValue(
+          new BehaviorSubject<Device[] | null>([device])
+        );
+        fixture.detectChanges();
+      });
+
+      it('should have disabled "Start" button', () => {
+        const startBtn = compiled.querySelector(
+          '.start-button'
+        ) as HTMLButtonElement;
+
+        expect(startBtn.disabled).toBeTrue();
+      });
+
+      it('should have "Stop" button', () => {
+        const stopBtn = compiled.querySelector('.stop-button');
+
+        expect(stopBtn).not.toBeNull();
+      });
+    });
+
+    describe('with available systemStatus$ data, as Monitoring', () => {
+      beforeEach(() => {
+        testRunServiceMock.systemStatus$ = of(MOCK_PROGRESS_DATA_MONITORING);
+        testRunServiceMock.getDevices.and.returnValue(
+          new BehaviorSubject<Device[] | null>([device])
+        );
+        fixture.detectChanges();
+      });
+
+      it('should have disabled "Start" button', () => {
+        const startBtn = compiled.querySelector(
+          '.start-button'
+        ) as HTMLButtonElement;
+
+        expect(startBtn.disabled).toBeTrue();
+      });
+
+      it('should have "Stop" button', () => {
+        const stopBtn = compiled.querySelector('.stop-button');
+
+        expect(stopBtn).not.toBeNull();
+      });
+    });
+
     describe('with available systemStatus$ data, when Testrun not started on Idle status', () => {
       beforeEach(() => {
         testRunServiceMock.systemStatus$ = of(MOCK_PROGRESS_DATA_NOT_STARTED);
+        testRunServiceMock.getDevices.and.returnValue(
+          new BehaviorSubject<Device[] | null>([device])
+        );
         fixture.detectChanges();
       });
 
       it('should have empty state content', () => {
-        const emptyContentEl = compiled.querySelector('.progress-content-empty');
+        const emptyContentEl = compiled.querySelector(
+          '.progress-content-empty'
+        );
         const toolbarEl = compiled.querySelector('.progress-toolbar');
 
         expect(emptyContentEl).not.toBeNull();
@@ -303,7 +594,7 @@ describe('ProgressComponent', () => {
 
 @Component({
   selector: 'app-progress-breadcrumbs',
-  template: '<div></div>'
+  template: '<div></div>',
 })
 class FakeProgressBreadcrumbsComponent {
   @Input() breadcrumbs$!: Observable<string[]>;
@@ -311,7 +602,7 @@ class FakeProgressBreadcrumbsComponent {
 
 @Component({
   selector: 'app-progress-status-card',
-  template: '<div></div>'
+  template: '<div></div>',
 })
 class FakeProgressStatusCardComponent {
   @Input() systemStatus$!: Observable<TestrunStatus>;
@@ -319,7 +610,7 @@ class FakeProgressStatusCardComponent {
 
 @Component({
   selector: 'app-progress-table',
-  template: '<div></div>'
+  template: '<div></div>',
 })
 class FakeProgressTableComponent {
   @Input() dataSource$!: Observable<IResult[] | undefined>;
diff --git a/modules/ui/src/app/progress/progress.component.ts b/modules/ui/src/app/progress/progress.component.ts
index 7ed1ef14a..d4183a46c 100644
--- a/modules/ui/src/app/progress/progress.component.ts
+++ b/modules/ui/src/app/progress/progress.component.ts
@@ -13,67 +13,195 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {ChangeDetectionStrategy, Component, OnDestroy, OnInit} from '@angular/core';
-import {Observable} from 'rxjs/internal/Observable';
-import {TestRunService} from '../test-run.service';
-import {IDevice, IResult, StatusOfTestrun, TestrunStatus, TestsData} from '../model/testrun-status';
-import {interval, map, shareReplay, Subject, takeUntil, tap} from 'rxjs';
-import {MatDialog} from '@angular/material/dialog';
-import {ProgressInitiateFormComponent} from './progress-initiate-form/progress-initiate-form.component';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import { Observable } from 'rxjs/internal/Observable';
+import { TestRunService } from '../services/test-run.service';
+import {
+  IDevice,
+  IResult,
+  StatusOfTestrun,
+  TestrunStatus,
+  TestsData,
+  TestsResponse,
+} from '../model/testrun-status';
+import { interval, map, shareReplay, Subject, takeUntil, tap } from 'rxjs';
+import { MatDialog } from '@angular/material/dialog';
+import { ProgressInitiateFormComponent } from './progress-initiate-form/progress-initiate-form.component';
+import { DeleteFormComponent } from '../components/delete-form/delete-form.component';
+import { LoaderService } from '../services/loader.service';
+import { LOADER_TIMEOUT_CONFIG_TOKEN } from '../services/loaderConfig';
+import { Device } from '../model/device';
+
+const EMPTY_RESULT = new Array(100).fill(null).map(() => ({}) as IResult);
 
 @Component({
   selector: 'app-progress',
   templateUrl: './progress.component.html',
   styleUrls: ['./progress.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  providers: [
+    LoaderService,
+    { provide: LOADER_TIMEOUT_CONFIG_TOKEN, useValue: 0 },
+  ],
 })
 export class ProgressComponent implements OnInit, OnDestroy {
   public systemStatus$!: Observable<TestrunStatus>;
   public breadcrumbs$!: Observable<string[]>;
   public dataSource$!: Observable<IResult[] | undefined>;
+  public devices$!: Observable<Device[] | null>;
   public readonly StatusOfTestrun = StatusOfTestrun;
 
   private destroy$: Subject<boolean> = new Subject<boolean>();
   private startInterval = false;
+  public currentStatus: TestrunStatus | null = null;
+  private isCancelling = false;
 
-  constructor(private readonly testRunService: TestRunService, public dialog: MatDialog) {
-    this.testRunService.getSystemStatus();
-  }
+  constructor(
+    private readonly testRunService: TestRunService,
+    private readonly loaderService: LoaderService,
+    public dialog: MatDialog
+  ) {}
 
   ngOnInit(): void {
+    this.devices$ = this.testRunService.getDevices();
+
     this.systemStatus$ = this.testRunService.systemStatus$.pipe(
-      tap((res) => {
-        if (res.status === StatusOfTestrun.InProgress && !this.startInterval) {
+      tap(res => {
+        this.currentStatus = res;
+        if (this.testrunInProgress(res.status) && !this.startInterval) {
           this.pullingSystemStatusData();
         }
-        if (res.status !== StatusOfTestrun.InProgress) {
+        if (
+          res.status === StatusOfTestrun.WaitingForDevice ||
+          res.status === StatusOfTestrun.Monitoring ||
+          (res.status === StatusOfTestrun.InProgress &&
+            this.resultIsEmpty(res.tests))
+        ) {
+          this.showLoading();
+        }
+        if (
+          res.status === StatusOfTestrun.InProgress &&
+          !this.resultIsEmpty(res.tests)
+        ) {
+          this.hideLoading();
+        }
+        if (
+          !this.testrunInProgress(res.status) &&
+          res.status !== StatusOfTestrun.Cancelling
+        ) {
+          this.isCancelling = false;
           this.destroy$.next(true);
           this.startInterval = false;
+          this.hideLoading();
         }
       }),
-      shareReplay({refCount: true, bufferSize: 1})
+      shareReplay({ refCount: true, bufferSize: 1 })
     );
 
     this.breadcrumbs$ = this.systemStatus$.pipe(
       map((res: TestrunStatus) => res?.device),
       map((res: IDevice) => [res?.manufacturer, res?.model, res?.firmware])
-    )
+    );
 
     this.dataSource$ = this.systemStatus$.pipe(
-      map((res: TestrunStatus) => (res.tests as TestsData)?.results)
+      map((res: TestrunStatus) => {
+        const results = (res.tests as TestsData)?.results || [];
+        if (
+          res.status === StatusOfTestrun.Monitoring ||
+          res.status === StatusOfTestrun.WaitingForDevice
+        ) {
+          return EMPTY_RESULT;
+        }
+
+        const total = (res.tests as TestsData)?.total || 100;
+        if (
+          res.status === StatusOfTestrun.InProgress &&
+          results.length < total
+        ) {
+          return [
+            ...results,
+            ...new Array(total - results.length)
+              .fill(null)
+              .map(() => ({}) as IResult),
+          ];
+        }
+
+        return results;
+      })
+    );
+  }
+
+  testrunInProgress(status?: string): boolean {
+    return (
+      status === StatusOfTestrun.InProgress ||
+      status === StatusOfTestrun.WaitingForDevice ||
+      status === StatusOfTestrun.Monitoring
     );
   }
 
   private pullingSystemStatusData(): void {
     this.startInterval = true;
-    interval(5000).pipe(
-      takeUntil(this.destroy$),
-      tap(() => this.testRunService.getSystemStatus()),
-    ).subscribe();
+    interval(5000)
+      .pipe(
+        takeUntil(this.destroy$),
+        tap(() => this.testRunService.getSystemStatus(this.isCancelling))
+      )
+      .subscribe();
+  }
+
+  public openStopTestrunDialog() {
+    const dialogRef = this.dialog.open(DeleteFormComponent, {
+      ariaLabel: 'Stop testrun',
+      data: {
+        title: 'Stop testrun',
+        content:
+          'Are you sure you would like to stop testrun without a report generation?',
+      },
+      autoFocus: true,
+      hasBackdrop: true,
+      disableClose: true,
+      panelClass: 'delete-form-dialog',
+    });
+
+    dialogRef
+      ?.afterClosed()
+      .pipe(takeUntil(this.destroy$))
+      .subscribe(stopTestrun => {
+        if (stopTestrun) {
+          this.stopTestrun();
+        }
+      });
   }
 
   public stopTestrun(): void {
-    this.testRunService.stopTestrun()
+    this.showLoading();
+    this.setCancellingStatus();
+    this.sendCloseRequest();
+  }
+
+  private setCancellingStatus() {
+    this.isCancelling = true;
+    if (this.currentStatus) {
+      this.currentStatus.status = StatusOfTestrun.Cancelling;
+      this.testRunService.setSystemStatus(this.currentStatus);
+    }
+  }
+  private showLoading() {
+    this.loaderService.setLoading(true);
+  }
+
+  private hideLoading() {
+    this.loaderService.setLoading(false);
+  }
+
+  private sendCloseRequest() {
+    this.testRunService
+      .stopTestrun()
       .pipe(takeUntil(this.destroy$))
       .subscribe();
   }
@@ -85,10 +213,18 @@ export class ProgressComponent implements OnInit, OnDestroy {
 
   openTestRunModal(): void {
     this.dialog.open(ProgressInitiateFormComponent, {
+      ariaLabel: 'Initiate testrun',
       autoFocus: true,
       hasBackdrop: true,
       disableClose: true,
-      panelClass: 'initiate-test-run-dialog'
+      panelClass: 'initiate-test-run-dialog',
     });
   }
+
+  resultIsEmpty(tests: TestsResponse | undefined) {
+    return (
+      (tests as TestsData)?.results?.length === 0 ||
+      (tests as IResult[])?.length === 0
+    );
+  }
 }
diff --git a/modules/ui/src/app/progress/progress.module.ts b/modules/ui/src/app/progress/progress.module.ts
index dd6729349..190fff085 100644
--- a/modules/ui/src/app/progress/progress.module.ts
+++ b/modules/ui/src/app/progress/progress.module.ts
@@ -13,26 +13,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {NgModule} from '@angular/core';
-import {CommonModule} from '@angular/common';
-import {MatButtonModule} from '@angular/material/button';
-import {MatIconModule} from '@angular/material/icon';
-import {MatToolbarModule} from '@angular/material/toolbar';
-import {MatProgressBarModule} from '@angular/material/progress-bar';
-import {MatTableModule} from '@angular/material/table';
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { MatButtonModule } from '@angular/material/button';
+import { MatIconModule } from '@angular/material/icon';
+import { MatToolbarModule } from '@angular/material/toolbar';
+import { MatProgressBarModule } from '@angular/material/progress-bar';
+import { MatTableModule } from '@angular/material/table';
 
-import {ProgressRoutingModule} from './progress-routing.module';
-import {ProgressComponent} from './progress.component';
-import {ProgressBreadcrumbsComponent} from './progress-breadcrumbs/progress-breadcrumbs.component';
-import {ProgressStatusCardComponent} from './progress-status-card/progress-status-card.component';
-import {ProgressTableComponent} from './progress-table/progress-table.component';
-import {ProgressInitiateFormComponent} from './progress-initiate-form/progress-initiate-form.component';
-import {MatDialogModule} from '@angular/material/dialog';
-import {DeviceItemComponent} from '../components/device-item/device-item.component';
-import {MatInputModule} from '@angular/material/input';
-import {ReactiveFormsModule} from '@angular/forms';
-import {DeviceTestsComponent} from '../components/device-tests/device-tests.component';
-import {DownloadReportComponent} from '../components/download-report/download-report.component';
+import { ProgressRoutingModule } from './progress-routing.module';
+import { ProgressComponent } from './progress.component';
+import { ProgressBreadcrumbsComponent } from './progress-breadcrumbs/progress-breadcrumbs.component';
+import { ProgressStatusCardComponent } from './progress-status-card/progress-status-card.component';
+import { ProgressTableComponent } from './progress-table/progress-table.component';
+import { ProgressInitiateFormComponent } from './progress-initiate-form/progress-initiate-form.component';
+import { MatDialogModule } from '@angular/material/dialog';
+import { DeviceItemComponent } from '../components/device-item/device-item.component';
+import { MatInputModule } from '@angular/material/input';
+import { ReactiveFormsModule } from '@angular/forms';
+import { DeviceTestsComponent } from '../components/device-tests/device-tests.component';
+import { DownloadReportComponent } from '../components/download-report/download-report.component';
+import { SpinnerComponent } from '../components/spinner/spinner.component';
 
 @NgModule({
   declarations: [
@@ -40,7 +41,7 @@ import {DownloadReportComponent} from '../components/download-report/download-re
     ProgressBreadcrumbsComponent,
     ProgressStatusCardComponent,
     ProgressTableComponent,
-    ProgressInitiateFormComponent
+    ProgressInitiateFormComponent,
   ],
   imports: [
     CommonModule,
@@ -55,8 +56,8 @@ import {DownloadReportComponent} from '../components/download-report/download-re
     MatInputModule,
     ReactiveFormsModule,
     DeviceTestsComponent,
-    DownloadReportComponent
-  ]
+    DownloadReportComponent,
+    SpinnerComponent,
+  ],
 })
-export class ProgressModule {
-}
+export class ProgressModule {}
diff --git a/modules/ui/src/app/services/loader.service.spec.ts b/modules/ui/src/app/services/loader.service.spec.ts
new file mode 100644
index 000000000..42dab23e4
--- /dev/null
+++ b/modules/ui/src/app/services/loader.service.spec.ts
@@ -0,0 +1,38 @@
+import { fakeAsync, TestBed, tick } from '@angular/core/testing';
+
+import { LoaderService } from './loader.service';
+
+describe('LoaderService', () => {
+  let service: LoaderService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(LoaderService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+
+  describe('update loading value', () => {
+    it('should has delay if true', fakeAsync(() => {
+      service.setLoading(true);
+
+      const timeoutSpy = jasmine.createSpy('timeoutSpy');
+      service.getLoading().subscribe(timeoutSpy);
+
+      expect(timeoutSpy).not.toHaveBeenCalled();
+      tick(1000);
+      expect(timeoutSpy).toHaveBeenCalledWith(true);
+    }));
+
+    it('should has no delay if false', fakeAsync(() => {
+      service.setLoading(false);
+
+      const timeoutSpy = jasmine.createSpy('timeoutSpy');
+      service.getLoading().subscribe(timeoutSpy);
+
+      expect(timeoutSpy).toHaveBeenCalledWith(false);
+    }));
+  });
+});
diff --git a/modules/ui/src/app/services/loader.service.ts b/modules/ui/src/app/services/loader.service.ts
new file mode 100644
index 000000000..84160637a
--- /dev/null
+++ b/modules/ui/src/app/services/loader.service.ts
@@ -0,0 +1,31 @@
+import { Inject, Injectable, Optional } from '@angular/core';
+import { BehaviorSubject, delay, Observable, of, switchMap } from 'rxjs';
+import { LOADER_TIMEOUT_CONFIG_TOKEN } from './loaderConfig';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class LoaderService {
+  private loading$ = new BehaviorSubject<boolean>(false);
+
+  constructor(
+    @Optional()
+    @Inject(LOADER_TIMEOUT_CONFIG_TOKEN)
+    private timeout: number = 1000
+  ) {}
+
+  setLoading(loading: boolean) {
+    this.loading$.next(loading);
+  }
+
+  getLoading(): Observable<boolean> {
+    return this.loading$.pipe(
+      switchMap(loading => {
+        if (loading) {
+          return of(true).pipe(delay(this.timeout));
+        }
+        return of(false);
+      })
+    );
+  }
+}
diff --git a/modules/ui/src/app/services/loaderConfig.ts b/modules/ui/src/app/services/loaderConfig.ts
new file mode 100644
index 000000000..705775861
--- /dev/null
+++ b/modules/ui/src/app/services/loaderConfig.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+import { InjectionToken } from '@angular/core';
+
+export const LOADER_TIMEOUT_CONFIG_TOKEN = new InjectionToken<number>(
+  'loaderTimeoutConfig'
+);
diff --git a/modules/ui/src/app/notification.service.spec.ts b/modules/ui/src/app/services/notification.service.spec.ts
similarity index 59%
rename from modules/ui/src/app/notification.service.spec.ts
rename to modules/ui/src/app/services/notification.service.spec.ts
index b10bf36a8..53cc73970 100644
--- a/modules/ui/src/app/notification.service.spec.ts
+++ b/modules/ui/src/app/services/notification.service.spec.ts
@@ -13,24 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {TestBed} from '@angular/core/testing';
+import { TestBed } from '@angular/core/testing';
 
-import {NotificationService} from './notification.service';
-import {MatSnackBar} from '@angular/material/snack-bar';
+import { NotificationService } from './notification.service';
+import { MatSnackBar } from '@angular/material/snack-bar';
 
 describe('NotificationService', () => {
   let service: NotificationService;
 
   const mockMatSnackBar = {
-    open: () => {
-    }
+    open: () => ({}),
+    dismiss: () => ({}),
   };
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      providers: [
-        {provide: MatSnackBar, useValue: mockMatSnackBar},
-      ]
+      providers: [{ provide: MatSnackBar, useValue: mockMatSnackBar }],
     });
     service = TestBed.inject(NotificationService);
   });
@@ -50,12 +48,35 @@ describe('NotificationService', () => {
       const args = matSnackBarSpy.calls.argsFor(0);
       expect(args.length).toBe(3);
       expect(args[0]).toBe('something good happened');
-      expect(args[1]).toBe('x');
+      expect(args[1]).toBe('OK');
       expect(args[2]).toEqual({
         horizontalPosition: 'right',
         panelClass: 'test-run-notification',
+        duration: 5000,
+      });
+    });
+
+    it('should open snackbar with duration', () => {
+      const matSnackBarSpy = spyOn(mockMatSnackBar, 'open').and.stub();
+
+      service.notify('something good happened', 15000);
+
+      const args = matSnackBarSpy.calls.argsFor(0);
+      expect(args[2]).toEqual({
+        horizontalPosition: 'right',
+        panelClass: 'test-run-notification',
+        duration: 15000,
       });
     });
   });
 
+  describe('dismiss', () => {
+    it('should close snackbar', () => {
+      const matSnackBarSpy = spyOn(mockMatSnackBar, 'dismiss').and.stub();
+
+      service.dismiss();
+
+      expect(matSnackBarSpy).toHaveBeenCalled();
+    });
+  });
 });
diff --git a/modules/ui/src/app/notification.service.ts b/modules/ui/src/app/services/notification.service.ts
similarity index 64%
rename from modules/ui/src/app/notification.service.ts
rename to modules/ui/src/app/services/notification.service.ts
index 1e1f4a43c..7daa17444 100644
--- a/modules/ui/src/app/notification.service.ts
+++ b/modules/ui/src/app/services/notification.service.ts
@@ -13,20 +13,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {Injectable} from '@angular/core';
-import {MatSnackBar} from '@angular/material/snack-bar';
+import { Injectable } from '@angular/core';
+import { MatSnackBar } from '@angular/material/snack-bar';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class NotificationService {
-  constructor(private snackBar: MatSnackBar) {
-  }
+  constructor(private snackBar: MatSnackBar) {}
 
-  notify(message: string) {
-    this.snackBar.open(message, 'x', {
+  notify(message: string, duration = 5000) {
+    this.snackBar.open(message, 'OK', {
       horizontalPosition: 'right',
-      panelClass: 'test-run-notification'
-    })
+      panelClass: 'test-run-notification',
+      duration: duration,
+    });
+  }
+
+  dismiss() {
+    this.snackBar.dismiss();
   }
 }
diff --git a/modules/ui/src/app/services/test-run.service.spec.ts b/modules/ui/src/app/services/test-run.service.spec.ts
new file mode 100644
index 000000000..68b841487
--- /dev/null
+++ b/modules/ui/src/app/services/test-run.service.spec.ts
@@ -0,0 +1,438 @@
+/**
+ * Copyright 2023 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+import {
+  HttpClientTestingModule,
+  HttpTestingController,
+} from '@angular/common/http/testing';
+import { fakeAsync, getTestBed, TestBed, tick } from '@angular/core/testing';
+import { Device, TestModule } from '../model/device';
+
+import { TestRunService } from './test-run.service';
+import { SystemConfig } from '../model/setting';
+import {
+  MOCK_PROGRESS_DATA_CANCELLING,
+  MOCK_PROGRESS_DATA_IN_PROGRESS,
+} from '../mocks/progress.mock';
+import { StatusOfTestResult, TestrunStatus } from '../model/testrun-status';
+import { device } from '../mocks/device.mock';
+import { VERSION } from '../mocks/version.mock';
+
+const MOCK_SYSTEM_CONFIG: SystemConfig = {
+  network: {
+    device_intf: 'mockDeviceValue',
+    internet_intf: 'mockInternetValue',
+  },
+};
+
+describe('TestRunService', () => {
+  let injector: TestBed;
+  let httpTestingController: HttpTestingController;
+  let service: TestRunService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [HttpClientTestingModule],
+      providers: [TestRunService],
+    });
+    injector = getTestBed();
+    httpTestingController = injector.get(HttpTestingController);
+    service = injector.get(TestRunService);
+  });
+
+  afterEach(() => {
+    httpTestingController.verify();
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+
+  it('should have test modules', () => {
+    expect(service.getTestModules()).toEqual([
+      {
+        displayName: 'Connection',
+        name: 'connection',
+        enabled: true,
+      },
+      {
+        displayName: 'NTP',
+        name: 'ntp',
+        enabled: true,
+      },
+      {
+        displayName: 'DNS',
+        name: 'dns',
+        enabled: true,
+      },
+      {
+        displayName: 'Services',
+        name: 'nmap',
+        enabled: true,
+      },
+      {
+        displayName: 'Security',
+        name: 'security',
+        enabled: true,
+      },
+      {
+        displayName: 'TLS',
+        name: 'tls',
+        enabled: true,
+      },
+    ] as TestModule[]);
+  });
+
+  it('setIsOpenAddDevice should update the isOpenAddDevice$ value', () => {
+    service.setIsOpenAddDevice(true);
+
+    service.isOpenAddDevice$.subscribe(value => {
+      expect(value).toBe(true);
+    });
+  });
+
+  it('getDevices should return devices', () => {
+    let result: Device[] | null = null;
+    const deviceArray = [device] as Device[];
+
+    service.getDevices().subscribe(res => {
+      expect(res).toEqual(result);
+    });
+
+    result = deviceArray;
+    service.fetchDevices();
+    const req = httpTestingController.expectOne(
+      'http://localhost:8000/devices'
+    );
+
+    expect(req.request.method).toBe('GET');
+
+    req.flush(deviceArray);
+  });
+
+  it('setSystemConfig should update the systemConfig data', () => {
+    service.setSystemConfig(MOCK_SYSTEM_CONFIG);
+
+    service.systemConfig$.subscribe(data => {
+      expect(data).toEqual(MOCK_SYSTEM_CONFIG);
+    });
+  });
+
+  it('setHasConnectionSetting should update the hasConnectionSetting$', () => {
+    service.setHasConnectionSetting(true);
+
+    service.hasConnectionSetting$.subscribe(data => {
+      expect(data).toEqual(true);
+    });
+  });
+
+  it('getSystemConfig should return systemConfig data', () => {
+    const apiUrl = 'http://localhost:8000/system/config';
+
+    service.getSystemConfig().subscribe(res => {
+      expect(res).toEqual(MOCK_SYSTEM_CONFIG);
+    });
+
+    const req = httpTestingController.expectOne(apiUrl);
+    expect(req.request.method).toBe('GET');
+    req.flush(MOCK_SYSTEM_CONFIG);
+  });
+
+  it('createSystemConfig should call systemConfig data', () => {
+    const apiUrl = 'http://localhost:8000/system/config';
+
+    service.createSystemConfig(MOCK_SYSTEM_CONFIG).subscribe(res => {
+      expect(res).toEqual(MOCK_SYSTEM_CONFIG);
+    });
+
+    const req = httpTestingController.expectOne(apiUrl);
+    expect(req.request.method).toBe('POST');
+    expect(req.request.body).toEqual(MOCK_SYSTEM_CONFIG);
+    req.flush(MOCK_SYSTEM_CONFIG);
+  });
+
+  it('getSystemInterfaces should return array of interfaces', () => {
+    const apiUrl = 'http://localhost:8000/system/interfaces';
+    const mockSystemInterfaces: string[] = ['mockValue', 'mockValue'];
+
+    service.getSystemInterfaces().subscribe(res => {
+      expect(res).toEqual(mockSystemInterfaces);
+    });
+
+    const req = httpTestingController.expectOne(apiUrl);
+    expect(req.request.method).toBe('GET');
+    req.flush(mockSystemInterfaces);
+  });
+
+  it('hasDevice should return true if device with mac address already exist', fakeAsync(() => {
+    const deviceArray = [device] as Device[];
+    service.setDevices(deviceArray);
+    tick();
+
+    expect(service.hasDevice('00:1e:42:35:73:c4')).toEqual(true);
+    expect(service.hasDevice('    00:1e:42:35:73:c4    ')).toEqual(true);
+  }));
+
+  describe('getSystemStatus', () => {
+    it('should get system status data with no changes', () => {
+      const result = { ...MOCK_PROGRESS_DATA_IN_PROGRESS };
+
+      service.systemStatus$.subscribe(res => {
+        expect(res).toEqual(result);
+      });
+
+      service.getSystemStatus();
+      const req = httpTestingController.expectOne(
+        'http://localhost:8000/system/status'
+      );
+      expect(req.request.method).toBe('GET');
+      req.flush(result);
+    });
+
+    it('should get cancelling data if status is cancelling', () => {
+      const result = { ...MOCK_PROGRESS_DATA_IN_PROGRESS };
+
+      service.systemStatus$.subscribe(res => {
+        expect(res).toEqual(MOCK_PROGRESS_DATA_CANCELLING);
+      });
+
+      service.getSystemStatus(true);
+      const req = httpTestingController.expectOne(
+        'http://localhost:8000/system/status'
+      );
+      expect(req.request.method).toBe('GET');
+      req.flush(result);
+    });
+  });
+
+  it('stopTestrun should have necessary request data', () => {
+    const apiUrl = 'http://localhost:8000/system/stop';
+
+    service.stopTestrun().subscribe(res => {
+      expect(res).toEqual(true);
+    });
+
+    const req = httpTestingController.expectOne(apiUrl);
+    expect(req.request.method).toBe('POST');
+    expect(req.request.body).toEqual({});
+    req.flush({});
+  });
+
+  describe('#startTestRun', () => {
+    it('should have necessary request data', () => {
+      const apiUrl = 'http://localhost:8000/system/start';
+
+      service.startTestrun(device).subscribe(res => {
+        expect(res).toEqual(true);
+      });
+
+      const req = httpTestingController.expectOne(apiUrl);
+      expect(req.request.method).toBe('POST');
+      expect(req.request.body).toEqual(JSON.stringify({ device }));
+      req.flush({});
+    });
+  });
+
+  it('getHistory should return reports', () => {
+    let result: TestrunStatus[] | null = null;
+
+    const reports = [
+      {
+        status: 'Completed',
+        device: device,
+        report: 'https://api.testrun.io/report.pdf',
+        started: '2023-06-22T10:11:00.123Z',
+        finished: '2023-06-22T10:17:00.123Z',
+      },
+    ] as TestrunStatus[];
+
+    service.getHistory().subscribe(res => {
+      expect(res).toEqual(result);
+    });
+
+    result = reports;
+    service.fetchHistory();
+    const req = httpTestingController.expectOne(
+      'http://localhost:8000/reports'
+    );
+
+    expect(req.request.method).toBe('GET');
+
+    req.flush(reports);
+  });
+
+  describe('#getResultClass', () => {
+    it('should return class "green" if test result is "Compliant" or "Smart Ready"', () => {
+      const expectedResult = {
+        green: true,
+        red: false,
+        blue: false,
+        grey: false,
+      };
+
+      const result1 = service.getResultClass(StatusOfTestResult.Compliant);
+
+      expect(result1).toEqual(expectedResult);
+    });
+
+    it('should return class "blue" if test result is "Smart Ready" or "Informational"', () => {
+      const expectedResult = {
+        green: false,
+        red: false,
+        blue: true,
+        grey: false,
+      };
+
+      const result1 = service.getResultClass(StatusOfTestResult.SmartReady);
+      const result2 = service.getResultClass(StatusOfTestResult.Info);
+
+      expect(result1).toEqual(expectedResult);
+      expect(result2).toEqual(expectedResult);
+    });
+
+    it('should return class "read" if test result is "Non Compliant" or "Error"', () => {
+      const expectedResult = {
+        green: false,
+        red: true,
+        blue: false,
+        grey: false,
+      };
+
+      const result = service.getResultClass(StatusOfTestResult.NonCompliant);
+      const result2 = service.getResultClass(StatusOfTestResult.Error);
+
+      expect(result).toEqual(expectedResult);
+      expect(result2).toEqual(expectedResult);
+    });
+
+    it('should return class "grey" if test result is "Skipped" or "Not Started"', () => {
+      const expectedResult = {
+        green: false,
+        red: false,
+        blue: false,
+        grey: true,
+      };
+
+      const result1 = service.getResultClass(StatusOfTestResult.Skipped);
+      const result2 = service.getResultClass(StatusOfTestResult.NotStarted);
+
+      expect(result1).toEqual(expectedResult);
+      expect(result2).toEqual(expectedResult);
+    });
+  });
+
+  describe('#addDevice', () => {
+    it('should create array with new value if previous value is null', function () {
+      service.addDevice(device);
+
+      expect(service.getDevices().value).toEqual([device]);
+    });
+
+    it('should add new value if previous value is array', function () {
+      service.setDevices([device, device]);
+      service.addDevice(device);
+
+      expect(service.getDevices().value).toEqual([device, device, device]);
+    });
+  });
+
+  it('deleteDevice should have necessary request data', () => {
+    const apiUrl = 'http://localhost:8000/device';
+
+    service.deleteDevice(device).subscribe(res => {
+      expect(res).toEqual(true);
+    });
+
+    const req = httpTestingController.expectOne(apiUrl);
+    expect(req.request.method).toBe('DELETE');
+    expect(req.request.body).toEqual(JSON.stringify(device));
+    req.flush({});
+  });
+
+  it('removeDevice should remove device from device list', fakeAsync(() => {
+    const deviceArray = [device] as Device[];
+    service.setDevices(deviceArray);
+    tick();
+    service.removeDevice(device);
+
+    expect(service.hasDevice('00:1e:42:35:73:c4')).toEqual(false);
+  }));
+
+  it('fetchVersion should get system version', () => {
+    const version = VERSION;
+
+    service.fetchVersion();
+    const req = httpTestingController.expectOne(
+      'http://localhost:8000/system/version'
+    );
+    expect(req.request.method).toBe('GET');
+    req.flush(version);
+
+    service.getVersion().subscribe(res => {
+      expect(res).toEqual(version);
+    });
+  });
+
+  it('deleteReport should have necessary request data', () => {
+    const apiUrl = 'http://localhost:8000/report';
+
+    service.deleteReport(device.mac_addr, '').subscribe(res => {
+      expect(res).toEqual(true);
+    });
+
+    const req = httpTestingController.expectOne(apiUrl);
+    expect(req.request.method).toBe('DELETE');
+    expect(req.request.body).toEqual(
+      JSON.stringify({
+        mac_addr: device.mac_addr,
+        timestamp: '',
+      })
+    );
+    req.flush({});
+  });
+
+  it('removeReport should remove device from history list', fakeAsync(() => {
+    const reports = [
+      {
+        status: 'Completed',
+        device: device,
+        report: 'https://api.testrun.io/report.pdf',
+        started: '2023-06-22T10:11:00.123Z',
+        finished: '2023-06-22T10:17:00.123Z',
+      },
+      {
+        status: 'Completed',
+        device: device,
+        report: 'https://api.testrun.io/report.pdf',
+        started: '2023-07-22T10:11:00.123Z',
+        finished: '2023-07-22T10:17:00.123Z',
+      },
+    ] as TestrunStatus[];
+
+    service.getHistory().next(reports);
+    tick();
+    service.removeReport('00:1e:42:35:73:c4', '2023-06-22T10:11:00.123Z');
+
+    expect(
+      service
+        .getHistory()
+        .value?.some(
+          report =>
+            report.device.mac_addr === '00:1e:42:35:73:c4' &&
+            report.started === '2023-06-22T10:11:00.123Z'
+        )
+    ).toEqual(false);
+  }));
+});
diff --git a/modules/ui/src/app/services/test-run.service.ts b/modules/ui/src/app/services/test-run.service.ts
new file mode 100644
index 000000000..22b4d2328
--- /dev/null
+++ b/modules/ui/src/app/services/test-run.service.ts
@@ -0,0 +1,279 @@
+/**
+ * Copyright 2023 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { Observable } from 'rxjs/internal/Observable';
+import { Device, TestModule } from '../model/device';
+import { map, ReplaySubject, retry } from 'rxjs';
+import { SystemConfig } from '../model/setting';
+import {
+  StatusOfTestResult,
+  StatusOfTestrun,
+  StatusResultClassName,
+  TestrunStatus,
+} from '../model/testrun-status';
+import { Version } from '../model/version';
+
+const API_URL = 'http://localhost:8000';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class TestRunService {
+  private readonly testModules: TestModule[] = [
+    {
+      displayName: 'Connection',
+      name: 'connection',
+      enabled: true,
+    },
+    {
+      displayName: 'NTP',
+      name: 'ntp',
+      enabled: true,
+    },
+    {
+      displayName: 'DNS',
+      name: 'dns',
+      enabled: true,
+    },
+    {
+      displayName: 'Services',
+      name: 'nmap',
+      enabled: true,
+    },
+    {
+      displayName: 'Security',
+      name: 'security',
+      enabled: true,
+    },
+    {
+      displayName: 'TLS',
+      name: 'tls',
+      enabled: true,
+    },
+  ];
+
+  private devices = new BehaviorSubject<Device[] | null>(null);
+  private isOpenAddDeviceSub$ = new BehaviorSubject<boolean>(false);
+  public isOpenAddDevice$ = this.isOpenAddDeviceSub$.asObservable();
+  private _systemConfig = new BehaviorSubject<SystemConfig | null>(null);
+  public systemConfig$ = this._systemConfig.asObservable();
+  private systemStatusSubject = new ReplaySubject<TestrunStatus>(1);
+  public systemStatus$ = this.systemStatusSubject.asObservable();
+  private isTestrunStartedSub$ = new BehaviorSubject<boolean>(false);
+  public isTestrunStarted$ = this.isTestrunStartedSub$.asObservable();
+  private hasConnectionSettingSub$ = new BehaviorSubject<boolean | null>(null);
+  public hasConnectionSetting$ = this.hasConnectionSettingSub$.asObservable();
+  private history = new BehaviorSubject<TestrunStatus[] | null>(null);
+  private version = new BehaviorSubject<Version | null>(null);
+
+  constructor(private http: HttpClient) {}
+
+  setIsOpenAddDevice(isOpen: boolean): void {
+    this.isOpenAddDeviceSub$.next(isOpen);
+  }
+
+  setHasConnectionSetting(hasSetting: boolean): void {
+    this.hasConnectionSettingSub$.next(hasSetting);
+  }
+  getDevices(): BehaviorSubject<Device[] | null> {
+    return this.devices;
+  }
+
+  setDevices(devices: Device[]): void {
+    this.devices.next(devices);
+  }
+
+  setSystemConfig(config: SystemConfig): void {
+    this._systemConfig.next(config);
+  }
+
+  setSystemStatus(status: TestrunStatus): void {
+    this.systemStatusSubject.next(status);
+  }
+
+  fetchDevices(): void {
+    this.http
+      .get<Device[]>(`${API_URL}/devices`)
+      .subscribe((devices: Device[]) => {
+        this.setDevices(devices);
+      });
+  }
+
+  getSystemConfig(): Observable<SystemConfig> {
+    return this.http.get<SystemConfig>(`${API_URL}/system/config`);
+  }
+
+  createSystemConfig(data: SystemConfig): Observable<SystemConfig> {
+    return this.http
+      .post<SystemConfig>(`${API_URL}/system/config`, data)
+      .pipe(retry(1));
+  }
+
+  getSystemInterfaces(): Observable<string[]> {
+    return this.http.get<string[]>(`${API_URL}/system/interfaces`);
+  }
+
+  /**
+   * Gets system status.
+   * Status Cancelling exist only on FE. Every status except Cancelled
+   * should be overriden with Cancelling value during cancelling process
+   * @param isCancelling - indicates if status should be overridden with Cancelling value
+   */
+  getSystemStatus(isCancelling?: boolean): void {
+    this.http
+      .get<TestrunStatus>(`${API_URL}/system/status`)
+      .subscribe((res: TestrunStatus) => {
+        if (isCancelling && res.status !== StatusOfTestrun.Cancelled) {
+          res.status = StatusOfTestrun.Cancelling;
+        }
+        this.setSystemStatus(res);
+      });
+  }
+
+  stopTestrun(): Observable<boolean> {
+    return this.http
+      .post<{ success: string }>(`${API_URL}/system/stop`, {})
+      .pipe(map(() => true));
+  }
+
+  getTestModules(): TestModule[] {
+    return this.testModules;
+  }
+
+  saveDevice(device: Device): Observable<boolean> {
+    return this.http
+      .post<boolean>(`${API_URL}/device`, JSON.stringify(device))
+      .pipe(map(() => true));
+  }
+
+  deleteDevice(device: Device): Observable<boolean> {
+    return this.http
+      .delete<boolean>(`${API_URL}/device`, {
+        body: JSON.stringify(device),
+      })
+      .pipe(map(() => true));
+  }
+
+  hasDevice(macAddress: string): boolean {
+    return (
+      this.devices.value?.some(
+        device => device.mac_addr === macAddress.trim()
+      ) || false
+    );
+  }
+
+  addDevice(device: Device): void {
+    this.devices.next(
+      this.devices.value ? this.devices.value.concat([device]) : [device]
+    );
+  }
+
+  updateDevice(deviceToUpdate: Device, update: Device): void {
+    const device = this.devices.value?.find(
+      device => update.mac_addr === device.mac_addr
+    );
+    if (device) {
+      device.model = update.model;
+      device.manufacturer = update.manufacturer;
+      device.test_modules = update.test_modules;
+
+      this.devices.next(this.devices.value);
+    }
+  }
+
+  removeDevice(deviceToDelete: Device): void {
+    const idx = this.devices.value?.findIndex(
+      device => deviceToDelete.mac_addr === device.mac_addr
+    );
+    if (typeof idx === 'number') {
+      this.devices.value?.splice(idx, 1);
+      this.devices.next(this.devices.value);
+    }
+  }
+
+  fetchHistory(): void {
+    this.http
+      .get<TestrunStatus[]>(`${API_URL}/reports`)
+      .pipe(retry(1))
+      .subscribe(data => {
+        this.history.next(data);
+      });
+  }
+
+  getHistory(): BehaviorSubject<TestrunStatus[] | null> {
+    return this.history;
+  }
+
+  public getResultClass(result: string): StatusResultClassName {
+    return {
+      green: result === StatusOfTestResult.Compliant,
+      red:
+        result === StatusOfTestResult.NonCompliant ||
+        result === StatusOfTestResult.Error,
+      blue:
+        result === StatusOfTestResult.SmartReady ||
+        result === StatusOfTestResult.Info,
+      grey:
+        result === StatusOfTestResult.Skipped ||
+        result === StatusOfTestResult.NotStarted,
+    };
+  }
+
+  startTestrun(device: Device): Observable<boolean> {
+    this.isTestrunStartedSub$.next(true);
+
+    return this.http
+      .post<TestrunStatus>(
+        `${API_URL}/system/start`,
+        JSON.stringify({ device })
+      )
+      .pipe(map(() => true));
+  }
+
+  getVersion(): BehaviorSubject<Version | null> {
+    return this.version;
+  }
+
+  fetchVersion(): void {
+    this.http
+      .get<Version>(`${API_URL}/system/version`)
+      .pipe(retry(1))
+      .subscribe(version => {
+        this.version.next(version);
+      });
+  }
+
+  deleteReport(mac_addr: string, started: string): Observable<boolean> {
+    return this.http
+      .delete<boolean>(`${API_URL}/report`, {
+        body: JSON.stringify({ mac_addr, timestamp: started }),
+      })
+      .pipe(map(() => true));
+  }
+
+  removeReport(mac_addr: string, started: string): void {
+    const idx = this.history.value?.findIndex(
+      report =>
+        report.device.mac_addr === mac_addr && report.started === started
+    );
+    if (typeof idx === 'number') {
+      this.history.value?.splice(idx, 1);
+      this.history.next(this.history.value);
+    }
+  }
+}
diff --git a/modules/ui/src/app/test-run.service.spec.ts b/modules/ui/src/app/test-run.service.spec.ts
deleted file mode 100644
index fd0c3b690..000000000
--- a/modules/ui/src/app/test-run.service.spec.ts
+++ /dev/null
@@ -1,309 +0,0 @@
-/**
- * Copyright 2023 Google LLC
- *
- * 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
- *
- *     https://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.
- */
-import {HttpClientTestingModule, HttpTestingController} from '@angular/common/http/testing';
-import {fakeAsync, getTestBed, TestBed, tick} from '@angular/core/testing';
-import {Device, TestModule} from './model/device';
-
-import {TestRunService} from './test-run.service';
-import {SystemConfig} from './model/setting';
-import {MOCK_PROGRESS_DATA_IN_PROGRESS} from './mocks/progress.mock';
-import {StatusOfTestResult, TestrunStatus} from './model/testrun-status';
-import {device} from './mocks/device.mock';
-
-const MOCK_SYSTEM_CONFIG: SystemConfig = {
-  network: {
-    device_intf: 'mockDeviceValue',
-    internet_intf: 'mockInternetValue'
-  }
-}
-
-describe('TestRunService', () => {
-  let injector: TestBed;
-  let httpTestingController: HttpTestingController;
-  let service: TestRunService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
-      providers: [TestRunService]
-    });
-    injector = getTestBed();
-    httpTestingController = injector.get(HttpTestingController);
-    service = injector.get(TestRunService);
-  });
-
-  afterEach(() => {
-    httpTestingController.verify();
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-
-  it('should have test modules', () => {
-    expect(service.getTestModules()).toEqual([
-      {
-        displayName: "Connection",
-        name: "connection",
-        enabled: true
-      },
-      {
-        displayName: "NTP",
-        name: "ntp",
-        enabled: true
-      },
-      {
-        displayName: "DHCP",
-        name: "dhcp",
-        enabled: true
-      },
-      {
-        displayName: "DNS",
-        name: "dns",
-        enabled: true
-      },
-      {
-        displayName: "Services",
-        name: "nmap",
-        enabled: true
-      },
-      {
-        displayName: "Security",
-        name: "security",
-        enabled: true
-      },
-      {
-        displayName: "TLS",
-        name: "tls",
-        enabled: true
-      },
-    ] as TestModule[]);
-  });
-
-  it('getDevices should return devices', () => {
-    let result: Device[] | null = null;
-    const deviceArray = [device] as Device[];
-
-    service.getDevices().subscribe((res) => {
-      expect(res).toEqual(result);
-    });
-
-    result = deviceArray;
-    service.fetchDevices();
-    const req = httpTestingController.expectOne('http://localhost:8000/devices');
-
-    expect(req.request.method).toBe('GET');
-
-    req.flush(deviceArray);
-  });
-
-  it('setSystemConfig should update the systemConfig data', () => {
-    service.setSystemConfig(MOCK_SYSTEM_CONFIG);
-
-    service.systemConfig$.subscribe(data => {
-      expect(data).toEqual(MOCK_SYSTEM_CONFIG);
-    })
-
-  })
-
-  it('getSystemConfig should return systemConfig data', () => {
-    const apiUrl = 'http://localhost:8000/system/config'
-
-    service.getSystemConfig().subscribe((res) => {
-      expect(res).toEqual(MOCK_SYSTEM_CONFIG);
-    });
-
-    const req = httpTestingController.expectOne(apiUrl);
-    expect(req.request.method).toBe('GET');
-    req.flush(MOCK_SYSTEM_CONFIG);
-  });
-
-  it('createSystemConfig should call systemConfig data', () => {
-    const apiUrl = 'http://localhost:8000/system/config'
-
-    service.createSystemConfig(MOCK_SYSTEM_CONFIG).subscribe((res) => {
-      expect(res).toEqual({});
-    });
-
-    const req = httpTestingController.expectOne(apiUrl);
-    expect(req.request.method).toBe('POST');
-    expect(req.request.body).toEqual(MOCK_SYSTEM_CONFIG);
-    req.flush({});
-  });
-
-  it('getSystemInterfaces should return array of interfaces', () => {
-    const apiUrl = 'http://localhost:8000/system/interfaces'
-    const mockSystemInterfaces: string[] = ['mockValue', 'mockValue'];
-
-    service.getSystemInterfaces().subscribe((res) => {
-      expect(res).toEqual(mockSystemInterfaces);
-    });
-
-    const req = httpTestingController.expectOne(apiUrl);
-    expect(req.request.method).toBe('GET');
-    req.flush(mockSystemInterfaces);
-  });
-
-  it('hasDevice should return true if device with mac address already exist', fakeAsync(() => {
-    const deviceArray = [device] as Device[];
-    service.setDevices(deviceArray);
-    tick();
-
-    expect(service.hasDevice("00:1e:42:35:73:c4")).toEqual(true);
-    expect(service.hasDevice("    00:1e:42:35:73:c4    ")).toEqual(true);
-  }));
-
-  it('getSystemStatus should get system status data', () => {
-    const result = MOCK_PROGRESS_DATA_IN_PROGRESS;
-
-    service.systemStatus$.subscribe((res) => {
-      expect(res).toEqual(result);
-    });
-
-    service.getSystemStatus();
-    const req = httpTestingController.expectOne('http://localhost:8000/system/status');
-    expect(req.request.method).toBe('GET');
-    req.flush(result);
-  });
-
-  it('stopTestrun should have necessary request data', () => {
-    const apiUrl = 'http://localhost:8000/system/stop'
-
-    service.stopTestrun().subscribe((res) => {
-      expect(res).toEqual(true);
-    });
-
-    const req = httpTestingController.expectOne(apiUrl);
-    expect(req.request.method).toBe('POST');
-    expect(req.request.body).toEqual({});
-    req.flush({});
-  });
-
-  describe('#startTestRun', () => {
-    it('should have necessary request data', () => {
-      const apiUrl = 'http://localhost:8000/system/start'
-
-      service.startTestrun(device).subscribe((res) => {
-        expect(res).toEqual(true);
-      });
-
-      const req = httpTestingController.expectOne(apiUrl);
-      expect(req.request.method).toBe('POST');
-      expect(req.request.body).toEqual(JSON.stringify({device}));
-      req.flush({});
-    });
-
-    it('should have error when timeout exceeded', fakeAsync(() => {
-      const apiUrl = 'http://localhost:8000/system/start'
-
-      service.startTestrun(device, 1000).subscribe(() => {
-      }, (error) => {
-        expect(error.toString()).toEqual('Timeout has occurred');
-      });
-
-      httpTestingController.expectOne(apiUrl);
-      tick(1001);
-    }));
-  });
-
-  it('getHistory should return history', () => {
-    let result: TestrunStatus[] = [];
-
-    const history = [{
-      "status": "Completed",
-      "device": device,
-      "report": "https://api.testrun.io/report.pdf",
-      "started": "2023-06-22T10:11:00.123Z",
-      "finished": "2023-06-22T10:17:00.123Z",
-    }] as TestrunStatus[];
-
-    service.getHistory().subscribe((res) => {
-      expect(res).toEqual(result);
-    });
-
-    result = history;
-    service.fetchHistory();
-    const req = httpTestingController.expectOne('http://localhost:8000/history');
-
-    expect(req.request.method).toBe('GET');
-
-    req.flush(history);
-  });
-
-  describe('#getResultClass', () => {
-    it('should return class "green" if test result is "Compliant" or "Smart Ready"', () => {
-      const expectedResult = {
-        green: true, red: false, blue: false, grey: false
-      };
-
-      const result1 = service.getResultClass(StatusOfTestResult.Compliant);
-
-      expect(result1).toEqual(expectedResult);
-    });
-
-    it('should return class "blue" if test result is "Smart Ready" or "Informational"', () => {
-      const expectedResult = {
-        green: false, red: false, blue: true, grey: false
-      };
-
-      const result1 = service.getResultClass(StatusOfTestResult.SmartReady);
-      const result2 = service.getResultClass(StatusOfTestResult.Info);
-
-      expect(result1).toEqual(expectedResult);
-      expect(result2).toEqual(expectedResult);
-    });
-
-    it('should return class "read" if test result is "Non Compliant" or "Error"', () => {
-      const expectedResult = {
-        green: false, red: true, blue: false, grey: false
-      };
-
-      const result = service.getResultClass(StatusOfTestResult.NonCompliant);
-      const result2 = service.getResultClass(StatusOfTestResult.Error);
-
-      expect(result).toEqual(expectedResult);
-      expect(result2).toEqual(expectedResult);
-    });
-
-    it('should return class "grey" if test result is "Skipped" or "Not Started"', () => {
-      const expectedResult = {
-        green: false, red: false, blue: false, grey: true
-      };
-
-      const result1 = service.getResultClass(StatusOfTestResult.Skipped);
-      const result2 = service.getResultClass(StatusOfTestResult.NotStarted);
-
-      expect(result1).toEqual(expectedResult);
-      expect(result2).toEqual(expectedResult);
-    });
-  });
-
-  describe('#addDevice', () => {
-    it('should create array with new value if previous value is null', function () {
-      service.addDevice(device);
-
-      expect(service.getDevices().value).toEqual([device]);
-    });
-
-    it('should add new value if previous value is array', function () {
-      service.setDevices([device, device]);
-      service.addDevice(device);
-
-      expect(service.getDevices().value).toEqual([device, device, device]);
-    });
-
-  });
-});
diff --git a/modules/ui/src/app/test-run.service.ts b/modules/ui/src/app/test-run.service.ts
deleted file mode 100644
index a17062708..000000000
--- a/modules/ui/src/app/test-run.service.ts
+++ /dev/null
@@ -1,193 +0,0 @@
-/**
- * Copyright 2023 Google LLC
- *
- * 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
- *
- *     https://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.
- */
-import {HttpClient} from '@angular/common/http';
-import {Injectable} from '@angular/core';
-import {BehaviorSubject} from 'rxjs/internal/BehaviorSubject';
-import {Observable} from 'rxjs/internal/Observable';
-import {Device, TestModule} from './model/device';
-import {map, ReplaySubject, retry, timeout} from 'rxjs';
-import {SystemConfig} from './model/setting';
-import {StatusOfTestResult, StatusResultClassName, TestrunStatus} from './model/testrun-status';
-import {catchError} from 'rxjs/internal/operators/catchError';
-import {throwError} from 'rxjs/internal/observable/throwError';
-
-const API_URL = 'http://localhost:8000'
-
-@Injectable({
-  providedIn: 'root'
-})
-export class TestRunService {
-  private readonly testModules: TestModule[] = [
-    {
-      displayName: "Connection",
-      name: "connection",
-      enabled: true
-    },
-    {
-      displayName: "NTP",
-      name: "ntp",
-      enabled: true
-    },
-    {
-      displayName: "DHCP",
-      name: "dhcp",
-      enabled: true
-    },
-    {
-      displayName: "DNS",
-      name: "dns",
-      enabled: true
-    },
-    {
-      displayName: "Services",
-      name: "nmap",
-      enabled: true
-    },
-    {
-      displayName: "Security",
-      name: "security",
-      enabled: true
-    },
-    {
-      displayName: "TLS",
-      name: "tls",
-      enabled: true
-    },
-  ];
-
-  private devices = new BehaviorSubject<Device[] | null>(null);
-  private _systemConfig = new BehaviorSubject<SystemConfig>({network: {}});
-  public systemConfig$ = this._systemConfig.asObservable();
-  private systemStatusSubject = new ReplaySubject<TestrunStatus>(1);
-  public systemStatus$ = this.systemStatusSubject.asObservable();
-  private history = new BehaviorSubject<TestrunStatus[]>([]);
-
-  constructor(private http: HttpClient) {
-  }
-
-  getDevices(): BehaviorSubject<Device[] | null> {
-    return this.devices;
-  }
-
-  setDevices(devices: Device[]): void {
-    this.devices.next(devices);
-  }
-
-  setSystemConfig(config: SystemConfig): void {
-    this._systemConfig.next(config);
-  }
-
-  setSystemStatus(status: TestrunStatus): void {
-    this.systemStatusSubject.next(status);
-  }
-
-  fetchDevices(): void {
-    this.http.get<any>(`${API_URL}/devices`).subscribe((devices: Device[]) => {
-      this.setDevices(devices);
-    });
-  }
-
-  getSystemConfig(): Observable<SystemConfig> {
-    return this.http
-      .get<SystemConfig>(`${API_URL}/system/config`)
-      .pipe(retry(1))
-  }
-
-  createSystemConfig(data: SystemConfig): Observable<any> {
-    return this.http
-      .post<any>(`${API_URL}/system/config`, data)
-      .pipe(retry(1));
-  }
-
-  getSystemInterfaces(): Observable<string[]> {
-    return this.http
-      .get<string[]>(`${API_URL}/system/interfaces`)
-      .pipe(retry(1));
-  }
-
-  getSystemStatus(): void {
-    this.http
-      .get<TestrunStatus>(`${API_URL}/system/status`)
-      .subscribe((res: TestrunStatus) => {
-        this.setSystemStatus(res);
-      });
-  }
-
-  stopTestrun(): Observable<boolean> {
-    return this.http
-      .post<any>(`${API_URL}/system/stop`, {})
-      .pipe(retry(1), map(() => true));
-  }
-
-  getTestModules(): TestModule[] {
-    return this.testModules;
-  }
-
-  saveDevice(device: Device): Observable<boolean> {
-    return this.http
-      .post<boolean>(`${API_URL}/device`, JSON.stringify(device))
-      .pipe(retry(1), map(() => true));
-  }
-
-  hasDevice(macAddress: string): boolean {
-    return this.devices.value?.some(device => device.mac_addr === macAddress.trim()) || false;
-  }
-
-  addDevice(device: Device): void {
-    this.devices.next(this.devices.value ? this.devices.value.concat([device]) : [device]);
-  }
-
-  updateDevice(deviceToUpdate: Device, update: Device): void {
-    const device = this.devices.value?.find(device => update.mac_addr === device.mac_addr)!;
-    device.model = update.model
-    device.manufacturer = update.manufacturer
-    device.test_modules = update.test_modules;
-
-    this.devices.next(this.devices.value);
-  }
-
-  fetchHistory(): void {
-    this.http
-      .get<TestrunStatus[]>(`${API_URL}/history`)
-      .pipe(retry(1))
-      .subscribe(data => {
-        this.history.next(data)
-      });
-  }
-
-  getHistory(): Observable<TestrunStatus[]> {
-    return this.history;
-  }
-
-  public getResultClass(result: string): StatusResultClassName {
-    return {
-      'green': result === StatusOfTestResult.Compliant,
-      'red': result === StatusOfTestResult.NonCompliant || result === StatusOfTestResult.Error,
-      'blue': result === StatusOfTestResult.SmartReady || result === StatusOfTestResult.Info,
-      'grey': result === StatusOfTestResult.Skipped || result === StatusOfTestResult.NotStarted
-    }
-  }
-
-  startTestrun(device: Device, timeoutMs = 120000): Observable<boolean> {
-    return this.http
-      .post<any>(`${API_URL}/system/start`, JSON.stringify({device}))
-      .pipe(
-        timeout(timeoutMs),
-        map(() => true),
-        catchError(err => throwError(err.error?.error || err.message))
-      );
-  }
-}
diff --git a/modules/ui/src/assets/icons/desktop.svg b/modules/ui/src/assets/icons/desktop.svg
new file mode 100644
index 000000000..1d779ed87
--- /dev/null
+++ b/modules/ui/src/assets/icons/desktop.svg
@@ -0,0 +1,23 @@
+<svg width="298" height="155" viewBox="0 0 298 155" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M62.8398 14H237.29V117.43H62.8398V96.98V14Z" fill="white" stroke="#3C4043" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M62.8398 28.0801H185.65" stroke="#3C4043" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M62.8398 96.6499H237.29" stroke="#3C4043" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M72.8191 22.8398C73.6641 22.8398 74.3491 22.1548 74.3491 21.3098C74.3491 20.4648 73.6641 19.7798 72.8191 19.7798C71.9741 19.7798 71.2891 20.4648 71.2891 21.3098C71.2891 22.1548 71.9741 22.8398 72.8191 22.8398Z" stroke="#3C4043" stroke-miterlimit="10"/>
+<path d="M80.5886 22.8398C81.4336 22.8398 82.1186 22.1548 82.1186 21.3098C82.1186 20.4648 81.4336 19.7798 80.5886 19.7798C79.7436 19.7798 79.0586 20.4648 79.0586 21.3098C79.0586 22.1548 79.7436 22.8398 80.5886 22.8398Z" stroke="#3C4043" stroke-miterlimit="10"/>
+<path d="M127.09 141.49C127.09 141.49 137.7 133.71 138.05 117.43H162.84C163.18 133.7 173.8 141.49 173.8 141.49H127.09Z" fill="#E8EAED" stroke="#3C4043" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M163.399 123.14C163.079 121.37 162.869 119.47 162.829 117.43H138.039L163.399 123.14Z" fill="#3C4043" stroke="#3C4043" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M222.25 91.7498C240.934 91.7498 256.08 76.6036 256.08 57.9198C256.08 39.236 240.934 24.0898 222.25 24.0898C203.566 24.0898 188.42 39.236 188.42 57.9198C188.42 76.6036 203.566 91.7498 222.25 91.7498Z" fill="#4285F4" stroke="#4285F4" stroke-miterlimit="10"/>
+<path d="M222.25 91.7498C240.934 91.7498 256.08 76.6036 256.08 57.9198C256.08 39.236 240.934 24.0898 222.25 24.0898C203.566 24.0898 188.42 39.236 188.42 57.9198C188.42 76.6036 203.566 91.7498 222.25 91.7498Z" stroke="#3C4043" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M244.09 83.75L271.5 117.43" stroke="#3C4043" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M47.1595 48.3598C46.7395 38.7598 52.7195 30.5098 60.5495 30.5098C68.3795 30.5098 74.3695 38.7598 73.9395 48.3698L71.1795 110.47H49.9195L47.1595 48.3598Z" fill="#34A853" stroke="#34A853" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M25.0201 89.6102C21.7801 83.2002 20.2001 73.3802 25.8101 71.3002C33.2901 68.5302 40.4901 75.4802 43.5601 84.0002C46.4201 91.9502 52.4701 110.47 52.4701 110.47H36.2201L25.0201 89.6102Z" fill="#34A853" stroke="#34A853" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M63.4198 110.11L68.1298 44.45C68.1298 35.58 63.7898 30.5 61.0098 30.5C58.5198 30.5 53.2598 36.5 53.2598 44.45L54.8698 110.11" stroke="#3C4043" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M48.8001 110.11C48.8001 110.11 40.4801 88.6202 37.2701 82.1602C33.2501 74.0402 28.0001 70.0802 25.8101 71.3002C23.1701 72.7702 25.0701 79.0502 28.4701 85.9102C31.6901 92.4002 42.8701 110.11 42.8701 110.11" stroke="#3C4043" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M54.6295 141.08C71.5395 141.08 85.2395 127.37 85.2395 110.47H24.0195C24.0195 127.37 37.7195 141.08 54.6295 141.08Z" fill="#E8EAED" stroke="#E8EAED" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M284.4 141.49H18.5" stroke="#3C4043" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<mask id="path-17-inside-1_2084_59325" fill="white">
+<path d="M219.442 63.138V61.122C219.442 60.142 219.554 59.302 219.778 58.602C220.03 57.874 220.422 57.188 220.954 56.544C221.514 55.872 222.228 55.13 223.096 54.318C223.712 53.758 224.258 53.226 224.734 52.722C225.21 52.218 225.574 51.686 225.826 51.126C226.106 50.538 226.246 49.88 226.246 49.152C226.246 47.836 225.812 46.758 224.944 45.918C224.104 45.078 222.9 44.658 221.332 44.658C220.324 44.658 219.47 44.868 218.77 45.288C218.07 45.708 217.51 46.24 217.09 46.884C216.67 47.528 216.348 48.172 216.124 48.816L212.848 47.43C213.156 46.562 213.66 45.652 214.36 44.7C215.06 43.748 215.984 42.936 217.132 42.264C218.28 41.592 219.68 41.256 221.332 41.256C223.04 41.256 224.524 41.606 225.784 42.306C227.072 42.978 228.066 43.916 228.766 45.12C229.494 46.296 229.858 47.64 229.858 49.152C229.858 50.328 229.606 51.378 229.102 52.302C228.626 53.226 228.066 54.024 227.422 54.696C226.778 55.34 226.218 55.886 225.742 56.334C225.154 56.866 224.664 57.384 224.272 57.888C223.88 58.392 223.586 58.924 223.39 59.484C223.194 60.044 223.096 60.674 223.096 61.374V63.138H219.442ZM221.29 72.252C220.534 72.252 219.89 72 219.358 71.496C218.854 70.964 218.602 70.32 218.602 69.564C218.602 68.836 218.854 68.22 219.358 67.716C219.89 67.184 220.534 66.918 221.29 66.918C222.018 66.918 222.634 67.184 223.138 67.716C223.67 68.22 223.936 68.836 223.936 69.564C223.936 70.32 223.67 70.964 223.138 71.496C222.634 72 222.018 72.252 221.29 72.252Z"/>
+</mask>
+<path d="M219.442 63.138V61.122C219.442 60.142 219.554 59.302 219.778 58.602C220.03 57.874 220.422 57.188 220.954 56.544C221.514 55.872 222.228 55.13 223.096 54.318C223.712 53.758 224.258 53.226 224.734 52.722C225.21 52.218 225.574 51.686 225.826 51.126C226.106 50.538 226.246 49.88 226.246 49.152C226.246 47.836 225.812 46.758 224.944 45.918C224.104 45.078 222.9 44.658 221.332 44.658C220.324 44.658 219.47 44.868 218.77 45.288C218.07 45.708 217.51 46.24 217.09 46.884C216.67 47.528 216.348 48.172 216.124 48.816L212.848 47.43C213.156 46.562 213.66 45.652 214.36 44.7C215.06 43.748 215.984 42.936 217.132 42.264C218.28 41.592 219.68 41.256 221.332 41.256C223.04 41.256 224.524 41.606 225.784 42.306C227.072 42.978 228.066 43.916 228.766 45.12C229.494 46.296 229.858 47.64 229.858 49.152C229.858 50.328 229.606 51.378 229.102 52.302C228.626 53.226 228.066 54.024 227.422 54.696C226.778 55.34 226.218 55.886 225.742 56.334C225.154 56.866 224.664 57.384 224.272 57.888C223.88 58.392 223.586 58.924 223.39 59.484C223.194 60.044 223.096 60.674 223.096 61.374V63.138H219.442ZM221.29 72.252C220.534 72.252 219.89 72 219.358 71.496C218.854 70.964 218.602 70.32 218.602 69.564C218.602 68.836 218.854 68.22 219.358 67.716C219.89 67.184 220.534 66.918 221.29 66.918C222.018 66.918 222.634 67.184 223.138 67.716C223.67 68.22 223.936 68.836 223.936 69.564C223.936 70.32 223.67 70.964 223.138 71.496C222.634 72 222.018 72.252 221.29 72.252Z" fill="white"/>
+<path d="M219.442 63.138H218.792V63.788H219.442V63.138ZM219.778 58.602L219.164 58.3894L219.161 58.3966L219.159 58.4039L219.778 58.602ZM220.954 56.544L220.455 56.1279L220.453 56.13L220.954 56.544ZM223.096 54.318L222.659 53.837L222.652 53.8433L223.096 54.318ZM224.734 52.722L225.207 53.1683H225.207L224.734 52.722ZM225.826 51.126L225.239 50.8465L225.233 50.8593L225.826 51.126ZM224.944 45.918L224.484 46.3777L224.492 46.3851L224.944 45.918ZM218.77 45.288L218.436 44.7306L218.436 44.7306L218.77 45.288ZM216.124 48.816L215.871 49.4146L216.51 49.6851L216.738 49.0295L216.124 48.816ZM212.848 47.43L212.235 47.2126L212.031 47.7899L212.595 48.0286L212.848 47.43ZM214.36 44.7L214.884 45.0851V45.0851L214.36 44.7ZM217.132 42.264L217.46 42.825L217.46 42.825L217.132 42.264ZM225.784 42.306L225.468 42.8742L225.476 42.8783L225.483 42.8823L225.784 42.306ZM228.766 45.12L228.204 45.4467L228.209 45.4545L228.213 45.4621L228.766 45.12ZM229.102 52.302L228.531 51.9907L228.528 51.9975L228.524 52.0043L229.102 52.302ZM227.422 54.696L227.882 55.1557L227.891 55.1457L227.422 54.696ZM225.742 56.334L226.178 56.8161L226.187 56.8073L225.742 56.334ZM224.272 57.888L223.759 57.4889L224.272 57.888ZM223.39 59.484L224.004 59.6987L223.39 59.484ZM223.096 63.138V63.788H223.746V63.138H223.096ZM219.358 71.496L218.886 71.943L218.898 71.9558L218.911 71.9679L219.358 71.496ZM219.358 67.716L219.818 68.1756L219.358 67.716ZM223.138 67.716L222.666 68.163L222.678 68.1758L222.691 68.1879L223.138 67.716ZM223.138 71.496L222.678 71.0364L223.138 71.496ZM220.092 63.138V61.122H218.792V63.138H220.092ZM220.092 61.122C220.092 60.1883 220.199 59.4188 220.397 58.8001L219.159 58.4039C218.909 59.1852 218.792 60.0957 218.792 61.122H220.092ZM220.392 58.8146C220.617 58.1659 220.968 57.5472 221.455 56.958L220.453 56.13C219.876 56.8288 219.443 57.5821 219.164 58.3894L220.392 58.8146ZM221.453 56.9601C221.991 56.3146 222.685 55.5923 223.54 54.7927L222.652 53.8433C221.771 54.6677 221.037 55.4294 220.455 56.1279L221.453 56.9601ZM223.533 54.799C224.159 54.23 224.717 53.6864 225.207 53.1683L224.261 52.2757C223.799 52.7656 223.265 53.286 222.659 53.837L223.533 54.799ZM225.207 53.1683C225.726 52.6183 226.133 52.0268 226.419 51.3927L225.233 50.8593C225.015 51.3452 224.694 51.8177 224.261 52.2757L225.207 53.1683ZM226.413 51.4055C226.739 50.7204 226.896 49.9652 226.896 49.152H225.596C225.596 49.7948 225.473 50.3556 225.239 50.8465L226.413 51.4055ZM226.896 49.152C226.896 47.6774 226.403 46.425 225.396 45.4509L224.492 46.3851C225.221 47.091 225.596 47.9946 225.596 49.152H226.896ZM225.404 45.4584C224.406 44.4613 223.015 44.008 221.332 44.008V45.308C222.785 45.308 223.802 45.6947 224.484 46.3776L225.404 45.4584ZM221.332 44.008C220.234 44.008 219.258 44.2373 218.436 44.7306L219.104 45.8454C219.682 45.4987 220.414 45.308 221.332 45.308V44.008ZM218.436 44.7306C217.656 45.1981 217.023 45.7974 216.546 46.5289L217.634 47.2391C217.997 46.6826 218.484 46.2179 219.104 45.8454L218.436 44.7306ZM216.546 46.5289C216.1 47.2116 215.753 47.9028 215.51 48.6025L216.738 49.0295C216.943 48.4412 217.24 47.8444 217.634 47.2391L216.546 46.5289ZM216.377 48.2174L213.101 46.8314L212.595 48.0286L215.871 49.4146L216.377 48.2174ZM213.461 47.6474C213.742 46.8535 214.211 45.9995 214.884 45.0851L213.836 44.3149C213.109 45.3045 212.57 46.2705 212.235 47.2126L213.461 47.6474ZM214.884 45.0851C215.525 44.2128 216.379 43.4579 217.46 42.825L216.804 41.703C215.589 42.4141 214.595 43.2832 213.836 44.3149L214.884 45.0851ZM217.46 42.825C218.487 42.2238 219.768 41.906 221.332 41.906V40.606C219.592 40.606 218.073 40.9602 216.804 41.703L217.46 42.825ZM221.332 41.906C222.95 41.906 224.321 42.237 225.468 42.8742L226.1 41.7378C224.727 40.975 223.13 40.606 221.332 40.606V41.906ZM225.483 42.8823C226.667 43.5 227.569 44.3536 228.204 45.4467L229.328 44.7933C228.563 43.4784 227.477 42.456 226.085 41.7297L225.483 42.8823ZM228.213 45.4621C228.872 46.5259 229.208 47.7492 229.208 49.152H230.508C230.508 47.5308 230.116 46.0661 229.319 44.7779L228.213 45.4621ZM229.208 49.152C229.208 50.2322 228.977 51.173 228.531 51.9907L229.673 52.6133C230.235 51.583 230.508 50.4238 230.508 49.152H229.208ZM228.524 52.0043C228.074 52.8791 227.549 53.6244 226.953 54.2463L227.891 55.1457C228.583 54.4236 229.178 53.5729 229.68 52.5997L228.524 52.0043ZM226.962 54.2364C226.321 54.8774 225.766 55.4185 225.297 55.8607L226.187 56.8073C226.67 56.3535 227.235 55.8026 227.882 55.1556L226.962 54.2364ZM225.306 55.852C224.696 56.4036 224.179 56.949 223.759 57.4889L224.785 58.2871C225.149 57.819 225.612 57.3284 226.178 56.816L225.306 55.852ZM223.759 57.4889C223.327 58.0443 222.997 58.6379 222.776 59.2693L224.004 59.6987C224.175 59.2101 224.433 58.7397 224.785 58.2871L223.759 57.4889ZM222.776 59.2693C222.552 59.9094 222.446 60.6137 222.446 61.374H223.746C223.746 60.7343 223.836 60.1786 224.004 59.6987L222.776 59.2693ZM222.446 61.374V63.138H223.746V61.374H222.446ZM223.096 62.488H219.442V63.788H223.096V62.488ZM221.29 71.602C220.694 71.602 220.212 71.4098 219.805 71.0241L218.911 71.9679C219.568 72.5902 220.374 72.902 221.29 72.902V71.602ZM219.83 71.049C219.444 70.6419 219.252 70.1595 219.252 69.564H217.952C217.952 70.4805 218.264 71.2861 218.886 71.943L219.83 71.049ZM219.252 69.564C219.252 69.0043 219.438 68.5548 219.818 68.1756L218.898 67.2564C218.27 67.8852 217.952 68.6677 217.952 69.564H219.252ZM219.818 68.1756C220.227 67.7662 220.705 67.568 221.29 67.568V66.268C220.363 66.268 219.553 66.6018 218.898 67.2564L219.818 68.1756ZM221.29 67.568C221.838 67.568 222.284 67.7596 222.666 68.163L223.61 67.269C222.984 66.6084 222.198 66.268 221.29 66.268V67.568ZM222.691 68.1879C223.094 68.57 223.286 69.0158 223.286 69.564H224.586C224.586 68.6562 224.246 67.87 223.585 67.2441L222.691 68.1879ZM223.286 69.564C223.286 70.1485 223.088 70.6269 222.678 71.0364L223.598 71.9556C224.252 71.3011 224.586 70.4915 224.586 69.564H223.286ZM222.678 71.0364C222.299 71.4156 221.85 71.602 221.29 71.602V72.902C222.186 72.902 222.969 72.5844 223.598 71.9556L222.678 71.0364Z" fill="#4285F4" mask="url(#path-17-inside-1_2084_59325)"/>
+</svg>
diff --git a/modules/ui/src/index.html b/modules/ui/src/index.html
index 666c51bba..37521c779 100644
--- a/modules/ui/src/index.html
+++ b/modules/ui/src/index.html
@@ -15,23 +15,34 @@
 -->
 <!doctype html>
 <html lang="en">
-<head>
-  <!-- Google tag (gtag.js) -->
-  <script async src="https://www.googletagmanager.com/gtag/js?id=G-XCDFEHN64Z"></script>
-  <script> window.dataLayer = window.dataLayer || []; function gtag(){dataLayer.push(arguments);} gtag('js', new Date()); gtag('config', 'G-XCDFEHN64Z'); </script>
-  <meta charset="utf-8">
-  <title>Testrun</title>
-  <base href="/">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="icon" type="image/x-icon" href="favicon.ico">
-  <link rel="preconnect" href="https://fonts.googleapis.com">
-  <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-  <link
-    href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;500&family=Roboto&display=swap"
-    rel="stylesheet">
-  <link href="https://fonts.googleapis.com/icon?family=Material+Icons|Material+Icons+Outlined" rel="stylesheet">
-</head>
-<body class="mat-typography">
-<app-root></app-root>
-</body>
+  <head>
+    <!-- Google tag (gtag.js) -->
+    <script
+      async
+      src="https://www.googletagmanager.com/gtag/js?id=G-XCDFEHN64Z"></script>
+    <script>
+      window.dataLayer = window.dataLayer || [];
+      function gtag() {
+        dataLayer.push(arguments);
+      }
+      gtag('js', new Date());
+      gtag('config', 'G-XCDFEHN64Z');
+    </script>
+    <meta charset="utf-8" />
+    <title>Testrun</title>
+    <base href="/" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <link rel="icon" type="image/x-icon" href="favicon.ico" />
+    <link rel="preconnect" href="https://fonts.googleapis.com" />
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+    <link
+      href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;500&family=Roboto&display=swap"
+      rel="stylesheet" />
+    <link
+      href="https://fonts.googleapis.com/icon?family=Material+Icons|Material+Icons+Outlined"
+      rel="stylesheet" />
+  </head>
+  <body class="mat-typography">
+    <app-root></app-root>
+  </body>
 </html>
diff --git a/modules/ui/src/main.ts b/modules/ui/src/main.ts
index e684414d0..012267c2c 100644
--- a/modules/ui/src/main.ts
+++ b/modules/ui/src/main.ts
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
-import {AppModule} from './app/app.module';
+import { AppModule } from './app/app.module';
 
 platformBrowserDynamic()
   .bootstrapModule(AppModule)
-  .catch((err) => console.error(err));
+  .catch(err => console.error(err));
diff --git a/modules/ui/src/styles.scss b/modules/ui/src/styles.scss
index 3d4c65367..189d5b43d 100644
--- a/modules/ui/src/styles.scss
+++ b/modules/ui/src/styles.scss
@@ -16,7 +16,8 @@
 @use '@angular/material' as mat;
 @import './theming/theme';
 
-html, body {
+html,
+body {
   height: 100%;
 }
 
@@ -25,6 +26,21 @@ body {
   font-family: 'Open Sans', sans-serif;
 }
 
+/* Custom Scroollbar */
+::-webkit-scrollbar {
+  width: 4px;
+  height: 4px;
+}
+
+::-webkit-scrollbar-thumb {
+  background: $secondary;
+  border-radius: 8px;
+}
+
+::-webkit-scrollbar-thumb:hover {
+  background: $dark-grey;
+}
+
 .app-sidebar-button-active .mat-icon path {
   fill: $white;
 }
@@ -34,7 +50,8 @@ body {
   border-radius: inherit;
 }
 
-.device-form-dialog, .initiate-test-run-dialog {
+.device-form-dialog,
+.initiate-test-run-dialog {
   max-height: 100vh;
 }
 
@@ -67,10 +84,38 @@ mat-hint {
 }
 
 .mdc-radio__native-control:focus:not(:focus-visible) ~ .mat-mdc-focus-indicator,
-.mdc-checkbox__native-control:focus:not(:focus-visible) ~ .mat-mdc-focus-indicator {
+.mdc-checkbox__native-control:focus:not(:focus-visible)
+  ~ .mat-mdc-focus-indicator {
   display: none;
 }
 
+.mat-sort-header-container.mat-focus-indicator:focus::before {
+  content: none;
+}
+
+.app-sidebar-button {
+  .mdc-button__label {
+    position: relative;
+    left: -999px;
+  }
+}
+
+.active-menu {
+  .app-sidebar-button {
+    .mdc-button__label {
+      left: 0;
+    }
+  }
+
+  .app-sidebar-button-active .mat-icon path {
+    fill: $grey-800;
+  }
+}
+
+.filter-button.active .filter-icon path {
+  fill: mat.get-color-from-palette($color-primary, 600);
+}
+
 .table-cell-result-text {
   margin: 0;
   padding: 4px;
@@ -78,6 +123,7 @@ mat-hint {
   font-size: 12px;
   line-height: 16px;
   letter-spacing: 0.3px;
+  white-space: nowrap;
 
   &.green {
     background: $green-50;
@@ -109,7 +155,54 @@ h2.title {
   letter-spacing: 0;
 }
 
+.message-link {
+  color: mat.get-color-from-palette($color-primary, 700);
+  text-decoration: none;
+  cursor: pointer;
+}
+
+.message-link:hover {
+  color: mat.get-color-from-palette($color-primary, 800);
+}
+
 .mat-mdc-snack-bar-container {
   --mat-snack-bar-button-color: #ffffff;
   --mdc-snackbar-supporting-text-color: #ffffff;
 }
+
+body:has(.initiate-test-run-dialog)
+  app-root
+  app-spinner.connection-settings-spinner,
+body:has(.device-form-dialog) app-root app-spinner.connection-settings-spinner {
+  display: none;
+}
+
+body:has(app-spinner:not(.global-spiner)) app-root app-spinner.global-spinner {
+  display: none;
+}
+
+body:has(.filter-dialog-content)
+  .cdk-overlay-backdrop.cdk-overlay-backdrop-showing {
+  opacity: 0;
+}
+
+body:has(app-callout .info)
+  app-device-repository:not(:has(.device-repository-content-empty)),
+body:has(app-callout .info) app-history:not(:has(.results-content-empty)),
+body:has(app-callout .info) app-progress:not(:has(.progress-content-empty)) {
+  margin-top: 96px;
+}
+
+.text-nowrap {
+  white-space: nowrap;
+}
+
+.history-content
+  [mat-sort-header].cdk-program-focused
+  .mat-sort-header-container {
+  border-bottom: none;
+}
+
+.filter-chip .mat-mdc-focus-indicator::before {
+  border: none;
+}
diff --git a/modules/ui/src/theming/colors.scss b/modules/ui/src/theming/colors.scss
index faf637429..db007cf16 100644
--- a/modules/ui/src/theming/colors.scss
+++ b/modules/ui/src/theming/colors.scss
@@ -15,32 +15,34 @@
  */
 $black: #000000;
 $white: #ffffff;
-$primary: #4285F4;
+$primary: #1967d2;
 $secondary: #5f6368;
-$accent: #008B00;
-$warn: #C5221F;
-$color-background-grey: #F8F9FA;
+$accent: #008b00;
+$warn: #c5221f;
+$color-background-grey: #f8f9fa;
 $dark-grey: #444746;
-$grey-700: #5F6368;
-$grey-800: #3C4043;
-$light-grey: #BDC1C6;
-$lighter-grey: #DADCE0;
-$green-50: #E6F4EA;
+$grey-700: #5f6368;
+$grey-800: #3c4043;
+$light-grey: #bdc1c6;
+$lighter-grey: #dadce0;
+$green-50: #e6f4ea;
 $green-800: #137333;
-$red-50: #FCE8E6;
-$red-700: #C5221F;
-$red-800: #B31412;
+$red-50: #fce8e6;
+$red-700: #c5221f;
+$red-800: #b31412;
+$orange-700: #a85d00;
+$yellow-50: #fef7e0;
 
 $color-primary: (
-  50: #E8F0FE,
+  50: #e8f0fe,
   100: #b9dafa,
   200: #8cc3f8,
   300: #5eacf4,
   400: #3b9bf3,
   500: $primary,
-  600: #1A73E8,
-  700: #1967D2,
-  800: #185ABC,
+  600: #1a73e8,
+  700: #1967d2,
+  800: #185abc,
   900: #143b9d,
   contrast: (
     50: $black,
@@ -52,33 +54,33 @@ $color-primary: (
     600: $white,
     700: $white,
     800: $white,
-    900: $white
-  )
+    900: $white,
+  ),
 );
 
 $color-blue-light: (
-  50 : #fcfdff,
-  100 : #f8fbff,
-  200 : #f4f8ff,
-  300 : #eff5fe,
-  400 : #ebf2fe,
-  500 : #e8f0fe,
-  600 : #e5eefe,
-  700 : #e2ecfe,
-  800 : #dee9fe,
-  900 : #d8e5fd,
+  50: #fcfdff,
+  100: #f8fbff,
+  200: #f4f8ff,
+  300: #eff5fe,
+  400: #ebf2fe,
+  500: #e8f0fe,
+  600: #e5eefe,
+  700: #e2ecfe,
+  800: #dee9fe,
+  900: #d8e5fd,
   contrast: (
-    50 : $black,
-    100 : $black,
-    200 : $black,
-    300 : $black,
-    400 : $black,
-    500 : $black,
-    600 : $black,
-    700 : $black,
-    800 : $black,
-    900 : $black
-  )
+    50: $black,
+    100: $black,
+    200: $black,
+    300: $black,
+    400: $black,
+    500: $black,
+    600: $black,
+    700: $black,
+    800: $black,
+    900: $black,
+  ),
 );
 
 $color-secondary: (
@@ -102,13 +104,13 @@ $color-secondary: (
     600: $white,
     700: $white,
     800: $white,
-    900: $white
-  )
+    900: $white,
+  ),
 );
 
 $color-accent: (
   50: #e6f5e5,
-  100: #CEEAD6,
+  100: #ceead6,
   200: #9cd494,
   300: #72c568,
   400: #4fb846,
@@ -127,8 +129,8 @@ $color-accent: (
     600: $white,
     700: $white,
     800: $white,
-    900: $white
-  )
+    900: $white,
+  ),
 );
 
 $color-warn: (
@@ -139,7 +141,7 @@ $color-warn: (
   400: #ee4f48,
   500: $warn,
   600: #e4342c,
-  700: #C5221F,
+  700: #c5221f,
   800: #b61312,
   900: #b61312,
   contrast: (
@@ -152,6 +154,6 @@ $color-warn: (
     600: $white,
     700: $white,
     800: $white,
-    900: $white
-  )
+    900: $white,
+  ),
 );
diff --git a/modules/ui/src/theming/theme.scss b/modules/ui/src/theming/theme.scss
index ed5eed964..27880951a 100644
--- a/modules/ui/src/theming/theme.scss
+++ b/modules/ui/src/theming/theme.scss
@@ -15,13 +15,14 @@
  */
 @use '@angular/material' as mat;
 @import url('https://fonts.googleapis.com/css2?family=Open+Sans&display=swap');
-@import "colors";
+@import 'colors';
 
 @include mat.core();
-@include mat.strong-focus-indicators((
-  border-width: 2px,
-));
-
+@include mat.strong-focus-indicators(
+  (
+    border-width: 2px,
+  )
+);
 
 $app-primary: mat.define-palette($color-primary);
 $app-accent: mat.define-palette($color-accent);
@@ -30,39 +31,46 @@ $app-secondary: mat.define-palette($color-secondary);
 $app-blue-light-palette: mat.define-palette($color-blue-light);
 
 $app-typography: mat.define-typography-config(
-  $font-family: 'Open Sans'
+  $font-family: 'Open Sans',
 );
 
-$brand-light-theme: mat.define-light-theme((
-  color: (
-    primary: $app-primary,
-    accent: $app-accent,
-    warn: $app-warn,
-  ),
-  typography: $app-typography,
-  density: 0,
-));
+$brand-light-theme: mat.define-light-theme(
+  (
+    color: (
+      primary: $app-primary,
+      accent: $app-accent,
+      warn: $app-warn,
+    ),
+    typography: $app-typography,
+    density: 0,
+  )
+);
 
-$brand-light-theme-secondary: mat.define-light-theme((
-  color: (
-    primary: $app-primary,
-    accent: $app-secondary,
-    warn: $app-warn,
-  ),
-  typography: $app-typography,
-  density: 0,
-));
+$brand-light-theme-secondary: mat.define-light-theme(
+  (
+    color: (
+      primary: $app-primary,
+      accent: $app-secondary,
+      warn: $app-warn,
+    ),
+    typography: $app-typography,
+    density: 0,
+  )
+);
 
 @include mat.all-component-themes($brand-light-theme);
 @include mat.radio-color($brand-light-theme-secondary);
 @include mat.snack-bar-typography(
-    mat.define-typography-config(
-      $font-family: 'Roboto, sans-serif'
-    ));
+  mat.define-typography-config($font-family: 'Roboto, sans-serif')
+);
 @include mat.snack-bar-color($brand-light-theme-secondary);
 @include mat.checkbox-color($brand-light-theme-secondary);
-@include mat.progress-bar-color((color: (
-  primary: $app-blue-light-palette,
-  accent: $app-secondary,
-  warn: $app-warn,
-)));
+@include mat.progress-bar-color(
+  (
+    color: (
+      primary: $app-blue-light-palette,
+      accent: $app-secondary,
+      warn: $app-warn,
+    ),
+  )
+);
diff --git a/modules/ui/tsconfig.app.json b/modules/ui/tsconfig.app.json
index 374cc9d29..84f1f992d 100644
--- a/modules/ui/tsconfig.app.json
+++ b/modules/ui/tsconfig.app.json
@@ -5,10 +5,6 @@
     "outDir": "./out-tsc/app",
     "types": []
   },
-  "files": [
-    "src/main.ts"
-  ],
-  "include": [
-    "src/**/*.d.ts"
-  ]
+  "files": ["src/main.ts"],
+  "include": ["src/**/*.d.ts"]
 }
diff --git a/modules/ui/tsconfig.json b/modules/ui/tsconfig.json
index ed966d43a..1301bf238 100644
--- a/modules/ui/tsconfig.json
+++ b/modules/ui/tsconfig.json
@@ -19,10 +19,7 @@
     "target": "ES2022",
     "module": "ES2022",
     "useDefineForClassFields": false,
-    "lib": [
-      "ES2022",
-      "dom"
-    ]
+    "lib": ["ES2022", "dom"]
   },
   "angularCompilerOptions": {
     "enableI18nLegacyMessageIdFormat": false,
diff --git a/modules/ui/tsconfig.spec.json b/modules/ui/tsconfig.spec.json
index be7e9da76..47e3dd755 100644
--- a/modules/ui/tsconfig.spec.json
+++ b/modules/ui/tsconfig.spec.json
@@ -3,12 +3,7 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "./out-tsc/spec",
-    "types": [
-      "jasmine"
-    ]
+    "types": ["jasmine"]
   },
-  "include": [
-    "src/**/*.spec.ts",
-    "src/**/*.d.ts"
-  ]
+  "include": ["src/**/*.spec.ts", "src/**/*.d.ts"]
 }
diff --git a/testing/api/test_api.py b/testing/api/test_api.py
index c92213ca3..c6368148c 100644
--- a/testing/api/test_api.py
+++ b/testing/api/test_api.py
@@ -196,8 +196,14 @@ def get_network_interfaces():
 
   uses /sys/class/net rather than inetfaces as test-run uses the latter
   """
+  ifaces = []
   path = Path("/sys/class/net")
-  return [i.stem for i in path.iterdir() if i.is_dir()]
+  for i in path.iterdir():
+    if not i.is_dir():
+      continue
+    if i.stem.startswith("en") or i.stem.startswith("eth"):
+      ifaces.append(i.stem)
+  return ifaces
 
 
 def local_delete_devices(path):
diff --git a/testing/device_configs/tester1/device_config.json b/testing/device_configs/tester1/device_config.json
index 1b63594ac..f9eeccb6a 100644
--- a/testing/device_configs/tester1/device_config.json
+++ b/testing/device_configs/tester1/device_config.json
@@ -13,7 +13,7 @@
       "enabled": true
     },
     "baseline": {
-      "enabled": false
+      "enabled": true
     },
     "nmap": {
       "enabled": true
diff --git a/testing/device_configs/tester2/device_config.json b/testing/device_configs/tester2/device_config.json
index 4526fa5d5..ccbc14585 100644
--- a/testing/device_configs/tester2/device_config.json
+++ b/testing/device_configs/tester2/device_config.json
@@ -4,7 +4,7 @@
   "mac_addr": "02:42:aa:00:00:02",
   "test_modules": {
     "dns": {
-      "enabled": false
+      "enabled": true
     },
     "connection": {
       "enabled": true
@@ -13,7 +13,7 @@
       "enabled": false
     },
     "baseline": {
-      "enabled": false
+      "enabled": true
     },
     "nmap": {
       "enabled": true
diff --git a/testing/tests/test_tests b/testing/tests/test_tests
index 7277d3e7f..9fad12d80 100755
--- a/testing/tests/test_tests
+++ b/testing/tests/test_tests
@@ -102,21 +102,20 @@ for tester in $TESTERS; do
     --name=$tester \
     ci_test_device1 $args
   
-wait $TPID
-#WAITING=600
-#for i in `seq 1 $WAITING`; do
-#  tail -1 $testrun_log
-#    if [[ -n $(fgrep "All tests complete" $testrun_log) ]]; then
-#        sleep 10
-#        kill -9 $TPID
-#    fi
-#
-#      if [[ ! -d /proc/$TPID ]]; then
-#          break
-#      fi
-#    
-#      sleep 1
-#  done
+  WAITING=600
+  for i in `seq 1 $WAITING`; do
+    tail -1 $testrun_log
+      if [[ -n $(fgrep "All tests complete" $testrun_log) ]]; then
+          sleep 10
+          sudo kill -9 $TPID
+      fi
+  
+      if [[ ! -d /proc/$TPID ]]; then
+          break
+      fi
+    
+      sleep 1
+    done
 
 
   # Following line indicates that tests are completed but wait till it exits

From 5abd7c54ea30358cf8430d5158085893c8493c35 Mon Sep 17 00:00:00 2001
From: jhughesbiot <50999916+jhughesbiot@users.noreply.github.com>
Date: Thu, 11 Jan 2024 12:44:25 -0700
Subject: [PATCH 02/11] Implement PR223 for clean merge into release (#225)

---
 modules/test/conn/python/requirements.txt     |   3 +-
 .../test/conn/python/src/connection_module.py | 131 ++++++++----------
 modules/test/conn/python/src/dhcp_util.py     |  67 ++++++---
 3 files changed, 110 insertions(+), 91 deletions(-)

diff --git a/modules/test/conn/python/requirements.txt b/modules/test/conn/python/requirements.txt
index c2275b3e0..7244e9e75 100644
--- a/modules/test/conn/python/requirements.txt
+++ b/modules/test/conn/python/requirements.txt
@@ -1,2 +1,3 @@
 pyOpenSSL
-scapy
\ No newline at end of file
+scapy
+python-dateutil
\ No newline at end of file
diff --git a/modules/test/conn/python/src/connection_module.py b/modules/test/conn/python/src/connection_module.py
index 3fc0e6765..9429541de 100644
--- a/modules/test/conn/python/src/connection_module.py
+++ b/modules/test/conn/python/src/connection_module.py
@@ -14,7 +14,6 @@
 """Connection test module"""
 import util
 import time
-import datetime
 import traceback
 from scapy.all import rdpcap, DHCP, Ether, IPv6, ICMPv6ND_NS
 from test_module import TestModule
@@ -85,7 +84,8 @@ def _connection_shared_address(self, config):
 
   def _connection_dhcp_address(self):
     LOGGER.info('Running connection.dhcp_address')
-    lease = self._dhcp_util.get_cur_lease(mac_address=self._device_mac, timeout=self._lease_wait_time_sec)
+    lease = self._dhcp_util.get_cur_lease(mac_address=self._device_mac,
+                                          timeout=self._lease_wait_time_sec)
     if lease is not None:
       if 'ip' in lease:
         ip_addr = lease['ip']
@@ -176,7 +176,7 @@ def _connection_target_ping(self):
       else:
         return False, 'Device does not respond to ping'
 
-  def _connection_ipaddr_ip_change(self,config):
+  def _connection_ipaddr_ip_change(self, config):
     result = None
     LOGGER.info('Running connection.ipaddr.ip_change')
     # Resolve the configured lease wait time
@@ -184,7 +184,8 @@ def _connection_ipaddr_ip_change(self,config):
       self._lease_wait_time_sec = config['lease_wait_time_sec']
 
     if self._dhcp_util.setup_single_dhcp_server():
-      lease = self._dhcp_util.get_cur_lease(mac_address=self._device_mac, timeout=self._lease_wait_time_sec)
+      lease = self._dhcp_util.get_cur_lease(mac_address=self._device_mac,
+                                            timeout=self._lease_wait_time_sec)
       if lease is not None:
         LOGGER.info('Current device lease resolved')
         LOGGER.debug(str(lease))
@@ -192,7 +193,8 @@ def _connection_ipaddr_ip_change(self,config):
         ip_address = '10.10.10.30'
         if self._dhcp_util.add_reserved_lease(lease['hostname'],
                                               lease['hw_addr'], ip_address):
-          self._dhcp_util.wait_for_lease_expire(lease)
+          self._dhcp_util.wait_for_lease_expire(lease,
+                                                self._lease_wait_time_sec)
           LOGGER.info('Checking device accepted new ip')
           for _ in range(5):
             LOGGER.info('Pinging device at IP: ' + ip_address)
@@ -216,12 +218,13 @@ def _connection_ipaddr_ip_change(self,config):
       self._dhcp_util.restore_failover_dhcp_server()
       LOGGER.info('Waiting 30 seconds for reserved lease to expire')
       time.sleep(30)
-      self._dhcp_util.get_cur_lease(mac_address=self._device_mac,timeout=self._lease_wait_time_sec)
+      self._dhcp_util.get_cur_lease(mac_address=self._device_mac,
+                                    timeout=self._lease_wait_time_sec)
     else:
       result = None, 'Failed to configure network for test'
     return result
 
-  def _connection_ipaddr_dhcp_failover(self,config):
+  def _connection_ipaddr_dhcp_failover(self, config):
     result = None
     LOGGER.info('Running connection.ipaddr.dhcp_failover')
 
@@ -235,17 +238,20 @@ def _connection_ipaddr_dhcp_failover(self,config):
     secondary_status = self._dhcp_util.get_dhcp_server_status(
         dhcp_server_primary=False)
     if primary_status and secondary_status:
-      lease = self._dhcp_util.get_cur_lease(mac_address=self._device_mac, timeout=self._lease_wait_time_sec)
+      lease = self._dhcp_util.get_cur_lease(mac_address=self._device_mac,
+                                            timeout=self._lease_wait_time_sec)
       if lease is not None:
         LOGGER.info('Current device lease resolved')
         if self._dhcp_util.is_lease_active(lease):
           # Shutdown the primary server
           if self._dhcp_util.stop_dhcp_server(dhcp_server_primary=True):
             # Wait until the current lease is expired
-            self._dhcp_util.wait_for_lease_expire(lease)
+            self._dhcp_util.wait_for_lease_expire(lease,
+                                                  self._lease_wait_time_sec)
             # Make sure the device has received a new lease from the
             # secondary server
-            if self._dhcp_util.get_cur_lease(mac_address=self._device_mac,timeout=self._lease_wait_time_sec):
+            if self._dhcp_util.get_cur_lease(mac_address=self._device_mac,
+                                             timeout=self._lease_wait_time_sec):
               if self._dhcp_util.is_lease_active(lease):
                 result = True, ('Secondary DHCP server lease confirmed active '
                                 'in device')
@@ -294,9 +300,8 @@ def _connection_ipv6_slaac(self):
     return result
 
   def _has_slaac_addres(self):
-    packet_capture = (rdpcap(STARTUP_CAPTURE_FILE)
-                      + rdpcap(MONITOR_CAPTURE_FILE)
-                      + rdpcap(DHCP_CAPTURE_FILE))
+    packet_capture = (rdpcap(STARTUP_CAPTURE_FILE) +
+                      rdpcap(MONITOR_CAPTURE_FILE) + rdpcap(DHCP_CAPTURE_FILE))
     sends_ipv6 = False
     for packet_number, packet in enumerate(packet_capture, start=1):
       if IPv6 in packet and packet.src == self._device_mac:
@@ -366,7 +371,8 @@ def setup_single_dhcp_server(self):
       if response.code == 200:
         LOGGER.info('Secondary DHCP server stopped')
         LOGGER.info('Configuring primary DHCP server')
-        # Move primary DHCP server from failover into a single DHCP server config
+        # Move primary DHCP server from failover into
+        # a single DHCP server config
         response = self.dhcp1_client.disable_failover()
         if response.code == 200:
           LOGGER.info('Primary DHCP server failover disabled')
@@ -410,7 +416,7 @@ def _run_subnet_test(self, config):
 
     # Resolve the configured lease wait time
     if 'lease_wait_time_sec' in config:
-      self._lease_wait_time_sec = config['lease_wait_time_sec']  
+      self._lease_wait_time_sec = config['lease_wait_time_sec']
 
     response = self.dhcp1_client.get_dhcp_range()
     cur_range = {}
@@ -428,12 +434,13 @@ def _run_subnet_test(self, config):
     dhcp_setup = self.setup_single_dhcp_server()
     if dhcp_setup[0]:
       LOGGER.info(dhcp_setup[1])
-      lease = self._dhcp_util.get_cur_lease(mac_address=self._device_mac, timeout=self._lease_wait_time_sec)
+      lease = self._dhcp_util.get_cur_lease(mac_address=self._device_mac,
+                                            timeout=self._lease_wait_time_sec)
       if lease is not None:
         if self._dhcp_util.is_lease_active(lease):
           results = self.test_subnets(ranges)
       else:
-        LOGGER.info("Failed to confirm a valid active lease for the device")
+        LOGGER.info('Failed to confirm a valid active lease for the device')
         return None, 'Failed to confirm a valid active lease for the device'
     else:
       LOGGER.error(dhcp_setup[1])
@@ -459,15 +466,18 @@ def _run_subnet_test(self, config):
       self.restore_failover_dhcp_server(cur_range)
 
       # Wait for the current lease to expire
-      self._wait_for_lease_expire(self._dhcp_util.get_cur_lease(
-          self._device_mac,timeout=self._lease_wait_time_sec))
+      lease = self._dhcp_util.get_cur_lease(mac_address=self._device_mac,
+                                            timeout=self._lease_wait_time_sec)
+      self._dhcp_util.wait_for_lease_expire(lease, self._lease_wait_time_sec)
 
       # Wait for a new lease to be provided before exiting test
       # to prevent other test modules from failing
       LOGGER.info('Checking for new lease')
       # Subnet changes tend to take longer to pick up so we'll allow
       # for twice the lease wait time
-      lease = self._dhcp_util.get_cur_lease(mac_address=self._device_mac,timeout=2*self._lease_wait_time_sec)
+      lease = self._dhcp_util.get_cur_lease(mac_address=self._device_mac,
+                                            timeout=2 *
+                                            self._lease_wait_time_sec)
       if lease is not None:
         LOGGER.info('Validating subnet for new lease...')
         in_range = self.is_ip_in_range(lease['ip'], cur_range['start'],
@@ -482,47 +492,28 @@ def _run_subnet_test(self, config):
     return final_result, final_result_details
 
   def _test_subnet(self, subnet, lease):
-    LOGGER.info("Testing subnet: " + str(subnet))
+    LOGGER.info('Testing subnet: ' + str(subnet))
     if self._change_subnet(subnet):
-      expiration = datetime.datetime.strptime(
-        lease['expires'], '%Y-%m-%d %H:%M:%S')
-      now_utc = datetime.datetime.now(
-        datetime.timezone.utc).replace(tzinfo=None)
-      time_to_expire = (expiration - now_utc).total_seconds()
-      LOGGER.debug('Time until lease expiration: ' + str(time_to_expire))
-      LOGGER.info('Waiting for current lease to expire: ' + str(expiration))
-      if time_to_expire > 0:
-        # Wait until the expiration time and add 5 seconds
-        time.sleep(time_to_expire + 5)
-        LOGGER.debug('Current lease expired. Checking for new lease')
-        LOGGER.debug('Checking for new lease')
-        # Subnet changes tend to take longer to pick up so we'll allow
-        # for twice the lease wait time
-        lease = self._dhcp_util.get_cur_lease(mac_address=self._device_mac,timeout=2*self._lease_wait_time_sec)
-        if lease is not None:
-          LOGGER.debug('New lease found: ' + str(lease))
-          LOGGER.debug('Validating subnet for new lease...')
-          in_range = self.is_ip_in_range(lease['ip'], subnet['start'],
-                                         subnet['end'])
-          LOGGER.info('Lease within subnet: ' + str(in_range))
-          return in_range
-        else:
-          LOGGER.info('Device did not receive lease in subnet')
-          return False
+      self._dhcp_util.wait_for_lease_expire(lease, self._lease_wait_time_sec)
+      LOGGER.debug('Checking for new lease')
+      # Subnet changes tend to take longer to pick up so we'll allow
+      # for twice the lease wait time
+      lease = self._dhcp_util.get_cur_lease(mac_address=self._device_mac,
+                                            timeout=2 *
+                                            self._lease_wait_time_sec)
+      if lease is not None:
+        LOGGER.debug('New lease found: ' + str(lease))
+        LOGGER.debug('Validating subnet for new lease...')
+        in_range = self.is_ip_in_range(lease['ip'], subnet['start'],
+                                       subnet['end'])
+        LOGGER.info('Lease within subnet: ' + str(in_range))
+        return in_range
+      else:
+        LOGGER.info('Device did not receive lease in subnet')
+        return False
     else:
       LOGGER.error('Failed to change subnet')
 
-  def _wait_for_lease_expire(self, lease):
-    expiration = datetime.datetime.strptime(
-      lease['expires'], '%Y-%m-%d %H:%M:%S')
-    time_to_expire = expiration - datetime.datetime.now()
-    LOGGER.info('Time until lease expiration: ' + str(time_to_expire))
-    LOGGER.info('Waiting for current lease to expire: ' + str(expiration))
-    if time_to_expire.total_seconds() > 0:
-      time.sleep(time_to_expire.total_seconds() +
-                 5)  # Wait until the expiration time and padd 5 seconds
-      LOGGER.info('Current lease expired.')
-
   def _change_subnet(self, subnet):
     LOGGER.info('Changing subnet to: ' + str(subnet))
     response = self.dhcp1_client.set_dhcp_range(subnet['start'], subnet['end'])
@@ -549,25 +540,25 @@ def test_subnets(self, subnets):
           result = self._test_subnet(subnet, lease)
           if result:
             result = {
-              'result':
-              True,
-              'details':
-              'Subnet ' + subnet['start'] + '-' + subnet['end'] + ' passed'
+                'result':
+                True,
+                'details':
+                'Subnet ' + subnet['start'] + '-' + subnet['end'] + ' passed'
             }
           else:
             result = {
-              'result':
-              False,
-              'details':
-              'Subnet ' + subnet['start'] + '-' + subnet['end'] + ' failed'
+                'result':
+                False,
+                'details':
+                'Subnet ' + subnet['start'] + '-' + subnet['end'] + ' failed'
             }
         else:
           result = {
-            'result':
-            None,
-            'details':
-            'Device does not have active lease, cannot test subnet change. ' +
-            'Subnet ' + subnet['start'] + '-' + subnet['end'] + ' skipped'
+              'result':
+              None,
+              'details':
+              'Device does not have active lease, cannot test subnet change. ' +
+              'Subnet ' + subnet['start'] + '-' + subnet['end'] + ' skipped'
           }
       except Exception as e:  # pylint: disable=W0718
         LOGGER.error('Subnet test failed: ' + str(e))
diff --git a/modules/test/conn/python/src/dhcp_util.py b/modules/test/conn/python/src/dhcp_util.py
index 6d063d62a..7dc543820 100644
--- a/modules/test/conn/python/src/dhcp_util.py
+++ b/modules/test/conn/python/src/dhcp_util.py
@@ -17,6 +17,7 @@
 import time
 from datetime import datetime
 import util
+from dateutil import tz
 
 LOG_NAME = 'dhcp_util'
 LOGGER = None
@@ -125,17 +126,22 @@ def get_cur_lease(self, mac_address, timeout):
       Retrieve the current lease for a given MAC address with retries.
 
       Args:
-          mac_address (str): The MAC address of the client whose lease is being queried.
-          timeout (int): The maximum time (in seconds) to wait for a lease to be found.
+          mac_address (str): The MAC address of the client whose 
+                             lease is being queried.
+          timeout (int): The maximum time (in seconds) to wait 
+                         for a lease to be found.
 
       Returns:
-          str or None: The lease information as a string if found, or None if no lease is found within the timeout.
+          str or None: The lease information as a string if found, 
+                       or None if no lease is found within the timeout.
 
       Note:
-          This method will attempt to query both primary and secondary DHCP servers for the lease,
-          with a 5-second pause between retries until the `timeout` is reached.
+          This method will attempt to query both primary and secondary 
+          DHCP servers for the lease, with a 5-second pause between 
+          retries until the `timeout` is reached.
       """
-    LOGGER.info('Resolving current lease with max wait time of ' + str(timeout) + ' seconds')
+    LOGGER.info('Resolving current lease with max wait time of ' +
+                str(timeout) + ' seconds')
     start_time = time.time()
 
     while True:
@@ -146,24 +152,27 @@ def get_cur_lease(self, mac_address, timeout):
 
   def _get_cur_lease(self, mac_address):
     """
-    Retrieve the current lease for a given MAC address from both primary and secondary DHCP servers.
+    Retrieve the current lease for a given MAC address from both
+    primary and secondary DHCP servers.
 
     Args:
-        mac_address (str): The MAC address of the client whose lease is being queried.
+        mac_address (str): The MAC address of the client whose
+                           lease is being queried.
 
     Returns:
-        str or None: The lease information as a string if found, or None if no lease is found.
+        str or None: The lease information as a string if found,
+                     or None if no lease is found.
     """
     primary = False
     lease = self._get_cur_lease_from_server(mac_address=mac_address,
                                             dhcp_server_primary=True)
     if lease is not None:
-      primary=True
+      primary = True
     else:
       lease = self._get_cur_lease_from_server(mac_address=mac_address,
                                               dhcp_server_primary=False)
     if lease is not None:
-      lease['primary']=primary
+      lease['primary'] = primary
       log_msg = 'DHCP lease resolved from '
       log_msg += 'primary' if lease['primary'] else 'secondary'
       log_msg += ' server'
@@ -176,7 +185,8 @@ def _get_cur_lease_from_server(self, mac_address, dhcp_server_primary=True):
     # Check if the server is online first, old lease files can still return
     # lease information that is no longer valid when a dhcp server is shutdown
     if self.get_dhcp_server_status(dhcp_server_primary):
-      response = self.get_dhcp_client(dhcp_server_primary).get_lease(mac_address)
+      response = self.get_dhcp_client(dhcp_server_primary).get_lease(
+          mac_address)
       if response.code == 200:
         lease_resp = eval(response.message)  # pylint: disable=W0123
         if lease_resp:  # Check if non-empty lease
@@ -245,12 +255,29 @@ def setup_single_dhcp_server(self):
       LOGGER.error('Failed to stop secondary DHCP server')
       return False
 
-  def wait_for_lease_expire(self, lease):
-    expiration = datetime.strptime(lease['expires'], '%Y-%m-%d %H:%M:%S')
-    time_to_expire = expiration - datetime.now()
-    LOGGER.info('Time until lease expiration: ' + str(time_to_expire))
+  def wait_for_lease_expire(self, lease, max_wait_time=30):
+    expiration_utc = datetime.strptime(lease['expires'], '%Y-%m-%d %H:%M:%S')
+    # lease information stored in UTC so we need to convert to local time
+    expiration = self.utc_to_local(expiration_utc)
+    time_to_expire = expiration - datetime.now(tz=tz.tzlocal())
+    # Wait until the expiration time and padd 5 seconds
+    # If wait time is longer than max_wait_time, only wait
+    # for the max wait time
+    wait_time = min(max_wait_time,
+                    time_to_expire.total_seconds() +
+                    5) if time_to_expire.total_seconds() > 0 else 0
+    LOGGER.info('Time until lease expiration: ' + str(wait_time))
     LOGGER.info('Waiting for current lease to expire: ' + str(expiration))
-    if time_to_expire.total_seconds() > 0:
-      time.sleep(time_to_expire.total_seconds() +
-                 5)  # Wait until the expiration time and padd 5 seconds
-      LOGGER.info('Current lease expired.')
+    if wait_time > 0:
+      time.sleep(wait_time)
+    LOGGER.info('Current lease expired.')
+
+  # Convert from a UTC datetime to the local time zone
+  def utc_to_local(self, utc_datetime):
+    # Set the time zone for the UTC datetime
+    utc = utc_datetime.replace(tzinfo=tz.tzutc())
+
+    # Convert to local time zone
+    local_datetime = utc.astimezone(tz.tzlocal())
+
+    return local_datetime
\ No newline at end of file

From 2a5d1271d5bcaf97107f642d683d7ba59fe3804f Mon Sep 17 00:00:00 2001
From: J Boddey <boddey@google.com>
Date: Tue, 16 Jan 2024 17:28:10 +0000
Subject: [PATCH 03/11] Add guide to identify network interfaces (#214)

* Update docs

* Add reference to get started guide

* Update UI

* Increment version
---
 cmd/package                                   |    2 +-
 docs/get_started.md                           |    7 +-
 docs/network/README.md                        |    5 +-
 docs/network/identify_interfaces.md           |   18 +
 framework/python/src/api/api.py               |   11 +-
 framework/python/src/common/testreport.py     |    2 +-
 make/DEBIAN/control                           |    2 +-
 modules/ui/package-lock.json                  | 1248 ++++-------------
 modules/ui/package.json                       |   36 +-
 modules/ui/src/app/app-routing.module.ts      |    3 +
 modules/ui/src/app/app.component.html         |   17 +-
 modules/ui/src/app/app.component.scss         |   10 +-
 modules/ui/src/app/app.component.spec.ts      |  320 +++--
 modules/ui/src/app/app.component.ts           |   18 +-
 .../bypass/bypass.component.spec.ts           |   10 +-
 .../app/components/bypass/bypass.component.ts |    9 +-
 .../components/callout/callout.component.scss |    2 +-
 .../delete-form/delete-form.component.html    |   14 +-
 .../delete-report.component.spec.ts           |    2 +
 .../delete-report/delete-report.component.ts  |   10 +-
 .../device-item/device-item.component.html    |    6 +-
 .../device-item/device-item.component.scss    |   12 +-
 .../filter-chips/filter-chips.component.html  |   33 +-
 .../filter-chips/filter-chips.component.scss  |   18 +-
 .../filter-dialog.component.html              |    9 +-
 .../general-settings.component.html           |  173 +--
 .../general-settings.component.scss           |   17 +-
 .../general-settings.component.spec.ts        |  112 +-
 .../general-settings.component.ts             |   28 +-
 .../components/spinner/spinner.component.scss |    2 +-
 .../update-dialog.component.html              |   11 +-
 .../components/version/version.component.html |    2 +-
 .../version/version.component.spec.ts         |    2 +
 .../components/version/version.component.ts   |   43 +-
 .../device-form/device-form.component.html    |    2 +-
 .../device-form/device-form.component.scss    |    8 +-
 .../device-form/device-form.component.spec.ts |   27 +-
 .../device-form/device-form.component.ts      |   14 +-
 .../device-form/device.validators.ts          |    2 +-
 .../device-repository.component.html          |    1 +
 .../device-repository.component.spec.ts       |  119 +-
 .../device-repository.component.ts            |   40 +-
 .../ui/src/app/history/history.component.html |   13 +-
 .../ui/src/app/history/history.component.scss |    2 +-
 .../src/app/history/history.component.spec.ts |   62 +
 .../ui/src/app/history/history.component.ts   |   36 +-
 .../event-type.ts}                            |   14 +-
 .../progress-breadcrumbs.component.html       |   26 -
 .../progress-breadcrumbs.component.scss       |   67 -
 .../progress-breadcrumbs.component.spec.ts    |   38 -
 .../progress-initiate-form.component.spec.ts  |    9 +
 .../progress-initiate-form.component.ts       |    1 +
 .../progress-status-card.component.scss       |    4 +-
 .../progress-table.component.html             |    6 +-
 .../src/app/progress/progress.component.html  |    8 +-
 .../src/app/progress/progress.component.scss  |    8 +-
 .../app/progress/progress.component.spec.ts   |   82 +-
 .../ui/src/app/progress/progress.component.ts |   58 +-
 .../ui/src/app/progress/progress.module.ts    |    2 -
 .../ui/src/app/services/state.service.spec.ts |   39 +
 modules/ui/src/app/services/state.service.ts  |   17 +
 .../src/app/services/test-run.service.spec.ts |   98 +-
 .../ui/src/app/services/test-run.service.ts   |   48 +-
 modules/ui/src/index.html                     |   23 +
 modules/ui/src/theming/theme.scss             |    2 +-
 65 files changed, 1386 insertions(+), 1704 deletions(-)
 create mode 100644 docs/network/identify_interfaces.md
 rename modules/ui/src/app/{progress/progress-breadcrumbs/progress-breadcrumbs.component.ts => model/event-type.ts} (57%)
 delete mode 100644 modules/ui/src/app/progress/progress-breadcrumbs/progress-breadcrumbs.component.html
 delete mode 100644 modules/ui/src/app/progress/progress-breadcrumbs/progress-breadcrumbs.component.scss
 delete mode 100644 modules/ui/src/app/progress/progress-breadcrumbs/progress-breadcrumbs.component.spec.ts
 create mode 100644 modules/ui/src/app/services/state.service.spec.ts
 create mode 100644 modules/ui/src/app/services/state.service.ts

diff --git a/cmd/package b/cmd/package
index 87e66d977..cb81c1592 100755
--- a/cmd/package
+++ b/cmd/package
@@ -53,4 +53,4 @@ cp -r {framework,modules} $MAKE_SRC_DIR/usr/local/testrun
 dpkg-deb --build --root-owner-group make
 
 # Rename the .deb file
-mv make.deb testrun_1-1_amd64.deb
+mv make.deb testrun_1-1-1-alpha_amd64.deb
diff --git a/docs/get_started.md b/docs/get_started.md
index 70215ac62..b7165d930 100644
--- a/docs/get_started.md
+++ b/docs/get_started.md
@@ -49,9 +49,10 @@ However, to achieve a compliant test outcome, your device must be configured cor
    - Connect one USB Ethernet adapter to the internet source (e.g., router or switch) using an ethernet cable.
    - Connect the other USB Ethernet adapter directly to the IoT device you want to test using an ethernet cable.
 
-   **NOTE: The device under test should be powered off until prompted**
-
-   **NOTE: Both adapters should be disabled in the host system (IPv4, IPv6 and general). You can do this by going to Settings > Network** 
+  Some things to remember:
+  - The device under test should be powered off until prompted
+  - Both adapters should be disabled in the host system (IPv4, IPv6 and general). You can do this by going to Settings > Network
+  - Struggling to identify the correct interfaces? See [this guide](network/identify_interfaces.md).
 
 2. Start Testrun.
 
diff --git a/docs/network/README.md b/docs/network/README.md
index 2d66d3e6a..601ed1349 100644
--- a/docs/network/README.md
+++ b/docs/network/README.md
@@ -2,8 +2,9 @@
 
 ## Table of Contents
 1) Network Overview (this page)
-2) [Addresses](addresses.md)
-3) [Add a new network service](add_new_service.md)
+2) [How to identify network interfaces](identify_interfaces.md)
+3) [Addresses](addresses.md)
+4) [Add a new network service](add_new_service.md)
 
 Test Run provides several built-in network services that can be utilized for testing purposes. These services are already available and can be used without any additional configuration. 
 
diff --git a/docs/network/identify_interfaces.md b/docs/network/identify_interfaces.md
new file mode 100644
index 000000000..6baddb6ca
--- /dev/null
+++ b/docs/network/identify_interfaces.md
@@ -0,0 +1,18 @@
+# Identifying network interfaces
+
+For Testrun to operate correctly, you must select the correct network interfaces within the settings panel of the user interface. There are 2 methods to identify the correct network interfaces:
+
+A) Find the printed MAC address on your interface
+
+Some USB network interfaces will have the MAC address printed on the interface itself. This will look something like: ```00:e0:4c:02:0f:a8```.
+
+Compare this printed MAC address against the MAC address provided in the settings panel in the user interface.
+
+B) Connect your interfaces one at a time
+
+  1) Ensure both interfaces are disconnected from your PC and open the settings panel in the user interface.
+
+  2) Connect your internet interface to your PC and refresh the settings panel. One interface, which was not previously present, should now be visibile.
+
+  3) Repeat the previous step for the devices interface.
+
diff --git a/framework/python/src/api/api.py b/framework/python/src/api/api.py
index 305310e7e..8bfa9171c 100644
--- a/framework/python/src/api/api.py
+++ b/framework/python/src/api/api.py
@@ -111,14 +111,17 @@ def stop(self):
 
   async def get_sys_interfaces(self):
     addrs = psutil.net_if_addrs()
-    ifaces = []
-    for iface in addrs:
+    ifaces = {}
+
+    # pylint: disable=consider-using-dict-items
+    for key in addrs.keys():
+      nic = addrs[key]
 
       # Ignore any interfaces that are not ethernet
-      if not (iface.startswith("en") or iface.startswith("eth")):
+      if not (key.startswith("en") or key.startswith("eth")):
         continue
 
-      ifaces.append(iface)
+      ifaces[key] = nic[0].address
 
     return ifaces
 
diff --git a/framework/python/src/common/testreport.py b/framework/python/src/common/testreport.py
index 0ac4cb9a6..ae9f61526 100644
--- a/framework/python/src/common/testreport.py
+++ b/framework/python/src/common/testreport.py
@@ -182,7 +182,7 @@ def generate_pages(self, json_data):
 
   def generate_page(self, json_data, page_num, max_page):
     # Placeholder until available in json report
-    version = 'v1.1 (2023-12-15)'
+    version = 'v1.1.1-alpha (2024-01-16)'
     page = '<div class="page">'
     page += self.generate_header(json_data)
     if page_num == 1:
diff --git a/make/DEBIAN/control b/make/DEBIAN/control
index c5af91918..53e2dba2b 100644
--- a/make/DEBIAN/control
+++ b/make/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: Testrun
-Version: 1.1
+Version: 1.1.1-alpha
 Architecture: amd64
 Maintainer: Google <boddey@google.com>
 Homepage: https://github.com/google/testrun
diff --git a/modules/ui/package-lock.json b/modules/ui/package-lock.json
index 8e90d3a71..f5a5b5e2f 100644
--- a/modules/ui/package-lock.json
+++ b/modules/ui/package-lock.json
@@ -8,44 +8,44 @@
       "name": "test-run-ui",
       "version": "0.0.0",
       "dependencies": {
-        "@angular/animations": "^16.2.10",
-        "@angular/cdk": "^16.2.9",
-        "@angular/common": "^16.2.10",
-        "@angular/compiler": "^16.2.10",
-        "@angular/core": "^16.2.10",
-        "@angular/forms": "^16.2.10",
-        "@angular/material": "^16.2.9",
-        "@angular/platform-browser": "^16.2.10",
-        "@angular/platform-browser-dynamic": "^16.2.10",
-        "@angular/router": "^16.2.10",
-        "ngx-mask": "^16.3.9",
+        "@angular/animations": "^16.2.12",
+        "@angular/cdk": "^16.2.13",
+        "@angular/common": "^16.2.12",
+        "@angular/compiler": "^16.2.12",
+        "@angular/core": "^16.2.12",
+        "@angular/forms": "^16.2.12",
+        "@angular/material": "^16.2.13",
+        "@angular/platform-browser": "^16.2.12",
+        "@angular/platform-browser-dynamic": "^16.2.12",
+        "@angular/router": "^16.2.12",
+        "ngx-mask": "^16.4.2",
         "rxjs": "~7.8.0",
         "tslib": "^2.6.2",
         "zone.js": "~0.13.3"
       },
       "devDependencies": {
-        "@angular-devkit/build-angular": "^16.2.6",
+        "@angular-devkit/build-angular": "^16.2.11",
         "@angular-eslint/builder": "16.2.0",
         "@angular-eslint/eslint-plugin": "16.2.0",
         "@angular-eslint/eslint-plugin-template": "16.2.0",
         "@angular-eslint/schematics": "16.2.0",
         "@angular-eslint/template-parser": "16.2.0",
         "@angular/cli": "~16.1.8",
-        "@angular/compiler-cli": "^16.2.10",
+        "@angular/compiler-cli": "^16.2.12",
         "@types/jasmine": "~4.3.6",
         "@typescript-eslint/eslint-plugin": "5.62.0",
         "@typescript-eslint/parser": "5.62.0",
-        "eslint": "^8.49.0",
-        "eslint-config-prettier": "^9.0.0",
-        "eslint-plugin-prettier": "^5.0.1",
+        "eslint": "^8.56.0",
+        "eslint-config-prettier": "^9.1.0",
+        "eslint-plugin-prettier": "^5.1.3",
         "jasmine-core": "~4.6.0",
         "karma": "~6.4.0",
         "karma-chrome-launcher": "~3.2.0",
         "karma-coverage": "~2.2.0",
         "karma-jasmine": "~5.1.0",
         "karma-jasmine-html-reporter": "~2.1.0",
-        "prettier": "^3.0.3",
-        "prettier-eslint": "^16.1.1",
+        "prettier": "^3.1.1",
+        "prettier-eslint": "^16.2.0",
         "typescript": "~5.1.3"
       }
     },
@@ -72,12 +72,12 @@
       }
     },
     "node_modules/@angular-devkit/architect": {
-      "version": "0.1602.6",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1602.6.tgz",
-      "integrity": "sha512-b1NNV3yNg6Rt86ms20bJIroWUI8ihaEwv5k+EoijEXLoMs4eNs5PhqL+QE8rTj+q9pa1gSrWf2blXor2JGwf1g==",
+      "version": "0.1602.11",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1602.11.tgz",
+      "integrity": "sha512-qC1tPL/82gxqCS1z9pTpLn5NQH6uqbV6UNjbkFEQpTwEyWEK6VLChAJsybHHfbpssPS2HWf31VoUzX7RqDjoQQ==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "16.2.6",
+        "@angular-devkit/core": "16.2.11",
         "rxjs": "7.8.1"
       },
       "engines": {
@@ -87,15 +87,15 @@
       }
     },
     "node_modules/@angular-devkit/build-angular": {
-      "version": "16.2.6",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-16.2.6.tgz",
-      "integrity": "sha512-QdU/q77K1P8CPEEZGxw1QqLcnA9ofboDWS7vcLRBmFmk2zydtLTApbK0P8GNDRbnmROOKkoaLo+xUTDJz9gvPA==",
+      "version": "16.2.11",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-16.2.11.tgz",
+      "integrity": "sha512-yNzUiAeg1WHMsFG9IBg4S/7dsMcEAMYQ1I360ib80c0T/IwRb8pHhOokrl5Mu8zfNqZ/dxH4ItKY1uIMDmuMGQ==",
       "dev": true,
       "dependencies": {
         "@ampproject/remapping": "2.2.1",
-        "@angular-devkit/architect": "0.1602.6",
-        "@angular-devkit/build-webpack": "0.1602.6",
-        "@angular-devkit/core": "16.2.6",
+        "@angular-devkit/architect": "0.1602.11",
+        "@angular-devkit/build-webpack": "0.1602.11",
+        "@angular-devkit/core": "16.2.11",
         "@babel/core": "7.22.9",
         "@babel/generator": "7.22.9",
         "@babel/helper-annotate-as-pure": "7.22.5",
@@ -107,7 +107,7 @@
         "@babel/runtime": "7.22.6",
         "@babel/template": "7.22.5",
         "@discoveryjs/json-ext": "0.5.7",
-        "@ngtools/webpack": "16.2.6",
+        "@ngtools/webpack": "16.2.11",
         "@vitejs/plugin-basic-ssl": "1.0.1",
         "ansi-colors": "4.1.3",
         "autoprefixer": "10.4.14",
@@ -150,7 +150,7 @@
         "text-table": "0.2.0",
         "tree-kill": "1.2.2",
         "tslib": "2.6.1",
-        "vite": "4.4.7",
+        "vite": "4.5.1",
         "webpack": "5.88.2",
         "webpack-dev-middleware": "6.1.1",
         "webpack-dev-server": "4.15.1",
@@ -215,12 +215,12 @@
       "dev": true
     },
     "node_modules/@angular-devkit/build-webpack": {
-      "version": "0.1602.6",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1602.6.tgz",
-      "integrity": "sha512-BJPR6xdq7gRJ6bVWnZ81xHyH75j7lyLbegCXbvUNaM8TWVBkwWsSdqr2NQ717dNLLn5umg58SFpU/pWMq6CxMQ==",
+      "version": "0.1602.11",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1602.11.tgz",
+      "integrity": "sha512-2Au6xRMxNugFkXP0LS1TwNE5gAfGW4g6yxC9P5j5p3kdGDnAVaZRTOKB9dg73i3uXtJHUMciYOThV0b78XRxwA==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/architect": "0.1602.6",
+        "@angular-devkit/architect": "0.1602.11",
         "rxjs": "7.8.1"
       },
       "engines": {
@@ -234,9 +234,9 @@
       }
     },
     "node_modules/@angular-devkit/core": {
-      "version": "16.2.6",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-16.2.6.tgz",
-      "integrity": "sha512-iez/8NYXQT6fqVQLlKmZUIRkFUEZ88ACKbTwD4lBmk0+hXW+bQBxI7JOnE3C4zkcM2YeuTXIYsC5SebTKYiR4Q==",
+      "version": "16.2.11",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-16.2.11.tgz",
+      "integrity": "sha512-u3cEQHqhSMWyAFIaPdRukCJwEUJt7Fy3C02gTlTeCB4F/OnftVFIm2e5vmCqMo9rgbfdvjWj9V+7wWiCpMrzAQ==",
       "dev": true,
       "dependencies": {
         "ajv": "8.12.0",
@@ -443,9 +443,9 @@
       }
     },
     "node_modules/@angular/animations": {
-      "version": "16.2.10",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-16.2.10.tgz",
-      "integrity": "sha512-UudunZoyFWWNpuWkwiBxC3cleLCVJGHIfMgypFwC35YjtiIlRJ0r4nVkc96Rq1xd4mT71Dbk1kQHc8urB8A7aw==",
+      "version": "16.2.12",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-16.2.12.tgz",
+      "integrity": "sha512-MD0ElviEfAJY8qMOd6/jjSSvtqER2RDAi0lxe6EtUacC1DHCYkaPrKW4vLqY+tmZBg1yf+6n+uS77pXcHHcA3w==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -453,13 +453,13 @@
         "node": "^16.14.0 || >=18.10.0"
       },
       "peerDependencies": {
-        "@angular/core": "16.2.10"
+        "@angular/core": "16.2.12"
       }
     },
     "node_modules/@angular/cdk": {
-      "version": "16.2.9",
-      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-16.2.9.tgz",
-      "integrity": "sha512-TrLV68YpddUx3t2rs8W29CPk8YkgNGA8PKHwjB4Xvo1yaEH5XUnsw3MQCh42Ee7FKseaqzFgG85USZXAK0IB0A==",
+      "version": "16.2.13",
+      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-16.2.13.tgz",
+      "integrity": "sha512-8kn2X2yesvgfIbCUNoS9EDjooIx9LwEglYBbD89Y/do8EeN/CC3Tn02gqSrEfgMhYBLBJmHXbfOhbDDvcvOCeg==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -581,9 +581,9 @@
       "dev": true
     },
     "node_modules/@angular/common": {
-      "version": "16.2.10",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-16.2.10.tgz",
-      "integrity": "sha512-cLth66aboInNcWFjDBRmK30jC5KN10nKDDcv4U/r3TDTBpKOtnmTjNFFr7dmjfUmVhHFy/66piBMfpjZI93Rxg==",
+      "version": "16.2.12",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-16.2.12.tgz",
+      "integrity": "sha512-B+WY/cT2VgEaz9HfJitBmgdk4I333XG/ybC98CMC4Wz8E49T8yzivmmxXB3OD6qvjcOB6ftuicl6WBqLbZNg2w==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -591,14 +591,14 @@
         "node": "^16.14.0 || >=18.10.0"
       },
       "peerDependencies": {
-        "@angular/core": "16.2.10",
+        "@angular/core": "16.2.12",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
     "node_modules/@angular/compiler": {
-      "version": "16.2.10",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-16.2.10.tgz",
-      "integrity": "sha512-ty6SfqkZlV2bLU/SSi3wmxrEFgPrK+WVslCNIr3FlTnCBdqpIbadHN2QB3A1d9XaNc7c4Tq5DQKh34cwMwNbuw==",
+      "version": "16.2.12",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-16.2.12.tgz",
+      "integrity": "sha512-6SMXUgSVekGM7R6l1Z9rCtUGtlg58GFmgbpMCsGf+VXxP468Njw8rjT2YZkf5aEPxEuRpSHhDYjqz7n14cwCXQ==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -606,7 +606,7 @@
         "node": "^16.14.0 || >=18.10.0"
       },
       "peerDependencies": {
-        "@angular/core": "16.2.10"
+        "@angular/core": "16.2.12"
       },
       "peerDependenciesMeta": {
         "@angular/core": {
@@ -615,9 +615,9 @@
       }
     },
     "node_modules/@angular/compiler-cli": {
-      "version": "16.2.10",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-16.2.10.tgz",
-      "integrity": "sha512-swgmtm4R23vQV9nJTXdDEFpOyIw3kz80mdT9qo3VId/2rqenOK253JsFypoqEj/fKzjV9gwXtTbmrMlhVyuyxw==",
+      "version": "16.2.12",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-16.2.12.tgz",
+      "integrity": "sha512-pWSrr152562ujh6lsFZR8NfNc5Ljj+zSTQO44DsuB0tZjwEpnRcjJEgzuhGXr+CoiBf+jTSPZKemtSktDk5aaA==",
       "dev": true,
       "dependencies": {
         "@babel/core": "7.23.2",
@@ -638,7 +638,7 @@
         "node": "^16.14.0 || >=18.10.0"
       },
       "peerDependencies": {
-        "@angular/compiler": "16.2.10",
+        "@angular/compiler": "16.2.12",
         "typescript": ">=4.9.3 <5.2"
       }
     },
@@ -688,12 +688,12 @@
       }
     },
     "node_modules/@angular/compiler-cli/node_modules/@babel/generator": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
-      "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz",
+      "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.23.0",
+        "@babel/types": "^7.23.6",
         "@jridgewell/gen-mapping": "^0.3.2",
         "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
@@ -717,9 +717,9 @@
       }
     },
     "node_modules/@angular/core": {
-      "version": "16.2.10",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-16.2.10.tgz",
-      "integrity": "sha512-0XTsPjNflFhOl2CfNEdGeDOklG2t+m/D3g10Y7hg9dBjC1dURUEqTmM4d6J7JNbBURrP+/iP7uLsn3WRSipGUw==",
+      "version": "16.2.12",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-16.2.12.tgz",
+      "integrity": "sha512-GLLlDeke/NjroaLYOks0uyzFVo6HyLl7VOm0K1QpLXnYvW63W9Ql/T3yguRZa7tRkOAeFZ3jw+1wnBD4O8MoUA==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -732,9 +732,9 @@
       }
     },
     "node_modules/@angular/forms": {
-      "version": "16.2.10",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-16.2.10.tgz",
-      "integrity": "sha512-TZliEtSWIL1UzY8kjed4QcMawWS8gk/H60KVgzCh83NGE0wd1OGv20Z5OR7O8j07dxB9vaxY7CQz/8eCz5KaNQ==",
+      "version": "16.2.12",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-16.2.12.tgz",
+      "integrity": "sha512-1Eao89hlBgLR3v8tU91vccn21BBKL06WWxl7zLpQmG6Hun+2jrThgOE4Pf3os4fkkbH4Apj0tWL2fNIWe/blbw==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -742,16 +742,16 @@
         "node": "^16.14.0 || >=18.10.0"
       },
       "peerDependencies": {
-        "@angular/common": "16.2.10",
-        "@angular/core": "16.2.10",
-        "@angular/platform-browser": "16.2.10",
+        "@angular/common": "16.2.12",
+        "@angular/core": "16.2.12",
+        "@angular/platform-browser": "16.2.12",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
     "node_modules/@angular/material": {
-      "version": "16.2.9",
-      "resolved": "https://registry.npmjs.org/@angular/material/-/material-16.2.9.tgz",
-      "integrity": "sha512-ppEVvB5+TAqYxEiWCOt56TJbKayuJXPO5gAIaoIgaj7a77A3iuJRBZD/TLldqUxqCI6T5pwuTVzdeDU4tTHGug==",
+      "version": "16.2.13",
+      "resolved": "https://registry.npmjs.org/@angular/material/-/material-16.2.13.tgz",
+      "integrity": "sha512-7gP9KlaVZGpCeJlwXlD7puTiafAHYAbgYoODEQLbPCiAL/woFFDvM+DCdos7lmCBMyt6+10bkrPvz8cVfyTfQg==",
       "dependencies": {
         "@material/animation": "15.0.0-canary.bc9ae6c9c.0",
         "@material/auto-init": "15.0.0-canary.bc9ae6c9c.0",
@@ -804,7 +804,7 @@
       },
       "peerDependencies": {
         "@angular/animations": "^16.0.0 || ^17.0.0",
-        "@angular/cdk": "16.2.9",
+        "@angular/cdk": "16.2.13",
         "@angular/common": "^16.0.0 || ^17.0.0",
         "@angular/core": "^16.0.0 || ^17.0.0",
         "@angular/forms": "^16.0.0 || ^17.0.0",
@@ -813,9 +813,9 @@
       }
     },
     "node_modules/@angular/platform-browser": {
-      "version": "16.2.10",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-16.2.10.tgz",
-      "integrity": "sha512-TOZiK7ji550F8G39Ri255NnK1+2Xlr74RiElJdQct4TzfN0lqNf2KRDFFNwDohkP/78FUzcP4qBxs+Nf8M7OuQ==",
+      "version": "16.2.12",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-16.2.12.tgz",
+      "integrity": "sha512-NnH7ju1iirmVEsUq432DTm0nZBGQsBrU40M3ZeVHMQ2subnGiyUs3QyzDz8+VWLL/T5xTxWLt9BkDn65vgzlIQ==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -823,9 +823,9 @@
         "node": "^16.14.0 || >=18.10.0"
       },
       "peerDependencies": {
-        "@angular/animations": "16.2.10",
-        "@angular/common": "16.2.10",
-        "@angular/core": "16.2.10"
+        "@angular/animations": "16.2.12",
+        "@angular/common": "16.2.12",
+        "@angular/core": "16.2.12"
       },
       "peerDependenciesMeta": {
         "@angular/animations": {
@@ -834,9 +834,9 @@
       }
     },
     "node_modules/@angular/platform-browser-dynamic": {
-      "version": "16.2.10",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-16.2.10.tgz",
-      "integrity": "sha512-YVmhAjOmsp2SWRonv6Mr/qXuKroCiew9asd1IlAZ//wqcml9ZrNAcX3WlDa8ZqdmOplQb0LuvvirfNB/6Is/jg==",
+      "version": "16.2.12",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-16.2.12.tgz",
+      "integrity": "sha512-ya54jerNgreCVAR278wZavwjrUWImMr2F8yM5n9HBvsMBbFaAQ83anwbOEiHEF2BlR+gJiEBLfpuPRMw20pHqw==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -844,16 +844,16 @@
         "node": "^16.14.0 || >=18.10.0"
       },
       "peerDependencies": {
-        "@angular/common": "16.2.10",
-        "@angular/compiler": "16.2.10",
-        "@angular/core": "16.2.10",
-        "@angular/platform-browser": "16.2.10"
+        "@angular/common": "16.2.12",
+        "@angular/compiler": "16.2.12",
+        "@angular/core": "16.2.12",
+        "@angular/platform-browser": "16.2.12"
       }
     },
     "node_modules/@angular/router": {
-      "version": "16.2.10",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-16.2.10.tgz",
-      "integrity": "sha512-ndiq2NkGZ8hTsyL/KK8qsiR3UA0NjOFIn1jtGXOKtHryXZ6vSTtkhtkE4h4+G6/QNTL1IKtocFhOQt/xsc7DUA==",
+      "version": "16.2.12",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-16.2.12.tgz",
+      "integrity": "sha512-aU6QnYSza005V9P3W6PpkieL56O0IHps96DjqI1RS8yOJUl3THmokqYN4Fm5+HXy4f390FN9i6ftadYQDKeWmA==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -861,9 +861,9 @@
         "node": "^16.14.0 || >=18.10.0"
       },
       "peerDependencies": {
-        "@angular/common": "16.2.10",
-        "@angular/core": "16.2.10",
-        "@angular/platform-browser": "16.2.10",
+        "@angular/common": "16.2.12",
+        "@angular/core": "16.2.12",
+        "@angular/platform-browser": "16.2.12",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
@@ -1255,9 +1255,9 @@
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
-      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
+      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
@@ -2667,12 +2667,12 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
-      "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.6.tgz",
+      "integrity": "sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-string-parser": "^7.22.5",
+        "@babel/helper-string-parser": "^7.23.4",
         "@babel/helper-validator-identifier": "^7.22.20",
         "to-fast-properties": "^2.0.0"
       },
@@ -2698,246 +2698,6 @@
         "node": ">=10.0.0"
       }
     },
-    "node_modules/@esbuild/android-arm": {
-      "version": "0.18.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.17.tgz",
-      "integrity": "sha512-wHsmJG/dnL3OkpAcwbgoBTTMHVi4Uyou3F5mf58ZtmUyIKfcdA7TROav/6tCzET4A3QW2Q2FC+eFneMU+iyOxg==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-arm64": {
-      "version": "0.18.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.17.tgz",
-      "integrity": "sha512-9np+YYdNDed5+Jgr1TdWBsozZ85U1Oa3xW0c7TWqH0y2aGghXtZsuT8nYRbzOMcl0bXZXjOGbksoTtVOlWrRZg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-x64": {
-      "version": "0.18.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.17.tgz",
-      "integrity": "sha512-O+FeWB/+xya0aLg23hHEM2E3hbfwZzjqumKMSIqcHbNvDa+dza2D0yLuymRBQQnC34CWrsJUXyH2MG5VnLd6uw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.18.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.17.tgz",
-      "integrity": "sha512-M9uJ9VSB1oli2BE/dJs3zVr9kcCBBsE883prage1NWz6pBS++1oNn/7soPNS3+1DGj0FrkSvnED4Bmlu1VAE9g==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/darwin-x64": {
-      "version": "0.18.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.17.tgz",
-      "integrity": "sha512-XDre+J5YeIJDMfp3n0279DFNrGCXlxOuGsWIkRb1NThMZ0BsrWXoTg23Jer7fEXQ9Ye5QjrvXpxnhzl3bHtk0g==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.18.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.17.tgz",
-      "integrity": "sha512-cjTzGa3QlNfERa0+ptykyxs5A6FEUQQF0MuilYXYBGdBxD3vxJcKnzDlhDCa1VAJCmAxed6mYhA2KaJIbtiNuQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.18.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.17.tgz",
-      "integrity": "sha512-sOxEvR8d7V7Kw8QqzxWc7bFfnWnGdaFBut1dRUYtu+EIRXefBc/eIsiUiShnW0hM3FmQ5Zf27suDuHsKgZ5QrA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-arm": {
-      "version": "0.18.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.17.tgz",
-      "integrity": "sha512-2d3Lw6wkwgSLC2fIvXKoMNGVaeY8qdN0IC3rfuVxJp89CRfA3e3VqWifGDfuakPmp90+ZirmTfye1n4ncjv2lg==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-arm64": {
-      "version": "0.18.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.17.tgz",
-      "integrity": "sha512-c9w3tE7qA3CYWjT+M3BMbwMt+0JYOp3vCMKgVBrCl1nwjAlOMYzEo+gG7QaZ9AtqZFj5MbUc885wuBBmu6aADQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-ia32": {
-      "version": "0.18.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.17.tgz",
-      "integrity": "sha512-1DS9F966pn5pPnqXYz16dQqWIB0dmDfAQZd6jSSpiT9eX1NzKh07J6VKR3AoXXXEk6CqZMojiVDSZi1SlmKVdg==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.18.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.17.tgz",
-      "integrity": "sha512-EvLsxCk6ZF0fpCB6w6eOI2Fc8KW5N6sHlIovNe8uOFObL2O+Mr0bflPHyHwLT6rwMg9r77WOAWb2FqCQrVnwFg==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.18.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.17.tgz",
-      "integrity": "sha512-e0bIdHA5p6l+lwqTE36NAW5hHtw2tNRmHlGBygZC14QObsA3bD4C6sXLJjvnDIjSKhW1/0S3eDy+QmX/uZWEYQ==",
-      "cpu": [
-        "mips64el"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.18.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.17.tgz",
-      "integrity": "sha512-BAAilJ0M5O2uMxHYGjFKn4nJKF6fNCdP1E0o5t5fvMYYzeIqy2JdAP88Az5LHt9qBoUa4tDaRpfWt21ep5/WqQ==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.18.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.17.tgz",
-      "integrity": "sha512-Wh/HW2MPnC3b8BqRSIme/9Zhab36PPH+3zam5pqGRH4pE+4xTrVLx2+XdGp6fVS3L2x+DrsIcsbMleex8fbE6g==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-s390x": {
-      "version": "0.18.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.17.tgz",
-      "integrity": "sha512-j/34jAl3ul3PNcK3pfI0NSlBANduT2UO5kZ7FCaK33XFv3chDhICLY8wJJWIhiQ+YNdQ9dxqQctRg2bvrMlYgg==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/@esbuild/linux-x64": {
       "version": "0.18.17",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.17.tgz",
@@ -2954,102 +2714,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.18.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.17.tgz",
-      "integrity": "sha512-/jGlhWR7Sj9JPZHzXyyMZ1RFMkNPjC6QIAan0sDOtIo2TYk3tZn5UDrkE0XgsTQCxWTTOcMPf9p6Rh2hXtl5TQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.18.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.17.tgz",
-      "integrity": "sha512-rSEeYaGgyGGf4qZM2NonMhMOP/5EHp4u9ehFiBrg7stH6BYEEjlkVREuDEcQ0LfIl53OXLxNbfuIj7mr5m29TA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/sunos-x64": {
-      "version": "0.18.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.17.tgz",
-      "integrity": "sha512-Y7ZBbkLqlSgn4+zot4KUNYst0bFoO68tRgI6mY2FIM+b7ZbyNVtNbDP5y8qlu4/knZZ73fgJDlXID+ohY5zt5g==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-arm64": {
-      "version": "0.18.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.17.tgz",
-      "integrity": "sha512-bwPmTJsEQcbZk26oYpc4c/8PvTY3J5/QK8jM19DVlEsAB41M39aWovWoHtNm78sd6ip6prilxeHosPADXtEJFw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-ia32": {
-      "version": "0.18.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.17.tgz",
-      "integrity": "sha512-H/XaPtPKli2MhW+3CQueo6Ni3Avggi6hP/YvgkEe1aSaxw+AeO8MFjq8DlgfTd9Iz4Yih3QCZI6YLMoyccnPRg==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-x64": {
-      "version": "0.18.17",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.17.tgz",
-      "integrity": "sha512-fGEb8f2BSA3CW7riJVurug65ACLuQAzKq0SSqkY2b2yHHH0MzDfbLyKIGzHwOI/gkHcxM/leuSW6D5w/LMNitA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/@eslint-community/eslint-utils": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
@@ -3075,9 +2739,9 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz",
-      "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
+      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
       "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
@@ -3120,9 +2784,9 @@
       "dev": true
     },
     "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.23.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz",
-      "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==",
+      "version": "13.24.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -3165,9 +2829,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.52.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.52.0.tgz",
-      "integrity": "sha512-mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA==",
+      "version": "8.56.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz",
+      "integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -4156,9 +3820,9 @@
       }
     },
     "node_modules/@ngtools/webpack": {
-      "version": "16.2.6",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-16.2.6.tgz",
-      "integrity": "sha512-d8ZlZL6dOtWmHdjG9PTGBkdiJMcsXD2tp6WeFRVvTEuvCI3XvKsUXBvJDE+mZOhzn5pUEYt+1TR5DHjDZbME3w==",
+      "version": "16.2.11",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-16.2.11.tgz",
+      "integrity": "sha512-4ndXJ4s94ZsryVGSDk/waIDrUqXqdGWftoOEn81Zu+nkL9ncI/G1fNUlSJ5OqeKmMLxMFouoy+BuJfvT+gEgnQ==",
       "dev": true,
       "engines": {
         "node": "^16.14.0 || >=18.10.0",
@@ -4414,174 +4078,46 @@
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
       "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
       "dev": true,
-      "dependencies": {
-        "rimraf": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8.17.0"
-      }
-    },
-    "node_modules/@nx/devkit/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/@nx/nx-darwin-arm64": {
-      "version": "16.5.1",
-      "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-16.5.1.tgz",
-      "integrity": "sha512-q98TFI4B/9N9PmKUr1jcbtD4yAFs1HfYd9jUXXTQOlfO9SbDjnrYJgZ4Fp9rMNfrBhgIQ4x1qx0AukZccKmH9Q==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@nx/nx-darwin-x64": {
-      "version": "16.5.1",
-      "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-16.5.1.tgz",
-      "integrity": "sha512-j9HmL1l8k7EVJ3eOM5y8COF93gqrydpxCDoz23ZEtsY+JHY77VAiRQsmqBgEx9GGA2dXi9VEdS67B0+1vKariw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@nx/nx-freebsd-x64": {
-      "version": "16.5.1",
-      "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-16.5.1.tgz",
-      "integrity": "sha512-CXSPT01aVS869tvCCF2tZ7LnCa8l41wJ3mTVtWBkjmRde68E5Up093hklRMyXb3kfiDYlfIKWGwrV4r0eH6x1A==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@nx/nx-linux-arm-gnueabihf": {
-      "version": "16.5.1",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-16.5.1.tgz",
-      "integrity": "sha512-BhrumqJSZCWFfLFUKl4CAUwR0Y0G2H5EfFVGKivVecEQbb+INAek1aa6c89evg2/OvetQYsJ+51QknskwqvLsA==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@nx/nx-linux-arm64-gnu": {
-      "version": "16.5.1",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-16.5.1.tgz",
-      "integrity": "sha512-x7MsSG0W+X43WVv7JhiSq2eKvH2suNKdlUHEG09Yt0vm3z0bhtym1UCMUg3IUAK7jy9hhLeDaFVFkC6zo+H/XQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@nx/nx-linux-arm64-musl": {
-      "version": "16.5.1",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-16.5.1.tgz",
-      "integrity": "sha512-J+/v/mFjOm74I0PNtH5Ka+fDd+/dWbKhpcZ2R1/6b9agzZk+Ff/SrwJcSYFXXWKbPX+uQ4RcJoytT06Zs3s0ow==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@nx/nx-linux-x64-gnu": {
-      "version": "16.5.1",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-16.5.1.tgz",
-      "integrity": "sha512-igooWJ5YxQ94Zft7IqgL+Lw0qHaY15Btw4gfK756g/YTYLZEt4tTvR1y6RnK/wdpE3sa68bFTLVBNCGTyiTiDQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@nx/nx-linux-x64-musl": {
-      "version": "16.5.1",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-16.5.1.tgz",
-      "integrity": "sha512-zF/exnPqFYbrLAduGhTmZ7zNEyADid2bzNQiIjJkh8Y6NpDwrQIwVIyvIxqynsjMrIs51kBH+8TUjKjj2Jgf5A==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+      "dependencies": {
+        "rimraf": "^3.0.0"
+      },
       "engines": {
-        "node": ">= 10"
+        "node": ">=8.17.0"
       }
     },
-    "node_modules/@nx/nx-win32-arm64-msvc": {
+    "node_modules/@nx/devkit/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/@nx/nx-linux-x64-gnu": {
       "version": "16.5.1",
-      "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-16.5.1.tgz",
-      "integrity": "sha512-qtqiLS9Y9TYyAbbpq58kRoOroko4ZXg5oWVqIWFHoxc5bGPweQSJCROEqd1AOl2ZDC6BxfuVHfhDDop1kK05WA==",
+      "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-16.5.1.tgz",
+      "integrity": "sha512-igooWJ5YxQ94Zft7IqgL+Lw0qHaY15Btw4gfK756g/YTYLZEt4tTvR1y6RnK/wdpE3sa68bFTLVBNCGTyiTiDQ==",
       "cpu": [
-        "arm64"
+        "x64"
       ],
       "dev": true,
       "optional": true,
       "os": [
-        "win32"
+        "linux"
       ],
       "engines": {
         "node": ">= 10"
       }
     },
-    "node_modules/@nx/nx-win32-x64-msvc": {
+    "node_modules/@nx/nx-linux-x64-musl": {
       "version": "16.5.1",
-      "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-16.5.1.tgz",
-      "integrity": "sha512-kUJBLakK7iyA9WfsGGQBVennA4jwf5XIgm0lu35oMOphtZIluvzItMt0EYBmylEROpmpEIhHq0P6J9FA+WH0Rg==",
+      "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-16.5.1.tgz",
+      "integrity": "sha512-zF/exnPqFYbrLAduGhTmZ7zNEyADid2bzNQiIjJkh8Y6NpDwrQIwVIyvIxqynsjMrIs51kBH+8TUjKjj2Jgf5A==",
       "cpu": [
         "x64"
       ],
       "dev": true,
       "optional": true,
       "os": [
-        "win32"
+        "linux"
       ],
       "engines": {
         "node": ">= 10"
@@ -4615,19 +4151,11 @@
         "node": ">=14"
       }
     },
-    "node_modules/@pkgr/utils": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/@pkgr/utils/-/utils-2.4.2.tgz",
-      "integrity": "sha512-POgTXhjrTfbTV63DiFXav4lBHiICLKKwDeaKn9Nphwj7WH6m0hMMCaJkMyRWjgtPFyRKRVoMXXjczsTQRDEhYw==",
+    "node_modules/@pkgr/core": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.0.tgz",
+      "integrity": "sha512-Zwq5OCzuwJC2jwqmpEQt7Ds1DTi6BWSwoGkbb1n9pO3hzb35BoJELx7c0T23iDkBGkh2e7tvOtjF3tr3OaQHDQ==",
       "dev": true,
-      "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "fast-glob": "^3.3.0",
-        "is-glob": "^4.0.3",
-        "open": "^9.1.0",
-        "picocolors": "^1.0.0",
-        "tslib": "^2.6.0"
-      },
       "engines": {
         "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
       },
@@ -4635,36 +4163,6 @@
         "url": "https://opencollective.com/unts"
       }
     },
-    "node_modules/@pkgr/utils/node_modules/define-lazy-prop": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz",
-      "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@pkgr/utils/node_modules/open": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/open/-/open-9.1.0.tgz",
-      "integrity": "sha512-OS+QTnw1/4vrf+9hh1jc1jnYjzSG4ttTBB8UxOwAnInG3Uo4ssetzC1ihqaIHjLJnA5GGlRl6QlZXOTQhRBUvg==",
-      "dev": true,
-      "dependencies": {
-        "default-browser": "^4.0.0",
-        "define-lazy-prop": "^3.0.0",
-        "is-inside-container": "^1.0.0",
-        "is-wsl": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=14.16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/@schematics/angular": {
       "version": "16.1.8",
       "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-16.1.8.tgz",
@@ -4823,9 +4321,9 @@
       }
     },
     "node_modules/@types/body-parser": {
-      "version": "1.19.4",
-      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.4.tgz",
-      "integrity": "sha512-N7UDG0/xiPQa2D/XrVJXjkWbpqHCd2sBaB32ggRF2l83RhPfamgKGF8gwwqyksS95qUS5ZYF9aF+lLPRlwI2UA==",
+      "version": "1.19.5",
+      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz",
+      "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==",
       "dev": true,
       "dependencies": {
         "@types/connect": "*",
@@ -4833,27 +4331,27 @@
       }
     },
     "node_modules/@types/bonjour": {
-      "version": "3.5.12",
-      "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.12.tgz",
-      "integrity": "sha512-ky0kWSqXVxSqgqJvPIkgFkcn4C8MnRog308Ou8xBBIVo39OmUFy+jqNe0nPwLCDFxUpmT9EvT91YzOJgkDRcFg==",
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz",
+      "integrity": "sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==",
       "dev": true,
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/connect": {
-      "version": "3.4.37",
-      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.37.tgz",
-      "integrity": "sha512-zBUSRqkfZ59OcwXon4HVxhx5oWCJmc0OtBTK05M+p0dYjgN6iTwIL2T/WbsQZrEsdnwaF9cWQ+azOnpPvIqY3Q==",
+      "version": "3.4.38",
+      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
+      "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
       "dev": true,
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/connect-history-api-fallback": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.2.tgz",
-      "integrity": "sha512-gX2j9x+NzSh4zOhnRPSdPPmTepS4DfxES0AvIFv3jGv5QyeAJf6u6dY5/BAoAJU9Qq1uTvwOku8SSC2GnCRl6Q==",
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz",
+      "integrity": "sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==",
       "dev": true,
       "dependencies": {
         "@types/express-serve-static-core": "*",
@@ -4902,9 +4400,9 @@
       "dev": true
     },
     "node_modules/@types/express": {
-      "version": "4.17.20",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.20.tgz",
-      "integrity": "sha512-rOaqlkgEvOW495xErXMsmyX3WKBInbhG5eqojXYi3cGUaLoRDlXa5d52fkfWZT963AZ3v2eZ4MbKE6WpDAGVsw==",
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz",
+      "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==",
       "dev": true,
       "dependencies": {
         "@types/body-parser": "*",
@@ -4914,9 +4412,9 @@
       }
     },
     "node_modules/@types/express-serve-static-core": {
-      "version": "4.17.38",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.38.tgz",
-      "integrity": "sha512-hXOtc0tuDHZPFwwhuBJXPbjemWtXnJjbvuuyNH2Y5Z6in+iXc63c4eXYDc7GGGqHy+iwYqAJMdaItqdnbcBKmg==",
+      "version": "4.17.41",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.41.tgz",
+      "integrity": "sha512-OaJ7XLaelTgrvlZD8/aa0vvvxZdUmlCn6MtWeB7TkiKW70BQLc9XEPpDLPdbo52ZhXUCrznlWdCHWxJWtdyajA==",
       "dev": true,
       "dependencies": {
         "@types/node": "*",
@@ -4926,15 +4424,15 @@
       }
     },
     "node_modules/@types/http-errors": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.3.tgz",
-      "integrity": "sha512-pP0P/9BnCj1OVvQR2lF41EkDG/lWWnDyA203b/4Fmi2eTyORnBtcDoKDwjWQthELrBvWkMOrvSOnZ8OVlW6tXA==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz",
+      "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==",
       "dev": true
     },
     "node_modules/@types/http-proxy": {
-      "version": "1.17.13",
-      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.13.tgz",
-      "integrity": "sha512-GkhdWcMNiR5QSQRYnJ+/oXzu0+7JJEPC8vkWXK351BkhjraZF+1W13CUYARUvX9+NqIU2n6YHA4iwywsc/M6Sw==",
+      "version": "1.17.14",
+      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.14.tgz",
+      "integrity": "sha512-SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w==",
       "dev": true,
       "dependencies": {
         "@types/node": "*"
@@ -4953,9 +4451,9 @@
       "dev": true
     },
     "node_modules/@types/mime": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.4.tgz",
-      "integrity": "sha512-1Gjee59G25MrQGk8bsNvC6fxNiRgUlGn2wlhGf95a59DrprnnHk80FIMMFG9XHMdrfsuA119ht06QPDXA1Z7tw==",
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
+      "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==",
       "dev": true
     },
     "node_modules/@types/node": {
@@ -4967,16 +4465,25 @@
         "undici-types": "~5.25.1"
       }
     },
+    "node_modules/@types/node-forge": {
+      "version": "1.3.11",
+      "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.11.tgz",
+      "integrity": "sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/qs": {
-      "version": "6.9.9",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.9.tgz",
-      "integrity": "sha512-wYLxw35euwqGvTDx6zfY1vokBFnsK0HNrzc6xNHchxfO2hpuRg74GbkEW7e3sSmPvj0TjCDT1VCa6OtHXnubsg==",
+      "version": "6.9.11",
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.11.tgz",
+      "integrity": "sha512-oGk0gmhnEJK4Yyk+oI7EfXsLayXatCWPHary1MtcmbAifkobT9cM9yutG/hZKIseOU0MqbIwQ/u2nn/Gb+ltuQ==",
       "dev": true
     },
     "node_modules/@types/range-parser": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.6.tgz",
-      "integrity": "sha512-+0autS93xyXizIYiyL02FCY8N+KkKPhILhcUSA276HxzreZ16kl+cmwvV2qAM/PuCCwPXzOXOWhiPcw20uSFcA==",
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz",
+      "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==",
       "dev": true
     },
     "node_modules/@types/retry": {
@@ -4992,9 +4499,9 @@
       "dev": true
     },
     "node_modules/@types/send": {
-      "version": "0.17.3",
-      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.3.tgz",
-      "integrity": "sha512-/7fKxvKUoETxjFUsuFlPB9YndePpxxRAOfGC/yJdc9kTjTeP5kRCTzfnE8kPUKCeyiyIZu0YQ76s50hCedI1ug==",
+      "version": "0.17.4",
+      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz",
+      "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==",
       "dev": true,
       "dependencies": {
         "@types/mime": "^1",
@@ -5002,18 +4509,18 @@
       }
     },
     "node_modules/@types/serve-index": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.3.tgz",
-      "integrity": "sha512-4KG+yMEuvDPRrYq5fyVm/I2uqAJSAwZK9VSa+Zf+zUq9/oxSSvy3kkIqyL+jjStv6UCVi8/Aho0NHtB1Fwosrg==",
+      "version": "1.9.4",
+      "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.4.tgz",
+      "integrity": "sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==",
       "dev": true,
       "dependencies": {
         "@types/express": "*"
       }
     },
     "node_modules/@types/serve-static": {
-      "version": "1.15.4",
-      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.4.tgz",
-      "integrity": "sha512-aqqNfs1XTF0HDrFdlY//+SGUxmdSUbjeRXb5iaZc3x0/vMbYmdw9qvOgHWOyyLFxSSRnUuP5+724zBgfw8/WAw==",
+      "version": "1.15.5",
+      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.5.tgz",
+      "integrity": "sha512-PDRk21MnK70hja/YF8AHfC7yIsiQHn1rcXx7ijCFBX/k+XQJhQT/gw3xekXKJvx+5SXaMMS8oqQy09Mzvz2TuQ==",
       "dev": true,
       "dependencies": {
         "@types/http-errors": "*",
@@ -5022,18 +4529,18 @@
       }
     },
     "node_modules/@types/sockjs": {
-      "version": "0.3.35",
-      "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.35.tgz",
-      "integrity": "sha512-tIF57KB+ZvOBpAQwSaACfEu7htponHXaFzP7RfKYgsOS0NoYnn+9+jzp7bbq4fWerizI3dTB4NfAZoyeQKWJLw==",
+      "version": "0.3.36",
+      "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz",
+      "integrity": "sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==",
       "dev": true,
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/ws": {
-      "version": "8.5.8",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.8.tgz",
-      "integrity": "sha512-flUksGIQCnJd6sZ1l5dqCEG/ksaoAg/eUwiLAGTJQcfgvZJKF++Ta4bJA6A5aPSJmsr+xlseHn4KLgVlNnvPTg==",
+      "version": "8.5.10",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.10.tgz",
+      "integrity": "sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==",
       "dev": true,
       "dependencies": {
         "@types/node": "*"
@@ -5865,9 +5372,9 @@
       }
     },
     "node_modules/array-flatten": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
-      "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
       "dev": true
     },
     "node_modules/array-union": {
@@ -5925,12 +5432,12 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz",
-      "integrity": "sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==",
+      "version": "1.6.5",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.5.tgz",
+      "integrity": "sha512-Ii012v05KEVuUoFWmMW/UQv9aRIc3ZwkWDcM+h5Il8izZCtRVpDUfwpoFf7eOtajT3QiGR4yDUx7lPqHJULgbg==",
       "dev": true,
       "dependencies": {
-        "follow-redirects": "^1.15.0",
+        "follow-redirects": "^1.15.4",
         "form-data": "^4.0.0",
         "proxy-from-env": "^1.1.0"
       }
@@ -6080,15 +5587,6 @@
       "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
       "dev": true
     },
-    "node_modules/big-integer": {
-      "version": "1.6.51",
-      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz",
-      "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
     "node_modules/big.js": {
       "version": "5.2.2",
       "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
@@ -6158,13 +5656,11 @@
       "dev": true
     },
     "node_modules/bonjour-service": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.1.tgz",
-      "integrity": "sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.2.1.tgz",
+      "integrity": "sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw==",
       "dev": true,
       "dependencies": {
-        "array-flatten": "^2.1.2",
-        "dns-equal": "^1.0.0",
         "fast-deep-equal": "^3.1.3",
         "multicast-dns": "^7.2.5"
       }
@@ -6175,18 +5671,6 @@
       "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
       "dev": true
     },
-    "node_modules/bplist-parser": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.2.0.tgz",
-      "integrity": "sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==",
-      "dev": true,
-      "dependencies": {
-        "big-integer": "^1.6.44"
-      },
-      "engines": {
-        "node": ">= 5.10.0"
-      }
-    },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -6286,21 +5770,6 @@
         "semver": "^7.0.0"
       }
     },
-    "node_modules/bundle-name": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-3.0.0.tgz",
-      "integrity": "sha512-PKA4BeSvBpQKQ8iPOGCSiell+N8P+Tf1DlwqmYhpe2gAhKPHn8EYOxVT+ShuGmhg8lN8XiSlS80yiExKXrURlw==",
-      "dev": true,
-      "dependencies": {
-        "run-applescript": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/bytes": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
@@ -7194,150 +6663,6 @@
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
       "dev": true
     },
-    "node_modules/default-browser": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-4.0.0.tgz",
-      "integrity": "sha512-wX5pXO1+BrhMkSbROFsyxUm0i/cJEScyNhA4PPxc41ICuv05ZZB/MX28s8aZx6xjmatvebIapF6hLEKEcpneUA==",
-      "dev": true,
-      "dependencies": {
-        "bundle-name": "^3.0.0",
-        "default-browser-id": "^3.0.0",
-        "execa": "^7.1.1",
-        "titleize": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=14.16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/default-browser-id": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-3.0.0.tgz",
-      "integrity": "sha512-OZ1y3y0SqSICtE8DE4S8YOE9UZOJ8wO16fKWVP5J1Qz42kV9jcnMVFrEE/noXb/ss3Q4pZIH79kxofzyNNtUNA==",
-      "dev": true,
-      "dependencies": {
-        "bplist-parser": "^0.2.0",
-        "untildify": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/default-browser/node_modules/execa": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-7.2.0.tgz",
-      "integrity": "sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==",
-      "dev": true,
-      "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.1",
-        "human-signals": "^4.3.0",
-        "is-stream": "^3.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^5.1.0",
-        "onetime": "^6.0.0",
-        "signal-exit": "^3.0.7",
-        "strip-final-newline": "^3.0.0"
-      },
-      "engines": {
-        "node": "^14.18.0 || ^16.14.0 || >=18.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
-      }
-    },
-    "node_modules/default-browser/node_modules/human-signals": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-4.3.1.tgz",
-      "integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=14.18.0"
-      }
-    },
-    "node_modules/default-browser/node_modules/is-stream": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
-      "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/default-browser/node_modules/mimic-fn": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
-      "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/default-browser/node_modules/npm-run-path": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz",
-      "integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==",
-      "dev": true,
-      "dependencies": {
-        "path-key": "^4.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/default-browser/node_modules/onetime": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz",
-      "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==",
-      "dev": true,
-      "dependencies": {
-        "mimic-fn": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/default-browser/node_modules/path-key": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
-      "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/default-browser/node_modules/strip-final-newline": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
-      "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/default-gateway": {
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
@@ -7444,12 +6769,6 @@
       "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==",
       "dev": true
     },
-    "node_modules/dns-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-      "integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==",
-      "dev": true
-    },
     "node_modules/dns-packet": {
       "version": "5.6.1",
       "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz",
@@ -7908,15 +7227,15 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.52.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.52.0.tgz",
-      "integrity": "sha512-zh/JHnaixqHZsolRB/w9/02akBk9EPrOs9JwcTP2ek7yL5bVvXuRariiaAjjoJ5DvuwQ1WAE/HsMz+w17YgBCg==",
+      "version": "8.56.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz",
+      "integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.2",
-        "@eslint/js": "8.52.0",
+        "@eslint/eslintrc": "^2.1.4",
+        "@eslint/js": "8.56.0",
         "@humanwhocodes/config-array": "^0.11.13",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -7963,9 +7282,9 @@
       }
     },
     "node_modules/eslint-config-prettier": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.0.0.tgz",
-      "integrity": "sha512-IcJsTkJae2S35pRsRAwoCE+925rJJStOdkKnLVgtE+tEpqU0EVVM7OqrwxqgptKdX29NUwC82I5pXsGFIgSevw==",
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz",
+      "integrity": "sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==",
       "dev": true,
       "bin": {
         "eslint-config-prettier": "bin/cli.js"
@@ -7975,23 +7294,24 @@
       }
     },
     "node_modules/eslint-plugin-prettier": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.0.1.tgz",
-      "integrity": "sha512-m3u5RnR56asrwV/lDC4GHorlW75DsFfmUcjfCYylTUs85dBRnB7VM6xG8eCMJdeDRnppzmxZVf1GEPJvl1JmNg==",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.1.3.tgz",
+      "integrity": "sha512-C9GCVAs4Eq7ZC/XFQHITLiHJxQngdtraXaM+LoUFoFp/lHNl2Zn8f3WQbe9HvTBBQ9YnKFB0/2Ajdqwo5D1EAw==",
       "dev": true,
       "dependencies": {
         "prettier-linter-helpers": "^1.0.0",
-        "synckit": "^0.8.5"
+        "synckit": "^0.8.6"
       },
       "engines": {
         "node": "^14.18.0 || >=16.0.0"
       },
       "funding": {
-        "url": "https://opencollective.com/prettier"
+        "url": "https://opencollective.com/eslint-plugin-prettier"
       },
       "peerDependencies": {
         "@types/eslint": ">=8.0.0",
         "eslint": ">=8.0.0",
+        "eslint-config-prettier": "*",
         "prettier": ">=3.0.0"
       },
       "peerDependenciesMeta": {
@@ -8460,12 +7780,6 @@
         "node": ">= 0.10.0"
       }
     },
-    "node_modules/express/node_modules/array-flatten": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
-      "dev": true
-    },
     "node_modules/express/node_modules/body-parser": {
       "version": "1.20.1",
       "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
@@ -8810,9 +8124,9 @@
       "dev": true
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.3",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz",
-      "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==",
+      "version": "1.15.5",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz",
+      "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==",
       "dev": true,
       "funding": [
         {
@@ -9837,39 +9151,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-inside-container": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz",
-      "integrity": "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==",
-      "dev": true,
-      "dependencies": {
-        "is-docker": "^3.0.0"
-      },
-      "bin": {
-        "is-inside-container": "cli.js"
-      },
-      "engines": {
-        "node": ">=14.16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-inside-container/node_modules/is-docker": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz",
-      "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==",
-      "dev": true,
-      "bin": {
-        "is-docker": "cli.js"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/is-interactive": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
@@ -11560,9 +10841,9 @@
       "dev": true
     },
     "node_modules/ngx-mask": {
-      "version": "16.3.9",
-      "resolved": "https://registry.npmjs.org/ngx-mask/-/ngx-mask-16.3.9.tgz",
-      "integrity": "sha512-cptsvlI4OLI8Tpj23ZgSQDKz5jksyWGzAuEEn5pd58cq2oFGeeHZS2i1SQQi8kp+a+Dh/2RvDsfFmDWmI5Ln9w==",
+      "version": "16.4.2",
+      "resolved": "https://registry.npmjs.org/ngx-mask/-/ngx-mask-16.4.2.tgz",
+      "integrity": "sha512-mQjcsTpctGu6HYKLf6/gjEUvW65D+46xvPIMYz0BDZXqHXrqKVluHXR3KF++TNOfdLLXwW6SvuHWd91NZN/C1A==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -12909,9 +12190,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz",
-      "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.1.tgz",
+      "integrity": "sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw==",
       "dev": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
@@ -12924,9 +12205,9 @@
       }
     },
     "node_modules/prettier-eslint": {
-      "version": "16.1.1",
-      "resolved": "https://registry.npmjs.org/prettier-eslint/-/prettier-eslint-16.1.1.tgz",
-      "integrity": "sha512-SbtugbH80njB9QOPqb8C+W40Rvhr6iD0wrJTxk1Zx10rkY7KdjtSwHpf/WfiI3REboaXbvIOJXGiua3maIt0Sw==",
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/prettier-eslint/-/prettier-eslint-16.2.0.tgz",
+      "integrity": "sha512-GDTSKc62VaLceiaI/qMaKo2oco2CIWtbj4Zr6ckhbTgcBL/uR0d9jkMzh9OtBIT/Z7iBoCB4OHj/aJ5YuNgAuA==",
       "dev": true,
       "dependencies": {
         "@typescript-eslint/parser": "^6.7.5",
@@ -13432,9 +12713,9 @@
       }
     },
     "node_modules/reflect-metadata": {
-      "version": "0.1.13",
-      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
-      "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==",
+      "version": "0.1.14",
+      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.14.tgz",
+      "integrity": "sha512-ZhYeb6nRaXCfhnndflDK8qI6ZQ/YcWZCISRAWICW9XYqMUwjZM9Z0DveWX/ABN01oxSHwVxKQmxeYZSsm0jh5A==",
       "dev": true
     },
     "node_modules/regenerate": {
@@ -13678,21 +12959,6 @@
         "fsevents": "~2.3.2"
       }
     },
-    "node_modules/run-applescript": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-5.0.0.tgz",
-      "integrity": "sha512-XcT5rBksx1QdIhlFOCtgZkB99ZEouFZ1E2Kc2LHqNW13U3/74YGdkQRmThTwxy4QIyookibDKYZOPqX//6BlAg==",
-      "dev": true,
-      "dependencies": {
-        "execa": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/run-async": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
@@ -13863,11 +13129,12 @@
       "dev": true
     },
     "node_modules/selfsigned": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz",
-      "integrity": "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.4.1.tgz",
+      "integrity": "sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==",
       "dev": true,
       "dependencies": {
+        "@types/node-forge": "^1.3.0",
         "node-forge": "^1"
       },
       "engines": {
@@ -14613,13 +13880,13 @@
       "dev": true
     },
     "node_modules/synckit": {
-      "version": "0.8.5",
-      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.8.5.tgz",
-      "integrity": "sha512-L1dapNV6vu2s/4Sputv8xGsCdAVlb5nRDMFU/E27D44l5U6cw1g0dGd45uLc+OXjNMmF4ntiMdCimzcjFKQI8Q==",
+      "version": "0.8.8",
+      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.8.8.tgz",
+      "integrity": "sha512-HwOKAP7Wc5aRGYdKH+dw0PRRpbO841v2DENBtjnR5HFWoiNByAl7vrx3p0G/rCyYXQsrxqtX48TImFtPcIHSpQ==",
       "dev": true,
       "dependencies": {
-        "@pkgr/utils": "^2.3.1",
-        "tslib": "^2.5.0"
+        "@pkgr/core": "^0.1.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
         "node": "^14.18.0 || >=16.0.0"
@@ -14845,18 +14112,6 @@
       "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
       "dev": true
     },
-    "node_modules/titleize": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/titleize/-/titleize-3.0.0.tgz",
-      "integrity": "sha512-KxVu8EYHDPBdUYdKZdKtU2aj2XfEx9AfjXxE/Aj0vT06w2icA09Vus1rh6eSu1y01akYg6BjIK/hxyLJINoMLQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/tmp": {
       "version": "0.0.33",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
@@ -15177,15 +14432,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/untildify": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
-      "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/update-browserslist-db": {
       "version": "1.0.13",
       "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
@@ -15297,14 +14543,14 @@
       }
     },
     "node_modules/vite": {
-      "version": "4.4.7",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.7.tgz",
-      "integrity": "sha512-6pYf9QJ1mHylfVh39HpuSfMPojPSKVxZvnclX1K1FyZ1PXDOcLBibdq5t1qxJSnL63ca8Wf4zts6mD8u8oc9Fw==",
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.1.tgz",
+      "integrity": "sha512-AXXFaAJ8yebyqzoNB9fu2pHoo/nWX+xZlaRwoeYUxEqBO+Zj4msE5G+BhGBll9lYEKv9Hfks52PAF2X7qDYXQA==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.18.10",
-        "postcss": "^8.4.26",
-        "rollup": "^3.25.2"
+        "postcss": "^8.4.27",
+        "rollup": "^3.27.1"
       },
       "bin": {
         "vite": "bin/vite.js"
@@ -15620,9 +14866,9 @@
       }
     },
     "node_modules/webpack-dev-server/node_modules/ws": {
-      "version": "8.14.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz",
-      "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==",
+      "version": "8.16.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz",
+      "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==",
       "dev": true,
       "engines": {
         "node": ">=10.0.0"
diff --git a/modules/ui/package.json b/modules/ui/package.json
index c7ce21ec7..46f775272 100644
--- a/modules/ui/package.json
+++ b/modules/ui/package.json
@@ -17,44 +17,44 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^16.2.10",
-    "@angular/cdk": "^16.2.9",
-    "@angular/common": "^16.2.10",
-    "@angular/compiler": "^16.2.10",
-    "@angular/core": "^16.2.10",
-    "@angular/forms": "^16.2.10",
-    "@angular/material": "^16.2.9",
-    "@angular/platform-browser": "^16.2.10",
-    "@angular/platform-browser-dynamic": "^16.2.10",
-    "@angular/router": "^16.2.10",
-    "ngx-mask": "^16.3.9",
+    "@angular/animations": "^16.2.12",
+    "@angular/cdk": "^16.2.13",
+    "@angular/common": "^16.2.12",
+    "@angular/compiler": "^16.2.12",
+    "@angular/core": "^16.2.12",
+    "@angular/forms": "^16.2.12",
+    "@angular/material": "^16.2.13",
+    "@angular/platform-browser": "^16.2.12",
+    "@angular/platform-browser-dynamic": "^16.2.12",
+    "@angular/router": "^16.2.12",
+    "ngx-mask": "^16.4.2",
     "rxjs": "~7.8.0",
     "tslib": "^2.6.2",
     "zone.js": "~0.13.3"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^16.2.6",
+    "@angular-devkit/build-angular": "^16.2.11",
     "@angular-eslint/builder": "16.2.0",
     "@angular-eslint/eslint-plugin": "16.2.0",
     "@angular-eslint/eslint-plugin-template": "16.2.0",
     "@angular-eslint/schematics": "16.2.0",
     "@angular-eslint/template-parser": "16.2.0",
     "@angular/cli": "~16.1.8",
-    "@angular/compiler-cli": "^16.2.10",
+    "@angular/compiler-cli": "^16.2.12",
     "@types/jasmine": "~4.3.6",
     "@typescript-eslint/eslint-plugin": "5.62.0",
     "@typescript-eslint/parser": "5.62.0",
-    "eslint": "^8.49.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-prettier": "^5.0.1",
+    "eslint": "^8.56.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-prettier": "^5.1.3",
     "jasmine-core": "~4.6.0",
     "karma": "~6.4.0",
     "karma-chrome-launcher": "~3.2.0",
     "karma-coverage": "~2.2.0",
     "karma-jasmine": "~5.1.0",
     "karma-jasmine-html-reporter": "~2.1.0",
-    "prettier": "^3.0.3",
-    "prettier-eslint": "^16.1.1",
+    "prettier": "^3.1.1",
+    "prettier-eslint": "^16.2.0",
     "typescript": "~5.1.3"
   }
 }
diff --git a/modules/ui/src/app/app-routing.module.ts b/modules/ui/src/app/app-routing.module.ts
index 59be3e59d..f9c349b7f 100644
--- a/modules/ui/src/app/app-routing.module.ts
+++ b/modules/ui/src/app/app-routing.module.ts
@@ -21,6 +21,7 @@ const routes: Routes = [
     path: 'testrun',
     loadChildren: () =>
       import('./progress/progress.module').then(m => m.ProgressModule),
+    title: 'Testrun',
   },
   {
     path: 'devices',
@@ -28,11 +29,13 @@ const routes: Routes = [
       import('./device-repository/device-repository.module').then(
         m => m.DeviceRepositoryModule
       ),
+    title: 'Testrun - Devices',
   },
   {
     path: 'reports',
     loadChildren: () =>
       import('./history/history.module').then(m => m.HistoryModule),
+    title: 'Testrun - Reports',
   },
   {
     path: '',
diff --git a/modules/ui/src/app/app.component.html b/modules/ui/src/app/app.component.html
index 9b78ec850..86281676f 100644
--- a/modules/ui/src/app/app.component.html
+++ b/modules/ui/src/app/app.component.html
@@ -86,6 +86,16 @@ <h1 class="main-heading">Testrun</h1>
         ">
         Step 1: To perform a device test, please, select ports in Connection
         settings.
+        <a
+          (click)="openSetting()"
+          (keydown.enter)="openSetting()"
+          (keydown.space)="openSetting()"
+          aria-label="The Connection settings link opens the menu. No redirect to other pages."
+          tabindex="0"
+          role="link"
+          class="message-link"
+          >Connection settings</a
+        >
       </app-callout>
       <app-callout
         [type]="CalloutType.Info"
@@ -99,8 +109,9 @@ <h1 class="main-heading">Testrun</h1>
           (click)="navigateToDeviceRepository()"
           (keydown.enter)="navigateToDeviceRepository()"
           (keydown.space)="navigateToDeviceRepository()"
+          aria-label="The Create a Device link redirects to the Devices page and opens the menu there."
           tabindex="0"
-          role="button"
+          role="link"
           class="message-link"
           >Create a Device</a
         >
@@ -121,8 +132,9 @@ <h1 class="main-heading">Testrun</h1>
           (click)="navigateToRuntime()"
           (keydown.enter)="navigateToRuntime()"
           (keydown.space)="navigateToRuntime()"
+          aria-label="The Testrun link redirects to the Testrun page and opens a menu there."
           tabindex="0"
-          role="button"
+          role="link"
           class="message-link"
           >Testrun</a
         >
@@ -139,7 +151,6 @@ <h1 class="main-heading">Testrun</h1>
     <app-general-settings
       [interfaces]="interfaces"
       (closeSettingEvent)="closeSetting()"
-      (openSettingEvent)="openSetting()"
       (reloadInterfacesEvent)="reloadInterfaces()">
     </app-general-settings>
   </mat-drawer>
diff --git a/modules/ui/src/app/app.component.scss b/modules/ui/src/app/app.component.scss
index 6060205f1..9eb33e232 100644
--- a/modules/ui/src/app/app.component.scss
+++ b/modules/ui/src/app/app.component.scss
@@ -74,10 +74,6 @@ $nav-open-btn-width: 210px;
     line-height: 20px;
     letter-spacing: 0.25px;
   }
-
-  app-version {
-    padding: 0 16px;
-  }
 }
 
 .app-sidebar {
@@ -132,7 +128,7 @@ $nav-open-btn-width: 210px;
 .app-sidebar-button > .mat-icon {
   margin: 0 11px;
   min-width: 24px;
-  line-height: 18px;
+  line-height: 18px !important;
 }
 
 .app-sidebar-button-active {
@@ -159,6 +155,7 @@ $nav-open-btn-width: 210px;
 .logo-link .mat-icon {
   width: 36px;
   height: 23px;
+  line-height: 18px !important;
 }
 
 .main-heading {
@@ -206,4 +203,7 @@ app-version {
   margin-top: auto;
   margin-bottom: 16px;
   max-width: 100%;
+  width: $nav-close-width;
+  display: flex;
+  justify-content: center;
 }
diff --git a/modules/ui/src/app/app.component.spec.ts b/modules/ui/src/app/app.component.spec.ts
index 68bcc31c5..69e921323 100644
--- a/modules/ui/src/app/app.component.spec.ts
+++ b/modules/ui/src/app/app.component.spec.ts
@@ -38,7 +38,6 @@ import { AppRoutingModule } from './app-routing.module';
 import { of } from 'rxjs/internal/observable/of';
 import SpyObj = jasmine.SpyObj;
 import { BypassComponent } from './components/bypass/bypass.component';
-import { VersionComponent } from './components/version/version.component';
 import { CalloutComponent } from './components/callout/callout.component';
 import {
   MOCK_PROGRESS_DATA_IDLE,
@@ -75,19 +74,18 @@ describe('AppComponent', () => {
       'getSystemStatus',
       'fetchHistory',
       'getSystemInterfaces',
-      'getVersion',
-      'fetchVersion',
       'setIsOpenAddDevice',
       'systemStatus$',
       'isTestrunStarted$',
       'hasConnectionSetting$',
+      'setIsOpenStartTestrun',
     ]);
 
     mockLoaderService = jasmine.createSpyObj(['setLoading']);
     mockService.getDevices.and.returnValue(
       new BehaviorSubject<Device[] | null>([device])
     );
-    mockService.getSystemInterfaces.and.returnValue(of([]));
+    mockService.getSystemInterfaces.and.returnValue(of({}));
     (mockService.systemStatus$ as unknown) = of({});
     mockService.isTestrunStarted$ = of(true);
     mockService.hasConnectionSetting$ = of(true);
@@ -103,7 +101,6 @@ describe('AppComponent', () => {
         MatToolbarModule,
         MatSidenavModule,
         BypassComponent,
-        VersionComponent,
         CalloutComponent,
       ],
       providers: [
@@ -114,6 +111,7 @@ describe('AppComponent', () => {
         AppComponent,
         FakeGeneralSettingsComponent,
         FakeSpinnerComponent,
+        FakeVersionComponent,
       ],
     });
 
@@ -324,177 +322,220 @@ describe('AppComponent', () => {
     expect(version).toBeTruthy();
   });
 
-  describe('with no connection settings', () => {
-    beforeEach(() => {
-      mockService.hasConnectionSetting$ = of(false);
-      component.ngOnInit();
-      fixture.detectChanges();
-    });
+  describe('Callout component visibility', () => {
+    describe('with no connection settings', () => {
+      beforeEach(() => {
+        mockService.hasConnectionSetting$ = of(false);
+        component.ngOnInit();
+        fixture.detectChanges();
+      });
 
-    it('should have callout component with "Step 1" text', () => {
-      const callout = compiled.querySelector('app-callout');
-      const calloutContent = callout?.innerHTML.trim();
+      it('should have callout component with "Step 1" text', () => {
+        const callout = compiled.querySelector('app-callout');
+        const calloutContent = callout?.innerHTML.trim();
 
-      expect(callout).toBeTruthy();
-      expect(calloutContent).toContain('Step 1');
-    });
-  });
+        expect(callout).toBeTruthy();
+        expect(calloutContent).toContain('Step 1');
+      });
 
-  describe('with system status as "Idle"', () => {
-    beforeEach(() => {
-      mockService.hasConnectionSetting$ = of(true);
-      mockService.getDevices.and.returnValue(
-        new BehaviorSubject<Device[] | null>([device])
-      );
-      mockService.systemStatus$ = of(MOCK_PROGRESS_DATA_IDLE);
-      mockService.isTestrunStarted$ = of(false);
-      component.ngOnInit();
-      fixture.detectChanges();
-    });
+      it('should have callout content with "Connection settings" link ', () => {
+        const calloutLinkEl = compiled.querySelector(
+          '.message-link'
+        ) as HTMLAnchorElement;
+        const calloutLinkContent = calloutLinkEl.innerHTML.trim();
 
-    it('should have callout component with "Step 3" text', () => {
-      const callout = compiled.querySelector('app-callout');
-      const calloutContent = callout?.innerHTML.trim();
+        expect(calloutLinkEl).toBeTruthy();
+        expect(calloutLinkContent).toContain('Connection settings');
+      });
 
-      expect(callout).toBeTruthy();
-      expect(calloutContent).toContain('Step 3');
-    });
-  });
+      keyboardCases.forEach(testCase => {
+        it(`should call openSetting on keydown ${testCase.name} "Connection settings" link`, fakeAsync(() => {
+          const spyOpenSetting = spyOn(component, 'openSetting');
+          const calloutLinkEl = compiled.querySelector(
+            '.message-link'
+          ) as HTMLAnchorElement;
 
-  describe('with no devices setted', () => {
-    beforeEach(() => {
-      mockService.getDevices.and.returnValue(
-        new BehaviorSubject<Device[] | null>(null)
-      );
-      component.ngOnInit();
-      fixture.detectChanges();
-    });
+          calloutLinkEl.dispatchEvent(testCase.event);
+          flush();
 
-    it('should have callout component', () => {
-      const callout = compiled.querySelector('app-callout');
+          expect(spyOpenSetting).toHaveBeenCalled();
+        }));
+      });
+    });
 
-      expect(callout).toBeTruthy();
+    describe('with system status as "Idle"', () => {
+      beforeEach(() => {
+        mockService.hasConnectionSetting$ = of(true);
+        mockService.getDevices.and.returnValue(
+          new BehaviorSubject<Device[] | null>([device])
+        );
+        mockService.systemStatus$ = of(MOCK_PROGRESS_DATA_IDLE);
+        mockService.isTestrunStarted$ = of(false);
+        component.ngOnInit();
+        fixture.detectChanges();
+      });
+
+      it('should have callout component with "Step 3" text', () => {
+        const callout = compiled.querySelector('app-callout');
+        const calloutContent = callout?.innerHTML.trim();
+
+        expect(callout).toBeTruthy();
+        expect(calloutContent).toContain('Step 3');
+      });
     });
 
-    it('should have callout component with "Step 2" text', () => {
-      const callout = compiled.querySelector('app-callout');
-      const calloutContent = callout?.innerHTML.trim();
+    describe('with no devices setted', () => {
+      beforeEach(() => {
+        mockService.getDevices.and.returnValue(
+          new BehaviorSubject<Device[] | null>(null)
+        );
+        component.ngOnInit();
+        fixture.detectChanges();
+      });
 
-      expect(callout).toBeTruthy();
-      expect(calloutContent).toContain('Step 2');
-    });
+      it('should have callout component', () => {
+        const callout = compiled.querySelector('app-callout');
 
-    it('should have callout content with "Create a Device" link ', () => {
-      const calloutLinkEl = compiled.querySelector(
-        '.message-link'
-      ) as HTMLAnchorElement;
-      const calloutLinkContent = calloutLinkEl.innerHTML.trim();
+        expect(callout).toBeTruthy();
+      });
 
-      expect(calloutLinkEl).toBeTruthy();
-      expect(calloutLinkContent).toContain('Create a Device');
-    });
+      it('should have callout component with "Step 2" text', () => {
+        const callout = compiled.querySelector('app-callout');
+        const calloutContent = callout?.innerHTML.trim();
 
-    keyboardCases.forEach(testCase => {
-      it(`should navigate to the device-repository on keydown ${testCase.name} "Create a Device" link`, fakeAsync(() => {
+        expect(callout).toBeTruthy();
+        expect(calloutContent).toContain('Step 2');
+      });
+
+      it('should have callout content with "Create a Device" link ', () => {
         const calloutLinkEl = compiled.querySelector(
           '.message-link'
         ) as HTMLAnchorElement;
+        const calloutLinkContent = calloutLinkEl.innerHTML.trim();
 
-        calloutLinkEl.dispatchEvent(testCase.event);
-        flush();
-
-        expect(router.url).toBe(Routes.Devices);
-      }));
-    });
-
-    it('should navigate to the device-repository on click "Create a Device" link', fakeAsync(() => {
-      const calloutLinkEl = compiled.querySelector(
-        '.message-link'
-      ) as HTMLAnchorElement;
-
-      calloutLinkEl.click();
-      flush();
+        expect(calloutLinkEl).toBeTruthy();
+        expect(calloutLinkContent).toContain('Create a Device');
+      });
 
-      expect(router.url).toBe(Routes.Devices);
-      expect(mockService.setIsOpenAddDevice).toHaveBeenCalledWith(true);
-    }));
-  });
+      keyboardCases.forEach(testCase => {
+        it(`should navigate to the device-repository on keydown ${testCase.name} "Create a Device" link`, fakeAsync(() => {
+          const calloutLinkEl = compiled.querySelector(
+            '.message-link'
+          ) as HTMLAnchorElement;
 
-  describe('with devices setted but without systemStatus data', () => {
-    beforeEach(() => {
-      mockService.getDevices.and.returnValue(
-        new BehaviorSubject<Device[] | null>([device])
-      );
-      mockService.isTestrunStarted$ = of(false);
-      component.ngOnInit();
-      fixture.detectChanges();
-    });
+          calloutLinkEl.dispatchEvent(testCase.event);
+          flush();
 
-    it('should have callout component with "Step 3" text', () => {
-      const callout = compiled.querySelector('app-callout');
-      const calloutContent = callout?.innerHTML.trim();
+          expect(router.url).toBe(Routes.Devices);
+        }));
+      });
 
-      expect(callout).toBeTruthy();
-      expect(calloutContent).toContain('Step 3');
-    });
+      it('should navigate to the device-repository on click "Create a Device" link', fakeAsync(() => {
+        const calloutLinkEl = compiled.querySelector(
+          '.message-link'
+        ) as HTMLAnchorElement;
 
-    it('should have callout component with "Testrun" link', () => {
-      const callout = compiled.querySelector('app-callout');
-      const calloutLinkEl = compiled.querySelector(
-        '.message-link'
-      ) as HTMLAnchorElement;
-      const calloutLinkContent = calloutLinkEl.innerHTML.trim();
+        calloutLinkEl.click();
+        flush();
 
-      expect(callout).toBeTruthy();
-      expect(calloutLinkContent).toContain('Testrun');
+        expect(router.url).toBe(Routes.Devices);
+        expect(mockService.setIsOpenAddDevice).toHaveBeenCalledWith(true);
+      }));
     });
 
-    keyboardCases.forEach(testCase => {
-      it(`should navigate to the runtime on keydown ${testCase.name} "Run the Test" link`, fakeAsync(() => {
+    describe('with devices setted but without systemStatus data', () => {
+      beforeEach(() => {
+        mockService.getDevices.and.returnValue(
+          new BehaviorSubject<Device[] | null>([device])
+        );
+        mockService.isTestrunStarted$ = of(false);
+        component.ngOnInit();
+        fixture.detectChanges();
+      });
+
+      it('should have callout component with "Step 3" text', () => {
+        const callout = compiled.querySelector('app-callout');
+        const calloutContent = callout?.innerHTML.trim();
+
+        expect(callout).toBeTruthy();
+        expect(calloutContent).toContain('Step 3');
+      });
+
+      it('should have callout component with "Testrun" link', () => {
+        const callout = compiled.querySelector('app-callout');
         const calloutLinkEl = compiled.querySelector(
           '.message-link'
         ) as HTMLAnchorElement;
+        const calloutLinkContent = calloutLinkEl.innerHTML.trim();
 
-        calloutLinkEl.dispatchEvent(testCase.event);
-        flush();
+        expect(callout).toBeTruthy();
+        expect(calloutLinkContent).toContain('Testrun');
+      });
 
-        expect(router.url).toBe(Routes.Testrun);
-      }));
-    });
-  });
+      keyboardCases.forEach(testCase => {
+        it(`should navigate to the runtime on keydown ${testCase.name} "Run the Test" link`, fakeAsync(() => {
+          const calloutLinkEl = compiled.querySelector(
+            '.message-link'
+          ) as HTMLAnchorElement;
 
-  describe('with devices setted, without systemStatus data, but run the tests ', () => {
-    beforeEach(() => {
-      mockService.getDevices.and.returnValue(
-        new BehaviorSubject<Device[] | null>([device])
-      );
-      mockService.isTestrunStarted$ = of(true);
-      component.ngOnInit();
-      fixture.detectChanges();
+          calloutLinkEl.dispatchEvent(testCase.event);
+          flush();
+
+          expect(router.url).toBe(Routes.Testrun);
+        }));
+      });
     });
 
-    it('should not have callout component', () => {
-      const callout = compiled.querySelector('app-callout');
+    describe('with devices setted, without systemStatus data, but run the tests ', () => {
+      beforeEach(() => {
+        mockService.getDevices.and.returnValue(
+          new BehaviorSubject<Device[] | null>([device])
+        );
+        mockService.isTestrunStarted$ = of(true);
+        component.ngOnInit();
+        fixture.detectChanges();
+      });
+
+      it('should not have callout component', () => {
+        const callout = compiled.querySelector('app-callout');
+
+        expect(callout).toBeNull();
+      });
+    });
 
-      expect(callout).toBeNull();
+    describe('with devices setted and systemStatus data ', () => {
+      beforeEach(() => {
+        mockService.getDevices.and.returnValue(
+          new BehaviorSubject<Device[] | null>([device])
+        );
+        mockService.systemStatus$ = of(MOCK_PROGRESS_DATA_IN_PROGRESS);
+        component.ngOnInit();
+        fixture.detectChanges();
+      });
+
+      it('should not have callout component', () => {
+        const callout = compiled.querySelector('app-callout');
+
+        expect(callout).toBeNull();
+      });
     });
   });
 
-  describe('with devices setted and systemStatus data ', () => {
-    beforeEach(() => {
-      mockService.getDevices.and.returnValue(
-        new BehaviorSubject<Device[] | null>([device])
-      );
-      mockService.systemStatus$ = of(MOCK_PROGRESS_DATA_IN_PROGRESS);
-      component.ngOnInit();
-      fixture.detectChanges();
-    });
+  it('should not call toggleSettingsBtn focus on closeSetting when device length is 0', async () => {
+    mockService.getDevices.and.returnValue(
+      new BehaviorSubject<Device[] | null>([])
+    );
+    component.ngOnInit();
+    fixture.detectChanges();
+
+    spyOn(component.settingsDrawer, 'close').and.returnValue(
+      Promise.resolve('close')
+    );
+    const spyToggle = spyOn(component.toggleSettingsBtn, 'focus');
 
-    it('should not have callout component', () => {
-      const callout = compiled.querySelector('app-callout');
+    await component.closeSetting();
 
-      expect(callout).toBeNull();
-    });
+    expect(spyToggle).toHaveBeenCalledTimes(0);
   });
 });
 
@@ -505,7 +546,6 @@ describe('AppComponent', () => {
 class FakeGeneralSettingsComponent {
   @Input() interfaces = [];
   @Output() closeSettingEvent = new EventEmitter<void>();
-  @Output() openSettingEvent = new EventEmitter<void>();
   @Output() reloadInterfacesEvent = new EventEmitter<void>();
 }
 
@@ -514,3 +554,9 @@ class FakeGeneralSettingsComponent {
   template: '<div></div>',
 })
 class FakeSpinnerComponent {}
+
+@Component({
+  selector: 'app-version',
+  template: '<div></div>',
+})
+class FakeVersionComponent {}
diff --git a/modules/ui/src/app/app.component.ts b/modules/ui/src/app/app.component.ts
index 41eb73ab2..11f39be81 100644
--- a/modules/ui/src/app/app.component.ts
+++ b/modules/ui/src/app/app.component.ts
@@ -23,7 +23,7 @@ import {
 import { MatIconRegistry } from '@angular/material/icon';
 import { DomSanitizer } from '@angular/platform-browser';
 import { MatDrawer } from '@angular/material/sidenav';
-import { TestRunService } from './services/test-run.service';
+import { SystemInterfaces, TestRunService } from './services/test-run.service';
 import { Observable } from 'rxjs/internal/Observable';
 import { Device } from './model/device';
 import { take } from 'rxjs';
@@ -52,13 +52,13 @@ export class AppComponent implements OnInit {
   systemStatus$!: Observable<TestrunStatus>;
   isTestrunStarted$!: Observable<boolean>;
   hasConnectionSetting$!: Observable<boolean | null>;
-  interfaces: string[] = [];
+  interfaces: SystemInterfaces = {};
   isDevicesLoaded = false;
   isStatusLoaded = false;
   isConnectionSettingsLoaded = false;
   public readonly StatusOfTestrun = StatusOfTestrun;
   public readonly Routes = Routes;
-
+  private devicesLength = 0;
   @ViewChild('settingsDrawer') public settingsDrawer!: MatDrawer;
   @ViewChild('toggleSettingsBtn') public toggleSettingsBtn!: HTMLButtonElement;
   @ViewChild('navigation') public navigation!: ElementRef;
@@ -99,7 +99,10 @@ export class AppComponent implements OnInit {
     this.devices$ = this.testRunService.getDevices().pipe(
       tap(result => {
         if (result !== null) {
+          this.devicesLength = result.length;
           this.isDevicesLoaded = true;
+        } else {
+          this.devicesLength = 0;
         }
       }),
       shareReplay({ refCount: true, bufferSize: 1 })
@@ -128,12 +131,15 @@ export class AppComponent implements OnInit {
 
   navigateToRuntime(): void {
     this.route.navigate([Routes.Testrun]);
+    this.testRunService.setIsOpenStartTestrun(true);
   }
 
   async closeSetting(): Promise<void> {
-    return await this.settingsDrawer
-      .close()
-      .then(() => this.toggleSettingsBtn.focus());
+    return await this.settingsDrawer.close().then(() => {
+      if (this.devicesLength > 0) {
+        this.toggleSettingsBtn.focus();
+      } // else device create window will be opened
+    });
   }
 
   async openSetting(): Promise<void> {
diff --git a/modules/ui/src/app/components/bypass/bypass.component.spec.ts b/modules/ui/src/app/components/bypass/bypass.component.spec.ts
index ab8919049..93430f5c4 100644
--- a/modules/ui/src/app/components/bypass/bypass.component.spec.ts
+++ b/modules/ui/src/app/components/bypass/bypass.component.spec.ts
@@ -17,6 +17,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { BypassComponent } from './bypass.component';
 import { Component } from '@angular/core';
+import { StateService } from '../../services/state.service';
+import SpyObj = jasmine.SpyObj;
 
 @Component({
   selector: 'app-test-bypass',
@@ -29,11 +31,14 @@ class TestBypassComponent {}
 describe('BypassComponent', () => {
   let component: TestBypassComponent;
   let fixture: ComponentFixture<TestBypassComponent>;
+  let mockService: SpyObj<StateService>;
 
   beforeEach(() => {
+    mockService = jasmine.createSpyObj(['focusFirstElementInMain']);
     TestBed.configureTestingModule({
       imports: [BypassComponent],
       declarations: [TestBypassComponent],
+      providers: [{ provide: StateService, useValue: mockService }],
     });
     fixture = TestBed.createComponent(TestBypassComponent);
     component = fixture.componentInstance;
@@ -49,13 +54,10 @@ describe('BypassComponent', () => {
       const button = fixture.nativeElement.querySelector(
         '.navigation-bypass-button'
       ) as HTMLButtonElement;
-      const testButton = fixture.nativeElement.querySelector(
-        '#test-button'
-      ) as HTMLButtonElement;
 
       button?.click();
 
-      expect(document.activeElement).toBe(testButton);
+      expect(mockService.focusFirstElementInMain).toHaveBeenCalled();
     });
   });
 });
diff --git a/modules/ui/src/app/components/bypass/bypass.component.ts b/modules/ui/src/app/components/bypass/bypass.component.ts
index 218a0b3c5..ad29f4544 100644
--- a/modules/ui/src/app/components/bypass/bypass.component.ts
+++ b/modules/ui/src/app/components/bypass/bypass.component.ts
@@ -16,6 +16,7 @@
 import { Component } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { MatButtonModule } from '@angular/material/button';
+import { StateService } from '../../services/state.service';
 
 @Component({
   selector: 'app-bypass',
@@ -25,13 +26,9 @@ import { MatButtonModule } from '@angular/material/button';
   styleUrls: ['./bypass.component.scss'],
 })
 export class BypassComponent {
+  constructor(private readonly state: StateService) {}
   skipToMainContent(event: Event) {
     event.preventDefault();
-    const firstControl: HTMLElement | null = window.document.querySelector(
-      '#main button:not(disabled), #main table'
-    );
-    if (firstControl) {
-      firstControl.focus();
-    }
+    this.state.focusFirstElementInMain();
   }
 }
diff --git a/modules/ui/src/app/components/callout/callout.component.scss b/modules/ui/src/app/components/callout/callout.component.scss
index dc7d78e5d..d6b6f26c5 100644
--- a/modules/ui/src/app/components/callout/callout.component.scss
+++ b/modules/ui/src/app/components/callout/callout.component.scss
@@ -32,7 +32,7 @@
   min-height: 48px;
   padding: 6px 24px;
   border-radius: 8px;
-  align-items: flex-start;
+  align-items: center;
   gap: 16px;
 }
 
diff --git a/modules/ui/src/app/components/delete-form/delete-form.component.html b/modules/ui/src/app/components/delete-form/delete-form.component.html
index cafeba26c..e63e204b8 100644
--- a/modules/ui/src/app/components/delete-form/delete-form.component.html
+++ b/modules/ui/src/app/components/delete-form/delete-form.component.html
@@ -19,10 +19,20 @@
 </p>
 
 <mat-dialog-actions align="end" class="delete-form-actions">
-  <button (click)="cancel()" class="cancel-button" mat-flat-button>
+  <button
+    (click)="cancel()"
+    class="cancel-button"
+    color="primary"
+    mat-button
+    type="button">
     Cancel
   </button>
-  <button (click)="confirm()" class="confirm-button" mat-flat-button>
+  <button
+    (click)="confirm()"
+    class="confirm-button"
+    color="primary"
+    mat-button
+    type="button">
     Confirm
   </button>
 </mat-dialog-actions>
diff --git a/modules/ui/src/app/components/delete-report/delete-report.component.spec.ts b/modules/ui/src/app/components/delete-report/delete-report.component.spec.ts
index 766bf8b4e..11e9c2a2e 100644
--- a/modules/ui/src/app/components/delete-report/delete-report.component.spec.ts
+++ b/modules/ui/src/app/components/delete-report/delete-report.component.spec.ts
@@ -55,6 +55,7 @@ describe('DeleteReportComponent', () => {
     });
 
     it('#deleteReport should open delete dialog', () => {
+      const deviceRemovedSpy = spyOn(component.deviceRemoved, 'emit');
       spyOn(component.dialog, 'open').and.returnValue({
         afterClosed: () => of(true),
       } as MatDialogRef<typeof DeleteFormComponent>);
@@ -71,6 +72,7 @@ describe('DeleteReportComponent', () => {
         '01:02:03:04:05:06',
         '2023-06-22T09:20:00.123Z'
       );
+      expect(deviceRemovedSpy).toHaveBeenCalled();
     });
   });
 
diff --git a/modules/ui/src/app/components/delete-report/delete-report.component.ts b/modules/ui/src/app/components/delete-report/delete-report.component.ts
index 16d82ac52..4f76b1859 100644
--- a/modules/ui/src/app/components/delete-report/delete-report.component.ts
+++ b/modules/ui/src/app/components/delete-report/delete-report.component.ts
@@ -13,7 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ChangeDetectionStrategy, Component, OnDestroy } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  EventEmitter,
+  OnDestroy,
+  Output,
+} from '@angular/core';
 import { CommonModule, DatePipe } from '@angular/common';
 import { MatButtonModule } from '@angular/material/button';
 import { ReportActionComponent } from '../report-action/report-action.component';
@@ -36,6 +42,7 @@ export class DeleteReportComponent
   extends ReportActionComponent
   implements OnDestroy
 {
+  @Output() deviceRemoved = new EventEmitter<void>();
   private destroy$: Subject<boolean> = new Subject<boolean>();
   constructor(
     private testRunService: TestRunService,
@@ -72,6 +79,7 @@ export class DeleteReportComponent
           this.testRunService
             .deleteReport(this.data.device.mac_addr, this.data.started || '')
             .subscribe(() => {
+              this.deviceRemoved.emit();
               this.testRunService.removeReport(
                 this.data.device.mac_addr,
                 this.data.started || ''
diff --git a/modules/ui/src/app/components/device-item/device-item.component.html b/modules/ui/src/app/components/device-item/device-item.component.html
index 19683b6f1..7fc675c86 100644
--- a/modules/ui/src/app/components/device-item/device-item.component.html
+++ b/modules/ui/src/app/components/device-item/device-item.component.html
@@ -19,12 +19,12 @@
   [attr.aria-label]="label"
   class="device-item"
   type="button">
-  <div [attr.aria-label]="device.model" class="item-name">
-    {{ device.model }}
-  </div>
   <div [attr.aria-label]="device.manufacturer" class="item-manufacturer">
     {{ device.manufacturer }}
   </div>
+  <div [attr.aria-label]="device.model" class="item-name">
+    {{ device.model }}
+  </div>
   <div [attr.aria-label]="device.mac_addr" class="item-mac-address">
     {{ device.mac_addr }}
   </div>
diff --git a/modules/ui/src/app/components/device-item/device-item.component.scss b/modules/ui/src/app/components/device-item/device-item.component.scss
index 4e9e88b49..b7025ff76 100644
--- a/modules/ui/src/app/components/device-item/device-item.component.scss
+++ b/modules/ui/src/app/components/device-item/device-item.component.scss
@@ -32,17 +32,17 @@ $border-radius: 12px;
   grid-row-gap: 4px;
   font-family: 'Open Sans', sans-serif;
   grid-template-areas:
-    'name name icon'
-    'manufacturer address icon';
+    'manufacturer manufacturer icon'
+    'name address icon';
 
   &:hover {
     cursor: pointer;
   }
 }
 
-.item-name {
+.item-manufacturer {
   padding: 0 16px;
-  grid-area: name;
+  grid-area: manufacturer;
   justify-self: start;
   align-self: end;
   color: #1f1f1f;
@@ -57,9 +57,9 @@ $border-radius: 12px;
   text-align: start;
 }
 
-.item-manufacturer {
+.item-name {
   padding: 0 16px;
-  grid-area: manufacturer;
+  grid-area: name;
   justify-self: start;
   color: $grey-800;
   font-size: 14px;
diff --git a/modules/ui/src/app/components/filter-chips/filter-chips.component.html b/modules/ui/src/app/components/filter-chips/filter-chips.component.html
index 512862023..07cf43aa0 100644
--- a/modules/ui/src/app/components/filter-chips/filter-chips.component.html
+++ b/modules/ui/src/app/components/filter-chips/filter-chips.component.html
@@ -20,11 +20,16 @@
       class="filter-chip"
       *ngIf="!isValueEmpty(item.value)"
       (removed)="clearFilter(item.key)">
-      <ng-container *ngIf="item.key === 'deviceInfo'">Device</ng-container>
+      <ng-container *ngIf="item.key === 'deviceInfo'"
+        >Device contains "{{ item.value }}"</ng-container
+      >
       <ng-container *ngIf="item.key === 'deviceFirmware'">
-        Firmware
+        Firmware contains "{{ item.value }}"
+      </ng-container>
+      <ng-container
+        *ngIf="item.key !== 'deviceFirmware' && item.key !== 'deviceInfo'">
+        {{ item.value }}
       </ng-container>
-      {{ item.value }}
       <button
         class="filter-chip-remove"
         [attr.aria-label]="'clear filter ' + item.value"
@@ -34,14 +39,16 @@
       </button>
     </mat-chip-row>
   </ng-container>
+  <mat-chip-row class="filter-chip-clear-all">
+    <a
+      class="clear-all"
+      type="button"
+      (click)="clearAllFilters()"
+      (keydown.enter)="clearAllFilters()"
+      (keydown.space)="clearAllFilters()"
+      aria-label="Clear all filters"
+      tabindex="0"
+      >Clear all filters</a
+    >
+  </mat-chip-row>
 </mat-chip-set>
-<a
-  type="button"
-  (click)="clearAllFilters()"
-  (keydown.enter)="clearAllFilters()"
-  (keydown.space)="clearAllFilters()"
-  aria-label="Clear all filters"
-  class="clear-all"
-  tabindex="0"
-  >Clear all filters</a
->
diff --git a/modules/ui/src/app/components/filter-chips/filter-chips.component.scss b/modules/ui/src/app/components/filter-chips/filter-chips.component.scss
index 3b3eeddb0..5dc1c5ede 100644
--- a/modules/ui/src/app/components/filter-chips/filter-chips.component.scss
+++ b/modules/ui/src/app/components/filter-chips/filter-chips.component.scss
@@ -23,7 +23,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  padding: 0 16px;
+  padding: 0 8px;
   cursor: pointer;
   color: $primary;
   font-weight: 400;
@@ -31,6 +31,8 @@
   margin: 4px 0 4px 8px;
   border-radius: 16px;
   flex-shrink: 0;
+  background: $white;
+  font-family: Roboto, sans-serif;
 }
 
 .filter-chip.mat-mdc-chip {
@@ -58,3 +60,17 @@
   padding-right: 0;
   border-radius: 8px;
 }
+
+.mat-mdc-standard-chip:not(
+    .mdc-evolution-chip--disabled
+  ).filter-chip-clear-all {
+  background-color: $white;
+
+  & ::ng-deep .mat-mdc-chip-action {
+    padding: 0;
+  }
+
+  & ::ng-deep .mat-mdc-chip-focus-overlay {
+    display: none;
+  }
+}
diff --git a/modules/ui/src/app/components/filter-dialog/filter-dialog.component.html b/modules/ui/src/app/components/filter-dialog/filter-dialog.component.html
index b422d051a..459ad20d6 100644
--- a/modules/ui/src/app/components/filter-dialog/filter-dialog.component.html
+++ b/modules/ui/src/app/components/filter-dialog/filter-dialog.component.html
@@ -21,7 +21,11 @@
       appearance="outline"
       class="text-field"
       *ngIf="data.filter === FilterName.DeviceInfo">
-      <input class="text-field-input" formControlName="deviceInfo" matInput />
+      <input
+        class="text-field-input"
+        formControlName="deviceInfo"
+        matInput
+        aria-label="device name" />
     </mat-form-field>
     <mat-form-field
       appearance="outline"
@@ -30,7 +34,8 @@
       <input
         class="text-field-input"
         formControlName="deviceFirmware"
-        matInput />
+        matInput
+        aria-label="device firmware" />
     </mat-form-field>
     <div formArrayName="results" *ngIf="data.filter === FilterName.Results">
       <p
diff --git a/modules/ui/src/app/components/general-settings/general-settings.component.html b/modules/ui/src/app/components/general-settings/general-settings.component.html
index 4e1954a2b..e366fe3b9 100644
--- a/modules/ui/src/app/components/general-settings/general-settings.component.html
+++ b/modules/ui/src/app/components/general-settings/general-settings.component.html
@@ -16,7 +16,7 @@
 <div class="settings-drawer-header">
   <h2 class="settings-drawer-header-title">Connection settings</h2>
   <button
-    (click)="closeSetting()"
+    (click)="closeSetting(EventType.Close)"
     [disabled]="!isFormValues || (hasConnectionSetting$ | async) !== true"
     aria-label="close"
     class="settings-drawer-header-button"
@@ -26,56 +26,96 @@ <h2 class="settings-drawer-header-title">Connection settings</h2>
 </div>
 <div class="setting-drawer-content">
   <form
-    *ngIf="interfaces.length; else warning_message"
-    [formGroup]="settingForm">
-    <app-callout
-      [type]="CalloutType.Warning"
-      *ngIf="interfaces.length === 1"
-      class="two-ports-message">
-      Warning! Testrun requires two ports to operate correctly.
-    </app-callout>
-    <label
-      class="setting-form-label internet-label"
-      id="internet-radio-group-label"
-      for="internet-group">
-      Select port used for Internet connection
-    </label>
-    <p class="setting-label-description">
-      Choose one of the following ports on your Laptop or Desktop
-    </p>
-    <mat-radio-group
-      aria-labelledby="internet-radio-group-label"
-      id="internet-group"
-      class="setting-radio-group"
-      formControlName="internet_intf">
-      <mat-radio-button
-        *ngFor="let interface of interfaces"
-        [value]="interface"
-        class="setting-radio-button">
-        {{ interface }}
-      </mat-radio-button>
-    </mat-radio-group>
-    <label
-      class="setting-form-label device-label"
-      id="device-radio-group-label"
-      for="device-group">
-      Select port where you’ll connect the tested device
-    </label>
-    <p class="setting-label-description">
-      Choose one of the options where you’ll connect IoT device for testing
+    [formGroup]="settingForm"
+    [class.setting-drawer-content-form-empty]="
+      (interfaces | keyvalue).length === 0
+    ">
+    <ng-container
+      *ngIf="(interfaces | keyvalue).length > 0; else warning_message">
+      <app-callout
+        [type]="CalloutType.Warning"
+        *ngIf="(interfaces | keyvalue).length === 1"
+        class="two-ports-message">
+        Warning! Testrun requires two ports to operate correctly.
+      </app-callout>
+      <label
+        class="setting-form-label internet-label"
+        id="internet-radio-group-label"
+        for="internet-group">
+        Select port used for Internet connection
+      </label>
+      <p class="setting-label-description">
+        Choose one of the following ports on your Laptop or Desktop
+      </p>
+      <mat-radio-group
+        aria-labelledby="internet-radio-group-label"
+        id="internet-group"
+        class="setting-radio-group"
+        formControlName="internet_intf">
+        <mat-radio-button
+          *ngFor="let interface of interfaces | keyvalue"
+          [value]="interface.key"
+          class="setting-radio-button">
+          {{ interface.value }}
+        </mat-radio-button>
+      </mat-radio-group>
+      <label
+        class="setting-form-label device-label"
+        id="device-radio-group-label"
+        for="device-group">
+        Select port where you’ll connect the tested device
+      </label>
+      <p class="setting-label-description">
+        Choose one of the options where you’ll connect IoT device for testing
+      </p>
+      <mat-radio-group
+        aria-labelledby="device-radio-group-label"
+        id="device-group"
+        class="setting-radio-group"
+        formControlName="device_intf">
+        <mat-radio-button
+          *ngFor="let interface of interfaces | keyvalue"
+          [value]="interface.key"
+          class="setting-radio-button">
+          {{ interface.value }}
+        </mat-radio-button>
+      </mat-radio-group>
+    </ng-container>
+    <p class="message">
+      If a port is missing from this list, you can
+      <a
+        (click)="reloadSetting()"
+        (keydown.enter)="reloadSetting()"
+        (keydown.space)="reloadSetting()"
+        role="button"
+        tabindex="0"
+        class="message-link">
+        Refresh
+      </a>
+      the Connection settings
     </p>
-    <mat-radio-group
-      aria-labelledby="device-radio-group-label"
-      id="device-group"
-      class="setting-radio-group"
-      formControlName="device_intf">
-      <mat-radio-button
-        *ngFor="let interface of interfaces"
-        [value]="interface"
-        class="setting-radio-button">
-        {{ interface }}
-      </mat-radio-button>
-    </mat-radio-group>
+    <mat-error
+      *ngIf="isSubmitting && isFormError"
+      class="error-message-container">
+      <span> Both interfaces must have different values </span>
+    </mat-error>
+    <div class="setting-drawer-footer">
+      <button
+        mat-flat-button
+        (click)="closeSetting(EventType.Close)"
+        [disabled]="!isFormValues || (hasConnectionSetting$ | async) !== true"
+        class="close-button">
+        Cancel
+      </button>
+      <button
+        mat-raised-button
+        class="save-button"
+        color="primary"
+        (click)="saveSetting()"
+        [disabled]="!isFormValues || isLessThanTwoInterfaces">
+        Save
+      </button>
+    </div>
   </form>
   <ng-template #warning_message>
     <app-callout [type]="CalloutType.Warning">
@@ -83,37 +123,4 @@ <h2 class="settings-drawer-header-title">Connection settings</h2>
     </app-callout>
   </ng-template>
 </div>
-<p class="message">
-  If a port is missing from this list, you can
-  <a
-    (click)="reloadSetting()"
-    (keydown.enter)="reloadSetting()"
-    (keydown.space)="reloadSetting()"
-    role="button"
-    tabindex="0"
-    class="message-link">
-    Refresh
-  </a>
-  the Connection settings
-</p>
-<mat-error *ngIf="isSubmitting && isFormError" class="error-message-container">
-  <span> Both interfaces must have different values </span>
-</mat-error>
-<div class="setting-drawer-footer">
-  <button
-    mat-flat-button
-    (click)="closeSetting()"
-    [disabled]="!isFormValues || (hasConnectionSetting$ | async) !== true"
-    class="close-button">
-    Cancel
-  </button>
-  <button
-    mat-raised-button
-    class="save-button"
-    color="primary"
-    (click)="saveSetting()"
-    [disabled]="!isFormValues || isLessThanTwoInterfaces">
-    Save
-  </button>
-</div>
 <app-spinner class="connection-settings-spinner"></app-spinner>
diff --git a/modules/ui/src/app/components/general-settings/general-settings.component.scss b/modules/ui/src/app/components/general-settings/general-settings.component.scss
index 84d49e514..e7fb547b2 100644
--- a/modules/ui/src/app/components/general-settings/general-settings.component.scss
+++ b/modules/ui/src/app/components/general-settings/general-settings.component.scss
@@ -56,20 +56,25 @@
 }
 
 .setting-drawer-content {
-  padding: 11px 16px 16px;
+  padding: 11px 16px 8px 16px;
   overflow: hidden;
+  flex: 1;
 
   form {
     display: grid;
-    grid-template-rows: repeat(4, auto);
+    grid-template-rows: repeat(7, auto) 1fr;
     height: 100%;
   }
+
+  .setting-drawer-content-form-empty {
+    grid-template-rows: repeat(2, auto) 1fr;
+  }
 }
 
 .error-message-container {
   display: block;
   margin-top: auto;
-  padding: 0 16px;
+  padding-bottom: 8px;
 }
 
 .error-message-container + .setting-drawer-footer {
@@ -126,7 +131,7 @@
 
 .message {
   margin: 0;
-  padding: 0 16px 16px;
+  padding: 16px 0 0 0;
   color: $grey-800;
   font-family: $font-secondary;
   font-size: 14px;
@@ -135,11 +140,11 @@
 }
 
 .setting-drawer-footer {
+  padding: 0 8px;
   margin-top: auto;
   display: flex;
   flex-shrink: 0;
   justify-content: flex-end;
-  padding: 16px 24px 8px 24px;
 
   .close-button,
   .save-button {
@@ -153,7 +158,7 @@
   .close-button {
     margin-right: 10px;
     &:enabled {
-      color: $secondary;
+      color: $primary;
     }
   }
 }
diff --git a/modules/ui/src/app/components/general-settings/general-settings.component.spec.ts b/modules/ui/src/app/components/general-settings/general-settings.component.spec.ts
index 6448b80a1..b67a1d64d 100644
--- a/modules/ui/src/app/components/general-settings/general-settings.component.spec.ts
+++ b/modules/ui/src/app/components/general-settings/general-settings.component.spec.ts
@@ -13,12 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {
-  ComponentFixture,
-  fakeAsync,
-  TestBed,
-  tick,
-} from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { GeneralSettingsComponent } from './general-settings.component';
 import { TestRunService } from '../../services/test-run.service';
@@ -30,6 +25,8 @@ import { MatButtonModule } from '@angular/material/button';
 import { MatIcon, MatIconModule } from '@angular/material/icon';
 import { MatIconTestingModule } from '@angular/material/icon/testing';
 import { Component, Input } from '@angular/core';
+import { LiveAnnouncer } from '@angular/cdk/a11y';
+import SpyObj = jasmine.SpyObj;
 
 const MOCK_SYSTEM_CONFIG_EMPTY: SystemConfig = {
   network: {
@@ -45,16 +42,11 @@ const MOCK_SYSTEM_CONFIG_WITH_DATA: SystemConfig = {
   },
 };
 
-const MOCK_SYSTEM_CONFIG_WITH_ONE_SETTING: SystemConfig = {
-  network: {
-    device_intf: 'mockDeviceValue',
-  },
-};
-
 describe('GeneralSettingsComponent', () => {
   let component: GeneralSettingsComponent;
   let fixture: ComponentFixture<GeneralSettingsComponent>;
-  let testRunServiceMock: jasmine.SpyObj<TestRunService>;
+  let testRunServiceMock: SpyObj<TestRunService>;
+  let mockLiveAnnouncer: SpyObj<LiveAnnouncer>;
   let compiled: HTMLElement;
 
   beforeEach(async () => {
@@ -63,11 +55,10 @@ describe('GeneralSettingsComponent', () => {
       'getSystemConfig',
       'setSystemConfig',
       'createSystemConfig',
-      'setIsOpenAddDevice',
       'hasConnectionSetting$',
       'setHasConnectionSetting',
     ]);
-    testRunServiceMock.getSystemInterfaces.and.returnValue(of([]));
+    testRunServiceMock.getSystemInterfaces.and.returnValue(of({}));
     testRunServiceMock.getSystemConfig.and.returnValue(
       of(MOCK_SYSTEM_CONFIG_EMPTY)
     );
@@ -76,6 +67,8 @@ describe('GeneralSettingsComponent', () => {
     );
     testRunServiceMock.hasConnectionSetting$ = of(true);
 
+    mockLiveAnnouncer = jasmine.createSpyObj(['announce']);
+
     await TestBed.configureTestingModule({
       declarations: [
         GeneralSettingsComponent,
@@ -83,7 +76,10 @@ describe('GeneralSettingsComponent', () => {
         FakeSpinnerComponent,
         FakeCalloutComponent,
       ],
-      providers: [{ provide: TestRunService, useValue: testRunServiceMock }],
+      providers: [
+        { provide: TestRunService, useValue: testRunServiceMock },
+        { provide: LiveAnnouncer, useValue: mockLiveAnnouncer },
+      ],
       imports: [
         MatButtonModule,
         MatIconModule,
@@ -126,50 +122,6 @@ describe('GeneralSettingsComponent', () => {
     expect(component.reloadInterfacesEvent.emit).toHaveBeenCalled();
   });
 
-  describe('#openSetting', () => {
-    it('should call openSetting if device and internet data are unavailable', () => {
-      spyOn(component.openSettingEvent, 'emit');
-
-      component.ngOnInit();
-
-      expect(component.openSettingEvent.emit).toHaveBeenCalled();
-    });
-
-    it('should call openSetting if not systemConfig data', fakeAsync(() => {
-      spyOn(component.openSettingEvent, 'emit');
-      testRunServiceMock.getSystemConfig.and.returnValue(of({}));
-      tick();
-
-      component.ngOnInit();
-
-      expect(component.openSettingEvent.emit).toHaveBeenCalled();
-    }));
-
-    it('should call openSetting if only one setting available', fakeAsync(() => {
-      spyOn(component.openSettingEvent, 'emit');
-      testRunServiceMock.getSystemConfig.and.returnValue(
-        of(MOCK_SYSTEM_CONFIG_WITH_ONE_SETTING)
-      );
-      tick();
-
-      component.ngOnInit();
-
-      expect(component.openSettingEvent.emit).toHaveBeenCalled();
-    }));
-
-    it('should not call openSetting if device and internet data are available', fakeAsync(() => {
-      spyOn(component.openSettingEvent, 'emit');
-      testRunServiceMock.getSystemConfig.and.returnValue(
-        of(MOCK_SYSTEM_CONFIG_WITH_DATA)
-      );
-      tick();
-
-      component.ngOnInit();
-
-      expect(component.openSettingEvent.emit).not.toHaveBeenCalled();
-    }));
-  });
-
   describe('#closeSetting', () => {
     beforeEach(() => {
       testRunServiceMock.systemConfig$ = of(MOCK_SYSTEM_CONFIG_WITH_DATA);
@@ -178,21 +130,31 @@ describe('GeneralSettingsComponent', () => {
     it('should emit closeSettingEvent', () => {
       spyOn(component.closeSettingEvent, 'emit');
 
-      component.closeSetting();
+      component.closeSetting('Message');
 
       expect(component.closeSettingEvent.emit).toHaveBeenCalled();
     });
 
+    it('should call liveAnnouncer with provided message', () => {
+      const mockMessage = 'mock event';
+
+      component.closeSetting(mockMessage);
+
+      expect(mockLiveAnnouncer.announce).toHaveBeenCalledWith(
+        `The ${mockMessage} finished. The connection setting panel is closed.`
+      );
+    });
+
     it('should call reset settingForm', () => {
       spyOn(component.settingForm, 'reset');
 
-      component.closeSetting();
+      component.closeSetting('Message');
 
       expect(component.settingForm.reset).toHaveBeenCalled();
     });
 
     it('should set value of settingForm on setSystemSetting', () => {
-      component.closeSetting();
+      component.closeSetting('Message');
 
       expect(component.settingForm.value).toEqual(
         MOCK_SYSTEM_CONFIG_WITH_DATA.network
@@ -232,24 +194,11 @@ describe('GeneralSettingsComponent', () => {
         MOCK_SYSTEM_CONFIG_WITH_DATA
       );
     });
-
-    it('should setIsOpenAddDevice as true on first save setting', () => {
-      component.deviceControl.setValue(
-        MOCK_SYSTEM_CONFIG_WITH_DATA.network?.device_intf
-      );
-      component.internetControl.setValue(
-        MOCK_SYSTEM_CONFIG_WITH_DATA.network?.internet_intf
-      );
-
-      component.saveSetting();
-
-      expect(testRunServiceMock.setIsOpenAddDevice).toHaveBeenCalledWith(true);
-    });
   });
 
   describe('with no intefaces data', () => {
     beforeEach(() => {
-      component.interfaces = [];
+      component.interfaces = {};
       fixture.detectChanges();
     });
 
@@ -270,7 +219,7 @@ describe('GeneralSettingsComponent', () => {
 
   describe('with intefaces lenght less then two', () => {
     beforeEach(() => {
-      component.interfaces = ['mockDeviceValue'];
+      component.interfaces = { mockDeviceValue: 'mockDeviceValue' };
       testRunServiceMock.systemConfig$ = of(MOCK_SYSTEM_CONFIG_WITH_DATA);
       testRunServiceMock.getSystemConfig.and.returnValue(
         of(MOCK_SYSTEM_CONFIG_WITH_DATA)
@@ -301,9 +250,12 @@ describe('GeneralSettingsComponent', () => {
     });
   });
 
-  describe('with intefaces lenght more then one', () => {
+  describe('with interfaces length more then one', () => {
     beforeEach(() => {
-      component.interfaces = ['mockDeviceValue', 'mockInternetValue'];
+      component.interfaces = {
+        mockDeviceValue: 'mockDeviceValue',
+        mockInterfaceValue: 'mockInterfaceValue',
+      };
       testRunServiceMock.systemConfig$ = of(MOCK_SYSTEM_CONFIG_WITH_DATA);
       testRunServiceMock.getSystemConfig.and.returnValue(
         of(MOCK_SYSTEM_CONFIG_WITH_DATA)
diff --git a/modules/ui/src/app/components/general-settings/general-settings.component.ts b/modules/ui/src/app/components/general-settings/general-settings.component.ts
index 1d19d0e56..b98ba35fc 100644
--- a/modules/ui/src/app/components/general-settings/general-settings.component.ts
+++ b/modules/ui/src/app/components/general-settings/general-settings.component.ts
@@ -28,11 +28,16 @@ import {
   Validators,
 } from '@angular/forms';
 import { Subject, takeUntil, tap } from 'rxjs';
-import { TestRunService } from '../../services/test-run.service';
+import {
+  SystemInterfaces,
+  TestRunService,
+} from '../../services/test-run.service';
 import { OnlyDifferentValuesValidator } from './only-different-values.validator';
 import { CalloutType } from '../../model/callout-type';
 import { Observable } from 'rxjs/internal/Observable';
 import { shareReplay } from 'rxjs/internal/operators/shareReplay';
+import { LiveAnnouncer } from '@angular/cdk/a11y';
+import { EventType } from '../../model/event-type';
 
 @Component({
   selector: 'app-general-settings',
@@ -40,11 +45,11 @@ import { shareReplay } from 'rxjs/internal/operators/shareReplay';
   styleUrls: ['./general-settings.component.scss'],
 })
 export class GeneralSettingsComponent implements OnInit, OnDestroy {
-  @Input() interfaces: string[] = [];
+  @Input() interfaces: SystemInterfaces = {};
   @Output() closeSettingEvent = new EventEmitter<void>();
-  @Output() openSettingEvent = new EventEmitter<void>();
   @Output() reloadInterfacesEvent = new EventEmitter<void>();
   public readonly CalloutType = CalloutType;
+  public readonly EventType = EventType;
   public settingForm!: FormGroup;
   public isSubmitting = false;
   hasConnectionSetting$!: Observable<boolean | null>;
@@ -67,12 +72,13 @@ export class GeneralSettingsComponent implements OnInit, OnDestroy {
   }
 
   get isLessThanTwoInterfaces(): boolean {
-    return !this.interfaces.length || this.interfaces?.length < 2;
+    return Object.keys(this.interfaces).length < 2;
   }
 
   constructor(
     private readonly testRunService: TestRunService,
     private readonly fb: FormBuilder,
+    private liveAnnouncer: LiveAnnouncer,
     private readonly onlyDifferentValuesValidator: OnlyDifferentValuesValidator
   ) {}
 
@@ -90,9 +96,12 @@ export class GeneralSettingsComponent implements OnInit, OnDestroy {
     this.reloadInterfacesEvent.emit();
   }
 
-  closeSetting(): void {
+  closeSetting(message: string): void {
     this.resetForm();
     this.closeSettingEvent.emit();
+    this.liveAnnouncer.announce(
+      `The ${message} finished. The connection setting panel is closed.`
+    );
     this.setSystemSetting();
   }
 
@@ -129,12 +138,10 @@ export class GeneralSettingsComponent implements OnInit, OnDestroy {
             this.testRunService.setHasConnectionSetting(true);
           } else {
             this.testRunService.setHasConnectionSetting(false);
-            this.openSetting();
           }
           this.setDefaultFormValues(device_intf, internet_intf);
         } else {
           this.testRunService.setHasConnectionSetting(false);
-          this.openSetting();
         }
         this.testRunService.setSystemConfig(config);
       });
@@ -170,17 +177,12 @@ export class GeneralSettingsComponent implements OnInit, OnDestroy {
       .createSystemConfig(data)
       .pipe(takeUntil(this.destroy$))
       .subscribe(() => {
-        this.closeSetting();
+        this.closeSetting(EventType.Save);
         this.testRunService.setSystemConfig(data);
-        this.testRunService.setIsOpenAddDevice(true);
         this.testRunService.setHasConnectionSetting(true);
       });
   }
 
-  private openSetting(): void {
-    this.openSettingEvent.emit();
-  }
-
   private setSystemSetting(): void {
     this.testRunService.systemConfig$
       .pipe(takeUntil(this.destroy$))
diff --git a/modules/ui/src/app/components/spinner/spinner.component.scss b/modules/ui/src/app/components/spinner/spinner.component.scss
index 5358b9874..788f2c676 100644
--- a/modules/ui/src/app/components/spinner/spinner.component.scss
+++ b/modules/ui/src/app/components/spinner/spinner.component.scss
@@ -9,7 +9,7 @@
   top: 0;
   bottom: 0;
   background-color: rgba(255, 255, 255, 0.7);
-  z-index: 9999;
+  z-index: 2;
   display: flex;
   align-items: center;
   justify-content: center;
diff --git a/modules/ui/src/app/components/version/update-dialog/update-dialog.component.html b/modules/ui/src/app/components/version/update-dialog/update-dialog.component.html
index 61b507282..b319f9b97 100644
--- a/modules/ui/src/app/components/version/update-dialog/update-dialog.component.html
+++ b/modules/ui/src/app/components/version/update-dialog/update-dialog.component.html
@@ -25,14 +25,21 @@
 </p>
 
 <mat-dialog-actions align="end" class="version-update-actions">
-  <button (click)="cancel()" class="cancel-button" mat-flat-button>
+  <button
+    (click)="cancel()"
+    class="cancel-button"
+    color="primary"
+    mat-button
+    type="button">
     Ignore
   </button>
   <a
     href="{{ data.latest_version_url }}"
     target="_blank"
     class="download-link"
-    mat-flat-button
+    color="primary"
+    mat-button
+    type="button"
     (click)="cancel()">
     Download
   </a>
diff --git a/modules/ui/src/app/components/version/version.component.html b/modules/ui/src/app/components/version/version.component.html
index 7d396e169..2420dbf5e 100644
--- a/modules/ui/src/app/components/version/version.component.html
+++ b/modules/ui/src/app/components/version/version.component.html
@@ -29,7 +29,7 @@
       version?.installed_version +
       ' New version is available. Click here to update'
     "
-    (click)="openUpdateWindow()">
+    (click)="openUpdateWindow(version)">
     {{ version?.installed_version }}
     <span
       role="alert"
diff --git a/modules/ui/src/app/components/version/version.component.spec.ts b/modules/ui/src/app/components/version/version.component.spec.ts
index 45c85e127..9f42b98ec 100644
--- a/modules/ui/src/app/components/version/version.component.spec.ts
+++ b/modules/ui/src/app/components/version/version.component.spec.ts
@@ -49,6 +49,7 @@ describe('VersionComponent', () => {
   describe('update is not available', () => {
     beforeEach(() => {
       versionBehaviorSubject$.next(VERSION);
+      mockService.getVersion.and.returnValue(versionBehaviorSubject$);
       fixture.detectChanges();
     });
 
@@ -64,6 +65,7 @@ describe('VersionComponent', () => {
   describe('update is available', () => {
     beforeEach(() => {
       versionBehaviorSubject$.next(NEW_VERSION);
+      mockService.getVersion.and.returnValue(versionBehaviorSubject$);
       fixture.detectChanges();
     });
 
diff --git a/modules/ui/src/app/components/version/version.component.ts b/modules/ui/src/app/components/version/version.component.ts
index e102ecaf6..5adb12bd1 100644
--- a/modules/ui/src/app/components/version/version.component.ts
+++ b/modules/ui/src/app/components/version/version.component.ts
@@ -13,14 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Component, OnInit } from '@angular/core';
+import { Component, OnDestroy, OnInit } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { TestRunService } from '../../services/test-run.service';
 import { Version } from '../../model/version';
-import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
 import { MatButtonModule } from '@angular/material/button';
 import { MatDialog, MatDialogModule } from '@angular/material/dialog';
 import { UpdateDialogComponent } from './update-dialog/update-dialog.component';
+import { tap } from 'rxjs/internal/operators/tap';
+
+import { Observable } from 'rxjs/internal/Observable';
+import { Subject } from 'rxjs/internal/Subject';
+import { takeUntil } from 'rxjs/internal/operators/takeUntil';
 
 @Component({
   selector: 'app-version',
@@ -29,28 +33,47 @@ import { UpdateDialogComponent } from './update-dialog/update-dialog.component';
   templateUrl: './version.component.html',
   styleUrls: ['./version.component.scss'],
 })
-export class VersionComponent implements OnInit {
-  version$: BehaviorSubject<Version | null>;
+export class VersionComponent implements OnInit, OnDestroy {
+  version$!: Observable<Version | null>;
+  private destroy$: Subject<boolean> = new Subject<boolean>();
+
+  private isDialogClosed = false;
 
   constructor(
     private testRunService: TestRunService,
     public dialog: MatDialog
-  ) {
-    this.version$ = testRunService.getVersion();
-  }
+  ) {}
 
   ngOnInit() {
     this.testRunService.fetchVersion();
+
+    this.version$ = this.testRunService.getVersion().pipe(
+      tap(version => {
+        if (version?.update_available && !this.isDialogClosed) {
+          this.openUpdateWindow(version);
+        }
+      })
+    );
   }
 
-  openUpdateWindow() {
-    this.dialog.open(UpdateDialogComponent, {
+  openUpdateWindow(version: Version) {
+    const dialogRef = this.dialog.open(UpdateDialogComponent, {
       ariaLabel: 'Update version',
-      data: this.version$.value,
+      data: version,
       autoFocus: true,
       hasBackdrop: true,
       disableClose: true,
       panelClass: 'version-update-dialog',
     });
+
+    dialogRef
+      ?.afterClosed()
+      .pipe(takeUntil(this.destroy$))
+      .subscribe(() => (this.isDialogClosed = true));
+  }
+
+  ngOnDestroy() {
+    this.destroy$.next(true);
+    this.destroy$.unsubscribe();
   }
 }
diff --git a/modules/ui/src/app/device-repository/device-form/device-form.component.html b/modules/ui/src/app/device-repository/device-form/device-form.component.html
index ef888451a..be653726f 100644
--- a/modules/ui/src/app/device-repository/device-form/device-form.component.html
+++ b/modules/ui/src/app/device-repository/device-form/device-form.component.html
@@ -79,7 +79,7 @@
   <mat-dialog-actions align="end" class="device-form-actions">
     <button
       (click)="delete()"
-      *ngIf="data.device"
+      [class.hidden]="!data.device"
       class="delete-button"
       mat-flat-button
       type="button">
diff --git a/modules/ui/src/app/device-repository/device-form/device-form.component.scss b/modules/ui/src/app/device-repository/device-form/device-form.component.scss
index ee0d87326..3f16cfa84 100644
--- a/modules/ui/src/app/device-repository/device-form/device-form.component.scss
+++ b/modules/ui/src/app/device-repository/device-form/device-form.component.scss
@@ -52,7 +52,7 @@ $device-form-min-width: 285px;
 }
 
 .close-button {
-  color: $grey-700;
+  color: $primary;
 }
 
 .device-form-mac-address-error {
@@ -60,6 +60,10 @@ $device-form-min-width: 285px;
 }
 
 .delete-button {
-  color: $grey-700;
+  color: $primary;
   margin-right: auto;
 }
+
+.hidden {
+  display: none;
+}
diff --git a/modules/ui/src/app/device-repository/device-form/device-form.component.spec.ts b/modules/ui/src/app/device-repository/device-form/device-form.component.spec.ts
index 2d0c7a423..47f8fa423 100644
--- a/modules/ui/src/app/device-repository/device-form/device-form.component.spec.ts
+++ b/modules/ui/src/app/device-repository/device-form/device-form.component.spec.ts
@@ -49,6 +49,8 @@ describe('DeviceFormComponent', () => {
       'getTestModules',
       'hasDevice',
       'saveDevice',
+      'editDevice',
+      'setIsOpenAddDevice',
     ]);
     testRunServiceMock.getTestModules.and.returnValue([
       {
@@ -122,6 +124,16 @@ describe('DeviceFormComponent', () => {
     closeSpy.calls.reset();
   });
 
+  it('should call setIsOpenAddDevice with false on "cancel" click', () => {
+    const closeButton = compiled.querySelector(
+      '.close-button'
+    ) as HTMLButtonElement;
+
+    closeButton?.click();
+
+    expect(testRunServiceMock.setIsOpenAddDevice).toHaveBeenCalledWith(false);
+  });
+
   it('should not save data when fields are empty', () => {
     const closeSpy = spyOn(component.dialogRef, 'close');
     const saveButton = compiled.querySelector(
@@ -354,12 +366,12 @@ describe('DeviceFormComponent', () => {
     });
   });
 
-  it('should have no delete device button', () => {
+  it('should have hidden delete device button', () => {
     const deleteButton = compiled.querySelector(
       '.delete-button'
     ) as HTMLButtonElement;
 
-    expect(deleteButton).toBeNull();
+    expect(deleteButton.classList.contains('hidden')).toBeTrue();
   });
 
   describe('when device is present', () => {
@@ -387,17 +399,15 @@ describe('DeviceFormComponent', () => {
       const manufacturer: HTMLInputElement = compiled.querySelector(
         '.device-form-manufacturer'
       ) as HTMLInputElement;
-      const macAddress: HTMLInputElement = compiled.querySelector(
-        '.device-form-mac-address'
-      ) as HTMLInputElement;
+
       expect(model.value).toEqual('O3-DIN-CPU');
       expect(manufacturer.value).toEqual('Delta');
-      expect(macAddress.disabled).toBeTrue();
     });
 
     it('should save data even mac address already exist', fakeAsync(() => {
       const closeSpy = spyOn(component.dialogRef, 'close');
       testRunServiceMock.saveDevice.and.returnValue(of(true));
+      testRunServiceMock.editDevice.and.returnValue(of(true));
       testRunServiceMock.hasDevice.and.returnValue(true);
       // fill the test controls
       component.test_modules.push(new FormControl(false));
@@ -431,15 +441,12 @@ describe('DeviceFormComponent', () => {
       flush();
     }));
 
-    it('should disable mac address', () => {
-      expect(component.mac_addr.disabled).toBeTrue();
-    });
-
     it('should have delete device button', () => {
       const deleteButton = compiled.querySelector(
         '.delete-button'
       ) as HTMLButtonElement;
 
+      expect(deleteButton.classList.contains('hidden')).toBeFalse();
       expect(deleteButton).toBeTruthy();
     });
 
diff --git a/modules/ui/src/app/device-repository/device-form/device-form.component.ts b/modules/ui/src/app/device-repository/device-form/device-form.component.ts
index 4cb53c258..f33271b95 100644
--- a/modules/ui/src/app/device-repository/device-form/device-form.component.ts
+++ b/modules/ui/src/app/device-repository/device-form/device-form.component.ts
@@ -28,6 +28,7 @@ import { DeviceValidators } from './device.validators';
 import { catchError, of, Subject, takeUntil } from 'rxjs';
 import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
 import { EscapableDialogComponent } from '../../components/escapable-dialog/escapable-dialog.component';
+import { Observable } from 'rxjs/internal/Observable';
 
 const MAC_ADDRESS_PATTERN =
   '^[\\s]*[a-fA-F0-9]{2}(?:[:][a-fA-F0-9]{2}){5}[\\s]*$';
@@ -109,6 +110,7 @@ export class DeviceFormComponent
   }
 
   cancel(): void {
+    this.testRunService.setIsOpenAddDevice(false);
     this.dialogRef.close();
   }
 
@@ -128,8 +130,7 @@ export class DeviceFormComponent
 
     const device = this.createDeviceFromForm();
 
-    this.testRunService
-      .saveDevice(device)
+    this.updateDevice(device)
       .pipe(
         takeUntil(this.destroy$),
         catchError(error => {
@@ -147,6 +148,13 @@ export class DeviceFormComponent
       });
   }
 
+  private updateDevice(device: Device): Observable<boolean> {
+    if (this.data.device) {
+      return this.testRunService.editDevice(device, this.data.device.mac_addr);
+    }
+    return this.testRunService.saveDevice(device);
+  }
+
   private isAllTestsDisabled(): boolean {
     return this.deviceForm.value.test_modules.every((enabled: boolean) => {
       return !enabled;
@@ -191,7 +199,7 @@ export class DeviceFormComponent
       model: ['', [this.deviceValidators.deviceStringFormat()]],
       manufacturer: ['', [this.deviceValidators.deviceStringFormat()]],
       mac_addr: [
-        { value: '', disabled: this.data.device },
+        '',
         [
           Validators.pattern(MAC_ADDRESS_PATTERN),
           this.deviceValidators.differentMACAddress(this.data.device),
diff --git a/modules/ui/src/app/device-repository/device-form/device.validators.ts b/modules/ui/src/app/device-repository/device-form/device.validators.ts
index 51264b135..dc6230502 100644
--- a/modules/ui/src/app/device-repository/device-form/device.validators.ts
+++ b/modules/ui/src/app/device-repository/device-form/device.validators.ts
@@ -45,7 +45,7 @@ export class DeviceValidators {
   public differentMACAddress(device?: Device): ValidatorFn {
     return (control: AbstractControl): ValidationErrors | null => {
       const value = control.value?.trim();
-      if (value && !device) {
+      if (value && (!device || device?.mac_addr !== value)) {
         const result = this.testRunService.hasDevice(value);
         return result ? { has_same_mac_address: true } : null;
       }
diff --git a/modules/ui/src/app/device-repository/device-repository.component.html b/modules/ui/src/app/device-repository/device-repository.component.html
index 00679934b..8ce001edb 100644
--- a/modules/ui/src/app/device-repository/device-repository.component.html
+++ b/modules/ui/src/app/device-repository/device-repository.component.html
@@ -22,6 +22,7 @@ <h2 class="title">Devices</h2>
     <ng-container *ngFor="let device of devices$ | async">
       <app-device-item
         (itemClicked)="openDialog($event)"
+        [class.device-item-selected]="device === selectedDevice"
         [device]="device"></app-device-item>
     </ng-container>
   </div>
diff --git a/modules/ui/src/app/device-repository/device-repository.component.spec.ts b/modules/ui/src/app/device-repository/device-repository.component.spec.ts
index e348729ee..9dd8f1340 100644
--- a/modules/ui/src/app/device-repository/device-repository.component.spec.ts
+++ b/modules/ui/src/app/device-repository/device-repository.component.spec.ts
@@ -120,28 +120,61 @@ describe('DeviceRepositoryComponent', () => {
       expect(item.length).toEqual(3);
     }));
 
-    it('should open device dialog on item click', () => {
-      const openSpy = spyOn(component.dialog, 'open').and.returnValue({
-        afterClosed: () => of(true),
-      } as MatDialogRef<typeof DeviceFormComponent>);
+    it('should add device-item-selected class for selected device', fakeAsync(() => {
+      component.selectedDevice = device;
       fixture.detectChanges();
+      const item = compiled.querySelector('app-device-item');
+
+      expect(item?.classList.contains('device-item-selected')).toBeTrue();
+    }));
 
-      component.openDialog(device);
-
-      expect(openSpy).toHaveBeenCalled();
-      expect(openSpy).toHaveBeenCalledWith(DeviceFormComponent, {
-        ariaLabel: 'Edit device',
-        data: {
-          device: device,
-          title: 'Edit device',
-        },
-        autoFocus: true,
-        hasBackdrop: true,
-        disableClose: true,
-        panelClass: 'device-form-dialog',
+    describe('#openDialog', () => {
+      it('should open device dialog on item click', () => {
+        const openSpy = spyOn(component.dialog, 'open').and.returnValue({
+          afterClosed: () => of(true),
+        } as MatDialogRef<typeof DeviceFormComponent>);
+        fixture.detectChanges();
+
+        component.openDialog(device);
+
+        expect(openSpy).toHaveBeenCalled();
+        expect(openSpy).toHaveBeenCalledWith(DeviceFormComponent, {
+          ariaLabel: 'Edit device',
+          data: {
+            device: device,
+            title: 'Edit device',
+          },
+          autoFocus: true,
+          hasBackdrop: true,
+          disableClose: true,
+          panelClass: 'device-form-dialog',
+        });
+
+        openSpy.calls.reset();
       });
 
-      openSpy.calls.reset();
+      it('should open device dialog with delete-button focus element', () => {
+        const openSpy = spyOn(component.dialog, 'open').and.returnValue({
+          afterClosed: () => of(true),
+        } as MatDialogRef<typeof DeviceFormComponent>);
+        fixture.detectChanges();
+
+        component.openDialog(device, true);
+
+        expect(openSpy).toHaveBeenCalledWith(DeviceFormComponent, {
+          ariaLabel: 'Edit device',
+          data: {
+            device: device,
+            title: 'Edit device',
+          },
+          autoFocus: '.delete-button',
+          hasBackdrop: true,
+          disableClose: true,
+          panelClass: 'device-form-dialog',
+        });
+
+        openSpy.calls.reset();
+      });
     });
   });
 
@@ -226,6 +259,20 @@ describe('DeviceRepositoryComponent', () => {
   });
 
   describe('delete device dialog', () => {
+    beforeEach(() => {
+      mockService.getDevices.and.returnValue(
+        new BehaviorSubject<Device[] | null>([device, device, device])
+      );
+      component.ngOnInit();
+    });
+
+    it('should show device item', fakeAsync(() => {
+      fixture.detectChanges();
+      const item = compiled.querySelectorAll('app-device-item');
+
+      expect(item.length).toEqual(3);
+    }));
+
     it('should delete device when dialog return true', () => {
       spyOn(component.dialog, 'open').and.returnValue({
         afterClosed: () => of(true),
@@ -239,6 +286,40 @@ describe('DeviceRepositoryComponent', () => {
       expect(mockService.removeDevice).toHaveBeenCalledWith(device);
     });
 
+    it('should focus next device when dialog return true and next device is exist', fakeAsync(() => {
+      spyOn(component.dialog, 'open').and.returnValue({
+        afterClosed: () => of(true),
+      } as MatDialogRef<typeof DeleteFormComponent>);
+      component.selectedDevice = device;
+      mockService.deleteDevice.and.returnValue(of(true));
+      mockService.removeDevice.and.callThrough();
+      fixture.detectChanges();
+      const deviceButton = compiled.querySelector(
+        '.device-item-selected + app-device-item button'
+      ) as HTMLButtonElement;
+      const buttonFocusSpy = spyOn(deviceButton, 'focus');
+
+      component.openDeleteDialog(device);
+
+      expect(buttonFocusSpy).toHaveBeenCalled();
+    }));
+
+    it('should focus add button when dialog return true and next device is not exist', fakeAsync(() => {
+      spyOn(component.dialog, 'open').and.returnValue({
+        afterClosed: () => of(true),
+      } as MatDialogRef<typeof DeleteFormComponent>);
+      component.selectedDevice = null;
+      mockService.deleteDevice.and.returnValue(of(true));
+      mockService.removeDevice.and.callThrough();
+      fixture.detectChanges();
+
+      component.openDeleteDialog(device);
+
+      expect(
+        document.activeElement?.classList.contains('device-add-button')
+      ).toBeTrue();
+    }));
+
     it('should open device dialog when dialog return null', () => {
       const openDeleteDialogSpy = spyOn(component, 'openDialog');
       spyOn(component.dialog, 'open').and.returnValue({
@@ -247,7 +328,7 @@ describe('DeviceRepositoryComponent', () => {
 
       component.openDeleteDialog(device);
 
-      expect(openDeleteDialogSpy).toHaveBeenCalledWith(device);
+      expect(openDeleteDialogSpy).toHaveBeenCalledWith(device, true);
     });
   });
 });
diff --git a/modules/ui/src/app/device-repository/device-repository.component.ts b/modules/ui/src/app/device-repository/device-repository.component.ts
index 0578ce2ef..7d35221d3 100644
--- a/modules/ui/src/app/device-repository/device-repository.component.ts
+++ b/modules/ui/src/app/device-repository/device-repository.component.ts
@@ -13,7 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import {
+  Component,
+  ElementRef,
+  OnDestroy,
+  OnInit,
+  ChangeDetectorRef,
+} from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { Observable } from 'rxjs/internal/Observable';
 import { Device } from '../model/device';
@@ -35,10 +41,13 @@ import { combineLatest } from 'rxjs/internal/observable/combineLatest';
 export class DeviceRepositoryComponent implements OnInit, OnDestroy {
   devices$!: Observable<Device[] | null>;
   private destroy$: Subject<boolean> = new Subject<boolean>();
+  selectedDevice: Device | undefined | null;
 
   constructor(
     private testRunService: TestRunService,
-    public dialog: MatDialog
+    public dialog: MatDialog,
+    private element: ElementRef,
+    private readonly changeDetectorRef: ChangeDetectorRef
   ) {}
 
   ngOnInit(): void {
@@ -58,14 +67,14 @@ export class DeviceRepositoryComponent implements OnInit, OnDestroy {
     this.destroy$.unsubscribe();
   }
 
-  openDialog(selectedDevice?: Device): void {
+  openDialog(selectedDevice?: Device, focusDeleteButton = false): void {
     const dialogRef = this.dialog.open(DeviceFormComponent, {
       ariaLabel: selectedDevice ? 'Edit device' : 'Create device',
       data: {
         device: selectedDevice || null,
         title: selectedDevice ? 'Edit device' : 'Create device',
       },
-      autoFocus: true,
+      autoFocus: focusDeleteButton ? '.delete-button' : true,
       hasBackdrop: true,
       disableClose: true,
       panelClass: 'device-form-dialog',
@@ -75,6 +84,7 @@ export class DeviceRepositoryComponent implements OnInit, OnDestroy {
       ?.afterClosed()
       .pipe(takeUntil(this.destroy$))
       .subscribe((response: FormResponse) => {
+        this.selectedDevice = null;
         if (!response) return;
 
         if (
@@ -92,6 +102,7 @@ export class DeviceRepositoryComponent implements OnInit, OnDestroy {
           this.testRunService.updateDevice(selectedDevice, response.device);
         }
         if (response.action === FormAction.Delete && selectedDevice) {
+          this.selectedDevice = selectedDevice;
           this.openDeleteDialog(selectedDevice);
         }
       });
@@ -120,10 +131,29 @@ export class DeviceRepositoryComponent implements OnInit, OnDestroy {
         if (deleteDevice) {
           this.testRunService.deleteDevice(device).subscribe(() => {
             this.testRunService.removeDevice(device);
+            this.focusNextButton();
+            this.selectedDevice = null;
           });
         } else {
-          this.openDialog(device);
+          this.openDialog(device, true);
+          this.selectedDevice = null;
         }
       });
   }
+
+  private focusNextButton() {
+    // Try to focus next device item, if exitst
+    const next = this.element.nativeElement.querySelector(
+      '.device-item-selected + app-device-item button'
+    );
+    if (next) {
+      next.focus();
+    } else {
+      this.changeDetectorRef.detectChanges();
+      // If next device item doest not exist, add device button should be focused
+      const addButton =
+        this.element.nativeElement.querySelector('.device-add-button');
+      addButton?.focus();
+    }
+  }
 }
diff --git a/modules/ui/src/app/history/history.component.html b/modules/ui/src/app/history/history.component.html
index 25fdff3b5..f2c992c82 100644
--- a/modules/ui/src/app/history/history.component.html
+++ b/modules/ui/src/app/history/history.component.html
@@ -25,6 +25,7 @@ <h2 class="title">Reports</h2>
       <table
         (matSortChange)="sortData($event)"
         [dataSource]="dataSource"
+        [trackBy]="trackByStarted"
         mat-table
         matSort
         tabindex="0">
@@ -132,7 +133,10 @@ <h2 class="title">Reports</h2>
                 file_download
               </mat-icon>
             </app-download-report>
-            <app-delete-report *ngIf="data?.device" [data]="data">
+            <app-delete-report
+              *ngIf="data?.device"
+              [data]="data"
+              (deviceRemoved)="focusNextButton()">
               <mat-icon
                 class="delete-report-icon"
                 fontSet="material-icons-outlined">
@@ -177,7 +181,12 @@ <h2 class="title">Reports</h2>
           </td>
         </tr>
 
-        <tr *matRowDef="let row; columns: displayedColumns" mat-row></tr>
+        <tr
+          *matRowDef="let row; columns: displayedColumns"
+          mat-row
+          #rowElement
+          [class.report-selected]="rowElement === selectedRow"
+          (click)="selectRow(rowElement)"></tr>
       </table>
     </div>
   </ng-container>
diff --git a/modules/ui/src/app/history/history.component.scss b/modules/ui/src/app/history/history.component.scss
index d74335db4..af0f8ffed 100644
--- a/modules/ui/src/app/history/history.component.scss
+++ b/modules/ui/src/app/history/history.component.scss
@@ -27,7 +27,7 @@
   padding-left: 32px;
   gap: 10px;
   background: $white;
-  height: 89px;
+  height: 72px;
 }
 
 .history-content {
diff --git a/modules/ui/src/app/history/history.component.spec.ts b/modules/ui/src/app/history/history.component.spec.ts
index 57b83267a..87ee2ab21 100644
--- a/modules/ui/src/app/history/history.component.spec.ts
+++ b/modules/ui/src/app/history/history.component.spec.ts
@@ -43,6 +43,18 @@ const history = [
     started: '2023-06-23T10:11:00.123Z',
     finished: '2023-06-23T10:17:10.123Z',
   },
+  {
+    status: 'compliant',
+    device: {
+      manufacturer: 'Delta',
+      model: '03-DIN-SRC',
+      mac_addr: '01:02:03:04:05:07',
+      firmware: '1.2.3',
+    },
+    report: 'https://api.testrun.io/report.pdf',
+    started: '2023-07-23T10:11:00.123Z',
+    finished: '2023-07-23T10:17:10.123Z',
+  },
 ] as TestrunStatus[];
 
 describe('HistoryComponent', () => {
@@ -214,6 +226,47 @@ describe('HistoryComponent', () => {
         mockFilteredData
       );
     });
+
+    it('should return true if filters has no values', () => {
+      component.filteredValues = {
+        deviceInfo: '',
+        deviceFirmware: '',
+        results: [],
+        dateRange: { start: '', end: '' },
+      };
+
+      expect(component.isFiltersEmpty()).toBeTrue();
+    });
+
+    describe('#focusNextButton', () => {
+      beforeEach(() => {
+        fixture.detectChanges();
+      });
+
+      it('should focus next active element if exist', () => {
+        const row = window.document.querySelector('tbody tr') as HTMLElement;
+        row.classList.add('report-selected');
+        const nextButton = window.document.querySelector(
+          '.report-selected + tr a'
+        ) as HTMLButtonElement;
+        const buttonFocusSpy = spyOn(nextButton, 'focus');
+
+        component.focusNextButton();
+
+        expect(buttonFocusSpy).toHaveBeenCalled();
+      });
+
+      it('should focus navigation button if next active element does not exist', () => {
+        const button = document.createElement('BUTTON');
+        button.classList.add('app-sidebar-button-reports');
+        document.querySelector('body')?.appendChild(button);
+        const buttonFocusSpy = spyOn(button, 'focus');
+
+        component.focusNextButton();
+
+        expect(buttonFocusSpy).toHaveBeenCalled();
+      });
+    });
   });
 
   describe('DOM tests', () => {
@@ -312,6 +365,15 @@ describe('HistoryComponent', () => {
 
         expect(emptyMessage).toBeTruthy();
       });
+
+      it('should select row on row click', () => {
+        component.selectedRow = null;
+        const row = window.document.querySelector('tbody tr') as HTMLElement;
+
+        row.click();
+
+        expect(component.selectedRow).toBeTruthy();
+      });
     });
   });
 });
diff --git a/modules/ui/src/app/history/history.component.ts b/modules/ui/src/app/history/history.component.ts
index ebcfb3bda..bb4b54b5e 100644
--- a/modules/ui/src/app/history/history.component.ts
+++ b/modules/ui/src/app/history/history.component.ts
@@ -30,7 +30,7 @@ import {
 import { DatePipe } from '@angular/common';
 import { MatSort, Sort } from '@angular/material/sort';
 import { Subject, takeUntil } from 'rxjs';
-import { MatTableDataSource } from '@angular/material/table';
+import { MatRow, MatTableDataSource } from '@angular/material/table';
 import { FilterDialogComponent } from '../components/filter-dialog/filter-dialog.component';
 import { MatDialog } from '@angular/material/dialog';
 import { tap } from 'rxjs/internal/operators/tap';
@@ -67,6 +67,7 @@ export class HistoryComponent implements OnInit, OnDestroy {
   private destroy$: Subject<boolean> = new Subject<boolean>();
   @ViewChild(MatSort, { static: false }) sort!: MatSort;
   dataLoaded = false;
+  selectedRow: MatRow | null = null;
   constructor(
     private testRunService: TestRunService,
     private datePipe: DatePipe,
@@ -285,8 +286,35 @@ export class HistoryComponent implements OnInit, OnDestroy {
   }
 
   isFiltersEmpty() {
-    return Object.values(this.filteredValues).every(
-      value => value.length === 0
-    );
+    return Object.values(this.filteredValues).every(value => {
+      if (value.start === '') {
+        return value.end.length === 0;
+      }
+      return value.length === 0;
+    });
+  }
+
+  selectRow(row: MatRow) {
+    this.selectedRow = row;
+  }
+
+  trackByStarted(index: number, item: TestrunStatus) {
+    return item.started;
+  }
+
+  focusNextButton() {
+    // Try to focus next interactive element, if exists
+    const next = window.document.querySelector(
+      '.report-selected + tr a'
+    ) as HTMLButtonElement;
+    if (next) {
+      next.focus();
+    } else {
+      // If next interactive element doest not exist, add menu reports button should be focused
+      const menuButton = window.document.querySelector(
+        '.app-sidebar-button-reports'
+      ) as HTMLButtonElement;
+      menuButton?.focus();
+    }
   }
 }
diff --git a/modules/ui/src/app/progress/progress-breadcrumbs/progress-breadcrumbs.component.ts b/modules/ui/src/app/model/event-type.ts
similarity index 57%
rename from modules/ui/src/app/progress/progress-breadcrumbs/progress-breadcrumbs.component.ts
rename to modules/ui/src/app/model/event-type.ts
index 4109c2c57..617fe8a49 100644
--- a/modules/ui/src/app/progress/progress-breadcrumbs/progress-breadcrumbs.component.ts
+++ b/modules/ui/src/app/model/event-type.ts
@@ -13,15 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
-import { Observable } from 'rxjs/internal/Observable';
-
-@Component({
-  selector: 'app-progress-breadcrumbs',
-  templateUrl: './progress-breadcrumbs.component.html',
-  styleUrls: ['./progress-breadcrumbs.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush,
-})
-export class ProgressBreadcrumbsComponent {
-  @Input() breadcrumbs$!: Observable<string[]>;
+export enum EventType {
+  Close = 'Close event',
+  Save = 'Save event',
 }
diff --git a/modules/ui/src/app/progress/progress-breadcrumbs/progress-breadcrumbs.component.html b/modules/ui/src/app/progress/progress-breadcrumbs/progress-breadcrumbs.component.html
deleted file mode 100644
index 0e28c84f7..000000000
--- a/modules/ui/src/app/progress/progress-breadcrumbs/progress-breadcrumbs.component.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-Copyright 2023 Google LLC
-
-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
-
-    https://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.
--->
-<ul class="progress-breadcrumbs">
-  <li class="breadcrumb-item first">
-    <mat-icon fontSet="material-icons-outlined" class="icon-home"
-      >home</mat-icon
-    >
-  </li>
-  <li *ngFor="let breadcrumb of breadcrumbs$ | async" class="breadcrumb-item">
-    <mat-icon class="icon"> keyboard_arrow_right </mat-icon>
-    <span class="breadcrumb-text">{{ breadcrumb }}</span>
-  </li>
-</ul>
diff --git a/modules/ui/src/app/progress/progress-breadcrumbs/progress-breadcrumbs.component.scss b/modules/ui/src/app/progress/progress-breadcrumbs/progress-breadcrumbs.component.scss
deleted file mode 100644
index 8abbab97b..000000000
--- a/modules/ui/src/app/progress/progress-breadcrumbs/progress-breadcrumbs.component.scss
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Copyright 2023 Google LLC
- *
- * 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
- *
- *     https://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.
- */
-@use '@angular/material' as mat;
-@import '../../../theming/colors';
-
-:host {
-  width: 100%;
-  overflow: hidden;
-}
-
-ul {
-  display: flex;
-  list-style: none;
-  margin: 0;
-  padding: 0 8px;
-
-  .breadcrumb-item {
-    display: flex;
-    flex: 0 1 auto;
-    max-width: 25%;
-    align-items: center;
-    justify-content: center;
-    gap: 8px;
-    margin-right: 16px;
-
-    &.first {
-      margin-right: 6px;
-      flex-shrink: 0;
-    }
-  }
-
-  .icon-home {
-    color: $dark-grey;
-    flex-shrink: 0;
-  }
-
-  .icon {
-    color: $secondary;
-    flex-shrink: 0;
-  }
-
-  .breadcrumb-text {
-    color: mat.get-color-from-palette($color-primary, 600);
-    text-align: center;
-    /* font-family: SF Pro Text; */
-    font-size: 12px;
-    font-weight: 700;
-    line-height: 16px;
-    letter-spacing: 0.3px;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-}
diff --git a/modules/ui/src/app/progress/progress-breadcrumbs/progress-breadcrumbs.component.spec.ts b/modules/ui/src/app/progress/progress-breadcrumbs/progress-breadcrumbs.component.spec.ts
deleted file mode 100644
index 8dde292e5..000000000
--- a/modules/ui/src/app/progress/progress-breadcrumbs/progress-breadcrumbs.component.spec.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Copyright 2023 Google LLC
- *
- * 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
- *
- *     https://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.
- */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ProgressBreadcrumbsComponent } from './progress-breadcrumbs.component';
-import { MatIconModule } from '@angular/material/icon';
-
-describe('ProgressBreadcrumbsComponent', () => {
-  let component: ProgressBreadcrumbsComponent;
-  let fixture: ComponentFixture<ProgressBreadcrumbsComponent>;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      declarations: [ProgressBreadcrumbsComponent],
-      imports: [MatIconModule],
-    });
-    fixture = TestBed.createComponent(ProgressBreadcrumbsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/modules/ui/src/app/progress/progress-initiate-form/progress-initiate-form.component.spec.ts b/modules/ui/src/app/progress/progress-initiate-form/progress-initiate-form.component.spec.ts
index 121e51465..604c05914 100644
--- a/modules/ui/src/app/progress/progress-initiate-form/progress-initiate-form.component.spec.ts
+++ b/modules/ui/src/app/progress/progress-initiate-form/progress-initiate-form.component.spec.ts
@@ -43,6 +43,7 @@ describe('ProgressInitiateFormComponent', () => {
     'systemStatus$',
     'getSystemStatus',
     'fetchVersion',
+    'setIsOpenStartTestrun',
   ]);
   testRunServiceMock.getTestModules.and.returnValue([
     {
@@ -109,6 +110,14 @@ describe('ProgressInitiateFormComponent', () => {
       expect(component.dialogRef.close).toHaveBeenCalled();
     });
 
+    it('should call setIsOpenAddDevice on cancel', () => {
+      component.cancel();
+
+      expect(testRunServiceMock.setIsOpenStartTestrun).toHaveBeenCalledWith(
+        false
+      );
+    });
+
     it('should set devices$ value', () => {
       component.ngOnInit();
 
diff --git a/modules/ui/src/app/progress/progress-initiate-form/progress-initiate-form.component.ts b/modules/ui/src/app/progress/progress-initiate-form/progress-initiate-form.component.ts
index b9f9de250..bfb08f3e3 100644
--- a/modules/ui/src/app/progress/progress-initiate-form/progress-initiate-form.component.ts
+++ b/modules/ui/src/app/progress/progress-initiate-form/progress-initiate-form.component.ts
@@ -67,6 +67,7 @@ export class ProgressInitiateFormComponent
   }
 
   cancel(): void {
+    this.testRunService.setIsOpenStartTestrun(false);
     this.dialogRef.close();
   }
 
diff --git a/modules/ui/src/app/progress/progress-status-card/progress-status-card.component.scss b/modules/ui/src/app/progress/progress-status-card/progress-status-card.component.scss
index 1d929bbbb..74f337d0f 100644
--- a/modules/ui/src/app/progress/progress-status-card/progress-status-card.component.scss
+++ b/modules/ui/src/app/progress/progress-status-card/progress-status-card.component.scss
@@ -17,7 +17,8 @@
 @import '../../../theming/colors';
 
 :host {
-  height: 152px;
+  height: auto;
+  min-height: 152px;
 }
 
 .progress-card {
@@ -26,6 +27,7 @@
   justify-content: space-between;
   width: 295px;
   height: 100%;
+  min-height: 152px;
   box-sizing: border-box;
   padding: 16px 32px;
 
diff --git a/modules/ui/src/app/progress/progress-table/progress-table.component.html b/modules/ui/src/app/progress/progress-table/progress-table.component.html
index 178d2cdb6..9a28e7824 100644
--- a/modules/ui/src/app/progress/progress-table/progress-table.component.html
+++ b/modules/ui/src/app/progress/progress-table/progress-table.component.html
@@ -24,7 +24,7 @@
     <ng-container matColumnDef="name">
       <th mat-header-cell *matHeaderCellDef class="table-header-cell">Name</th>
       <td mat-cell *matCellDef="let element" class="table-cell">
-        {{ element.name }}
+        <span>{{ element.name }}</span>
       </td>
     </ng-container>
 
@@ -33,7 +33,7 @@
         Description
       </th>
       <td mat-cell *matCellDef="let element" class="table-cell">
-        {{ element.description }}
+        <span>{{ element.description }}</span>
       </td>
     </ng-container>
 
@@ -48,7 +48,7 @@
         <span
           class="table-cell-result-text"
           [ngClass]="getResultClass(element.result)">
-          {{ element.result }}
+          <span>{{ element.result }}</span>
         </span>
       </td>
     </ng-container>
diff --git a/modules/ui/src/app/progress/progress.component.html b/modules/ui/src/app/progress/progress.component.html
index 75b6d57b2..66d1016ed 100644
--- a/modules/ui/src/app/progress/progress.component.html
+++ b/modules/ui/src/app/progress/progress.component.html
@@ -26,14 +26,12 @@
         <div class="toolbar-row top">
           <ng-container
             *ngTemplateOutlet="startNewTestrunButton"></ng-container>
-          <span class="vertical-divider"></span>
-          <app-progress-breadcrumbs [breadcrumbs$]="breadcrumbs$">
-          </app-progress-breadcrumbs>
         </div>
         <div class="toolbar-row bottom">
           <h2 class="title progress-title">
-            {{ data.device.manufacturer }} {{ data.device.model }}
-            {{ data.device.firmware }} {{ data.started | date: 'd MMM y H:mm' }}
+            {{ data.device.manufacturer }} {{ data.device.model }} v{{
+              data.device.firmware
+            }}
           </h2>
           <button
             *ngIf="testrunInProgress(data.status)"
diff --git a/modules/ui/src/app/progress/progress.component.scss b/modules/ui/src/app/progress/progress.component.scss
index 4df37a115..50fd91fe1 100644
--- a/modules/ui/src/app/progress/progress.component.scss
+++ b/modules/ui/src/app/progress/progress.component.scss
@@ -101,13 +101,13 @@
   overflow-y: auto;
   flex: 1;
   padding-top: 10px;
+  & ::ng-deep .loader {
+    width: 196px;
+    height: 196px;
+  }
 }
 
 .progress-table-progress-empty {
   position: relative;
   overflow-y: hidden;
-  & ::ng-deep .loader {
-    width: 196px;
-    height: 196px;
-  }
 }
diff --git a/modules/ui/src/app/progress/progress.component.spec.ts b/modules/ui/src/app/progress/progress.component.spec.ts
index 433dc8a45..77e29dc43 100644
--- a/modules/ui/src/app/progress/progress.component.spec.ts
+++ b/modules/ui/src/app/progress/progress.component.spec.ts
@@ -51,6 +51,7 @@ import { device } from '../mocks/device.mock';
 import { DeleteFormComponent } from '../components/delete-form/delete-form.component';
 import { SpinnerComponent } from '../components/spinner/spinner.component';
 import { LoaderService } from '../services/loader.service';
+import { StateService } from '../services/state.service';
 
 describe('ProgressComponent', () => {
   let component: ProgressComponent;
@@ -64,16 +65,26 @@ describe('ProgressComponent', () => {
       'systemStatus$',
       'stopTestrun',
       'getDevices',
+      'isOpenStartTestrun$',
+      'isTestrunStarted$',
     ]);
 
   const loaderServiceMock: jasmine.SpyObj<LoaderService> = jasmine.createSpyObj(
-    ['setLoading']
+    ['setLoading', 'getLoading']
+  );
+
+  const stateServiceMock: jasmine.SpyObj<StateService> = jasmine.createSpyObj(
+    'stateServiceMock',
+    ['focusFirstElementInMain']
   );
 
   testRunServiceMock.getDevices.and.returnValue(
     new BehaviorSubject<Device[] | null>([])
   );
 
+  testRunServiceMock.isOpenStartTestrun$ = new BehaviorSubject(false);
+  testRunServiceMock.isTestrunStarted$ = new BehaviorSubject(false);
+
   describe('Class tests', () => {
     beforeEach(() => {
       testRunServiceMock.systemStatus$ = of(MOCK_PROGRESS_DATA_IN_PROGRESS);
@@ -85,12 +96,12 @@ describe('ProgressComponent', () => {
       TestBed.configureTestingModule({
         declarations: [
           ProgressComponent,
-          FakeProgressBreadcrumbsComponent,
           FakeProgressStatusCardComponent,
           FakeProgressTableComponent,
         ],
         providers: [
           { provide: TestRunService, useValue: testRunServiceMock },
+          { provide: StateService, useValue: stateServiceMock },
           {
             provide: MatDialogRef,
             useValue: {},
@@ -101,6 +112,8 @@ describe('ProgressComponent', () => {
           MatIconModule,
           MatToolbarModule,
           MatDialogModule,
+          SpinnerComponent,
+          DownloadReportComponent,
         ],
       })
         .overrideComponent(ProgressComponent, {
@@ -125,6 +138,21 @@ describe('ProgressComponent', () => {
       expect(component).toBeTruthy();
     });
 
+    describe('openTestRunModal on first flow', () => {
+      beforeEach(() => {
+        testRunServiceMock.isOpenStartTestrun$ = new BehaviorSubject(true);
+        component.ngOnInit();
+      });
+
+      it('should open the modal if isOpenStartTestrun$ as true', () => {
+        const openDialogSpy = spyOn(component, 'openTestRunModal');
+
+        component.ngOnInit();
+
+        expect(openDialogSpy).toHaveBeenCalled();
+      });
+    });
+
     describe('#stopTestrun', () => {
       it('should call service method stopTestrun', () => {
         component.stopTestrun();
@@ -177,20 +205,6 @@ describe('ProgressComponent', () => {
         });
       });
 
-      it('should set breadcrumbs$ value', () => {
-        const expectedResult = [
-          MOCK_PROGRESS_DATA_IN_PROGRESS.device.manufacturer,
-          MOCK_PROGRESS_DATA_IN_PROGRESS.device.model,
-          MOCK_PROGRESS_DATA_IN_PROGRESS.device.firmware,
-        ];
-
-        component.ngOnInit();
-
-        component.breadcrumbs$.subscribe(res => {
-          expect(res).toEqual(expectedResult);
-        });
-      });
-
       describe('dataSource$', () => {
         it('should set value with empty values if result length < total for status "In Progress"', () => {
           const expectedResult = TEST_DATA_TABLE_RESULT;
@@ -228,6 +242,16 @@ describe('ProgressComponent', () => {
         });
       });
 
+      it('should call focusFirstElementInMain when testrun stops after cancelling', () => {
+        testRunServiceMock.systemStatus$ = of(MOCK_PROGRESS_DATA_COMPLIANT);
+        component.isCancelling = true;
+
+        component.ngOnInit();
+        fixture.detectChanges();
+
+        expect(stateServiceMock.focusFirstElementInMain).toHaveBeenCalled();
+      });
+
       describe('hideLoading', () => {
         it('should called if testrun is finished', () => {
           testRunServiceMock.systemStatus$ = of(MOCK_PROGRESS_DATA_COMPLIANT);
@@ -283,12 +307,12 @@ describe('ProgressComponent', () => {
       await TestBed.configureTestingModule({
         declarations: [
           ProgressComponent,
-          FakeProgressBreadcrumbsComponent,
           FakeProgressStatusCardComponent,
           FakeProgressTableComponent,
         ],
         providers: [
           { provide: TestRunService, useValue: testRunServiceMock },
+          { provide: StateService, useValue: stateServiceMock },
           {
             provide: MatDialogRef,
             useValue: {},
@@ -302,7 +326,15 @@ describe('ProgressComponent', () => {
           DownloadReportComponent,
           SpinnerComponent,
         ],
-      }).compileComponents();
+      })
+        .overrideComponent(ProgressComponent, {
+          set: {
+            providers: [
+              { provide: LoaderService, useValue: loaderServiceMock },
+            ],
+          },
+        })
+        .compileComponents();
 
       fixture = TestBed.createComponent(ProgressComponent);
       compiled = fixture.nativeElement as HTMLElement;
@@ -359,7 +391,7 @@ describe('ProgressComponent', () => {
         expect(startBtn.disabled).toBeFalse();
       });
 
-      it('should open initiate test run modal when start button clicked', () => {
+      it('should open initiate test run modal when start button clicked', fakeAsync(() => {
         const openSpy = spyOn(component.dialog, 'open').and.returnValue({
           afterClosed: () => of(true),
         } as MatDialogRef<typeof ProgressInitiateFormComponent>);
@@ -376,9 +408,11 @@ describe('ProgressComponent', () => {
           disableClose: true,
           panelClass: 'initiate-test-run-dialog',
         });
+        tick(0);
+        expect(stateServiceMock.focusFirstElementInMain).toHaveBeenCalled();
 
         openSpy.calls.reset();
-      });
+      }));
     });
 
     describe('with available systemStatus$ data, status "In Progress"', () => {
@@ -592,14 +626,6 @@ describe('ProgressComponent', () => {
   });
 });
 
-@Component({
-  selector: 'app-progress-breadcrumbs',
-  template: '<div></div>',
-})
-class FakeProgressBreadcrumbsComponent {
-  @Input() breadcrumbs$!: Observable<string[]>;
-}
-
 @Component({
   selector: 'app-progress-status-card',
   template: '<div></div>',
diff --git a/modules/ui/src/app/progress/progress.component.ts b/modules/ui/src/app/progress/progress.component.ts
index d4183a46c..6702f8a51 100644
--- a/modules/ui/src/app/progress/progress.component.ts
+++ b/modules/ui/src/app/progress/progress.component.ts
@@ -22,20 +22,29 @@ import {
 import { Observable } from 'rxjs/internal/Observable';
 import { TestRunService } from '../services/test-run.service';
 import {
-  IDevice,
   IResult,
   StatusOfTestrun,
   TestrunStatus,
   TestsData,
   TestsResponse,
 } from '../model/testrun-status';
-import { interval, map, shareReplay, Subject, takeUntil, tap } from 'rxjs';
+import {
+  interval,
+  map,
+  shareReplay,
+  Subject,
+  takeUntil,
+  tap,
+  timer,
+} from 'rxjs';
 import { MatDialog } from '@angular/material/dialog';
 import { ProgressInitiateFormComponent } from './progress-initiate-form/progress-initiate-form.component';
 import { DeleteFormComponent } from '../components/delete-form/delete-form.component';
 import { LoaderService } from '../services/loader.service';
 import { LOADER_TIMEOUT_CONFIG_TOKEN } from '../services/loaderConfig';
 import { Device } from '../model/device';
+import { StateService } from '../services/state.service';
+import { combineLatest } from 'rxjs/internal/observable/combineLatest';
 
 const EMPTY_RESULT = new Array(100).fill(null).map(() => ({}) as IResult);
 
@@ -51,25 +60,37 @@ const EMPTY_RESULT = new Array(100).fill(null).map(() => ({}) as IResult);
 })
 export class ProgressComponent implements OnInit, OnDestroy {
   public systemStatus$!: Observable<TestrunStatus>;
-  public breadcrumbs$!: Observable<string[]>;
   public dataSource$!: Observable<IResult[] | undefined>;
   public devices$!: Observable<Device[] | null>;
   public readonly StatusOfTestrun = StatusOfTestrun;
 
   private destroy$: Subject<boolean> = new Subject<boolean>();
+  private destroyInterval$: Subject<boolean> = new Subject<boolean>();
   private startInterval = false;
   public currentStatus: TestrunStatus | null = null;
-  private isCancelling = false;
+  isCancelling = false;
 
   constructor(
     private readonly testRunService: TestRunService,
     private readonly loaderService: LoaderService,
-    public dialog: MatDialog
+    public dialog: MatDialog,
+    private readonly state: StateService
   ) {}
 
   ngOnInit(): void {
     this.devices$ = this.testRunService.getDevices();
 
+    combineLatest([
+      this.testRunService.isOpenStartTestrun$,
+      this.testRunService.isTestrunStarted$,
+    ])
+      .pipe(takeUntil(this.destroy$))
+      .subscribe(([isOpenStartTestrun, isTestrunStarted]) => {
+        if (isOpenStartTestrun && !isTestrunStarted) {
+          this.openTestRunModal();
+        }
+      });
+
     this.systemStatus$ = this.testRunService.systemStatus$.pipe(
       tap(res => {
         this.currentStatus = res;
@@ -94,8 +115,11 @@ export class ProgressComponent implements OnInit, OnDestroy {
           !this.testrunInProgress(res.status) &&
           res.status !== StatusOfTestrun.Cancelling
         ) {
+          if (this.isCancelling) {
+            this.state.focusFirstElementInMain();
+          }
           this.isCancelling = false;
-          this.destroy$.next(true);
+          this.destroyInterval$.next(true);
           this.startInterval = false;
           this.hideLoading();
         }
@@ -103,11 +127,6 @@ export class ProgressComponent implements OnInit, OnDestroy {
       shareReplay({ refCount: true, bufferSize: 1 })
     );
 
-    this.breadcrumbs$ = this.systemStatus$.pipe(
-      map((res: TestrunStatus) => res?.device),
-      map((res: IDevice) => [res?.manufacturer, res?.model, res?.firmware])
-    );
-
     this.dataSource$ = this.systemStatus$.pipe(
       map((res: TestrunStatus) => {
         const results = (res.tests as TestsData)?.results || [];
@@ -148,7 +167,7 @@ export class ProgressComponent implements OnInit, OnDestroy {
     this.startInterval = true;
     interval(5000)
       .pipe(
-        takeUntil(this.destroy$),
+        takeUntil(this.destroyInterval$),
         tap(() => this.testRunService.getSystemStatus(this.isCancelling))
       )
       .subscribe();
@@ -209,16 +228,29 @@ export class ProgressComponent implements OnInit, OnDestroy {
   ngOnDestroy() {
     this.destroy$.next(true);
     this.destroy$.unsubscribe();
+    this.destroyInterval$.next(true);
+    this.destroyInterval$.unsubscribe();
   }
 
   openTestRunModal(): void {
-    this.dialog.open(ProgressInitiateFormComponent, {
+    const dialogRef = this.dialog.open(ProgressInitiateFormComponent, {
       ariaLabel: 'Initiate testrun',
       autoFocus: true,
       hasBackdrop: true,
       disableClose: true,
       panelClass: 'initiate-test-run-dialog',
     });
+
+    dialogRef
+      ?.afterClosed()
+      .pipe(takeUntil(this.destroy$))
+      .subscribe(() => {
+        timer(0)
+          .pipe(takeUntil(this.destroy$))
+          .subscribe(() => {
+            this.state.focusFirstElementInMain();
+          });
+      });
   }
 
   resultIsEmpty(tests: TestsResponse | undefined) {
diff --git a/modules/ui/src/app/progress/progress.module.ts b/modules/ui/src/app/progress/progress.module.ts
index 190fff085..e7b28e662 100644
--- a/modules/ui/src/app/progress/progress.module.ts
+++ b/modules/ui/src/app/progress/progress.module.ts
@@ -23,7 +23,6 @@ import { MatTableModule } from '@angular/material/table';
 
 import { ProgressRoutingModule } from './progress-routing.module';
 import { ProgressComponent } from './progress.component';
-import { ProgressBreadcrumbsComponent } from './progress-breadcrumbs/progress-breadcrumbs.component';
 import { ProgressStatusCardComponent } from './progress-status-card/progress-status-card.component';
 import { ProgressTableComponent } from './progress-table/progress-table.component';
 import { ProgressInitiateFormComponent } from './progress-initiate-form/progress-initiate-form.component';
@@ -38,7 +37,6 @@ import { SpinnerComponent } from '../components/spinner/spinner.component';
 @NgModule({
   declarations: [
     ProgressComponent,
-    ProgressBreadcrumbsComponent,
     ProgressStatusCardComponent,
     ProgressTableComponent,
     ProgressInitiateFormComponent,
diff --git a/modules/ui/src/app/services/state.service.spec.ts b/modules/ui/src/app/services/state.service.spec.ts
new file mode 100644
index 000000000..0a5c5bc0a
--- /dev/null
+++ b/modules/ui/src/app/services/state.service.spec.ts
@@ -0,0 +1,39 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { StateService } from './state.service';
+import { Component } from '@angular/core';
+
+@Component({
+  template: '<div id="main"><button id="test-button">Test</button></div>',
+})
+class DummyComponent {}
+
+describe('StateService', () => {
+  let service: StateService;
+  let fixture: ComponentFixture<DummyComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [DummyComponent],
+    });
+    service = TestBed.inject(StateService);
+
+    fixture = TestBed.createComponent(DummyComponent);
+
+    fixture.detectChanges();
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+
+  it('should focus element', () => {
+    const testButton = fixture.nativeElement.querySelector(
+      '#test-button'
+    ) as HTMLButtonElement;
+
+    service.focusFirstElementInMain();
+
+    expect(document.activeElement).toBe(testButton);
+  });
+});
diff --git a/modules/ui/src/app/services/state.service.ts b/modules/ui/src/app/services/state.service.ts
new file mode 100644
index 000000000..509fbd897
--- /dev/null
+++ b/modules/ui/src/app/services/state.service.ts
@@ -0,0 +1,17 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class StateService {
+  focusFirstElementInMain() {
+    const firstControl: HTMLElement | null = window.document.querySelector(
+      '#main button:not([disabled="true"]), ' +
+        '#main a:not([disabled="true"]), #main table'
+    );
+
+    if (firstControl) {
+      firstControl.focus();
+    }
+  }
+}
diff --git a/modules/ui/src/app/services/test-run.service.spec.ts b/modules/ui/src/app/services/test-run.service.spec.ts
index 68b841487..5cb091fed 100644
--- a/modules/ui/src/app/services/test-run.service.spec.ts
+++ b/modules/ui/src/app/services/test-run.service.spec.ts
@@ -20,7 +20,7 @@ import {
 import { fakeAsync, getTestBed, TestBed, tick } from '@angular/core/testing';
 import { Device, TestModule } from '../model/device';
 
-import { TestRunService } from './test-run.service';
+import { SystemInterfaces, TestRunService } from './test-run.service';
 import { SystemConfig } from '../model/setting';
 import {
   MOCK_PROGRESS_DATA_CANCELLING,
@@ -82,11 +82,6 @@ describe('TestRunService', () => {
         name: 'nmap',
         enabled: true,
       },
-      {
-        displayName: 'Security',
-        name: 'security',
-        enabled: true,
-      },
       {
         displayName: 'TLS',
         name: 'tls',
@@ -165,7 +160,10 @@ describe('TestRunService', () => {
 
   it('getSystemInterfaces should return array of interfaces', () => {
     const apiUrl = 'http://localhost:8000/system/interfaces';
-    const mockSystemInterfaces: string[] = ['mockValue', 'mockValue'];
+    const mockSystemInterfaces: SystemInterfaces = {
+      mockValue1: 'mockValue1',
+      mockValue2: 'mockValue2',
+    };
 
     service.getSystemInterfaces().subscribe(res => {
       expect(res).toEqual(mockSystemInterfaces);
@@ -245,32 +243,50 @@ describe('TestRunService', () => {
     });
   });
 
-  it('getHistory should return reports', () => {
-    let result: TestrunStatus[] | null = null;
+  describe('getHistory', () => {
+    it('should return reports', () => {
+      let result: TestrunStatus[] | null = null;
+
+      const reports = [
+        {
+          status: 'Completed',
+          device: device,
+          report: 'https://api.testrun.io/report.pdf',
+          started: '2023-06-22T10:11:00.123Z',
+          finished: '2023-06-22T10:17:00.123Z',
+        },
+      ] as TestrunStatus[];
+
+      service.getHistory().subscribe(res => {
+        expect(res).toEqual(result);
+      });
 
-    const reports = [
-      {
-        status: 'Completed',
-        device: device,
-        report: 'https://api.testrun.io/report.pdf',
-        started: '2023-06-22T10:11:00.123Z',
-        finished: '2023-06-22T10:17:00.123Z',
-      },
-    ] as TestrunStatus[];
+      result = reports;
+      service.fetchHistory();
+      const req = httpTestingController.expectOne(
+        'http://localhost:8000/reports'
+      );
 
-    service.getHistory().subscribe(res => {
-      expect(res).toEqual(result);
+      expect(req.request.method).toBe('GET');
+
+      req.flush(reports);
     });
 
-    result = reports;
-    service.fetchHistory();
-    const req = httpTestingController.expectOne(
-      'http://localhost:8000/reports'
-    );
+    it('should return [] when error happens', () => {
+      let result: TestrunStatus[] | null = null;
 
-    expect(req.request.method).toBe('GET');
+      service.getHistory().subscribe(res => {
+        expect(res).toEqual(result);
+      });
 
-    req.flush(reports);
+      result = [];
+      service.fetchHistory();
+      const req = httpTestingController.expectOne({
+        url: 'http://localhost:8000/reports',
+      });
+
+      req.flush([], { status: 500, statusText: 'error' });
+    });
   });
 
   describe('#getResultClass', () => {
@@ -435,4 +451,32 @@ describe('TestRunService', () => {
         )
     ).toEqual(false);
   }));
+
+  it('#saveDevice should have necessary request data', () => {
+    const apiUrl = 'http://localhost:8000/device';
+
+    service.saveDevice(device).subscribe(res => {
+      expect(res).toEqual(true);
+    });
+
+    const req = httpTestingController.expectOne(apiUrl);
+    expect(req.request.method).toBe('POST');
+    expect(req.request.body).toEqual(JSON.stringify(device));
+    req.flush(true);
+  });
+
+  it('#editDevice should have necessary request data', () => {
+    const apiUrl = 'http://localhost:8000/device/edit';
+
+    service.editDevice(device, '01:01:01:01:01:01').subscribe(res => {
+      expect(res).toEqual(true);
+    });
+
+    const req = httpTestingController.expectOne(apiUrl);
+    expect(req.request.method).toBe('POST');
+    expect(req.request.body).toEqual(
+      JSON.stringify({ mac_addr: '01:01:01:01:01:01', device })
+    );
+    req.flush(true);
+  });
 });
diff --git a/modules/ui/src/app/services/test-run.service.ts b/modules/ui/src/app/services/test-run.service.ts
index 22b4d2328..37d46f23b 100644
--- a/modules/ui/src/app/services/test-run.service.ts
+++ b/modules/ui/src/app/services/test-run.service.ts
@@ -30,6 +30,10 @@ import { Version } from '../model/version';
 
 const API_URL = 'http://localhost:8000';
 
+export type SystemInterfaces = {
+  [key: string]: string;
+};
+
 @Injectable({
   providedIn: 'root',
 })
@@ -55,11 +59,6 @@ export class TestRunService {
       name: 'nmap',
       enabled: true,
     },
-    {
-      displayName: 'Security',
-      name: 'security',
-      enabled: true,
-    },
     {
       displayName: 'TLS',
       name: 'tls',
@@ -70,6 +69,8 @@ export class TestRunService {
   private devices = new BehaviorSubject<Device[] | null>(null);
   private isOpenAddDeviceSub$ = new BehaviorSubject<boolean>(false);
   public isOpenAddDevice$ = this.isOpenAddDeviceSub$.asObservable();
+  private isOpenStartTestrunSub$ = new BehaviorSubject<boolean>(false);
+  public isOpenStartTestrun$ = this.isOpenStartTestrunSub$.asObservable();
   private _systemConfig = new BehaviorSubject<SystemConfig | null>(null);
   public systemConfig$ = this._systemConfig.asObservable();
   private systemStatusSubject = new ReplaySubject<TestrunStatus>(1);
@@ -87,6 +88,10 @@ export class TestRunService {
     this.isOpenAddDeviceSub$.next(isOpen);
   }
 
+  setIsOpenStartTestrun(isOpen: boolean): void {
+    this.isOpenStartTestrunSub$.next(isOpen);
+  }
+
   setHasConnectionSetting(hasSetting: boolean): void {
     this.hasConnectionSettingSub$.next(hasSetting);
   }
@@ -124,8 +129,8 @@ export class TestRunService {
       .pipe(retry(1));
   }
 
-  getSystemInterfaces(): Observable<string[]> {
-    return this.http.get<string[]>(`${API_URL}/system/interfaces`);
+  getSystemInterfaces(): Observable<SystemInterfaces> {
+    return this.http.get<SystemInterfaces>(`${API_URL}/system/interfaces`);
   }
 
   /**
@@ -161,6 +166,20 @@ export class TestRunService {
       .pipe(map(() => true));
   }
 
+  editDevice(device: Device, mac_addr: string): Observable<boolean> {
+    type EditDeviceRequest = {
+      mac_addr: string; // original mac address
+      device: Device;
+    };
+    const request: EditDeviceRequest = {
+      mac_addr,
+      device,
+    };
+
+    return this.http
+      .post<boolean>(`${API_URL}/device/edit`, JSON.stringify(request))
+      .pipe(map(() => true));
+  }
   deleteDevice(device: Device): Observable<boolean> {
     return this.http
       .delete<boolean>(`${API_URL}/device`, {
@@ -185,12 +204,13 @@ export class TestRunService {
 
   updateDevice(deviceToUpdate: Device, update: Device): void {
     const device = this.devices.value?.find(
-      device => update.mac_addr === device.mac_addr
+      device => deviceToUpdate.mac_addr === device.mac_addr
     );
     if (device) {
       device.model = update.model;
       device.manufacturer = update.manufacturer;
       device.test_modules = update.test_modules;
+      device.mac_addr = update.mac_addr;
 
       this.devices.next(this.devices.value);
     }
@@ -207,12 +227,14 @@ export class TestRunService {
   }
 
   fetchHistory(): void {
-    this.http
-      .get<TestrunStatus[]>(`${API_URL}/reports`)
-      .pipe(retry(1))
-      .subscribe(data => {
+    this.http.get<TestrunStatus[]>(`${API_URL}/reports`).subscribe(
+      data => {
         this.history.next(data);
-      });
+      },
+      () => {
+        this.history.next([]);
+      }
+    );
   }
 
   getHistory(): BehaviorSubject<TestrunStatus[] | null> {
diff --git a/modules/ui/src/index.html b/modules/ui/src/index.html
index 37521c779..aee186784 100644
--- a/modules/ui/src/index.html
+++ b/modules/ui/src/index.html
@@ -16,6 +16,20 @@
 <!doctype html>
 <html lang="en">
   <head>
+    <!-- Google Tag Manager -->
+    <script>
+      (function (w, d, s, l, i) {
+        w[l] = w[l] || [];
+        w[l].push({ 'gtm.start': new Date().getTime(), event: 'gtm.js' });
+        var f = d.getElementsByTagName(s)[0],
+          j = d.createElement(s),
+          dl = l != 'dataLayer' ? '&l=' + l : '';
+        j.async = true;
+        j.src = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl;
+        f.parentNode.insertBefore(j, f);
+      })(window, document, 'script', 'dataLayer', 'GTM-NDFZ7L89');
+    </script>
+    <!-- End Google Tag Manager -->
     <!-- Google tag (gtag.js) -->
     <script
       async
@@ -43,6 +57,15 @@
       rel="stylesheet" />
   </head>
   <body class="mat-typography">
+    <!-- Google Tag Manager (noscript) -->
+    <noscript
+      ><iframe
+        src="https://www.googletagmanager.com/ns.html?id=GTM-NDFZ7L89"
+        height="0"
+        width="0"
+        style="display: none; visibility: hidden"></iframe
+    ></noscript>
+    <!-- End Google Tag Manager (noscript) -->
     <app-root></app-root>
   </body>
 </html>
diff --git a/modules/ui/src/theming/theme.scss b/modules/ui/src/theming/theme.scss
index 27880951a..9912da5ec 100644
--- a/modules/ui/src/theming/theme.scss
+++ b/modules/ui/src/theming/theme.scss
@@ -50,7 +50,7 @@ $brand-light-theme-secondary: mat.define-light-theme(
   (
     color: (
       primary: $app-primary,
-      accent: $app-secondary,
+      accent: $app-primary,
       warn: $app-warn,
     ),
     typography: $app-typography,

From ac51109fc13a16c15099cd0fce01c477e1d77d54 Mon Sep 17 00:00:00 2001
From: J Boddey <boddey@google.com>
Date: Wed, 17 Jan 2024 12:21:47 +0000
Subject: [PATCH 04/11] Add edit device endpoint (#227)

Signed-off-by: J Boddey <boddey@google.com>
---
 cmd/package                               |  2 +-
 framework/python/src/api/api.py           | 77 ++++++++++++++++++++++-
 framework/python/src/common/testreport.py |  2 +-
 make/DEBIAN/control                       |  2 +-
 4 files changed, 78 insertions(+), 5 deletions(-)

diff --git a/cmd/package b/cmd/package
index cb81c1592..988d4092e 100755
--- a/cmd/package
+++ b/cmd/package
@@ -53,4 +53,4 @@ cp -r {framework,modules} $MAKE_SRC_DIR/usr/local/testrun
 dpkg-deb --build --root-owner-group make
 
 # Rename the .deb file
-mv make.deb testrun_1-1-1-alpha_amd64.deb
+mv make.deb testrun_1-1-1-beta_amd64.deb
diff --git a/framework/python/src/api/api.py b/framework/python/src/api/api.py
index 8bfa9171c..80730f4d6 100644
--- a/framework/python/src/api/api.py
+++ b/framework/python/src/api/api.py
@@ -77,6 +77,9 @@ def __init__(self, test_run):
                                self.delete_device,
                                methods=["DELETE"])
     self._router.add_api_route("/device", self.save_device, methods=["POST"])
+    self._router.add_api_route("/device/edit",
+                               self.edit_device,
+                               methods=["POST"])
 
     # Allow all origins to access the API
     origins = ["*"]
@@ -365,6 +368,7 @@ async def delete_device(self, request: Request, response: Response):
                                 "the device")
 
   async def save_device(self, request: Request, response: Response):
+
     LOGGER.debug("Received device post request")
 
     try:
@@ -392,8 +396,9 @@ async def save_device(self, request: Request, response: Response):
 
       else:
 
-        self._test_run.save_device(device, device_json)
-        response.status_code = status.HTTP_200_OK
+        response.status_code = status.HTTP_409_CONFLICT
+        return self._generate_msg(False, "A device with that " +
+                                  "MAC address already exists")
 
       return device.to_config_json()
 
@@ -402,6 +407,74 @@ async def save_device(self, request: Request, response: Response):
       response.status_code = status.HTTP_400_BAD_REQUEST
       return self._generate_msg(False, "Invalid JSON received")
 
+  async def edit_device(self, request: Request, response: Response):
+
+    LOGGER.debug("Received device edit request")
+
+    try:
+      req_raw = (await request.body()).decode("UTF-8")
+      req_json = json.loads(req_raw)
+
+      # Validate top level fields
+      if not (DEVICE_MAC_ADDR_KEY in req_json and
+          "device" in req_json):
+        response.status_code = status.HTTP_400_BAD_REQUEST
+        return self._generate_msg(False, "Invalid request received")
+
+      # Extract device information from request
+      device_json = req_json.get("device")
+
+      if not self._validate_device_json(device_json):
+        response.status_code = status.HTTP_400_BAD_REQUEST
+        return self._generate_msg(False, "Invalid request received")
+
+      # Get device from old MAC address
+      device = self._session.get_device(req_json.get(DEVICE_MAC_ADDR_KEY))
+
+      # Check if device exists
+      if device is None:
+        response.status_code = status.HTTP_404_NOT_FOUND
+        return self._generate_msg(False,
+                                  "A device with that MAC " +
+                                  "address could not be found")
+
+      if (self._session.get_target_device() == device and
+          self._session.get_status() not in [
+            "Cancelled",
+            "Compliant",
+            "Non-Compliant"]):
+        response.status_code = 403
+        return self._generate_msg(False, "Cannot edit this device whilst " +
+                                  "it is being tested")
+
+      # Check if a device exists with the new MAC address
+      check_new_device = self._session.get_device(
+        device_json.get(DEVICE_MAC_ADDR_KEY))
+
+      if not check_new_device is None and (device.mac_addr 
+                                           != check_new_device.mac_addr):
+        response.status_code = status.HTTP_409_CONFLICT
+        return self._generate_msg(False,
+                                  "A device with that MAC address " +
+                                  "already exists")
+
+      # Update the device
+      device.mac_addr = device_json.get(DEVICE_MAC_ADDR_KEY).lower()
+      device.manufacturer = device_json.get(DEVICE_MANUFACTURER_KEY)
+      device.model = device_json.get(DEVICE_MODEL_KEY)
+      device.test_modules = device_json.get(DEVICE_TEST_MODULES_KEY)
+
+      self._test_run.save_device(device, device_json)
+      response.status_code = status.HTTP_200_OK
+
+      return device.to_config_json()
+
+    # Catch JSON Decode error etc
+    except JSONDecodeError:
+      response.status_code = status.HTTP_400_BAD_REQUEST
+      return self._generate_msg(False, "Invalid JSON received")
+
+
   async def get_report(self, response: Response,
                        device_name, timestamp):
 
diff --git a/framework/python/src/common/testreport.py b/framework/python/src/common/testreport.py
index ae9f61526..f522c7b25 100644
--- a/framework/python/src/common/testreport.py
+++ b/framework/python/src/common/testreport.py
@@ -182,7 +182,7 @@ def generate_pages(self, json_data):
 
   def generate_page(self, json_data, page_num, max_page):
     # Placeholder until available in json report
-    version = 'v1.1.1-alpha (2024-01-16)'
+    version = 'v1.1.1-beta (2024-01-17)'
     page = '<div class="page">'
     page += self.generate_header(json_data)
     if page_num == 1:
diff --git a/make/DEBIAN/control b/make/DEBIAN/control
index 53e2dba2b..071073aa9 100644
--- a/make/DEBIAN/control
+++ b/make/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: Testrun
-Version: 1.1.1-alpha
+Version: 1.1.1-beta
 Architecture: amd64
 Maintainer: Google <boddey@google.com>
 Homepage: https://github.com/google/testrun

From 51e2fb42e2078d4eff7759270ca514291836d96f Mon Sep 17 00:00:00 2001
From: Jacob Boddey <boddey@google.com>
Date: Thu, 18 Jan 2024 10:16:05 +0000
Subject: [PATCH 05/11] Fix merge conflict and fix pylint

---
 framework/python/src/api/api.py               |  7 +-
 framework/python/src/common/util.py           | 28 +++---
 .../python/src/net_orc/network_validator.py   |  3 +-
 .../test/conn/python/src/connection_module.py | 97 -------------------
 modules/test/ntp/python/src/ntp_module.py     |  8 +-
 5 files changed, 26 insertions(+), 117 deletions(-)

diff --git a/framework/python/src/api/api.py b/framework/python/src/api/api.py
index 8697f8a33..dc57607a5 100644
--- a/framework/python/src/api/api.py
+++ b/framework/python/src/api/api.py
@@ -11,7 +11,7 @@
 # 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.
-
+"""Provides Testrun data via REST API."""
 from fastapi import FastAPI, APIRouter, Response, Request, status
 from fastapi.responses import FileResponse
 from fastapi.middleware.cors import CORSMiddleware
@@ -37,7 +37,8 @@
 DEVICES_PATH = "/usr/local/testrun/local/devices"
 DEFAULT_DEVICE_INTF = "enx123456789123"
 
-LATEST_RELEASE_CHECK = "https://api.github.com/repos/google/testrun/releases/latest"
+LATEST_RELEASE_CHECK = ("https://api.github.com/repos/google/" +
+                        "testrun/releases/latest")
 
 class Api:
   """Provide REST endpoints to manage Testrun"""
@@ -450,7 +451,7 @@ async def edit_device(self, request: Request, response: Response):
       check_new_device = self._session.get_device(
         device_json.get(DEVICE_MAC_ADDR_KEY))
 
-      if not check_new_device is None and (device.mac_addr 
+      if not check_new_device is None and (device.mac_addr
                                            != check_new_device.mac_addr):
         response.status_code = status.HTTP_409_CONFLICT
         return self._generate_msg(False,
diff --git a/framework/python/src/common/util.py b/framework/python/src/common/util.py
index 098c478d3..ebc3d3d70 100644
--- a/framework/python/src/common/util.py
+++ b/framework/python/src/common/util.py
@@ -32,21 +32,21 @@ def run_command(cmd, output=True):
   by any return code from the process other than zero."""
 
   success = False
-  process = subprocess.Popen(shlex.split(cmd),
+  with subprocess.Popen(shlex.split(cmd),
                              stdout=subprocess.PIPE,
-                             stderr=subprocess.PIPE)
-  stdout, stderr = process.communicate()
-
-  if process.returncode != 0 and output:
-    err_msg = f'{stderr.strip()}. Code: {process.returncode}'
-    LOGGER.error('Command failed: ' + cmd)
-    LOGGER.error('Error: ' + err_msg)
-  else:
-    success = True
-  if output:
-    return stdout.strip().decode('utf-8'), stderr
-  else:
-    return success
+                             stderr=subprocess.PIPE) as process:
+    stdout, stderr = process.communicate()
+
+    if process.returncode != 0 and output:
+      err_msg = f'{stderr.strip()}. Code: {process.returncode}'
+      LOGGER.error('Command failed: ' + cmd)
+      LOGGER.error('Error: ' + err_msg)
+    else:
+      success = True
+    if output:
+      return stdout.strip().decode('utf-8'), stderr
+    else:
+      return success
 
 
 def interface_exists(interface):
diff --git a/framework/python/src/net_orc/network_validator.py b/framework/python/src/net_orc/network_validator.py
index 3866bd3ae..6673a1fdb 100644
--- a/framework/python/src/net_orc/network_validator.py
+++ b/framework/python/src/net_orc/network_validator.py
@@ -240,7 +240,8 @@ def _attach_device_to_network(self, device):
 
     mac_addr = TR_CONTAINER_MAC_PREFIX + '10'
 
-    util.run_command('ip link set dev ' + container_intf + ' address ' + mac_addr)
+    util.run_command('ip link set dev ' + container_intf +
+                     ' address ' + mac_addr)
 
     # Add bridge interface to device bridge
     util.run_command('ovs-vsctl add-port ' + DEVICE_BRIDGE + ' ' + bridge_intf)
diff --git a/modules/test/conn/python/src/connection_module.py b/modules/test/conn/python/src/connection_module.py
index 0ac5b53ce..9429541de 100644
--- a/modules/test/conn/python/src/connection_module.py
+++ b/modules/test/conn/python/src/connection_module.py
@@ -14,10 +14,6 @@
 """Connection test module"""
 import util
 import time
-<<<<<<< HEAD
-=======
-import datetime
->>>>>>> main
 import traceback
 from scapy.all import rdpcap, DHCP, Ether, IPv6, ICMPv6ND_NS
 from test_module import TestModule
@@ -88,12 +84,8 @@ def _connection_shared_address(self, config):
 
   def _connection_dhcp_address(self):
     LOGGER.info('Running connection.dhcp_address')
-<<<<<<< HEAD
     lease = self._dhcp_util.get_cur_lease(mac_address=self._device_mac,
                                           timeout=self._lease_wait_time_sec)
-=======
-    lease = self._dhcp_util.get_cur_lease(mac_address=self._device_mac, timeout=self._lease_wait_time_sec)
->>>>>>> main
     if lease is not None:
       if 'ip' in lease:
         ip_addr = lease['ip']
@@ -184,11 +176,7 @@ def _connection_target_ping(self):
       else:
         return False, 'Device does not respond to ping'
 
-<<<<<<< HEAD
   def _connection_ipaddr_ip_change(self, config):
-=======
-  def _connection_ipaddr_ip_change(self,config):
->>>>>>> main
     result = None
     LOGGER.info('Running connection.ipaddr.ip_change')
     # Resolve the configured lease wait time
@@ -196,12 +184,8 @@ def _connection_ipaddr_ip_change(self,config):
       self._lease_wait_time_sec = config['lease_wait_time_sec']
 
     if self._dhcp_util.setup_single_dhcp_server():
-<<<<<<< HEAD
       lease = self._dhcp_util.get_cur_lease(mac_address=self._device_mac,
                                             timeout=self._lease_wait_time_sec)
-=======
-      lease = self._dhcp_util.get_cur_lease(mac_address=self._device_mac, timeout=self._lease_wait_time_sec)
->>>>>>> main
       if lease is not None:
         LOGGER.info('Current device lease resolved')
         LOGGER.debug(str(lease))
@@ -234,21 +218,13 @@ def _connection_ipaddr_ip_change(self,config):
       self._dhcp_util.restore_failover_dhcp_server()
       LOGGER.info('Waiting 30 seconds for reserved lease to expire')
       time.sleep(30)
-<<<<<<< HEAD
       self._dhcp_util.get_cur_lease(mac_address=self._device_mac,
                                     timeout=self._lease_wait_time_sec)
-=======
-      self._dhcp_util.get_cur_lease(mac_address=self._device_mac,timeout=self._lease_wait_time_sec)
->>>>>>> main
     else:
       result = None, 'Failed to configure network for test'
     return result
 
-<<<<<<< HEAD
   def _connection_ipaddr_dhcp_failover(self, config):
-=======
-  def _connection_ipaddr_dhcp_failover(self,config):
->>>>>>> main
     result = None
     LOGGER.info('Running connection.ipaddr.dhcp_failover')
 
@@ -262,12 +238,8 @@ def _connection_ipaddr_dhcp_failover(self,config):
     secondary_status = self._dhcp_util.get_dhcp_server_status(
         dhcp_server_primary=False)
     if primary_status and secondary_status:
-<<<<<<< HEAD
       lease = self._dhcp_util.get_cur_lease(mac_address=self._device_mac,
                                             timeout=self._lease_wait_time_sec)
-=======
-      lease = self._dhcp_util.get_cur_lease(mac_address=self._device_mac, timeout=self._lease_wait_time_sec)
->>>>>>> main
       if lease is not None:
         LOGGER.info('Current device lease resolved')
         if self._dhcp_util.is_lease_active(lease):
@@ -278,12 +250,8 @@ def _connection_ipaddr_dhcp_failover(self,config):
                                                   self._lease_wait_time_sec)
             # Make sure the device has received a new lease from the
             # secondary server
-<<<<<<< HEAD
             if self._dhcp_util.get_cur_lease(mac_address=self._device_mac,
                                              timeout=self._lease_wait_time_sec):
-=======
-            if self._dhcp_util.get_cur_lease(mac_address=self._device_mac,timeout=self._lease_wait_time_sec):
->>>>>>> main
               if self._dhcp_util.is_lease_active(lease):
                 result = True, ('Secondary DHCP server lease confirmed active '
                                 'in device')
@@ -332,14 +300,8 @@ def _connection_ipv6_slaac(self):
     return result
 
   def _has_slaac_addres(self):
-<<<<<<< HEAD
     packet_capture = (rdpcap(STARTUP_CAPTURE_FILE) +
                       rdpcap(MONITOR_CAPTURE_FILE) + rdpcap(DHCP_CAPTURE_FILE))
-=======
-    packet_capture = (rdpcap(STARTUP_CAPTURE_FILE)
-                      + rdpcap(MONITOR_CAPTURE_FILE)
-                      + rdpcap(DHCP_CAPTURE_FILE))
->>>>>>> main
     sends_ipv6 = False
     for packet_number, packet in enumerate(packet_capture, start=1):
       if IPv6 in packet and packet.src == self._device_mac:
@@ -409,12 +371,8 @@ def setup_single_dhcp_server(self):
       if response.code == 200:
         LOGGER.info('Secondary DHCP server stopped')
         LOGGER.info('Configuring primary DHCP server')
-<<<<<<< HEAD
         # Move primary DHCP server from failover into
         # a single DHCP server config
-=======
-        # Move primary DHCP server from failover into a single DHCP server config
->>>>>>> main
         response = self.dhcp1_client.disable_failover()
         if response.code == 200:
           LOGGER.info('Primary DHCP server failover disabled')
@@ -458,11 +416,7 @@ def _run_subnet_test(self, config):
 
     # Resolve the configured lease wait time
     if 'lease_wait_time_sec' in config:
-<<<<<<< HEAD
       self._lease_wait_time_sec = config['lease_wait_time_sec']
-=======
-      self._lease_wait_time_sec = config['lease_wait_time_sec']  
->>>>>>> main
 
     response = self.dhcp1_client.get_dhcp_range()
     cur_range = {}
@@ -480,12 +434,8 @@ def _run_subnet_test(self, config):
     dhcp_setup = self.setup_single_dhcp_server()
     if dhcp_setup[0]:
       LOGGER.info(dhcp_setup[1])
-<<<<<<< HEAD
       lease = self._dhcp_util.get_cur_lease(mac_address=self._device_mac,
                                             timeout=self._lease_wait_time_sec)
-=======
-      lease = self._dhcp_util.get_cur_lease(mac_address=self._device_mac, timeout=self._lease_wait_time_sec)
->>>>>>> main
       if lease is not None:
         if self._dhcp_util.is_lease_active(lease):
           results = self.test_subnets(ranges)
@@ -516,27 +466,18 @@ def _run_subnet_test(self, config):
       self.restore_failover_dhcp_server(cur_range)
 
       # Wait for the current lease to expire
-<<<<<<< HEAD
       lease = self._dhcp_util.get_cur_lease(mac_address=self._device_mac,
                                             timeout=self._lease_wait_time_sec)
       self._dhcp_util.wait_for_lease_expire(lease, self._lease_wait_time_sec)
-=======
-      self._wait_for_lease_expire(self._dhcp_util.get_cur_lease(
-          self._device_mac,timeout=self._lease_wait_time_sec))
->>>>>>> main
 
       # Wait for a new lease to be provided before exiting test
       # to prevent other test modules from failing
       LOGGER.info('Checking for new lease')
       # Subnet changes tend to take longer to pick up so we'll allow
       # for twice the lease wait time
-<<<<<<< HEAD
       lease = self._dhcp_util.get_cur_lease(mac_address=self._device_mac,
                                             timeout=2 *
                                             self._lease_wait_time_sec)
-=======
-      lease = self._dhcp_util.get_cur_lease(mac_address=self._device_mac,timeout=2*self._lease_wait_time_sec)
->>>>>>> main
       if lease is not None:
         LOGGER.info('Validating subnet for new lease...')
         in_range = self.is_ip_in_range(lease['ip'], cur_range['start'],
@@ -551,7 +492,6 @@ def _run_subnet_test(self, config):
     return final_result, final_result_details
 
   def _test_subnet(self, subnet, lease):
-<<<<<<< HEAD
     LOGGER.info('Testing subnet: ' + str(subnet))
     if self._change_subnet(subnet):
       self._dhcp_util.wait_for_lease_expire(lease, self._lease_wait_time_sec)
@@ -571,35 +511,6 @@ def _test_subnet(self, subnet, lease):
       else:
         LOGGER.info('Device did not receive lease in subnet')
         return False
-=======
-    LOGGER.info("Testing subnet: " + str(subnet))
-    if self._change_subnet(subnet):
-      expiration = datetime.datetime.strptime(
-        lease['expires'], '%Y-%m-%d %H:%M:%S')
-      now_utc = datetime.datetime.now(
-        datetime.timezone.utc).replace(tzinfo=None)
-      time_to_expire = (expiration - now_utc).total_seconds()
-      LOGGER.debug('Time until lease expiration: ' + str(time_to_expire))
-      LOGGER.info('Waiting for current lease to expire: ' + str(expiration))
-      if time_to_expire > 0:
-        # Wait until the expiration time and add 5 seconds
-        time.sleep(time_to_expire + 5)
-        LOGGER.debug('Current lease expired. Checking for new lease')
-        LOGGER.debug('Checking for new lease')
-        # Subnet changes tend to take longer to pick up so we'll allow
-        # for twice the lease wait time
-        lease = self._dhcp_util.get_cur_lease(mac_address=self._device_mac,timeout=2*self._lease_wait_time_sec)
-        if lease is not None:
-          LOGGER.debug('New lease found: ' + str(lease))
-          LOGGER.debug('Validating subnet for new lease...')
-          in_range = self.is_ip_in_range(lease['ip'], subnet['start'],
-                                         subnet['end'])
-          LOGGER.info('Lease within subnet: ' + str(in_range))
-          return in_range
-        else:
-          LOGGER.info('Device did not receive lease in subnet')
-          return False
->>>>>>> main
     else:
       LOGGER.error('Failed to change subnet')
 
@@ -643,19 +554,11 @@ def test_subnets(self, subnets):
             }
         else:
           result = {
-<<<<<<< HEAD
               'result':
               None,
               'details':
               'Device does not have active lease, cannot test subnet change. ' +
               'Subnet ' + subnet['start'] + '-' + subnet['end'] + ' skipped'
-=======
-            'result':
-            None,
-            'details':
-            'Device does not have active lease, cannot test subnet change. ' +
-            'Subnet ' + subnet['start'] + '-' + subnet['end'] + ' skipped'
->>>>>>> main
           }
       except Exception as e:  # pylint: disable=W0718
         LOGGER.error('Subnet test failed: ' + str(e))
diff --git a/modules/test/ntp/python/src/ntp_module.py b/modules/test/ntp/python/src/ntp_module.py
index 56dea19a0..40089ad44 100644
--- a/modules/test/ntp/python/src/ntp_module.py
+++ b/modules/test/ntp/python/src/ntp_module.py
@@ -36,7 +36,9 @@ def __init__(self, module):
   def _ntp_network_ntp_support(self):
     LOGGER.info('Running ntp.network.ntp_support')
     result = None
-    packet_capture = rdpcap(STARTUP_CAPTURE_FILE) + rdpcap(MONITOR_CAPTURE_FILE) + rdpcap(NTP_SERVER_CAPTURE_FILE)
+    packet_capture = (rdpcap(STARTUP_CAPTURE_FILE) +
+                      rdpcap(MONITOR_CAPTURE_FILE) +
+                      rdpcap(NTP_SERVER_CAPTURE_FILE))
 
     device_sends_ntp4 = False
     device_sends_ntp3 = False
@@ -71,7 +73,9 @@ def _ntp_network_ntp_support(self):
   def _ntp_network_ntp_dhcp(self):
     LOGGER.info('Running ntp.network.ntp_dhcp')
     result = None
-    packet_capture = rdpcap(STARTUP_CAPTURE_FILE) + rdpcap(MONITOR_CAPTURE_FILE) + rdpcap(NTP_SERVER_CAPTURE_FILE)
+    packet_capture = (rdpcap(STARTUP_CAPTURE_FILE) +
+                      rdpcap(MONITOR_CAPTURE_FILE) +
+                      rdpcap(NTP_SERVER_CAPTURE_FILE))
 
     device_sends_ntp = False
     ntp_to_local = False

From 39d0323db9f31e70acd66c534453bcda74c18855 Mon Sep 17 00:00:00 2001
From: J Boddey <boddey@google.com>
Date: Fri, 19 Jan 2024 19:09:28 +0000
Subject: [PATCH 06/11] Update README.md (#232)

Signed-off-by: J Boddey <boddey@google.com>
---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 53915aaaa..ccd056c2e 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,8 @@
 [![CodeQL](https://github.com/google/testrun/actions/workflows/github-code-scanning/codeql/badge.svg?branch=main)](https://github.com/google/testrun/actions/workflows/github-code-scanning/codeql)
 [![Testrun test suite](https://github.com/google/testrun/actions/workflows/testing.yml/badge.svg?branch=main&event=push)](https://github.com/google/testrun/actions/workflows/testing.yml)
 
+<strong>Disclaimer</strong>: Testrun uses Google Analytics to learn about how our users use Testrun. By installing and running Testrun, you understand and accept the Terms of Service found [here](https://policies.google.com/technologies/partner-sites).
+
 ## Introduction :wave:
 Testrun automates specific test cases to verify network and security functionality in IoT devices. It is an open source tool which allows manufacturers of IP capable devices to test their devices for the purposes of Device Qualification within the BOS program.
 

From 27d5064dce368127c7415dd326e6f7d5ad4b4fce Mon Sep 17 00:00:00 2001
From: J Boddey <boddey@google.com>
Date: Mon, 22 Jan 2024 10:54:25 +0000
Subject: [PATCH 07/11] Add error handling to version check (#230)

---
 framework/python/src/api/api.py | 50 ++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/framework/python/src/api/api.py b/framework/python/src/api/api.py
index dc57607a5..ebd022acf 100644
--- a/framework/python/src/api/api.py
+++ b/framework/python/src/api/api.py
@@ -247,32 +247,38 @@ async def get_version(self, response: Response):
     json_response["installed_version"] = "v" + current_version
 
     # Check latest version number from GitHub API
-    version_check = requests.get(LATEST_RELEASE_CHECK, timeout=5)
+    try:
+      version_check = requests.get(LATEST_RELEASE_CHECK, timeout=5)
+
+      # Check OK response was received
+      if version_check.status_code != 200:
+        response.status_code = 500
+        LOGGER.error(version_check.content)
+        return self._generate_msg(False, "Failed to fetch latest version")
+
+      # Extract version number from response, removing the leading 'v'
+      latest_version_no = version_check.json()["name"].strip("v")
+      LOGGER.debug(f"Latest version available is {latest_version_no}")
+
+      # Craft JSON response
+      json_response["latest_version"] = "v" + latest_version_no
+      json_response["latest_version_url"] = version_check.json()["html_url"]
+
+      # String comparison between current and latest version
+      if latest_version_no > current_version:
+        json_response["update_available"] = True
+        LOGGER.debug("An update is available")
+      else:
+        json_response["update_available"] = False
+        LOGGER.debug("The latest version is installed")
 
-    # Check OK response was received
-    if version_check.status_code != 200:
+      return json_response
+    except Exception as e:
       response.status_code = 500
-      LOGGER.error(version_check.content)
+      LOGGER.error("Failed to fetch latest version")
+      LOGGER.debug(e)
       return self._generate_msg(False, "Failed to fetch latest version")
 
-    # Extract version number from response, removing the leading 'v'
-    latest_version_no = version_check.json()["name"].strip("v")
-    LOGGER.debug(f"Latest version available is {latest_version_no}")
-
-    # Craft JSON response
-    json_response["latest_version"] = "v" + latest_version_no
-    json_response["latest_version_url"] = version_check.json()["html_url"]
-
-    # String comparison between current and latest version
-    if latest_version_no > current_version:
-      json_response["update_available"] = True
-      LOGGER.debug("An update is available")
-    else:
-      json_response["update_available"] = False
-      LOGGER.debug("The latest version is installed")
-
-    return json_response
-
   async def get_reports(self, request: Request):
     LOGGER.debug("Received reports list request")
     # Resolve the server IP from the request so we

From bf9d00c8ad1acb365e9f5f91b0754e3052b5e65e Mon Sep 17 00:00:00 2001
From: J Boddey <boddey@google.com>
Date: Thu, 25 Jan 2024 17:43:27 +0000
Subject: [PATCH 08/11] Add report to session (#234)

---
 framework/python/src/common/session.py             | 13 +++++++++++--
 framework/python/src/common/testreport.py          |  6 ++++++
 framework/python/src/test_orc/test_orchestrator.py |  4 ++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/framework/python/src/common/session.py b/framework/python/src/common/session.py
index 70442e9ff..c9ce524c3 100644
--- a/framework/python/src/common/session.py
+++ b/framework/python/src/common/session.py
@@ -42,6 +42,7 @@ def __init__(self, config_file):
     self._runtime_params = []
     self._device_repository = []
     self._total_tests = 0
+    self._report_url = None
 
     self._version = None
     self._load_version()
@@ -231,9 +232,16 @@ def add_total_tests(self, no_tests):
   def get_total_tests(self):
     return self._total_tests
 
+  def get_report_url(self):
+    return self._report_url
+
+  def set_report_url(self, url):
+    self._report_url = url
+
   def reset(self):
     self.set_status('Idle')
     self.set_target_device(None)
+    self._report_url = None
     self._total_tests = 0
     self._results = []
     self._started = None
@@ -241,8 +249,6 @@ def reset(self):
 
   def to_json(self):
 
-    # TODO: Add report URL
-
     results = {
       'total': self.get_total_tests(),
       'results': self.get_test_results()
@@ -256,6 +262,9 @@ def to_json(self):
       'tests': results
     }
 
+    if self._report_url is not None:
+      session_json['report'] = self.get_report_url()
+
     return session_json
 
   def get_timezone(self):
diff --git a/framework/python/src/common/testreport.py b/framework/python/src/common/testreport.py
index 9f561e9ad..25df0e511 100644
--- a/framework/python/src/common/testreport.py
+++ b/framework/python/src/common/testreport.py
@@ -75,6 +75,12 @@ def get_duration(self):
   def add_test(self, test):
     self._results.append(test)
 
+  def set_report_url(self, url):
+    self._report_url = url
+
+  def get_report_url(self):
+    return self._report_url
+
   def to_json(self):
     report_json = {}
     report_json['device'] = self._device
diff --git a/framework/python/src/test_orc/test_orchestrator.py b/framework/python/src/test_orc/test_orchestrator.py
index 21b8650bb..d9b25108d 100644
--- a/framework/python/src/test_orc/test_orchestrator.py
+++ b/framework/python/src/test_orc/test_orchestrator.py
@@ -115,6 +115,7 @@ def run_test_modules(self):
     self._write_reports(report)
     self._test_in_progress = False
     self._timestamp_results(device)
+    self.get_session().set_report_url(report.get_report_url())
 
     LOGGER.debug("Cleaning old test results...")
     self._cleanup_old_test_results(device)
@@ -234,6 +235,7 @@ def _timestamp_results(self, device):
       device.mac_addr.replace(":", "")
     )
 
+    # Define the directory 
     completed_results_dir = os.path.join(
       self._root_path,
       LOCAL_DEVICE_REPORTS.replace("{device_folder}", device.device_folder),
@@ -246,6 +248,8 @@ def _timestamp_results(self, device):
     shutil.copytree(cur_results_dir, completed_results_dir, dirs_exist_ok=True)
     util.run_command(f"chown -R {self._host_user} '{completed_results_dir}'")
 
+    return completed_results_dir
+
   def test_in_progress(self):
     return self._test_in_progress
 

From be0b55d3b008ab090a151ce5ba807bf17d01d4af Mon Sep 17 00:00:00 2001
From: sofyakurilova <sonnycactus@gmail.com>
Date: Thu, 25 Jan 2024 22:20:13 +0000
Subject: [PATCH 09/11] Update UI: (#240)

- change connection settings to allow use one port
- [a11y] add the name of testrun to stop testrun dialog
---
 modules/ui/src/app/app.component.html         |   7 +-
 modules/ui/src/app/app.component.spec.ts      |  22 ++++
 modules/ui/src/app/app.component.ts           |  12 +-
 modules/ui/src/app/app.module.ts              |   4 +
 .../device-item/device-item.component.ts      |   2 +-
 .../general-settings.component.html           | 108 ++++++++++++------
 .../general-settings.component.scss           |  57 +++++----
 .../general-settings.component.spec.ts        |  66 ++++++++---
 .../general-settings.component.ts             |  57 ++++++---
 .../only-different-values.validator.ts        |   2 +-
 .../device-form/device-form.component.html    |   6 +-
 .../device-repository.component.spec.ts       |  11 +-
 .../device-repository.component.ts            |   8 ++
 modules/ui/src/app/model/setting.ts           |   5 +
 .../app/progress/progress.component.spec.ts   |   2 +-
 .../ui/src/app/progress/progress.component.ts |  14 ++-
 modules/ui/src/styles.scss                    |   7 ++
 17 files changed, 288 insertions(+), 102 deletions(-)

diff --git a/modules/ui/src/app/app.component.html b/modules/ui/src/app/app.component.html
index b93ed7f28..e6e351a99 100644
--- a/modules/ui/src/app/app.component.html
+++ b/modules/ui/src/app/app.component.html
@@ -64,7 +64,10 @@
         (keydown.tab)="skipToNavigation($event)">
         <mat-icon>menu</mat-icon>
       </button>
-      <a class="logo-link" routerLink="/runtime" aria-label="Testrun ui logo">
+      <a
+        class="logo-link"
+        routerLink="{{ Routes.Testrun }}"
+        aria-label="Testrun ui logo">
         <mat-icon svgIcon="testrun_logo_color"></mat-icon>
         <h1 class="main-heading">Testrun</h1>
       </a>
@@ -74,7 +77,7 @@ <h1 class="main-heading">Testrun</h1>
         class="app-toolbar-button app-toolbar-button-general-settings"
         mat-icon-button
         aria-label="Connection settings"
-        (click)="openGeneralSettings()">
+        (click)="openGeneralSettings(true)">
         <mat-icon>tune</mat-icon>
       </button>
     </mat-toolbar>
diff --git a/modules/ui/src/app/app.component.spec.ts b/modules/ui/src/app/app.component.spec.ts
index 69e921323..093ad3f35 100644
--- a/modules/ui/src/app/app.component.spec.ts
+++ b/modules/ui/src/app/app.component.spec.ts
@@ -45,6 +45,7 @@ import {
 } from './mocks/progress.mock';
 import { LoaderService } from './services/loader.service';
 import { Routes } from './model/routes';
+import { StateService } from './services/state.service';
 
 describe('AppComponent', () => {
   let component: AppComponent;
@@ -53,6 +54,7 @@ describe('AppComponent', () => {
   let router: Router;
   let mockService: SpyObj<TestRunService>;
   let mockLoaderService: SpyObj<LoaderService>;
+  let mockStateService: SpyObj<StateService>;
 
   const enterKeyEvent = new KeyboardEvent('keydown', {
     key: 'Enter',
@@ -82,6 +84,10 @@ describe('AppComponent', () => {
     ]);
 
     mockLoaderService = jasmine.createSpyObj(['setLoading']);
+    mockStateService = jasmine.createSpyObj('mockStateService', [
+      'focusFirstElementInMain',
+    ]);
+
     mockService.getDevices.and.returnValue(
       new BehaviorSubject<Device[] | null>([device])
     );
@@ -106,6 +112,7 @@ describe('AppComponent', () => {
       providers: [
         { provide: TestRunService, useValue: mockService },
         { provide: LoaderService, useValue: mockLoaderService },
+        { provide: StateService, useValue: mockStateService },
       ],
       declarations: [
         AppComponent,
@@ -226,6 +233,21 @@ describe('AppComponent', () => {
     });
   }));
 
+  it('should call focusFirstElementInMain if settingsDrawer opened not from toggleBtn', fakeAsync(() => {
+    spyOn(component.settingsDrawer, 'close').and.returnValue(
+      Promise.resolve('close')
+    );
+
+    component.openGeneralSettings(false);
+    tick();
+    component.closeSetting();
+    flush();
+
+    component.settingsDrawer.close().then(() => {
+      expect(mockStateService.focusFirstElementInMain).toHaveBeenCalled();
+    });
+  }));
+
   it('should call settingsDrawer open on openSetting', fakeAsync(() => {
     spyOn(component.settingsDrawer, 'open');
 
diff --git a/modules/ui/src/app/app.component.ts b/modules/ui/src/app/app.component.ts
index 11f39be81..287d8ba20 100644
--- a/modules/ui/src/app/app.component.ts
+++ b/modules/ui/src/app/app.component.ts
@@ -34,6 +34,7 @@ import { CalloutType } from './model/callout-type';
 import { tap } from 'rxjs/internal/operators/tap';
 import { shareReplay } from 'rxjs/internal/operators/shareReplay';
 import { Routes } from './model/routes';
+import { StateService } from './services/state.service';
 
 const DEVICES_LOGO_URL = '/assets/icons/devices.svg';
 const REPORTS_LOGO_URL = '/assets/icons/reports.svg';
@@ -59,6 +60,7 @@ export class AppComponent implements OnInit {
   public readonly StatusOfTestrun = StatusOfTestrun;
   public readonly Routes = Routes;
   private devicesLength = 0;
+  private openedSettingFromToggleBtn = true;
   @ViewChild('settingsDrawer') public settingsDrawer!: MatDrawer;
   @ViewChild('toggleSettingsBtn') public toggleSettingsBtn!: HTMLButtonElement;
   @ViewChild('navigation') public navigation!: ElementRef;
@@ -69,6 +71,7 @@ export class AppComponent implements OnInit {
     private domSanitizer: DomSanitizer,
     private testRunService: TestRunService,
     private readonly loaderService: LoaderService,
+    private readonly state: StateService,
     private route: Router
   ) {
     this.testRunService.fetchDevices();
@@ -139,11 +142,15 @@ export class AppComponent implements OnInit {
       if (this.devicesLength > 0) {
         this.toggleSettingsBtn.focus();
       } // else device create window will be opened
+
+      if (!this.openedSettingFromToggleBtn) {
+        this.state.focusFirstElementInMain();
+      }
     });
   }
 
   async openSetting(): Promise<void> {
-    return await this.openGeneralSettings();
+    return await this.openGeneralSettings(false);
   }
 
   reloadInterfaces(): void {
@@ -175,7 +182,8 @@ export class AppComponent implements OnInit {
     }
   }
 
-  async openGeneralSettings() {
+  async openGeneralSettings(openSettingFromToggleBtn: boolean) {
+    this.openedSettingFromToggleBtn = openSettingFromToggleBtn;
     this.getSystemInterfaces();
     await this.settingsDrawer.open();
   }
diff --git a/modules/ui/src/app/app.module.ts b/modules/ui/src/app/app.module.ts
index 67d4c3464..e130fda29 100644
--- a/modules/ui/src/app/app.module.ts
+++ b/modules/ui/src/app/app.module.ts
@@ -30,6 +30,8 @@ import { GeneralSettingsComponent } from './components/general-settings/general-
 import { ReactiveFormsModule } from '@angular/forms';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
+import { MatInputModule } from '@angular/material/input';
+import { MatSelectModule } from '@angular/material/select';
 import { ErrorInterceptor } from './interceptors/error.interceptor';
 import { LoadingInterceptor } from './interceptors/loading.interceptor';
 import { SpinnerComponent } from './components/spinner/spinner.component';
@@ -49,6 +51,8 @@ import { CalloutComponent } from './components/callout/callout.component';
     MatSidenavModule,
     MatButtonToggleModule,
     MatRadioModule,
+    MatInputModule,
+    MatSelectModule,
     HttpClientModule,
     ReactiveFormsModule,
     MatFormFieldModule,
diff --git a/modules/ui/src/app/components/device-item/device-item.component.ts b/modules/ui/src/app/components/device-item/device-item.component.ts
index a72d2516d..dfb161089 100644
--- a/modules/ui/src/app/components/device-item/device-item.component.ts
+++ b/modules/ui/src/app/components/device-item/device-item.component.ts
@@ -32,6 +32,6 @@ export class DeviceItemComponent {
   }
 
   get label() {
-    return `${this.device.model} ${this.device.manufacturer} ${this.device.mac_addr}`;
+    return `${this.device.manufacturer} ${this.device.model} ${this.device.mac_addr}`;
   }
 }
diff --git a/modules/ui/src/app/components/general-settings/general-settings.component.html b/modules/ui/src/app/components/general-settings/general-settings.component.html
index 4d5cfcb35..c698e167f 100644
--- a/modules/ui/src/app/components/general-settings/general-settings.component.html
+++ b/modules/ui/src/app/components/general-settings/general-settings.component.html
@@ -37,48 +37,86 @@ <h2 class="settings-drawer-header-title">Connection settings</h2>
         class="two-ports-message">
         Warning! Testrun requires two ports to operate correctly.
       </app-callout>
-      <label
-        class="setting-form-label internet-label"
-        id="internet-radio-group-label"
-        for="internet-group">
-        Select port used for Internet connection
-      </label>
-      <p class="setting-label-description">
-        Choose one of the following ports on your Laptop or Desktop
-      </p>
-      <mat-radio-group
-        aria-labelledby="internet-radio-group-label"
-        id="internet-group"
-        class="setting-radio-group"
-        formControlName="internet_intf">
-        <mat-radio-button
-          *ngFor="let interface of interfaces | keyvalue"
-          [value]="interface.key"
-          class="setting-radio-button">
-          {{ interface.value }}
-        </mat-radio-button>
-      </mat-radio-group>
       <label
         class="setting-form-label device-label"
-        id="device-radio-group-label"
+        id="device-group-label"
         for="device-group">
         Select port where you’ll connect the tested device
       </label>
       <p class="setting-label-description">
         Choose one of the options where you’ll connect IoT device for testing
       </p>
-      <mat-radio-group
-        aria-labelledby="device-radio-group-label"
-        id="device-group"
-        class="setting-radio-group"
-        formControlName="device_intf">
-        <mat-radio-button
-          *ngFor="let interface of interfaces | keyvalue"
-          [value]="interface.key"
-          class="setting-radio-button">
-          {{ interface.value }}
-        </mat-radio-button>
-      </mat-radio-group>
+      <mat-form-field appearance="outline" class="setting-field">
+        <mat-label>Device connection port</mat-label>
+        <mat-select
+          aria-labelledby="device-group-label"
+          id="device-group"
+          class="setting-radio-group"
+          [compareWith]="compare"
+          formControlName="device_intf">
+          <mat-select-trigger>
+            <ng-container *ngIf="deviceControl.value">
+              <p *ngIf="deviceControl.value.key" class="option-value top">
+                {{ deviceControl.value.key }}
+              </p>
+              <p *ngIf="deviceControl.value.value" class="option-value bottom">
+                {{ deviceControl.value.value }}
+              </p>
+            </ng-container>
+          </mat-select-trigger>
+          <mat-option
+            *ngFor="let interface of interfaces | keyvalue"
+            [value]="interface"
+            class="setting-option-value">
+            <p class="option-value top">{{ interface.key }}</p>
+            <p class="option-value bottom">{{ interface.value }}</p>
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
+      <label
+        class="setting-form-label internet-label"
+        id="internet-group-label"
+        for="internet-group">
+        Select port used for Internet connection
+      </label>
+      <p class="setting-label-description">
+        Choose one of the following ports on your Laptop or Desktop
+      </p>
+      <mat-form-field appearance="outline" class="setting-field">
+        <mat-label>Internet connection port</mat-label>
+        <mat-select
+          aria-labelledby="internet-group-label"
+          id="internet-group"
+          class="setting-radio-group"
+          [compareWith]="compare"
+          formControlName="internet_intf">
+          <mat-select-trigger>
+            <ng-container *ngIf="internetControl.value">
+              <p *ngIf="internetControl.value.key" class="option-value top">
+                {{ internetControl.value.key }}
+              </p>
+              <p
+                *ngIf="internetControl.value.value"
+                class="option-value bottom">
+                {{ internetControl.value.value }}
+              </p>
+            </ng-container>
+          </mat-select-trigger>
+          <mat-option
+            [value]="defaultInternetOption"
+            class="setting-option-value">
+            <p class="option-value top">{{ defaultInternetOption.key }}</p>
+            <p class="option-value bottom">{{ defaultInternetOption.value }}</p>
+          </mat-option>
+          <mat-option
+            *ngFor="let interface of interfaces | keyvalue"
+            [value]="interface"
+            class="setting-option-value">
+            <p class="option-value top">{{ interface.key }}</p>
+            <p class="option-value bottom">{{ interface.value }}</p>
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
     </ng-container>
     <p class="message">
       If a port is missing from this list, you can
@@ -96,7 +134,7 @@ <h2 class="settings-drawer-header-title">Connection settings</h2>
     <mat-error
       *ngIf="isSubmitting && isFormError"
       class="error-message-container">
-      <span> Both interfaces must have different values </span>
+      <span>Both interfaces must have different values</span>
     </mat-error>
     <div class="setting-drawer-footer">
       <button
diff --git a/modules/ui/src/app/components/general-settings/general-settings.component.scss b/modules/ui/src/app/components/general-settings/general-settings.component.scss
index e7fb547b2..01e13dcef 100644
--- a/modules/ui/src/app/components/general-settings/general-settings.component.scss
+++ b/modules/ui/src/app/components/general-settings/general-settings.component.scss
@@ -84,11 +84,6 @@
 .setting-form-label {
   font-size: 18px;
   color: $dark-grey;
-
-  &.device-label {
-    display: inline-block;
-    padding-top: 16px;
-  }
 }
 
 :host:has(.two-ports-message) .internet-label {
@@ -100,32 +95,50 @@
   font-size: 14px;
   line-height: 20px;
   letter-spacing: 0.2px;
-  margin: 10px 0 0;
+  margin: 10px 0;
   color: $dark-grey;
 }
 
-.setting-radio-group {
-  display: flex;
-  flex-direction: column;
-  margin-left: -10px;
-  align-items: flex-start;
-  overflow: scroll;
+.setting-option-value {
+  padding: 14px 16px;
 }
 
-.setting-radio-button {
-  padding: 8px 0;
+.option-value {
+  margin: 0;
+  font-family: Roboto;
+  font-size: 14px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: 20px;
+  letter-spacing: 0.2px;
+
+  &.top {
+    color: #3c4043;
+  }
 
-  ::ng-deep .mdc-form-field > label {
+  &.bottom {
+    color: #5f6368;
+  }
+}
+
+.setting-field {
+  ::ng-deep .mat-mdc-form-field-infix {
+    min-height: 76px;
+    display: flex;
+    align-items: center;
+  }
+
+  ::ng-deep .mat-mdc-floating-label {
     font-family: Roboto;
-    font-size: 16px;
+    font-size: 14px;
     font-style: normal;
     font-weight: 400;
-    line-height: 24px;
-    letter-spacing: 0.1px;
-    color: $grey-800;
-    max-width: 240px;
-    overflow: hidden;
-    text-overflow: ellipsis;
+    line-height: 20px;
+    letter-spacing: 0.2px;
+  }
+
+  ::ng-deep .mat-mdc-floating-label:not(.mdc-floating-label--float-above) {
+    top: 35px;
   }
 }
 
diff --git a/modules/ui/src/app/components/general-settings/general-settings.component.spec.ts b/modules/ui/src/app/components/general-settings/general-settings.component.spec.ts
index b67a1d64d..e9b82ddca 100644
--- a/modules/ui/src/app/components/general-settings/general-settings.component.spec.ts
+++ b/modules/ui/src/app/components/general-settings/general-settings.component.spec.ts
@@ -16,7 +16,10 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { GeneralSettingsComponent } from './general-settings.component';
-import { TestRunService } from '../../services/test-run.service';
+import {
+  SystemInterfaces,
+  TestRunService,
+} from '../../services/test-run.service';
 import { of } from 'rxjs';
 import { SystemConfig } from '../../model/setting';
 import { MatRadioModule } from '@angular/material/radio';
@@ -27,6 +30,9 @@ import { MatIconTestingModule } from '@angular/material/icon/testing';
 import { Component, Input } from '@angular/core';
 import { LiveAnnouncer } from '@angular/cdk/a11y';
 import SpyObj = jasmine.SpyObj;
+import { MatInputModule } from '@angular/material/input';
+import { MatSelectModule } from '@angular/material/select';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 
 const MOCK_SYSTEM_CONFIG_EMPTY: SystemConfig = {
   network: {
@@ -37,11 +43,16 @@ const MOCK_SYSTEM_CONFIG_EMPTY: SystemConfig = {
 
 const MOCK_SYSTEM_CONFIG_WITH_DATA: SystemConfig = {
   network: {
-    device_intf: 'mockDeviceValue',
-    internet_intf: 'mockInternetValue',
+    device_intf: 'mockDeviceKey',
+    internet_intf: 'mockInternetKey',
   },
 };
 
+const MOCK_INTERFACES: SystemInterfaces = {
+  mockDeviceKey: 'mockDeviceValue',
+  mockInternetKey: 'mockInternetValue',
+};
+
 describe('GeneralSettingsComponent', () => {
   let component: GeneralSettingsComponent;
   let fixture: ComponentFixture<GeneralSettingsComponent>;
@@ -57,6 +68,7 @@ describe('GeneralSettingsComponent', () => {
       'createSystemConfig',
       'hasConnectionSetting$',
       'setHasConnectionSetting',
+      'systemConfig$',
     ]);
     testRunServiceMock.getSystemInterfaces.and.returnValue(of({}));
     testRunServiceMock.getSystemConfig.and.returnValue(
@@ -65,6 +77,7 @@ describe('GeneralSettingsComponent', () => {
     testRunServiceMock.createSystemConfig.and.returnValue(
       of(MOCK_SYSTEM_CONFIG_WITH_DATA)
     );
+    testRunServiceMock.systemConfig$ = of(MOCK_SYSTEM_CONFIG_EMPTY);
     testRunServiceMock.hasConnectionSetting$ = of(true);
 
     mockLiveAnnouncer = jasmine.createSpyObj(['announce']);
@@ -81,11 +94,14 @@ describe('GeneralSettingsComponent', () => {
         { provide: LiveAnnouncer, useValue: mockLiveAnnouncer },
       ],
       imports: [
+        BrowserAnimationsModule,
         MatButtonModule,
         MatIconModule,
         MatRadioModule,
         ReactiveFormsModule,
         MatIconTestingModule,
+        MatInputModule,
+        MatSelectModule,
       ],
     }).compileComponents();
 
@@ -103,14 +119,15 @@ describe('GeneralSettingsComponent', () => {
     testRunServiceMock.getSystemConfig.and.returnValue(
       of(MOCK_SYSTEM_CONFIG_WITH_DATA)
     );
+    component.interfaces = { mockDeviceKey: 'mockDeviceValue' };
+
+    const expectedDevice = { key: 'mockDeviceKey', value: 'mockDeviceValue' };
 
     component.ngOnInit();
 
-    expect(component.deviceControl.value).toBe(
-      MOCK_SYSTEM_CONFIG_WITH_DATA?.network?.device_intf
-    );
-    expect(component.internetControl.value).toBe(
-      MOCK_SYSTEM_CONFIG_WITH_DATA?.network?.internet_intf
+    expect(component.deviceControl.value).toEqual(expectedDevice);
+    expect(component.internetControl.value).toEqual(
+      component.defaultInternetOption
     );
   });
 
@@ -125,6 +142,7 @@ describe('GeneralSettingsComponent', () => {
   describe('#closeSetting', () => {
     beforeEach(() => {
       testRunServiceMock.systemConfig$ = of(MOCK_SYSTEM_CONFIG_WITH_DATA);
+      component.interfaces = MOCK_INTERFACES;
     });
 
     it('should emit closeSettingEvent', () => {
@@ -156,8 +174,16 @@ describe('GeneralSettingsComponent', () => {
     it('should set value of settingForm on setSystemSetting', () => {
       component.closeSetting('Message');
 
-      expect(component.settingForm.value).toEqual(
-        MOCK_SYSTEM_CONFIG_WITH_DATA.network
+      const expectedDevice = { key: 'mockDeviceKey', value: 'mockDeviceValue' };
+      const expectedInternet = {
+        key: 'mockInternetKey',
+        value: 'mockInternetValue',
+      };
+
+      expect(component.settingForm.value.device_intf).toEqual(expectedDevice);
+
+      expect(component.settingForm.value.internet_intf).toEqual(
+        expectedInternet
       );
     });
   });
@@ -180,18 +206,24 @@ describe('GeneralSettingsComponent', () => {
     });
 
     it('should call createSystemConfig when setting form valid', () => {
-      component.deviceControl.setValue(
-        MOCK_SYSTEM_CONFIG_WITH_DATA?.network?.device_intf
-      );
-      component.internetControl.setValue(
-        MOCK_SYSTEM_CONFIG_WITH_DATA?.network?.internet_intf
-      );
+      const expectedResult = {
+        network: {
+          device_intf: 'mockDeviceKey',
+          internet_intf: '',
+        },
+      };
+
+      component.deviceControl.setValue({
+        key: 'mockDeviceKey',
+        value: 'mockDeviceValue',
+      });
+      component.internetControl.setValue(component.defaultInternetOption);
 
       component.saveSetting();
 
       expect(component.settingForm.invalid).toBeFalse();
       expect(testRunServiceMock.createSystemConfig).toHaveBeenCalledWith(
-        MOCK_SYSTEM_CONFIG_WITH_DATA
+        expectedResult
       );
     });
   });
diff --git a/modules/ui/src/app/components/general-settings/general-settings.component.ts b/modules/ui/src/app/components/general-settings/general-settings.component.ts
index b98ba35fc..c26c535da 100644
--- a/modules/ui/src/app/components/general-settings/general-settings.component.ts
+++ b/modules/ui/src/app/components/general-settings/general-settings.component.ts
@@ -21,12 +21,7 @@ import {
   OnInit,
   Output,
 } from '@angular/core';
-import {
-  FormBuilder,
-  FormControl,
-  FormGroup,
-  Validators,
-} from '@angular/forms';
+import { FormBuilder, FormControl, FormGroup } from '@angular/forms';
 import { Subject, takeUntil, tap } from 'rxjs';
 import {
   SystemInterfaces,
@@ -38,6 +33,7 @@ import { Observable } from 'rxjs/internal/Observable';
 import { shareReplay } from 'rxjs/internal/operators/shareReplay';
 import { LiveAnnouncer } from '@angular/cdk/a11y';
 import { EventType } from '../../model/event-type';
+import { SettingOption } from '../../model/setting';
 
 @Component({
   selector: 'app-general-settings',
@@ -45,13 +41,25 @@ import { EventType } from '../../model/event-type';
   styleUrls: ['./general-settings.component.scss'],
 })
 export class GeneralSettingsComponent implements OnInit, OnDestroy {
-  @Input() interfaces: SystemInterfaces = {};
+  private _interfaces: SystemInterfaces = {};
+  @Input()
+  get interfaces(): SystemInterfaces {
+    return this._interfaces;
+  }
+  set interfaces(value: SystemInterfaces) {
+    this._interfaces = value;
+    this.setSystemSetting();
+  }
   @Output() closeSettingEvent = new EventEmitter<void>();
   @Output() reloadInterfacesEvent = new EventEmitter<void>();
   public readonly CalloutType = CalloutType;
   public readonly EventType = EventType;
   public settingForm!: FormGroup;
   public isSubmitting = false;
+  public defaultInternetOption = {
+    key: '',
+    value: 'Not specified',
+  };
   hasConnectionSetting$!: Observable<boolean | null>;
   private destroy$: Subject<boolean> = new Subject<boolean>();
 
@@ -117,8 +125,8 @@ export class GeneralSettingsComponent implements OnInit, OnDestroy {
   private createSettingForm(): FormGroup {
     return (this.settingForm = this.fb.group(
       {
-        device_intf: ['', Validators.required],
-        internet_intf: ['', Validators.required],
+        device_intf: [''],
+        internet_intf: [this.defaultInternetOption],
       },
       {
         validators: [this.onlyDifferentValuesValidator.onlyDifferentSetting()],
@@ -147,12 +155,31 @@ export class GeneralSettingsComponent implements OnInit, OnDestroy {
       });
   }
 
+  compare(c1: SettingOption, c2: SettingOption): boolean {
+    return c1 && c2 && c1.key === c2.key && c1.value === c2.value;
+  }
+
   private setDefaultFormValues(
     device: string | undefined,
     internet: string | undefined
   ): void {
-    this.deviceControl.setValue(device);
-    this.internetControl.setValue(internet);
+    if (device && this.interfaces[device]) {
+      const deviceData = this.transformValueToObj(device);
+      this.deviceControl.setValue(deviceData);
+    }
+    if (internet && this.interfaces[internet]) {
+      const interneData = this.transformValueToObj(internet);
+      this.internetControl.setValue(interneData);
+    } else {
+      this.internetControl.setValue(this.defaultInternetOption);
+    }
+  }
+
+  private transformValueToObj(value: string): SettingOption {
+    return {
+      key: value,
+      value: this.interfaces[value],
+    };
   }
 
   private cleanFormErrorMessage(): void {
@@ -168,8 +195,8 @@ export class GeneralSettingsComponent implements OnInit, OnDestroy {
     const { device_intf, internet_intf } = this.settingForm.value;
     const data = {
       network: {
-        device_intf,
-        internet_intf,
+        device_intf: device_intf.key,
+        internet_intf: internet_intf.key,
       },
     };
 
@@ -189,9 +216,7 @@ export class GeneralSettingsComponent implements OnInit, OnDestroy {
       .subscribe(config => {
         if (config?.network) {
           const { device_intf, internet_intf } = config.network;
-          if (device_intf && internet_intf) {
-            this.setDefaultFormValues(device_intf, internet_intf);
-          }
+          this.setDefaultFormValues(device_intf, internet_intf);
         }
       });
   }
diff --git a/modules/ui/src/app/components/general-settings/only-different-values.validator.ts b/modules/ui/src/app/components/general-settings/only-different-values.validator.ts
index dea0c50dc..351e2bc06 100644
--- a/modules/ui/src/app/components/general-settings/only-different-values.validator.ts
+++ b/modules/ui/src/app/components/general-settings/only-different-values.validator.ts
@@ -39,7 +39,7 @@ export class OnlyDifferentValuesValidator {
         return null;
       }
 
-      if (deviceControlValue === internetControlValue) {
+      if (deviceControlValue.key === internetControlValue.key) {
         return { hasSameValues: true };
       }
       return null;
diff --git a/modules/ui/src/app/device-repository/device-form/device-form.component.html b/modules/ui/src/app/device-repository/device-form/device-form.component.html
index be653726f..e8ce4ac98 100644
--- a/modules/ui/src/app/device-repository/device-form/device-form.component.html
+++ b/modules/ui/src/app/device-repository/device-form/device-form.component.html
@@ -13,7 +13,11 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<form [formGroup]="deviceForm" class="device-form">
+<form
+  [formGroup]="deviceForm"
+  class="device-form"
+  [class.device-form-create]="!data.device"
+  [class.device-form-edit]="data.device">
   <span class="device-form-title">{{ data.title }}</span>
   <mat-form-field appearance="outline">
     <mat-label>Device Manufacturer</mat-label>
diff --git a/modules/ui/src/app/device-repository/device-repository.component.spec.ts b/modules/ui/src/app/device-repository/device-repository.component.spec.ts
index 9dd8f1340..3bcc131f3 100644
--- a/modules/ui/src/app/device-repository/device-repository.component.spec.ts
+++ b/modules/ui/src/app/device-repository/device-repository.component.spec.ts
@@ -30,6 +30,7 @@ import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
 import { device } from '../mocks/device.mock';
 import { DeleteFormComponent } from '../components/delete-form/delete-form.component';
 import SpyObj = jasmine.SpyObj;
+import { StateService } from '../services/state.service';
 
 describe('DeviceRepositoryComponent', () => {
   let component: DeviceRepositoryComponent;
@@ -37,6 +38,11 @@ describe('DeviceRepositoryComponent', () => {
   let compiled: HTMLElement;
   let mockService: SpyObj<TestRunService>;
 
+  const stateServiceMock: jasmine.SpyObj<StateService> = jasmine.createSpyObj(
+    'stateServiceMock',
+    ['focusFirstElementInMain']
+  );
+
   beforeEach(() => {
     mockService = jasmine.createSpyObj([
       'getDevices',
@@ -67,7 +73,10 @@ describe('DeviceRepositoryComponent', () => {
     ]);
     TestBed.configureTestingModule({
       imports: [DeviceRepositoryModule, BrowserAnimationsModule],
-      providers: [{ provide: TestRunService, useValue: mockService }],
+      providers: [
+        { provide: TestRunService, useValue: mockService },
+        { provide: StateService, useValue: stateServiceMock },
+      ],
       declarations: [DeviceRepositoryComponent],
     });
     fixture = TestBed.createComponent(DeviceRepositoryComponent);
diff --git a/modules/ui/src/app/device-repository/device-repository.component.ts b/modules/ui/src/app/device-repository/device-repository.component.ts
index 7d35221d3..ef569b55d 100644
--- a/modules/ui/src/app/device-repository/device-repository.component.ts
+++ b/modules/ui/src/app/device-repository/device-repository.component.ts
@@ -32,6 +32,8 @@ import {
 import { Subject, takeUntil } from 'rxjs';
 import { DeleteFormComponent } from '../components/delete-form/delete-form.component';
 import { combineLatest } from 'rxjs/internal/observable/combineLatest';
+import { StateService } from '../services/state.service';
+import { timer } from 'rxjs/internal/observable/timer';
 
 @Component({
   selector: 'app-device-repository',
@@ -45,6 +47,7 @@ export class DeviceRepositoryComponent implements OnInit, OnDestroy {
 
   constructor(
     private testRunService: TestRunService,
+    private readonly state: StateService,
     public dialog: MatDialog,
     private element: ElementRef,
     private readonly changeDetectorRef: ChangeDetectorRef
@@ -93,6 +96,11 @@ export class DeviceRepositoryComponent implements OnInit, OnDestroy {
           !selectedDevice
         ) {
           this.testRunService.addDevice(response.device);
+          timer(10)
+            .pipe(takeUntil(this.destroy$))
+            .subscribe(() => {
+              this.state.focusFirstElementInMain();
+            });
         }
         if (
           response.action === FormAction.Save &&
diff --git a/modules/ui/src/app/model/setting.ts b/modules/ui/src/app/model/setting.ts
index 5d9c768e0..2fd7e7875 100644
--- a/modules/ui/src/app/model/setting.ts
+++ b/modules/ui/src/app/model/setting.ts
@@ -19,3 +19,8 @@ export interface SystemConfig {
     internet_intf?: string;
   };
 }
+
+export interface SettingOption {
+  key: string;
+  value: string;
+}
diff --git a/modules/ui/src/app/progress/progress.component.spec.ts b/modules/ui/src/app/progress/progress.component.spec.ts
index 77e29dc43..3e453ef6b 100644
--- a/modules/ui/src/app/progress/progress.component.spec.ts
+++ b/modules/ui/src/app/progress/progress.component.spec.ts
@@ -408,7 +408,7 @@ describe('ProgressComponent', () => {
           disableClose: true,
           panelClass: 'initiate-test-run-dialog',
         });
-        tick(0);
+        tick(10);
         expect(stateServiceMock.focusFirstElementInMain).toHaveBeenCalled();
 
         openSpy.calls.reset();
diff --git a/modules/ui/src/app/progress/progress.component.ts b/modules/ui/src/app/progress/progress.component.ts
index 6702f8a51..79141c1f1 100644
--- a/modules/ui/src/app/progress/progress.component.ts
+++ b/modules/ui/src/app/progress/progress.component.ts
@@ -175,9 +175,9 @@ export class ProgressComponent implements OnInit, OnDestroy {
 
   public openStopTestrunDialog() {
     const dialogRef = this.dialog.open(DeleteFormComponent, {
-      ariaLabel: 'Stop testrun',
+      ariaLabel: `Stop testrun ${this.getTestRunName()}`,
       data: {
-        title: 'Stop testrun',
+        title: `Stop testrun ${this.getTestRunName()}`,
         content:
           'Are you sure you would like to stop testrun without a report generation?',
       },
@@ -203,6 +203,14 @@ export class ProgressComponent implements OnInit, OnDestroy {
     this.sendCloseRequest();
   }
 
+  private getTestRunName(): string {
+    if (this.currentStatus?.device) {
+      const device = this.currentStatus.device;
+      return `${device.manufacturer} ${device.model} v${device.firmware}`;
+    } else {
+      return '';
+    }
+  }
   private setCancellingStatus() {
     this.isCancelling = true;
     if (this.currentStatus) {
@@ -245,7 +253,7 @@ export class ProgressComponent implements OnInit, OnDestroy {
       ?.afterClosed()
       .pipe(takeUntil(this.destroy$))
       .subscribe(() => {
-        timer(0)
+        timer(10)
           .pipe(takeUntil(this.destroy$))
           .subscribe(() => {
             this.state.focusFirstElementInMain();
diff --git a/modules/ui/src/styles.scss b/modules/ui/src/styles.scss
index 189d5b43d..7d4a4eb6d 100644
--- a/modules/ui/src/styles.scss
+++ b/modules/ui/src/styles.scss
@@ -159,6 +159,7 @@ h2.title {
   color: mat.get-color-from-palette($color-primary, 700);
   text-decoration: none;
   cursor: pointer;
+  font-weight: 500;
 }
 
 .message-link:hover {
@@ -170,6 +171,12 @@ h2.title {
   --mdc-snackbar-supporting-text-color: #ffffff;
 }
 
+.mat-mdc-option {
+  --mat-option-hover-state-layer-color: #e8f0fe;
+  --mat-option-focus-state-layer-color: #e8f0fe;
+  --mat-option-selected-state-layer-color: #e8f0fe;
+}
+
 body:has(.initiate-test-run-dialog)
   app-root
   app-spinner.connection-settings-spinner,

From 5eda0bbd46fd514eafe8dd17b2c83230e80d743f Mon Sep 17 00:00:00 2001
From: Olga Mardvilko <omardvilko@mail.ru>
Date: Fri, 26 Jan 2024 17:35:44 +0100
Subject: [PATCH 10/11] 322476587: (fix) change to set default selected value
 on close panel (#245)

Co-authored-by: Volha Mardvilka <mardvilka@google.com>
---
 .../general-settings/general-settings.component.ts          | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/ui/src/app/components/general-settings/general-settings.component.ts b/modules/ui/src/app/components/general-settings/general-settings.component.ts
index c26c535da..5f34ff98c 100644
--- a/modules/ui/src/app/components/general-settings/general-settings.component.ts
+++ b/modules/ui/src/app/components/general-settings/general-settings.component.ts
@@ -64,11 +64,11 @@ export class GeneralSettingsComponent implements OnInit, OnDestroy {
   private destroy$: Subject<boolean> = new Subject<boolean>();
 
   get deviceControl(): FormControl {
-    return this.settingForm.get('device_intf') as FormControl;
+    return this.settingForm?.get('device_intf') as FormControl;
   }
 
   get internetControl(): FormControl {
-    return this.settingForm.get('internet_intf') as FormControl;
+    return this.settingForm?.get('internet_intf') as FormControl;
   }
 
   get isFormValues(): boolean {
@@ -217,6 +217,8 @@ export class GeneralSettingsComponent implements OnInit, OnDestroy {
         if (config?.network) {
           const { device_intf, internet_intf } = config.network;
           this.setDefaultFormValues(device_intf, internet_intf);
+        } else {
+          this.internetControl?.setValue(this.defaultInternetOption);
         }
       });
   }

From fe7c34dfbcd28f2dc0c546c1bcd0b157c8d9796b Mon Sep 17 00:00:00 2001
From: Jacob Boddey <boddey@google.com>
Date: Sun, 4 Feb 2024 08:53:51 +0000
Subject: [PATCH 11/11] Fix UI build directory

---
 modules/ui/angular.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ui/angular.json b/modules/ui/angular.json
index b56d3c7b8..d72fee51f 100644
--- a/modules/ui/angular.json
+++ b/modules/ui/angular.json
@@ -17,7 +17,7 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "outputPath": "dist/test-run-ui",
+            "outputPath": "dist",
             "index": "src/index.html",
             "main": "src/main.ts",
             "polyfills": ["zone.js"],