From d1668d282bbfe75b7f0353789f20b79ca009dff5 Mon Sep 17 00:00:00 2001
From: Rastislav Krutak <492918@mail.muni.cz>
Date: Wed, 9 Aug 2023 08:19:30 +0200
Subject: [PATCH 01/22] test(admin): e2e tests for blocked logins

Added e2e tests for blocked logins page.
---
 .../src/e2e/admin/perun-admin.cy.js           | 57 +++++++++++++++++++
 .../src/e2e/admin/perun-observer.cy.js        | 10 ++++
 .../admin-blocked-logins.component.html       |  2 +
 .../block-logins-dialog.component.html        |  2 +
 .../unblock-logins-dialog.component.html      |  7 ++-
 ...blocked-logins-dynamic-list.component.html |  9 +--
 6 files changed, 82 insertions(+), 5 deletions(-)

diff --git a/apps/admin-gui-e2e/src/e2e/admin/perun-admin.cy.js b/apps/admin-gui-e2e/src/e2e/admin/perun-admin.cy.js
index a12cb6eee..41f39ed37 100644
--- a/apps/admin-gui-e2e/src/e2e/admin/perun-admin.cy.js
+++ b/apps/admin-gui-e2e/src/e2e/admin/perun-admin.cy.js
@@ -7,6 +7,9 @@ describe('Perun admin management with role Perun admin', () => {
   const dbExtSourceName = 'test_ext_source_db';
   const dbConsentHubName = 'test-e2e-facility-from-db-3';
   const dbOwnerName = 'DbOwnerTest';
+  const loginToBlock = "testLoginToBlock"
+  const dbBlockedLogin = "test_blocking_login"
+  const dbBlockedLoginListOnly = "test_blocking_login_list"
 
   const dbSearcherAttrDisplayName = 'login-namespace:einfra';
   const dbSearcherAttrValue = 'e2etestlogin';
@@ -199,6 +202,60 @@ describe('Perun admin management with role Perun admin', () => {
     });
   });
 
+  context('Blocked logins management', () => {
+    beforeEach(() => {
+      cy.get('[data-cy=blocked-logins]')
+        .click();
+    });
+
+    it("test get blocked login", () => {
+      cy.get('[data-cy=filter-input]')
+        .type(dbBlockedLoginListOnly, {force: true})
+        .get(`[data-cy=${dbBlockedLoginListOnly}-checkbox]`)
+        .should('exist');
+    })
+
+    it('test block login', () => {
+      cy.intercept('**/usersManager/blockLogins**')
+        .as('blockLogin')
+        .intercept('**/usersManager/getBlockedLoginsPage**')
+        .as('getBlockedLogins')
+        .get('[data-cy=block-logins-button]')
+        .click({force: true})
+        .get('[data-cy=logins-input]')
+        .type(loginToBlock, {force: true})
+        .get('[data-cy=submit-blocked-logins-button]')
+        .click()
+        .wait('@blockLogin')
+        .wait('@getBlockedLogins')
+        // assert that the login is listed as blocked
+        .get('[data-cy=filter-input]')
+        .type(loginToBlock, {force: true})
+        .get(`[data-cy=${loginToBlock}-checkbox]`)
+        .should('exist');
+    });
+
+    it('test unblock login', () => {
+      cy.intercept('**/usersManager/unblockLoginsById**')
+        .as('unblockLogins')
+        .intercept('**/usersManager/getBlockedLoginsPage**')
+        .as('getBlockedLogins')
+        .get('[data-cy=filter-input]')
+        .type(dbBlockedLogin, {force: true})
+        .get(`[data-cy=${dbBlockedLogin}-checkbox]`)
+        .click()
+        .get('[data-cy=unblock-logins-button]')
+        .click({force: true})
+        .get('[data-cy=unblock-button-dialog]')
+        .click()
+        .wait('@unblockLogins')
+        .wait('@getBlockedLogins')
+        // assert that the login is no longer listed as blocked
+        .get(`[data-cy=${dbBlockedLogin}-checkbox]`)
+        .should('not.exist');
+    });
+  });
+
   it('test list ext sources', () => {
     cy.get('[data-cy=external-sources]')
       .click()
diff --git a/apps/admin-gui-e2e/src/e2e/admin/perun-observer.cy.js b/apps/admin-gui-e2e/src/e2e/admin/perun-observer.cy.js
index 869932c5a..5e1d8040b 100644
--- a/apps/admin-gui-e2e/src/e2e/admin/perun-observer.cy.js
+++ b/apps/admin-gui-e2e/src/e2e/admin/perun-observer.cy.js
@@ -11,6 +11,7 @@ describe('Perun admin management with role Perun observer', () => {
   const dbSearcherAttrValue = 'e2etestlogin';
   const dbSearcherUserFirstName = 'Test6';
   const dbOwnerName = 'DbOwnerTest';
+  const dbBlockedLoginListOnly = "test_blocking_login_list"
 
   before(() => {
     cy.login('PERUN_OBSERVER', 'perunObserver');
@@ -114,4 +115,13 @@ describe('Perun admin management with role Perun observer', () => {
       .get(`[data-cy=${dbSearcherUserFirstName.toLowerCase()}-firstName-td]`)
       .should('exist');
   });
+
+  it("test get blocked login", () => {
+    cy.get('[data-cy=blocked-logins]')
+      .click()
+      .get('[data-cy=filter-input]')
+      .type(dbBlockedLoginListOnly, {force: true})
+      .get(`[data-cy=${dbBlockedLoginListOnly}-checkbox]`)
+      .should('exist');
+  });
 });
diff --git a/apps/admin-gui/src/app/admin/pages/admin-page/admin-blocked-logins/admin-blocked-logins.component.html b/apps/admin-gui/src/app/admin/pages/admin-page/admin-blocked-logins/admin-blocked-logins.component.html
index 0cecf5c3a..95d4ca732 100644
--- a/apps/admin-gui/src/app/admin/pages/admin-page/admin-blocked-logins/admin-blocked-logins.component.html
+++ b/apps/admin-gui/src/app/admin/pages/admin-page/admin-blocked-logins/admin-blocked-logins.component.html
@@ -7,6 +7,7 @@ <h1 class="page-subtitle">{{'ADMIN.BLOCKED_LOGINS.TITLE' | translate}}</h1>
       (click)="block()"
       color="accent"
       class="me-2 action-button"
+      data-cy="block-logins-button"
       mat-flat-button
       *ngIf="isAdmin">
       {{'ADMIN.BLOCKED_LOGINS.BLOCK' | translate}}
@@ -16,6 +17,7 @@ <h1 class="page-subtitle">{{'ADMIN.BLOCKED_LOGINS.TITLE' | translate}}</h1>
       (click)="unblock()"
       class="me-2"
       color="warn"
+      data-cy="unblock-logins-button"
       mat-flat-button
       [disabled]="selection.selected.length === 0">
       {{'ADMIN.BLOCKED_LOGINS.UNBLOCK' | translate}}
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/block-logins-dialog/block-logins-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/block-logins-dialog/block-logins-dialog.component.html
index 2759b6360..824b8013b 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/block-logins-dialog/block-logins-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/block-logins-dialog/block-logins-dialog.component.html
@@ -34,6 +34,7 @@ <h1 mat-dialog-title>{{'DIALOGS.BLOCK_LOGINS.TITLE' | translate}}</h1>
         <textarea
           cols="50"
           class="md-textarea form-control"
+          data-cy="logins-input"
           [formControl]="blockLogins"
           required
           matInput
@@ -53,6 +54,7 @@ <h1 mat-dialog-title>{{'DIALOGS.BLOCK_LOGINS.TITLE' | translate}}</h1>
         (click)="onSubmit()"
         class="ms-2"
         color="accent"
+        data-cy="submit-blocked-logins-button"
         [disabled]="loading || blockLogins.invalid || (!isGlobal && selectedNamespace === null)"
         mat-flat-button>
         {{'DIALOGS.BLOCK_LOGINS.BLOCK' | translate}}
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/unblock-logins-dialog/unblock-logins-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/unblock-logins-dialog/unblock-logins-dialog.component.html
index cac4f0a08..c270ec4a8 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/unblock-logins-dialog/unblock-logins-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/unblock-logins-dialog/unblock-logins-dialog.component.html
@@ -42,7 +42,12 @@ <h1 mat-dialog-title>{{'DIALOGS.UNBLOCK_LOGINS.TITLE' | translate}}</h1>
       <button (click)="onCancel()" class="ms-auto" mat-stroked-button>
         {{'DIALOGS.UNBLOCK_LOGINS.CANCEL' | translate}}
       </button>
-      <button (click)="onSubmit()" class="ms-2" color="warn" mat-flat-button>
+      <button
+        (click)="onSubmit()"
+        class="ms-2"
+        color="warn"
+        mat-flat-button
+        data-cy="unblock-button-dialog">
         {{'DIALOGS.UNBLOCK_LOGINS.UNBLOCK' | translate}}
       </button>
     </div>
diff --git a/libs/perun/components/src/lib/blocked-logins-dynamic-list/blocked-logins-dynamic-list.component.html b/libs/perun/components/src/lib/blocked-logins-dynamic-list/blocked-logins-dynamic-list.component.html
index fae49d25a..4b68e9126 100644
--- a/libs/perun/components/src/lib/blocked-logins-dynamic-list/blocked-logins-dynamic-list.component.html
+++ b/libs/perun/components/src/lib/blocked-logins-dynamic-list/blocked-logins-dynamic-list.component.html
@@ -26,12 +26,13 @@
             color="primary">
           </mat-checkbox>
         </th>
-        <td *matCellDef="let row" class="static-column-size align-checkbox" mat-cell>
+        <td *matCellDef="let blockedLogin" class="static-column-size align-checkbox" mat-cell>
           <mat-checkbox
-            (change)="$event ? selection.toggle(row) : null"
+            attr.data-cy="{{blockedLogin.login}}-checkbox"
+            (change)="$event ? selection.toggle(blockedLogin) : null"
             (click)="$event.stopPropagation()"
-            [aria-label]="selection.isSelected(row) | checkboxLabel | translate: {name: row}"
-            [checked]="selection.isSelected(row)"
+            [aria-label]="selection.isSelected(blockedLogin) | checkboxLabel | translate: {name: blockedLogin.login}"
+            [checked]="selection.isSelected(blockedLogin)"
             color="primary">
           </mat-checkbox>
         </td>

From a242a6a26b376e6d786478c68e5d3bfea51e81c5 Mon Sep 17 00:00:00 2001
From: Rastislav Krutak <492918@mail.muni.cz>
Date: Wed, 16 Aug 2023 11:34:29 +0200
Subject: [PATCH 02/22] fix(admin): align input in create relation dialog

---
 .../create-relation-dialog.component.html                   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/admin-gui/src/app/shared/components/dialogs/create-relation-dialog/create-relation-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/create-relation-dialog/create-relation-dialog.component.html
index 7a8b4ccc1..98752291c 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/create-relation-dialog/create-relation-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/create-relation-dialog/create-relation-dialog.component.html
@@ -9,10 +9,10 @@ <h1 mat-dialog-title>{{"DIALOGS.CREATE_RELATION.TITLE" | translate}}</h1>
       [vo]="thisVo.vo"
       [vos]="vosToSelect"
       (voSelected)="getGroupsToInclude($event.id)"></perun-web-apps-vo-search-select>
-    <perun-web-apps-debounce-filter
-      (filter)="applyFilter($event)"
-      [placeholder]="'GROUP_DETAIL.SETTINGS.RELATIONS.FILTER'"></perun-web-apps-debounce-filter>
     <div class="dialog-container" mat-dialog-content>
+      <perun-web-apps-debounce-filter
+        (filter)="applyFilter($event)"
+        [placeholder]="'GROUP_DETAIL.SETTINGS.RELATIONS.FILTER'"></perun-web-apps-debounce-filter>
       <ng-template #spinner>
         <perun-web-apps-loading-table></perun-web-apps-loading-table>
       </ng-template>

From 5fe6804c2ea56e43e933fb5a79b6f18b9e6f0028 Mon Sep 17 00:00:00 2001
From: Rastislav Krutak <492918@mail.muni.cz>
Date: Fri, 18 Aug 2023 10:45:21 +0200
Subject: [PATCH 03/22] feat(admin): remove outer border at manageable entities

---
 .../user-dashboard/dashboard-card/dashboard-card.component.html | 2 +-
 .../user-dashboard/user-dashboard.component.html                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/admin-gui/src/app/users/pages/user-detail-page/user-dashboard/dashboard-card/dashboard-card.component.html b/apps/admin-gui/src/app/users/pages/user-detail-page/user-dashboard/dashboard-card/dashboard-card.component.html
index cf121945b..76b9ce965 100644
--- a/apps/admin-gui/src/app/users/pages/user-detail-page/user-dashboard/dashboard-card/dashboard-card.component.html
+++ b/apps/admin-gui/src/app/users/pages/user-detail-page/user-dashboard/dashboard-card/dashboard-card.component.html
@@ -1,4 +1,4 @@
-<div class="card p-3">
+<div class="py-3">
   <div class="d-flex flex-row align-items-center gap-2 card-title">
     <mat-icon [svgIcon]="svgIcon" class="d-flex cover-image"></mat-icon>
     {{this.title | translate}}
diff --git a/apps/admin-gui/src/app/users/pages/user-detail-page/user-dashboard/user-dashboard.component.html b/apps/admin-gui/src/app/users/pages/user-detail-page/user-dashboard/user-dashboard.component.html
index 57c477852..3d44656bb 100644
--- a/apps/admin-gui/src/app/users/pages/user-detail-page/user-dashboard/user-dashboard.component.html
+++ b/apps/admin-gui/src/app/users/pages/user-detail-page/user-dashboard/user-dashboard.component.html
@@ -79,7 +79,7 @@ <h1 class="page-title d-flex">
           </div>
           <app-perun-web-apps-dashboard-recently-viewed-button-field></app-perun-web-apps-dashboard-recently-viewed-button-field>
         </span>
-        <div *ngIf="rolesToHide.toString() !== roleNames.toString()" class="page-subtitle mt-4">
+        <div *ngIf="rolesToHide.toString() !== roleNames.toString()" class="page-subtitle my-4">
           {{'USER_DETAIL.DASHBOARD.MANAGEABLE_ENTITIES' | translate}}
         </div>
         <div>

From f2c656ccbd80d48e9846169bfcdc9ec1a7d23c65 Mon Sep 17 00:00:00 2001
From: Rastislav Krutak <492918@mail.muni.cz>
Date: Thu, 17 Aug 2023 15:37:27 +0200
Subject: [PATCH 04/22] feat(admin): customizable items per page in dashboard
 tables

---
 .../dashboard-card/dashboard-card.component.html              | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/apps/admin-gui/src/app/users/pages/user-detail-page/user-dashboard/dashboard-card/dashboard-card.component.html b/apps/admin-gui/src/app/users/pages/user-detail-page/user-dashboard/dashboard-card/dashboard-card.component.html
index 76b9ce965..125e33524 100644
--- a/apps/admin-gui/src/app/users/pages/user-detail-page/user-dashboard/dashboard-card/dashboard-card.component.html
+++ b/apps/admin-gui/src/app/users/pages/user-detail-page/user-dashboard/dashboard-card/dashboard-card.component.html
@@ -12,7 +12,6 @@
   <span *ngIf="primaryObject === 'Vo'" class="position-relative">
     <perun-web-apps-vos-list
       *perunWebAppsLoader="loading; indicator: spinner"
-      [pageSizeOptions]="null"
       [displayedColumns]="['id', 'recent', 'shortName', 'name']"
       [recentIds]="this.recentIds"
       [vos]="this.objects">
@@ -21,7 +20,6 @@
   <span *ngIf="primaryObject === 'Group'" class="position-relative">
     <perun-web-apps-groups-list
       *perunWebAppsLoader="loading; indicator: spinner"
-      [pageSizeOptions]="null"
       [displayedColumns]="['id', 'recent', 'vo', 'name', 'description']"
       [groups]="this.objects"
       [recentIds]="recentIds">
@@ -30,7 +28,6 @@
   <span *ngIf="primaryObject === 'Resource'" class="position-relative">
     <perun-web-apps-resources-list
       *perunWebAppsLoader="loading; indicator: spinner"
-      [pageSizeOptions]="null"
       [displayedColumns]="['id', 'recent', 'name', 'vo', 'facility']"
       [resources]="this.objects"
       [recentIds]="recentIds"
@@ -42,7 +39,6 @@
       *perunWebAppsLoader="loading; indicator: spinner"
       [displayedColumns]="['id', 'recent', 'name', 'description']"
       [facilities]="this.objects"
-      [pageSizeOptions]="null"
       [recentIds]="recentIds">
     </perun-web-apps-facilities-list>
   </span>

From fb8d9cd6fc4799a398d5b3d032af074c43bf7ea6 Mon Sep 17 00:00:00 2001
From: sarkapalkovicova <sarka.palkovicova@gmail.com>
Date: Mon, 21 Aug 2023 12:18:29 +0200
Subject: [PATCH 05/22] fix(admin): expand section

A section is expanded also after clicking on the title not only the icon.
---
 .../expandable-tiles/expandable-tiles.component.html   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libs/perun/components/src/lib/expandable-tiles/expandable-tiles.component.html b/libs/perun/components/src/lib/expandable-tiles/expandable-tiles.component.html
index 40cf7e61f..12285effb 100644
--- a/libs/perun/components/src/lib/expandable-tiles/expandable-tiles.component.html
+++ b/libs/perun/components/src/lib/expandable-tiles/expandable-tiles.component.html
@@ -1,11 +1,11 @@
 <div *ngIf="{expanded: expanded | async} as ex" class="mt-4">
-  <div class="d-flex align-items-center justify-content-start">
-    <span class="fs-5">{{title | translate}}</span>
-    <button mat-icon-button (click)="toggle()">
+  <button mat-button (click)="toggle()">
+    <div class="d-flex align-items-center justify-content-start">
+      <span class="fs-5">{{title | translate}}</span>
       <mat-icon *ngIf="ex.expanded">keyboard_arrow_down</mat-icon>
       <mat-icon *ngIf="!ex.expanded">keyboard_arrow_right</mat-icon>
-    </button>
-  </div>
+    </div>
+  </button>
   <mat-divider class="max-divider-width mb-3"></mat-divider>
   <perun-web-apps-menu-buttons-field *ngIf="ex.expanded" [items]="items">
   </perun-web-apps-menu-buttons-field>

From 1eea89f1cdc400e97e07a397fed77780780fd5c6 Mon Sep 17 00:00:00 2001
From: Rastislav Krutak <492918@mail.muni.cz>
Date: Fri, 18 Aug 2023 09:54:27 +0200
Subject: [PATCH 06/22] fix(admin): notifications sending enabled control
 changed to toggle

The control of sending notification in the list is now toggle.
Also added a notification about the result of the action.
---
 .../notification-list/notification-list.component.html        | 4 ++--
 .../notification-list/notification-list.component.ts          | 2 ++
 apps/admin-gui/src/assets/i18n/en.json                        | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/apps/admin-gui/src/app/vos/components/notification-list/notification-list.component.html b/apps/admin-gui/src/app/vos/components/notification-list/notification-list.component.html
index 020f70e4a..6625ca5b2 100644
--- a/apps/admin-gui/src/app/vos/components/notification-list/notification-list.component.html
+++ b/apps/admin-gui/src/app/vos/components/notification-list/notification-list.component.html
@@ -72,14 +72,14 @@
         </th>
         <td *matCellDef="let applicationMail" mat-cell>
           <section>
-            <mat-checkbox
+            <mat-slide-toggle
               (change)="changeSending(applicationMail)"
               (click)="$event.stopPropagation()"
               [disabled]="disableSend"
               [matTooltipDisabled]="!disableSend"
               [ngModel]="applicationMail.send"
               matTooltip="{{'VO_DETAIL.SETTINGS.NOTIFICATIONS.DISABLED_HINT' | translate}}">
-            </mat-checkbox>
+            </mat-slide-toggle>
           </section>
         </td>
       </ng-container>
diff --git a/apps/admin-gui/src/app/vos/components/notification-list/notification-list.component.ts b/apps/admin-gui/src/app/vos/components/notification-list/notification-list.component.ts
index 3fa375249..6a042e18b 100644
--- a/apps/admin-gui/src/app/vos/components/notification-list/notification-list.component.ts
+++ b/apps/admin-gui/src/app/vos/components/notification-list/notification-list.component.ts
@@ -99,12 +99,14 @@ export class NotificationListComponent implements OnChanges, AfterViewInit {
         .setSendingEnabled({ mails: [applicationMail], enabled: false })
         .subscribe(() => {
           applicationMail.send = false;
+          this.notificator.showInstantSuccess('VO_DETAIL.SETTINGS.NOTIFICATIONS.SENDING_DISABLE');
         });
     } else {
       this.registrarService
         .setSendingEnabled({ mails: [applicationMail], enabled: true })
         .subscribe(() => {
           applicationMail.send = true;
+          this.notificator.showInstantSuccess('VO_DETAIL.SETTINGS.NOTIFICATIONS.SENDING_ENABLE');
         });
     }
   }
diff --git a/apps/admin-gui/src/assets/i18n/en.json b/apps/admin-gui/src/assets/i18n/en.json
index 68e2c39b9..6126578e2 100644
--- a/apps/admin-gui/src/assets/i18n/en.json
+++ b/apps/admin-gui/src/assets/i18n/en.json
@@ -531,7 +531,9 @@
         "NO_EMAILS": "No mail notifications found.",
         "EDIT_SUCCESS": "Email notification was successfully edited",
         "ADD_SUCCESS": "Email notification was successfully added",
-        "DISABLED_HINT": "You don't have permission to change sending settings."
+        "DISABLED_HINT": "You don't have permission to change sending settings.",
+        "SENDING_ENABLE": "Sending of notification was successfully enabled.",
+        "SENDING_DISABLE": "Sending of notification was successfully disabled."
       },
       "EXT_SOURCES": {
         "TITLE": "External sources",

From a4579db9d2f2ca115400658940c0dd24e8e7acfd Mon Sep 17 00:00:00 2001
From: mattjoke <matejhakos@gmail.com>
Date: Wed, 16 Aug 2023 13:41:55 +0200
Subject: [PATCH 07/22] feat(admin): added support for new role

* new role PERUNADMINBA
* this role is the same as PERUNADMIN, but skips MFA
* regenerated openapi
* added 'PERUNADMINBA' description field to roles in en.json
---
 apps/admin-gui/src/assets/i18n/en.json        |   2 +
 libs/perun/models/src/lib/PerunPrincipal.ts   |   1 +
 .../src/lib/api/membersManager.service.ts     | 162 ++++++++++++++++++
 .../src/lib/gui-auth-resolver.service.ts      |  31 ++--
 4 files changed, 180 insertions(+), 16 deletions(-)

diff --git a/apps/admin-gui/src/assets/i18n/en.json b/apps/admin-gui/src/assets/i18n/en.json
index 6126578e2..30d6262db 100644
--- a/apps/admin-gui/src/assets/i18n/en.json
+++ b/apps/admin-gui/src/assets/i18n/en.json
@@ -2920,6 +2920,8 @@
     "AUDITCONSUMERADMIN": "Audit consumer admin",
     "PERUNADMIN": "Perun admin",
     "PERUNADMIN_SELF": "You have the role of perun admin",
+    "PERUNADMINBA": "Perun admin for BA accounts",
+    "PERUNADMINBA_SELF": "You have the role of perun admin for BA accounts",
     "PERUNOBSERVER": "Perun observer",
     "PERUNOBSERVER_SELF": "You have the role of perun observer"
   },
diff --git a/libs/perun/models/src/lib/PerunPrincipal.ts b/libs/perun/models/src/lib/PerunPrincipal.ts
index 878419ee9..cf3a4eb72 100644
--- a/libs/perun/models/src/lib/PerunPrincipal.ts
+++ b/libs/perun/models/src/lib/PerunPrincipal.ts
@@ -1,5 +1,6 @@
 export enum Role {
   PERUNADMIN = 'PERUNADMIN',
+  PERUNADMINBA = 'PERUNADMINBA',
   PERUNOBSERVER = 'PERUNOBSERVER',
   VOADMIN = 'VOADMIN',
   GROUPADMIN = 'GROUPADMIN',
diff --git a/libs/perun/openapi/src/lib/api/membersManager.service.ts b/libs/perun/openapi/src/lib/api/membersManager.service.ts
index 9838384d0..15476ff94 100644
--- a/libs/perun/openapi/src/lib/api/membersManager.service.ts
+++ b/libs/perun/openapi/src/lib/api/membersManager.service.ts
@@ -6015,6 +6015,168 @@ export class MembersManagerService {
     });
   }
 
+  /**
+   * Send mail to user\&#39;s preferred email address with a reminder of the username for the given namespace.
+   * @param member id of Member
+   * @param namespace namespace
+   * @param emailAttributeURN urn of the attribute with stored mail
+   * @param language language of the message
+   * @param useNon if set to true sends the request to the backend server as 'non' instead of the usual (oauth, krb...).
+   * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+   * @param reportProgress flag to report request and response progress.
+   */
+  public sendUsernameReminderEmail(
+    member: number,
+    namespace: string,
+    emailAttributeURN: string,
+    language: string,
+    useNon?: boolean,
+    observe?: 'body',
+    reportProgress?: boolean,
+    options?: { httpHeaderAccept?: 'application/json'; context?: HttpContext }
+  ): Observable<any>;
+  public sendUsernameReminderEmail(
+    member: number,
+    namespace: string,
+    emailAttributeURN: string,
+    language: string,
+    useNon?: boolean,
+    observe?: 'response',
+    reportProgress?: boolean,
+    options?: { httpHeaderAccept?: 'application/json'; context?: HttpContext }
+  ): Observable<HttpResponse<any>>;
+  public sendUsernameReminderEmail(
+    member: number,
+    namespace: string,
+    emailAttributeURN: string,
+    language: string,
+    useNon?: boolean,
+    observe?: 'events',
+    reportProgress?: boolean,
+    options?: { httpHeaderAccept?: 'application/json'; context?: HttpContext }
+  ): Observable<HttpEvent<any>>;
+  public sendUsernameReminderEmail(
+    member: number,
+    namespace: string,
+    emailAttributeURN: string,
+    language: string,
+    useNon: boolean = false,
+    observe: any = 'body',
+    reportProgress: boolean = false,
+    options?: { httpHeaderAccept?: 'application/json'; context?: HttpContext }
+  ): Observable<any> {
+    if (member === null || member === undefined) {
+      throw new Error(
+        'Required parameter member was null or undefined when calling sendUsernameReminderEmail.'
+      );
+    }
+    if (namespace === null || namespace === undefined) {
+      throw new Error(
+        'Required parameter namespace was null or undefined when calling sendUsernameReminderEmail.'
+      );
+    }
+    if (emailAttributeURN === null || emailAttributeURN === undefined) {
+      throw new Error(
+        'Required parameter emailAttributeURN was null or undefined when calling sendUsernameReminderEmail.'
+      );
+    }
+    if (language === null || language === undefined) {
+      throw new Error(
+        'Required parameter language was null or undefined when calling sendUsernameReminderEmail.'
+      );
+    }
+
+    let localVarQueryParameters = new HttpParams({ encoder: this.encoder });
+    if (member !== undefined && member !== null) {
+      localVarQueryParameters = this.addToHttpParams(
+        localVarQueryParameters,
+        <any>member,
+        'member'
+      );
+    }
+    if (namespace !== undefined && namespace !== null) {
+      localVarQueryParameters = this.addToHttpParams(
+        localVarQueryParameters,
+        <any>namespace,
+        'namespace'
+      );
+    }
+    if (emailAttributeURN !== undefined && emailAttributeURN !== null) {
+      localVarQueryParameters = this.addToHttpParams(
+        localVarQueryParameters,
+        <any>emailAttributeURN,
+        'emailAttributeURN'
+      );
+    }
+    if (language !== undefined && language !== null) {
+      localVarQueryParameters = this.addToHttpParams(
+        localVarQueryParameters,
+        <any>language,
+        'language'
+      );
+    }
+
+    let localVarHeaders = this.defaultHeaders;
+
+    let localVarCredential: string | undefined;
+    // authentication (BasicAuth) required
+    localVarCredential = this.configuration.lookupCredential('BasicAuth');
+    if (localVarCredential) {
+      localVarHeaders = localVarHeaders.set('Authorization', 'Basic ' + localVarCredential);
+    }
+
+    // authentication (BearerAuth) required
+    localVarCredential = this.configuration.lookupCredential('BearerAuth');
+    if (localVarCredential) {
+      localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential);
+    }
+
+    let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept;
+    if (localVarHttpHeaderAcceptSelected === undefined) {
+      // to determine the Accept header
+      const httpHeaderAccepts: string[] = ['application/json'];
+      localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+    }
+    if (localVarHttpHeaderAcceptSelected !== undefined) {
+      localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
+    }
+
+    let localVarHttpContext: HttpContext | undefined = options && options.context;
+    if (localVarHttpContext === undefined) {
+      localVarHttpContext = new HttpContext();
+    }
+
+    let responseType_: 'text' | 'json' | 'blob' = 'json';
+    if (localVarHttpHeaderAcceptSelected) {
+      if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
+        responseType_ = 'text';
+      } else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) {
+        responseType_ = 'json';
+      } else {
+        responseType_ = 'blob';
+      }
+    }
+
+    let requestUrl = `${this.configuration.basePath}/urlinjsonout/membersManager/sendUsernameReminderEmail`;
+    if (useNon) {
+      // replace the authentication part of url with 'non' authentication
+      let helperUrl = new URL(requestUrl);
+      let path = helperUrl.pathname.split('/');
+      path[1] = 'non';
+      helperUrl.pathname = path.join('/');
+      requestUrl = helperUrl.toString();
+    }
+    return this.httpClient.post<any>(requestUrl, null, {
+      context: localVarHttpContext,
+      params: localVarQueryParameters,
+      responseType: <any>responseType_,
+      withCredentials: this.configuration.withCredentials,
+      headers: localVarHeaders,
+      observe: observe,
+      reportProgress: reportProgress,
+    });
+  }
+
   /**
    * Creates a sponsored membership for the given user.
    * @param InputSetSponsoredMember
diff --git a/libs/perun/services/src/lib/gui-auth-resolver.service.ts b/libs/perun/services/src/lib/gui-auth-resolver.service.ts
index c7772efc2..1d77be515 100644
--- a/libs/perun/services/src/lib/gui-auth-resolver.service.ts
+++ b/libs/perun/services/src/lib/gui-auth-resolver.service.ts
@@ -89,6 +89,7 @@ export class GuiAuthResolver {
   canManageFacilities(): boolean {
     return this.hasAtLeastOne(
       Role.PERUNADMIN,
+      Role.PERUNADMINBA,
       Role.PERUNOBSERVER,
       Role.FACILITYADMIN,
       Role.FACILITIYOBSERVER
@@ -96,31 +97,31 @@ export class GuiAuthResolver {
   }
 
   isPerunAdmin(): boolean {
-    return this.principalRoles.has(Role.PERUNADMIN);
+    return this.principalRoles.has(Role.PERUNADMIN) || this.principalRoles.has(Role.PERUNADMINBA);
   }
 
   isPerunAdminOrObserver(): boolean {
-    return this.hasAtLeastOne(Role.PERUNADMIN, Role.PERUNOBSERVER);
+    return this.hasAtLeastOne(Role.PERUNADMIN, Role.PERUNOBSERVER, Role.PERUNADMINBA);
   }
 
   isVoAdmin(): boolean {
-    return this.hasAtLeastOne(Role.PERUNADMIN, Role.VOADMIN);
+    return this.hasAtLeastOne(Role.PERUNADMIN, Role.VOADMIN, Role.PERUNADMINBA);
   }
 
   isThisVoAdminOrObserver(id: number): boolean {
     return (
       this.editableVos.includes(Number(id.toString())) ||
       this.observableVos.includes(Number(id.toString())) ||
-      this.hasAtLeastOne(Role.PERUNADMIN, Role.PERUNOBSERVER)
+      this.isPerunAdminOrObserver()
     );
   }
 
   isThisVoAdmin(id: number): boolean {
-    return this.editableVos.includes(id) || this.principalRoles.has(Role.PERUNADMIN);
+    return this.editableVos.includes(id) || this.isPerunAdmin();
   }
 
   isGroupAdmin(): boolean {
-    return this.hasAtLeastOne(Role.PERUNADMIN, Role.GROUPADMIN);
+    return this.isPerunAdmin() || this.hasAtLeastOne(Role.GROUPADMIN);
   }
 
   isOnlySponsor(): boolean {
@@ -128,7 +129,7 @@ export class GuiAuthResolver {
   }
 
   isThisGroupAdmin(id: number): boolean {
-    return this.editableGroups.includes(id) || this.principalRoles.has(Role.PERUNADMIN);
+    return this.editableGroups.includes(id) || this.isPerunAdmin();
   }
 
   isGroupAdminInThisVo(id: number): boolean {
@@ -136,36 +137,34 @@ export class GuiAuthResolver {
   }
 
   isFacilityAdmin(): boolean {
-    return this.hasAtLeastOne(Role.PERUNADMIN, Role.FACILITYADMIN);
+    return this.isPerunAdmin() || this.hasAtLeastOne(Role.FACILITYADMIN);
   }
 
   isThisFacilityAdmin(id: number): boolean {
-    return this.editableFacilities.includes(id) || this.principalRoles.has(Role.PERUNADMIN);
+    return this.editableFacilities.includes(id) || this.isPerunAdmin();
   }
 
   isResourceAdmin(): boolean {
-    return this.hasAtLeastOne(Role.PERUNADMIN, Role.RESOURCEADMIN);
+    return this.isPerunAdmin() || this.hasAtLeastOne(Role.RESOURCEADMIN);
   }
 
   isTopGroupCreator(): boolean {
-    return this.hasAtLeastOne(Role.PERUNADMIN, Role.TOPGROUPCREATOR);
+    return this.isPerunAdmin() || this.hasAtLeastOne(Role.TOPGROUPCREATOR);
   }
   isTopGroupCreatorOnly(): boolean {
     return this.hasAtLeastOne(Role.TOPGROUPCREATOR);
   }
 
   isCabinetAdmin(): boolean {
-    return this.hasAtLeastOne(Role.PERUNADMIN, Role.CABINETADMIN);
+    return this.isPerunAdmin() || this.hasAtLeastOne(Role.CABINETADMIN);
   }
 
   isVoObserver(): boolean {
-    return this.hasAtLeastOne(Role.PERUNADMIN, Role.VOOBSERVER, Role.PERUNOBSERVER);
+    return this.isPerunAdminOrObserver() || this.hasAtLeastOne(Role.VOOBSERVER);
   }
 
   isThisVoObserver(id: number): boolean {
-    return (
-      this.hasAtLeastOne(Role.PERUNADMIN, Role.PERUNOBSERVER) || this.observableVos.includes(id)
-    );
+    return this.isPerunAdminOrObserver() || this.observableVos.includes(id);
   }
 
   getMemberIds(): number[] {

From aa73beb654bcee36d8967ab175961373682042f7 Mon Sep 17 00:00:00 2001
From: Rastislav Krutak <492918@mail.muni.cz>
Date: Mon, 21 Aug 2023 11:08:48 +0200
Subject: [PATCH 08/22] feat(admin): modify user without role message

After logging-in of a user whose roles are only SELF or MEMBERSHIP a
notice is displayed about this fact with button leading to user profile.
---
 .../user-dashboard.component.html             | 38 ++++++-------------
 .../user-dashboard.component.ts               |  9 ++---
 apps/admin-gui/src/assets/i18n/en.json        |  8 ++--
 3 files changed, 17 insertions(+), 38 deletions(-)

diff --git a/apps/admin-gui/src/app/users/pages/user-detail-page/user-dashboard/user-dashboard.component.html b/apps/admin-gui/src/app/users/pages/user-detail-page/user-dashboard/user-dashboard.component.html
index 3d44656bb..289a5fdcd 100644
--- a/apps/admin-gui/src/app/users/pages/user-detail-page/user-dashboard/user-dashboard.component.html
+++ b/apps/admin-gui/src/app/users/pages/user-detail-page/user-dashboard/user-dashboard.component.html
@@ -29,50 +29,34 @@ <h1 class="page-title d-flex">
         >
         <button
           (click)="this.rightSettingOpened = true"
-          *ngIf="!isOnlySelfRole"
+          *ngIf="!hasOnlyNoRightsRoles"
           class="ms-auto text-bigger"
           mat-stroked-button>
           <mat-icon>settings</mat-icon>
         </button>
       </h1>
 
-      <div *ngIf="isOnlySelfRole">
-        <div class="card m-3 p-5">
+      <div *ngIf="hasOnlyNoRightsRoles">
+        <div class="card m-3 p-4">
           <div class="text-align">
-            {{'USER_DETAIL.DASHBOARD.NOT_MANAGER' | translate}}
+            {{'USER_DETAIL.DASHBOARD.NO_ASSIGNED_ROLES' | translate}}
           </div>
-          <div class="text-align pt-3">
-            <span
-              *ngIf="!userProfileUrl"
-              >{{'USER_DETAIL.DASHBOARD.NOT_MANAGER_INFO_NO_USER_PROFILE' | translate}}</span
-            >
-            <span
-              *ngIf="userProfileUrl"
-              >{{'USER_DETAIL.DASHBOARD.NOT_MANAGER_INFO' | translate}}</span
-            >
+          <div class="text-align pt-3 mt-2">
+            {{'USER_DETAIL.DASHBOARD.NO_ASSIGNED_ROLES_PROFILE' | translate}}
           </div>
           <div class="mx-auto pt-3">
             <button
               [routerLink]="['/myProfile']"
               queryParamsHandling="merge"
-              class="text-bigger"
-              mat-stroked-button>
-              <mat-icon class="me-1 user-icon perun-icon" svgIcon="perun-user-dark"></mat-icon>
-              {{'USER_DETAIL.DASHBOARD.GO_TO_MY_PROFILE' | translate}}
-            </button>
-
-            <button
-              (click)="goToUserProfile()"
-              class="text-bigger ms-2 mt-2"
-              *ngIf="userProfileUrl"
-              mat-stroked-button>
-              <mat-icon class="me-1">exit_to_app</mat-icon
-              >{{'USER_DETAIL.DASHBOARD.GO_TO_USER_PROFILE' | translate}} {{this.userProfileName}}
+              class="ms-2 mt-2"
+              color="accent"
+              mat-flat-button>
+              {{'USER_DETAIL.DASHBOARD.GO_TO_USER_PROFILE' | translate}}
             </button>
           </div>
         </div>
       </div>
-      <div *ngIf="!isOnlySelfRole">
+      <div *ngIf="!hasOnlyNoRightsRoles">
         <span *ngIf="recentlyViewedShow">
           <div class="page-subtitle">
             {{'USER_DETAIL.DASHBOARD.RECENTLY_VIEWED' | translate}}
diff --git a/apps/admin-gui/src/app/users/pages/user-detail-page/user-dashboard/user-dashboard.component.ts b/apps/admin-gui/src/app/users/pages/user-detail-page/user-dashboard/user-dashboard.component.ts
index 80ff3fdba..aa485e375 100644
--- a/apps/admin-gui/src/app/users/pages/user-detail-page/user-dashboard/user-dashboard.component.ts
+++ b/apps/admin-gui/src/app/users/pages/user-detail-page/user-dashboard/user-dashboard.component.ts
@@ -25,10 +25,11 @@ export class UserDashboardComponent implements OnInit {
   roles: { [key: string]: { [key: string]: Array<number> } } = {};
   userProfileUrl = '';
   roleNames: string[];
-  isOnlySelfRole = false;
+  hasOnlyNoRightsRoles = false;
   rightSettingOpened = false;
   recentlyViewedShow = true;
   rolesToHide: string[] = [];
+  noRightsRoles = new Set<string>(['SELF', 'MEMBERSHIP', 'SPONSORSHIP']);
   allowedRoles = [
     'VOADMIN',
     'GROUPADMIN',
@@ -70,15 +71,11 @@ export class UserDashboardComponent implements OnInit {
     this.roles = this.storeService.getPerunPrincipal().roles;
     this.getUserProfile();
     const allUserRoles = Object.keys(this.roles);
-    this.isOnlySelfRole = allUserRoles.toString() === ['SELF'].toString();
+    this.hasOnlyNoRightsRoles = allUserRoles.every((role) => this.noRightsRoles.has(role));
     this.roleNames = this.allowedRoles.filter((value) => allUserRoles.includes(value));
     this.getDashboardSettings();
   }
 
-  goToUserProfile(): void {
-    window.open(this.userProfileUrl);
-  }
-
   recentlyViewedChanged(): void {
     localStorage.setItem('showRecentlyViewed', JSON.stringify(this.recentlyViewedShow));
   }
diff --git a/apps/admin-gui/src/assets/i18n/en.json b/apps/admin-gui/src/assets/i18n/en.json
index 30d6262db..30e204b78 100644
--- a/apps/admin-gui/src/assets/i18n/en.json
+++ b/apps/admin-gui/src/assets/i18n/en.json
@@ -2584,11 +2584,9 @@
       "TITLE": "Welcome ",
       "RECENTLY_VIEWED": "Recently viewed",
       "NO_RECENTLY_VIEWED": "No recently viewed",
-      "NOT_MANAGER": "It looks like you don’t manage anything here.",
-      "NOT_MANAGER_INFO_NO_USER_PROFILE": "If you want to administrate information about yourself you can look on your profile",
-      "NOT_MANAGER_INFO": "If you want to administrate information about yourself please choose one of the options",
-      "GO_TO_MY_PROFILE": "See My profile",
-      "GO_TO_USER_PROFILE": "Go to",
+      "NO_ASSIGNED_ROLES": "You currently do not have any assigned roles within the system. As a result, you do not have access to any specific functionalities or actions.",
+      "NO_ASSIGNED_ROLES_PROFILE": "If you believe this is an error or if you require access to specific features, see settings in My profile.",
+      "GO_TO_USER_PROFILE": "See My profile",
       "MANAGEABLE_ENTITIES": "Manageable entities",
       "CARD_TITLE_VOADMIN": "Manager in Organizations",
       "ROLE_INFO_VOADMIN": "You can manage organizations that are listed below",

From 8682866e0f05ae447a2428c76c1153bf7f5044d3 Mon Sep 17 00:00:00 2001
From: Rastislav Krutak <492918@mail.muni.cz>
Date: Tue, 22 Aug 2023 08:58:10 +0200
Subject: [PATCH 09/22] fix(admin): missaligned icons in action-buttons

* Fix action-buttons where the icon inside was misaligned
* Buttons in the group application form changed to be consistent with VO
* Settings button in VO application form aligned to be consistent with group
---
 ...p-settings-application-form.component.html | 16 ++++++----
 ...roup-settings-notifications.component.html | 12 +++++---
 ...o-settings-application-form.component.html | 30 +++++++++----------
 .../vo-settings-notifications.component.html  | 12 +++++---
 4 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/apps/admin-gui/src/app/vos/pages/group-detail-page/group-settings/group-settings-application-form/group-settings-application-form.component.html b/apps/admin-gui/src/app/vos/pages/group-detail-page/group-settings/group-settings-application-form/group-settings-application-form.component.html
index 80c11585b..eda8be548 100644
--- a/apps/admin-gui/src/app/vos/pages/group-detail-page/group-settings/group-settings-application-form/group-settings-application-form.component.html
+++ b/apps/admin-gui/src/app/vos/pages/group-detail-page/group-settings/group-settings-application-form/group-settings-application-form.component.html
@@ -31,9 +31,11 @@ <h1 class="page-subtitle">
           {{applicationForm.automaticApprovalEmbedded ?
           ('GROUP_DETAIL.SETTINGS.APPLICATION_FORM.AUTOMATIC'| translate) : ('GROUP_DETAIL.SETTINGS.APPLICATION_FORM.MANUAL'| translate)}}
         </span>
-        <button *ngIf="editAuth" (click)="settings()" mat-stroked-button>
-          <i class="material-icons">edit</i>
-          {{'GROUP_DETAIL.SETTINGS.APPLICATION_FORM.SETTINGS_BUTTON' | translate}}
+        <button *ngIf="editAuth" (click)="settings()" class="ms-2 action-button" mat-stroked-button>
+          <i class="material-icons align-middle">edit</i>
+          <span class="align-middle">
+            {{'GROUP_DETAIL.SETTINGS.APPLICATION_FORM.SETTINGS_BUTTON' | translate}}
+          </span>
         </button>
       </div>
       <span *ngIf="autoRegistrationEnabled">
@@ -71,9 +73,11 @@ <h1 class="page-subtitle">
       {{'VO_DETAIL.SETTINGS.APPLICATION_FORM.SAVE_BUTTON' | translate}}
     </button>
 
-    <button (click)="copy()" *ngIf="editAuth" class="me-2" mat-stroked-button>
-      <i class="material-icons">file_copy</i>
-      {{'GROUP_DETAIL.SETTINGS.APPLICATION_FORM.COPY_GROUP_BUTTON' | translate}}
+    <button (click)="copy()" *ngIf="editAuth" class="me-2 action-button" mat-stroked-button>
+      <i class="material-icons align-middle">file_copy</i>
+      <span class="align-middle">
+        {{'GROUP_DETAIL.SETTINGS.APPLICATION_FORM.COPY_GROUP_BUTTON' | translate}}
+      </span>
     </button>
 
     <button (click)="preview()" mat-stroked-button>
diff --git a/apps/admin-gui/src/app/vos/pages/group-detail-page/group-settings/group-settings-notifications/group-settings-notifications.component.html b/apps/admin-gui/src/app/vos/pages/group-detail-page/group-settings/group-settings-notifications/group-settings-notifications.component.html
index 585e5511f..80f5152f5 100644
--- a/apps/admin-gui/src/app/vos/pages/group-detail-page/group-settings/group-settings-notifications/group-settings-notifications.component.html
+++ b/apps/admin-gui/src/app/vos/pages/group-detail-page/group-settings/group-settings-notifications/group-settings-notifications.component.html
@@ -24,13 +24,17 @@ <h1 class="page-subtitle">
     </button>
 
     <button (click)="changeEmailFooter()" class="me-2 action-button" mat-stroked-button>
-      <i class="material-icons">email</i>
-      {{'GROUP_DETAIL.SETTINGS.NOTIFICATIONS.EMAIL_FOOTER' | translate}}
+      <i class="material-icons align-middle">email</i>
+      <span class="align-middle">
+        {{'GROUP_DETAIL.SETTINGS.NOTIFICATIONS.EMAIL_FOOTER' | translate}}
+      </span>
     </button>
 
     <button (click)="copy()" *ngIf="copyAuth" class="action-button" mat-stroked-button>
-      <i class="material-icons">file_copy</i>
-      {{'GROUP_DETAIL.SETTINGS.NOTIFICATIONS.COPY_FROM_VO' | translate}}
+      <i class="material-icons align-middle">file_copy</i>
+      <span class="align-middle">
+        {{'GROUP_DETAIL.SETTINGS.NOTIFICATIONS.COPY_FROM_VO' | translate}}
+      </span>
     </button>
   </div>
 
diff --git a/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-settings/vo-settings-application-form/vo-settings-application-form.component.html b/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-settings/vo-settings-application-form/vo-settings-application-form.component.html
index 7dd7f13f5..9d61e63e8 100644
--- a/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-settings/vo-settings-application-form/vo-settings-application-form.component.html
+++ b/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-settings/vo-settings-application-form/vo-settings-application-form.component.html
@@ -3,8 +3,8 @@ <h1 class="page-subtitle">
 </h1>
 <mat-spinner *ngIf="loading" class="ms-auto me-auto"> </mat-spinner>
 <div>
-  <div *ngIf="!loading" class="d-flex w-50">
-    <div class="w-50">
+  <div *ngIf="!loading" class="d-flex w-75">
+    <div>
       <div class="fw-bold">
         {{'VO_DETAIL.SETTINGS.APPLICATION_FORM.MODULE_NAME' | translate}}:
         {{applicationForm.moduleClassName}}
@@ -15,26 +15,22 @@ <h1 class="page-subtitle">
           >{{'VO_DETAIL.SETTINGS.APPLICATION_FORM.APPLICATION_TYPE' | translate}}</span
         >:
 
-        <mat-icon class="align-bottom" matTooltip="Initial">arrow_right_alt</mat-icon>
+        <mat-icon class="align-middle" matTooltip="Initial">arrow_right_alt</mat-icon>
         {{applicationForm.automaticApproval ?
         ('VO_DETAIL.SETTINGS.APPLICATION_FORM.AUTOMATIC'| translate) : ('VO_DETAIL.SETTINGS.APPLICATION_FORM.MANUAL'| translate)}}
         ,
 
-        <mat-icon class="align-bottom" matTooltip="Extension">restore</mat-icon>
+        <mat-icon class="align-middle" matTooltip="Extension">restore</mat-icon>
         {{applicationForm.automaticApprovalExtension ?
         ('VO_DETAIL.SETTINGS.APPLICATION_FORM.AUTOMATIC'| translate) : ('VO_DETAIL.SETTINGS.APPLICATION_FORM.MANUAL'| translate)}}
+        <button *ngIf="editAuth" (click)="settings()" class="ms-3 action-button" mat-stroked-button>
+          <i class="material-icons align-middle">edit</i>
+          <span class="align-middle">
+            {{'VO_DETAIL.SETTINGS.APPLICATION_FORM.SETTINGS_BUTTON' | translate}}
+          </span>
+        </button>
       </div>
     </div>
-    <div class="w-25">
-      <button
-        *ngIf="editAuth"
-        (click)="settings()"
-        class="ms-auto action-button"
-        mat-stroked-button>
-        <i class="material-icons">edit</i>
-        {{'VO_DETAIL.SETTINGS.APPLICATION_FORM.SETTINGS_BUTTON' | translate}}
-      </button>
-    </div>
   </div>
 
   <mat-divider class="mb-2 mt-2"></mat-divider>
@@ -66,8 +62,10 @@ <h1 class="page-subtitle">
     </button>
 
     <button (click)="copy()" *ngIf="editAuth" class="me-2 action-button" mat-stroked-button>
-      <i class="material-icons">file_copy</i>
-      {{'VO_DETAIL.SETTINGS.APPLICATION_FORM.COPY_VO_BUTTON' | translate}}
+      <i class="material-icons align-middle">file_copy</i>
+      <span class="align-middle">
+        {{'VO_DETAIL.SETTINGS.APPLICATION_FORM.COPY_VO_BUTTON' | translate}}
+      </span>
     </button>
 
     <button (click)="preview()" mat-stroked-button>
diff --git a/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-settings/vo-settings-notifications/vo-settings-notifications.component.html b/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-settings/vo-settings-notifications/vo-settings-notifications.component.html
index b3f3ca0b9..6f5ab9fa7 100644
--- a/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-settings/vo-settings-notifications/vo-settings-notifications.component.html
+++ b/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-settings/vo-settings-notifications/vo-settings-notifications.component.html
@@ -19,13 +19,17 @@ <h1 class="page-subtitle">
   </button>
 
   <button (click)="changeEmailFooter()" class="me-2 action-button" mat-stroked-button>
-    <i class="material-icons">email</i>
-    {{'VO_DETAIL.SETTINGS.NOTIFICATIONS.EMAIL_FOOTER' | translate}}
+    <i class="material-icons align-middle">email</i>
+    <span class="align-middle">
+      {{'VO_DETAIL.SETTINGS.NOTIFICATIONS.EMAIL_FOOTER' | translate}}
+    </span>
   </button>
 
   <button (click)="copy()" *ngIf="copyAuth" class="action-button" mat-stroked-button>
-    <i class="material-icons">file_copy</i>
-    {{'VO_DETAIL.SETTINGS.NOTIFICATIONS.COPY_FROM_VO' | translate}}
+    <i class="material-icons align-middle">file_copy</i>
+    <span class="align-middle">
+      {{'VO_DETAIL.SETTINGS.NOTIFICATIONS.COPY_FROM_VO' | translate}}
+    </span>
   </button>
 </div>
 

From b30ce1e36d770e6ce2436a6c42486717f5ea0267 Mon Sep 17 00:00:00 2001
From: HejdaJakub <kuba.hejda97@gmail.com>
Date: Tue, 22 Aug 2023 05:49:17 +0200
Subject: [PATCH 10/22] feat(admin): check disabled and hidden dependencies for
 application items

* Provide a warning message when trying to change source or destination attribute for items which are marked as hidden or disabled dependency for another form item.
* Display an error in dialog when trying to delete an item which is marked as hidden or disabled dependency for another form item (it used to throw an uncatched exception).
---
 ...pplication-form-item-dialog.component.html | 14 ++++--
 ...-application-form-item-dialog.component.ts | 17 +++++--
 ...pplication-form-item-dialog.component.html |  6 ++-
 ...-application-form-item-dialog.component.ts | 42 +++++++++++++++--
 .../application-form-list.component.ts        | 46 ++++++++++++++-----
 apps/admin-gui/src/assets/i18n/en.json        |  2 +
 .../entity-search-select.component.css        |  5 ++
 .../entity-search-select.component.html       |  3 +-
 .../entity-search-select.component.ts         |  1 +
 ...election-item-search-select.component.html |  1 +
 .../selection-item-search-select.component.ts |  1 +
 11 files changed, 114 insertions(+), 24 deletions(-)

diff --git a/apps/admin-gui/src/app/shared/components/dialogs/delete-application-form-item-dialog/delete-application-form-item-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/delete-application-form-item-dialog/delete-application-form-item-dialog.component.html
index 6c666b4e0..1ba9a8226 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/delete-application-form-item-dialog/delete-application-form-item-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/delete-application-form-item-dialog/delete-application-form-item-dialog.component.html
@@ -1,10 +1,15 @@
 <h1 mat-dialog-title>{{'DIALOGS.DELETE_APPLICATION_FORM_ITEM.TITLE' | translate}}</h1>
 <div class="dialog-container" mat-dialog-content>
-  <div class="pb-2 fw-bold">
-    {{'DIALOGS.DELETE_APPLICATION_FORM_ITEM.INFO_1' | translate}}
+  <div *ngIf="!deletionDisabled">
+    <div class="pb-2 fw-bold">
+      {{'DIALOGS.DELETE_APPLICATION_FORM_ITEM.INFO_1' | translate}}
+    </div>
+    <div>{{'DIALOGS.DELETE_APPLICATION_FORM_ITEM.INFO_2' | translate}}</div>
+    <div class="pb-4 pt-2">{{'DIALOGS.DELETE_APPLICATION_FORM_ITEM.INFO_3' | translate}}</div>
   </div>
-  <div>{{'DIALOGS.DELETE_APPLICATION_FORM_ITEM.INFO_2' | translate}}</div>
-  <div class="pb-4 pt-2">{{'DIALOGS.DELETE_APPLICATION_FORM_ITEM.INFO_3' | translate}}</div>
+  <perun-web-apps-alert *ngIf="deletionDisabled" alert_type="error">
+    {{data.errorMessage}}
+  </perun-web-apps-alert>
 </div>
 <div mat-dialog-actions>
   <button (click)="onCancel()" class="ms-auto" mat-stroked-button>
@@ -12,6 +17,7 @@ <h1 mat-dialog-title>{{'DIALOGS.DELETE_APPLICATION_FORM_ITEM.TITLE' | translate}
   </button>
   <button
     (click)="submit()"
+    [disabled]="deletionDisabled"
     class="ms-2"
     color="warn"
     data-cy="delete-application-form-item-dialog"
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/delete-application-form-item-dialog/delete-application-form-item-dialog.component.ts b/apps/admin-gui/src/app/shared/components/dialogs/delete-application-form-item-dialog/delete-application-form-item-dialog.component.ts
index 9826c75a3..4aad6233e 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/delete-application-form-item-dialog/delete-application-form-item-dialog.component.ts
+++ b/apps/admin-gui/src/app/shared/components/dialogs/delete-application-form-item-dialog/delete-application-form-item-dialog.component.ts
@@ -1,5 +1,9 @@
-import { Component } from '@angular/core';
-import { MatDialogRef } from '@angular/material/dialog';
+import { Component, Inject } from '@angular/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+
+export interface DeleteApplicationFormItemDialogData {
+  errorMessage: string;
+}
 
 @Component({
   selector: 'app-delete-application-form-item-dialog',
@@ -7,7 +11,14 @@ import { MatDialogRef } from '@angular/material/dialog';
   styleUrls: ['./delete-application-form-item-dialog.component.scss'],
 })
 export class DeleteApplicationFormItemDialogComponent {
-  constructor(private dialogRef: MatDialogRef<DeleteApplicationFormItemDialogComponent>) {}
+  deletionDisabled: boolean;
+
+  constructor(
+    private dialogRef: MatDialogRef<DeleteApplicationFormItemDialogComponent>,
+    @Inject(MAT_DIALOG_DATA) public data: DeleteApplicationFormItemDialogData
+  ) {
+    this.deletionDisabled = this.data.errorMessage?.length !== 0;
+  }
 
   onCancel(): void {
     this.dialogRef.close(false);
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/edit-application-form-item-dialog/edit-application-form-item-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/edit-application-form-item-dialog/edit-application-form-item-dialog.component.html
index 8cd924e05..534e052ad 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/edit-application-form-item-dialog/edit-application-form-item-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/edit-application-form-item-dialog/edit-application-form-item-dialog.component.html
@@ -67,7 +67,8 @@ <h1 mat-dialog-title>
                 <perun-web-apps-selection-item-search-select
                   [attributes]="sourceAttributes"
                   [selectedAttribute]="applicationFormItem.perunSourceAttribute"
-                  (itemSelected)="applicationFormItem.perunSourceAttribute = $event.value"
+                  (itemSelected)="applicationFormItem.perunSourceAttribute = $event.value; loadWarning(itemType.SOURCE)"
+                  [warning]="displayWarningForSourceAttr ? warningMessage : ''"
                   [asGroup]="!!data.group"
                   [type]="itemType.SOURCE">
                 </perun-web-apps-selection-item-search-select>
@@ -81,7 +82,8 @@ <h1 mat-dialog-title>
                 <perun-web-apps-selection-item-search-select
                   [attributes]="destinationAttributes"
                   [selectedAttribute]="applicationFormItem.perunDestinationAttribute"
-                  (itemSelected)="applicationFormItem.perunDestinationAttribute = $event.value"
+                  (itemSelected)="applicationFormItem.perunDestinationAttribute = $event.value; loadWarning(itemType.DESTINATION)"
+                  [warning]="displayWarningForDestinationAttr ? warningMessage : ''"
                   [asGroup]="!!data.group"
                   [type]="itemType.DESTINATION">
                 </perun-web-apps-selection-item-search-select>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/edit-application-form-item-dialog/edit-application-form-item-dialog.component.ts b/apps/admin-gui/src/app/shared/components/dialogs/edit-application-form-item-dialog/edit-application-form-item-dialog.component.ts
index 961367729..7331cea83 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/edit-application-form-item-dialog/edit-application-form-item-dialog.component.ts
+++ b/apps/admin-gui/src/app/shared/components/dialogs/edit-application-form-item-dialog/edit-application-form-item-dialog.component.ts
@@ -1,6 +1,5 @@
 import { ChangeDetectorRef, Component, Inject, OnInit } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { TranslateService } from '@ngx-translate/core';
 import {
   ApplicationFormItem,
   AppType,
@@ -13,7 +12,11 @@ import { createNewApplicationFormItem } from '@perun-web-apps/perun/utils';
 import DisabledEnum = ApplicationFormItem.DisabledEnum;
 import HiddenEnum = ApplicationFormItem.HiddenEnum;
 import { ItemType, NO_FORM_ITEM, SelectionItem } from '@perun-web-apps/perun/components';
-import { HtmlEscapeService, StoreService } from '@perun-web-apps/perun/services';
+import {
+  HtmlEscapeService,
+  PerunTranslateService,
+  StoreService,
+} from '@perun-web-apps/perun/services';
 import { FormControl, FormGroup } from '@angular/forms';
 
 export interface EditApplicationFormItemDialogComponentData {
@@ -69,6 +72,9 @@ export class EditApplicationFormItemDialogComponent implements OnInit {
 
   hiddenDependencyItem: ApplicationFormItem = null;
   disabledDependencyItem: ApplicationFormItem = null;
+  warningMessage = '';
+  displayWarningForSourceAttr = false;
+  displayWarningForDestinationAttr = false;
   languages = ['en'];
   private dependencyTypes: Type[] = [
     'PASSWORD',
@@ -86,7 +92,7 @@ export class EditApplicationFormItemDialogComponent implements OnInit {
     private dialogRef: MatDialogRef<EditApplicationFormItemDialogComponent>,
     @Inject(MAT_DIALOG_DATA) public data: EditApplicationFormItemDialogComponentData,
     private attributesManager: AttributesManagerService,
-    private translateService: TranslateService,
+    private translate: PerunTranslateService,
     private store: StoreService,
     private cd: ChangeDetectorRef,
     private escapeService: HtmlEscapeService
@@ -145,6 +151,36 @@ export class EditApplicationFormItemDialogComponent implements OnInit {
     this.getOptions();
   }
 
+  loadWarning(itemType: ItemType): void {
+    this.warningMessage = '';
+    const hiddenDependencyForItem = this.data.allItems.find(
+      (item) => item.hiddenDependencyItemId === this.data.applicationFormItem.id
+    );
+    const disabledDependencyForItem = this.data.allItems.find(
+      (item) => item.disabledDependencyItemId === this.data.applicationFormItem.id
+    );
+    if (hiddenDependencyForItem || disabledDependencyForItem) {
+      if (itemType === ItemType.SOURCE) {
+        this.displayWarningForSourceAttr = true;
+      } else {
+        this.displayWarningForDestinationAttr = true;
+      }
+      this.warningMessage = this.translate.instant(
+        'DIALOGS.APPLICATION_FORM_EDIT_ITEM.DEPENDENCY_WARNING_MESSAGE',
+        hiddenDependencyForItem
+          ? {
+              dependency: 'hidden',
+              shortname: hiddenDependencyForItem.shortname,
+            }
+          : {
+              dependency: 'disabled',
+              shortname: disabledDependencyForItem.shortname,
+            }
+      );
+      this.cd.detectChanges();
+    }
+  }
+
   cancel(): void {
     this.dialogRef.close();
   }
diff --git a/apps/admin-gui/src/app/vos/components/application-form-list/application-form-list.component.ts b/apps/admin-gui/src/app/vos/components/application-form-list/application-form-list.component.ts
index 9539ed15f..816f3cd92 100644
--- a/apps/admin-gui/src/app/vos/components/application-form-list/application-form-list.component.ts
+++ b/apps/admin-gui/src/app/vos/components/application-form-list/application-form-list.component.ts
@@ -11,8 +11,7 @@ import { MatDialog } from '@angular/material/dialog';
 import { MatTable } from '@angular/material/table';
 import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop';
 import { DeleteApplicationFormItemDialogComponent } from '../../../shared/components/dialogs/delete-application-form-item-dialog/delete-application-form-item-dialog.component';
-import { NotificatorService } from '@perun-web-apps/perun/services';
-import { TranslateService } from '@ngx-translate/core';
+import { NotificatorService, PerunTranslateService } from '@perun-web-apps/perun/services';
 import { EditApplicationFormItemDialogComponent } from '../../../shared/components/dialogs/edit-application-form-item-dialog/edit-application-form-item-dialog.component';
 import { ApplicationForm, ApplicationFormItem } from '@perun-web-apps/perun/openapi';
 import { getDefaultDialogConfig } from '@perun-web-apps/perun/utils';
@@ -67,37 +66,37 @@ export class ApplicationFormListComponent implements OnInit, OnChanges {
     private dialog: MatDialog,
     private notificator: NotificatorService,
     private router: Router,
-    private translate: TranslateService
+    private translate: PerunTranslateService
   ) {}
 
   ngOnInit(): void {
     // labels for hidden and disabled icons
     this.ifEmpty = this.translate.instant(
       'VO_DETAIL.SETTINGS.APPLICATION_FORM.DISABLED_HIDDEN_ICON.IF_EMPTY'
-    ) as string;
+    );
     this.ifPrefilled = this.translate.instant(
       'VO_DETAIL.SETTINGS.APPLICATION_FORM.DISABLED_HIDDEN_ICON.IF_PREFILLED'
-    ) as string;
+    );
 
     // tooltips for hidden and disabled icons
     this.alwaysDisabled = this.translate.instant(
       'VO_DETAIL.SETTINGS.APPLICATION_FORM.DISABLED_HIDDEN_ICON.ALWAYS_DISABLED_HINT'
-    ) as string;
+    );
     this.alwaysHidden = this.translate.instant(
       'VO_DETAIL.SETTINGS.APPLICATION_FORM.DISABLED_HIDDEN_ICON.ALWAYS_HIDDEN_HINT'
-    ) as string;
+    );
     this.isDisabledIf = this.translate.instant(
       'VO_DETAIL.SETTINGS.APPLICATION_FORM.DISABLED_HIDDEN_ICON.DISABLED_IF_HINT'
-    ) as string;
+    );
     this.isHiddenIf = this.translate.instant(
       'VO_DETAIL.SETTINGS.APPLICATION_FORM.DISABLED_HIDDEN_ICON.HIDDEN_IF_HINT'
-    ) as string;
+    );
     this.isEmpty = this.translate.instant(
       'VO_DETAIL.SETTINGS.APPLICATION_FORM.DISABLED_HIDDEN_ICON.IS_EMPTY_HINT'
-    ) as string;
+    );
     this.isPrefilled = this.translate.instant(
       'VO_DETAIL.SETTINGS.APPLICATION_FORM.DISABLED_HIDDEN_ICON.IS_PREFILLED_HINT'
-    ) as string;
+    );
   }
 
   ngOnChanges(): void {
@@ -188,8 +187,33 @@ export class ApplicationFormListComponent implements OnInit, OnChanges {
   }
 
   delete(applicationFormItem: ApplicationFormItem): void {
+    let errorMessage = '';
+    const hiddenDependencyForItem = this.applicationFormItems.find(
+      (item) => item.hiddenDependencyItemId === applicationFormItem.id
+    );
+    const disabledDependencyForItem = this.applicationFormItems.find(
+      (item) => item.disabledDependencyItemId === applicationFormItem.id
+    );
+    if (hiddenDependencyForItem || disabledDependencyForItem) {
+      errorMessage = this.translate.instant(
+        'DIALOGS.APPLICATION_FORM_EDIT_ITEM.DEPENDENCY_ERROR_MESSAGE',
+        hiddenDependencyForItem
+          ? {
+              dependency: 'hidden',
+              shortname: hiddenDependencyForItem.shortname,
+            }
+          : {
+              dependency: 'disabled',
+              shortname: disabledDependencyForItem.shortname,
+            }
+      );
+    }
+
     const config = getDefaultDialogConfig();
     config.width = '500px';
+    config.data = {
+      errorMessage: errorMessage,
+    };
 
     const dialog = this.dialog.open(DeleteApplicationFormItemDialogComponent, config);
     dialog.afterClosed().subscribe((deleteItem) => {
diff --git a/apps/admin-gui/src/assets/i18n/en.json b/apps/admin-gui/src/assets/i18n/en.json
index 30e204b78..e2772fc50 100644
--- a/apps/admin-gui/src/assets/i18n/en.json
+++ b/apps/admin-gui/src/assets/i18n/en.json
@@ -1378,6 +1378,8 @@
       "SOURCE_ATTRIBUTE_DESCRIPTION": "Select attribute, which will be used to pre-fill form value. You can select also organization attributes.",
       "DESTINATION_ATTRIBUTE": "Destination attribute",
       "DESTINATION_ATTRIBUTE_DESCRIPTION": "Select attribute, where will be submitted value stored after accepting user`s application.",
+      "DEPENDENCY_WARNING_MESSAGE": "Be careful when changing this attribute - this item is a {{dependency}} dependency for item {{shortname}}",
+      "DEPENDENCY_ERROR_MESSAGE": "You can't delete this item because it is a {{dependency}} dependency for item {{shortname}}",
       "FEDERATION_ATTRIBUTE": "Federation attribute",
       "FEDERATION_ATTRIBUTE_DESCRIPTION": "Select federation attribute to get pre-filed value from.",
       "REQUIRED": "Required",
diff --git a/libs/perun/components/src/lib/entity-search-select/entity-search-select.component.css b/libs/perun/components/src/lib/entity-search-select/entity-search-select.component.css
index 3af19b3cc..fc800c1d9 100644
--- a/libs/perun/components/src/lib/entity-search-select/entity-search-select.component.css
+++ b/libs/perun/components/src/lib/entity-search-select/entity-search-select.component.css
@@ -18,3 +18,8 @@
 .black {
   color: black;
 }
+
+.warning {
+  color: darkorange;
+  font-weight: bold;
+}
diff --git a/libs/perun/components/src/lib/entity-search-select/entity-search-select.component.html b/libs/perun/components/src/lib/entity-search-select/entity-search-select.component.html
index 532bbdc43..c5d3fe6d0 100644
--- a/libs/perun/components/src/lib/entity-search-select/entity-search-select.component.html
+++ b/libs/perun/components/src/lib/entity-search-select/entity-search-select.component.html
@@ -1,5 +1,5 @@
 <div class="d-flex flex-row align-items-center gap-4">
-  <mat-form-field class="w-100 pb-0">
+  <mat-form-field class="w-100 pb-0" subscriptSizing="dynamic">
     <mat-label>{{selectPlaceholder}}</mat-label>
     <mat-select
       [required]="required"
@@ -50,6 +50,7 @@
         </mat-option>
       </cdk-virtual-scroll-viewport>
     </mat-select>
+    <mat-hint *ngIf="warning?.length !== 0" class="warning">{{warning}}</mat-hint>
   </mat-form-field>
 
   <perun-web-apps-deselect-button
diff --git a/libs/perun/components/src/lib/entity-search-select/entity-search-select.component.ts b/libs/perun/components/src/lib/entity-search-select/entity-search-select.component.ts
index 4a03f96e5..65dcdb210 100644
--- a/libs/perun/components/src/lib/entity-search-select/entity-search-select.component.ts
+++ b/libs/perun/components/src/lib/entity-search-select/entity-search-select.component.ts
@@ -38,6 +38,7 @@ export class EntitySearchSelectComponent<T extends PerunBean>
   @Input() highlightOption = false;
   @Input() theme = '';
   @Input() required = false;
+  @Input() warning: string;
   @Output() entitySelected = new EventEmitter<T | T[]>();
   @Output() selectClosed = new EventEmitter<boolean>();
   @ViewChild('scrollViewport', { static: false }) scrollViewport: CdkVirtualScrollViewport;
diff --git a/libs/perun/components/src/lib/selection-item-search-select/selection-item-search-select.component.html b/libs/perun/components/src/lib/selection-item-search-select/selection-item-search-select.component.html
index f345754bf..1760b21f7 100644
--- a/libs/perun/components/src/lib/selection-item-search-select/selection-item-search-select.component.html
+++ b/libs/perun/components/src/lib/selection-item-search-select/selection-item-search-select.component.html
@@ -5,6 +5,7 @@
   [searchFunction]="searchFunction"
   [mainTextFunction]="nameFunction"
   [secondaryTextFunction]="shortNameFunction"
+  [warning]="warning"
   [selectPlaceholder]="'SHARED_LIB.PERUN.COMPONENTS.SELECTION_ITEM_SEARCH_SELECT.SELECT_ITEM' | translate"
   [findPlaceholder]="'SHARED_LIB.PERUN.COMPONENTS.SELECTION_ITEM_SEARCH_SELECT.FIND_ITEM' | translate"
   [noEntriesText]="'SHARED_LIB.PERUN.COMPONENTS.SELECTION_ITEM_SEARCH_SELECT.NO_ITEM_FOUND' | translate">
diff --git a/libs/perun/components/src/lib/selection-item-search-select/selection-item-search-select.component.ts b/libs/perun/components/src/lib/selection-item-search-select/selection-item-search-select.component.ts
index 9eefa4d0f..2672e3af1 100644
--- a/libs/perun/components/src/lib/selection-item-search-select/selection-item-search-select.component.ts
+++ b/libs/perun/components/src/lib/selection-item-search-select/selection-item-search-select.component.ts
@@ -28,6 +28,7 @@ export class SelectionItemSearchSelectComponent implements OnInit {
   @Input() selectedAttribute: string;
   @Input() type: ItemType;
   @Input() asGroup = false;
+  @Input() warning: string;
   @Output() itemSelected = new EventEmitter<SelectionItem>();
 
   items: SelectionItem[] = [];

From d3b9eebc87a921faee892ef0859d55fd8bb1836e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20B=C5=99ou=C5=A1ek?=
 <melanger@users.noreply.github.com>
Date: Tue, 1 Aug 2023 07:47:58 +0200
Subject: [PATCH 11/22] ci: config for renovate

* Renovate Github app needs to be enabled for this repo
* PRs by dependabot need to be disabled
(but keep vulnerability alerts enabled, renovate will read them)
---
 renovate.json | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 renovate.json

diff --git a/renovate.json b/renovate.json
new file mode 100644
index 000000000..399df23d7
--- /dev/null
+++ b/renovate.json
@@ -0,0 +1,26 @@
+{
+	"$schema": "https://docs.renovatebot.com/renovate-schema.json",
+	"extends": [
+		"config:best-practices",
+		"config:js-app",
+		":automergeLinters",
+		":automergeRequireAllStatusChecks",
+		":maintainLockFilesMonthly",
+		":semanticCommits",
+		":label(dependencies)",
+		":enableVulnerabilityAlertsWithLabel(security)",
+	],
+	"minimumReleaseAge": 3,
+	"osvVulnerabilityAlerts": true,
+	"packageRules": [
+		{
+			"dependencyDashboardApproval": true,
+			"matchUpdateTypes": [
+				"major",
+				"minor",
+				"patch",
+				"digest"
+			]
+		}
+	]
+}

From 67655ae18c7a680a963c789d78f383e4186278ad Mon Sep 17 00:00:00 2001
From: HejdaJakub <kuba.hejda97@gmail.com>
Date: Thu, 24 Aug 2023 02:09:56 +0200
Subject: [PATCH 12/22] fixup! ci: config for renovate

* Property 'minimumReleaseAge' muset be a string instead of number.
* Last comma removed from extends array.
---
 renovate.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/renovate.json b/renovate.json
index 399df23d7..3e1fc73fa 100644
--- a/renovate.json
+++ b/renovate.json
@@ -8,9 +8,9 @@
 		":maintainLockFilesMonthly",
 		":semanticCommits",
 		":label(dependencies)",
-		":enableVulnerabilityAlertsWithLabel(security)",
+		":enableVulnerabilityAlertsWithLabel(security)"
 	],
-	"minimumReleaseAge": 3,
+	"minimumReleaseAge": "3 days",
 	"osvVulnerabilityAlerts": true,
 	"packageRules": [
 		{

From f910a57827328d7c55bb598a855d11b8a67539ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20B=C5=99ou=C5=A1ek?=
 <melanger@users.noreply.github.com>
Date: Wed, 23 Aug 2023 12:36:58 +0200
Subject: [PATCH 13/22] ci: un-hide patch commits from changelog

affects UPGRADE.md and GitHub release descriptions
---
 .releaserc.json | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/.releaserc.json b/.releaserc.json
index 7dd99c288..efa4e610a 100644
--- a/.releaserc.json
+++ b/.releaserc.json
@@ -20,14 +20,10 @@
         "preset": "conventionalcommits",
         "presetConfig": {
           "types": [
-            {
-              "type": "feat",
-              "section": "New features and notable changes",
-              "hidden": false
-            },
-            { "type": "fix", "hidden": true },
-            { "type": "perf", "hidden": true },
-            { "type": "revert", "hidden": true },
+            { "type": "feat", "hidden": false },
+            { "type": "fix", "hidden": false },
+            { "type": "perf", "hidden": false },
+            { "type": "revert", "hidden": false },
             { "type": "docs", "hidden": true },
             { "type": "style", "hidden": true },
             { "type": "chore", "hidden": true },

From bfbe9a2b0eca2b814af336ced2b21107ca09b76d Mon Sep 17 00:00:00 2001
From: sarkapalkovicova <sarka.palkovicova@gmail.com>
Date: Tue, 29 Aug 2023 10:50:17 +0200
Subject: [PATCH 14/22] fix(admin): buttons authz on member pages

Authz of buttons is checked independently of data loading.
---
 .../member-attributes.component.html          |  6 +-
 .../member-attributes.component.ts            | 35 ++++-----
 .../member-groups.component.html              |  2 +-
 .../member-groups/member-groups.component.ts  | 76 ++++++++-----------
 .../member-resources.component.ts             | 45 ++++-------
 5 files changed, 66 insertions(+), 98 deletions(-)

diff --git a/apps/admin-gui/src/app/vos/pages/member-detail-page/member-attributes/member-attributes.component.html b/apps/admin-gui/src/app/vos/pages/member-detail-page/member-attributes/member-attributes.component.html
index a84e4befe..bf02382a4 100644
--- a/apps/admin-gui/src/app/vos/pages/member-detail-page/member-attributes/member-attributes.component.html
+++ b/apps/admin-gui/src/app/vos/pages/member-detail-page/member-attributes/member-attributes.component.html
@@ -6,7 +6,7 @@ <h1 class="page-subtitle">{{'MEMBER_DETAIL.SETTINGS.ATTRIBUTES.TITLE' | translat
         {{'MEMBER_DETAIL.ENTITY' | translate}}
       </ng-template>
       <ng-template matTabContent>
-        <app-one-entity-attribute-page [entityId]="this.memberId" [entity]="'member'">
+        <app-one-entity-attribute-page [entityId]="member.id" [entity]="'member'">
         </app-one-entity-attribute-page>
       </ng-template>
     </mat-tab>
@@ -19,7 +19,7 @@ <h1 class="page-subtitle">{{'MEMBER_DETAIL.SETTINGS.ATTRIBUTES.TITLE' | translat
       <ng-template matTabContent>
         <app-two-entity-attribute-page
           [firstEntity]="'member'"
-          [firstEntityId]="memberId"
+          [firstEntityId]="member.id"
           [secondEntity]="'group'"></app-two-entity-attribute-page>
       </ng-template>
     </mat-tab>
@@ -32,7 +32,7 @@ <h1 class="page-subtitle">{{'MEMBER_DETAIL.SETTINGS.ATTRIBUTES.TITLE' | translat
       <ng-template matTabContent>
         <app-two-entity-attribute-page
           [firstEntity]="'member'"
-          [firstEntityId]="memberId"
+          [firstEntityId]="member.id"
           [secondEntity]="'resource'"></app-two-entity-attribute-page>
       </ng-template>
     </mat-tab>
diff --git a/apps/admin-gui/src/app/vos/pages/member-detail-page/member-attributes/member-attributes.component.ts b/apps/admin-gui/src/app/vos/pages/member-detail-page/member-attributes/member-attributes.component.ts
index 3b52e327b..e6a741f74 100644
--- a/apps/admin-gui/src/app/vos/pages/member-detail-page/member-attributes/member-attributes.component.ts
+++ b/apps/admin-gui/src/app/vos/pages/member-detail-page/member-attributes/member-attributes.component.ts
@@ -1,6 +1,6 @@
 import { Component, HostBinding, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { GuiAuthResolver } from '@perun-web-apps/perun/services';
+import { EntityStorageService, GuiAuthResolver } from '@perun-web-apps/perun/services';
 import { Member, MembersManagerService } from '@perun-web-apps/perun/openapi';
 
 @Component({
@@ -10,7 +10,6 @@ import { Member, MembersManagerService } from '@perun-web-apps/perun/openapi';
 })
 export class MemberAttributesComponent implements OnInit {
   @HostBinding('class.router-component') true;
-  memberId: number;
   member: Member;
   memberResourceAttAuth: boolean;
   memberGroupAttAuth: boolean;
@@ -19,28 +18,22 @@ export class MemberAttributesComponent implements OnInit {
   constructor(
     private route: ActivatedRoute,
     private authResolver: GuiAuthResolver,
-    private memberManager: MembersManagerService
+    private memberManager: MembersManagerService,
+    private entityService: EntityStorageService
   ) {}
 
   ngOnInit(): void {
-    this.route.parent.params.subscribe((params) => {
-      this.memberId = Number(params['memberId']);
+    this.member = this.entityService.getEntity();
 
-      this.memberManager.getMemberById(this.memberId).subscribe((member) => {
-        this.member = member;
-
-        this.memberGroupAttAuth = this.authResolver.isAuthorized('getMemberGroups_Member_policy', [
-          this.member,
-        ]);
-        this.memberResourceAttAuth = this.authResolver.isAuthorized(
-          'getAssignedResourcesWithStatus_Member_policy',
-          [this.member]
-        );
-        this.userFacilityAttAuth = this.authResolver.isAuthorized(
-          'getAssignedFacilities_User_policy',
-          [{ beanName: 'User', id: member.userId }]
-        );
-      });
-    });
+    this.memberGroupAttAuth = this.authResolver.isAuthorized('getMemberGroups_Member_policy', [
+      this.member,
+    ]);
+    this.memberResourceAttAuth = this.authResolver.isAuthorized(
+      'getAssignedResourcesWithStatus_Member_policy',
+      [this.member]
+    );
+    this.userFacilityAttAuth = this.authResolver.isAuthorized('getAssignedFacilities_User_policy', [
+      { beanName: 'User', id: this.member.userId },
+    ]);
   }
 }
diff --git a/apps/admin-gui/src/app/vos/pages/member-detail-page/member-groups/member-groups.component.html b/apps/admin-gui/src/app/vos/pages/member-detail-page/member-groups/member-groups.component.html
index 48665d6a1..4b6e38e40 100644
--- a/apps/admin-gui/src/app/vos/pages/member-detail-page/member-groups/member-groups.component.html
+++ b/apps/admin-gui/src/app/vos/pages/member-detail-page/member-groups/member-groups.component.html
@@ -57,7 +57,7 @@ <h1 class="page-subtitle">{{'MEMBER_DETAIL.GROUPS.TITLE' | translate}}</h1>
       *perunWebAppsLoader="loading; indicator: spinner"
       (refreshTable)="refreshTable()"
       [displayedColumns]="['select', 'id', 'name', 'description', 'expiration', 'groupStatus']"
-      [memberId]="memberId"
+      [memberId]="member.id"
       [disableRouting]="!routeAuth"
       [groups]="groups"
       [filter]="filterValue"
diff --git a/apps/admin-gui/src/app/vos/pages/member-detail-page/member-groups/member-groups.component.ts b/apps/admin-gui/src/app/vos/pages/member-detail-page/member-groups/member-groups.component.ts
index 2476273d1..643ace258 100644
--- a/apps/admin-gui/src/app/vos/pages/member-detail-page/member-groups/member-groups.component.ts
+++ b/apps/admin-gui/src/app/vos/pages/member-detail-page/member-groups/member-groups.component.ts
@@ -5,7 +5,6 @@ import {
   GroupsManagerService,
   Member,
   MembersManagerService,
-  Vo,
 } from '@perun-web-apps/perun/openapi';
 import { TABLE_MEMBER_DETAIL_GROUPS } from '@perun-web-apps/config/table-config';
 import { SelectionModel } from '@angular/cdk/collections';
@@ -13,7 +12,7 @@ import { getDefaultDialogConfig } from '@perun-web-apps/perun/utils';
 import { MatDialog } from '@angular/material/dialog';
 import { AddMemberGroupDialogComponent } from '../../../../shared/components/dialogs/add-member-group-dialog/add-member-group-dialog.component';
 import { RemoveMemberGroupDialogComponent } from '../../../../shared/components/dialogs/remove-member-group-dialog/remove-member-group-dialog.component';
-import { GuiAuthResolver } from '@perun-web-apps/perun/services';
+import { EntityStorageService, GuiAuthResolver } from '@perun-web-apps/perun/services';
 import { Urns } from '@perun-web-apps/perun/urns';
 import { Observable } from 'rxjs';
 import { map, startWith } from 'rxjs/operators';
@@ -35,7 +34,6 @@ export class MemberGroupsComponent implements OnInit {
   @ViewChild('list') private list: GroupsListComponent;
 
   groups: Group[] = [];
-  memberId: number;
   member: Member;
   allGroups: Group[];
   loading: boolean;
@@ -62,29 +60,31 @@ export class MemberGroupsComponent implements OnInit {
     private route: ActivatedRoute,
     private dialog: MatDialog,
     private authResolver: GuiAuthResolver,
-    private memberService: MembersManagerService
+    private memberService: MembersManagerService,
+    private entityService: EntityStorageService
   ) {}
 
   ngOnInit(): void {
     this.loading = true;
-    this.route.parent.params.subscribe((parentParams) => {
-      this.memberId = Number(parentParams['memberId']);
-      this.memberService.getMemberById(this.memberId).subscribe((member) => {
-        this.member = member;
-        this.groupsService.getAllGroups(this.member.voId).subscribe((allGroups) => {
-          this.allGroups = allGroups;
-          this.refreshTable();
-          if (localStorage.getItem('preferedValue') === 'list') {
-            this.toggle.toggle();
-            this.showGroupList = true;
-          }
+    this.member = this.entityService.getEntity();
+
+    this.groupsService.getAllGroups(this.member.voId).subscribe((allGroups) => {
+      this.allGroups = allGroups;
+      this.addAuth = this.allGroups.reduce(
+        (acc, grp) => acc || this.authResolver.isAuthorized('addMember_Group_Member_policy', [grp]),
+        false
+      );
+
+      this.refreshTable();
+      if (localStorage.getItem('preferedValue') === 'list') {
+        this.toggle.toggle();
+        this.showGroupList = true;
+      }
 
-          this.toggle.change.subscribe(() => {
-            const value = this.toggle.checked ? 'list' : 'tree';
-            localStorage.setItem('preferedValue', value);
-            this.refreshTable();
-          });
-        });
+      this.toggle.change.subscribe(() => {
+        const value = this.toggle.checked ? 'list' : 'tree';
+        localStorage.setItem('preferedValue', value);
+        this.refreshTable();
       });
     });
   }
@@ -92,7 +92,7 @@ export class MemberGroupsComponent implements OnInit {
   refreshTable(): void {
     this.loading = true;
     this.groupsService
-      .getMemberRichGroupsWithAttributesByNames(this.memberId, [
+      .getMemberRichGroupsWithAttributesByNames(this.member.id, [
         Urns.MEMBER_DEF_GROUP_EXPIRATION,
         Urns.MEMBER_GROUP_STATUS,
         Urns.MEMBER_GROUP_STATUS_INDIRECT,
@@ -101,7 +101,14 @@ export class MemberGroupsComponent implements OnInit {
         next: (groups) => {
           this.selection.clear();
           this.groups = groups;
-          this.setAuthRights();
+
+          if (this.groups.length !== 0) {
+            this.routeAuth = this.authResolver.isAuthorized('getGroupById_int_policy', [
+              { id: this.member.voId, beanName: 'Vo' },
+              this.groups[0],
+            ]);
+          }
+
           this.loading = false;
         },
         error: () => (this.loading = false),
@@ -112,30 +119,11 @@ export class MemberGroupsComponent implements OnInit {
     this.list.changeExpiration(group);
   }
 
-  setAuthRights(): void {
-    const vo: Vo = {
-      id: this.member.voId,
-      beanName: 'Vo',
-    };
-
-    this.addAuth = this.allGroups.reduce(
-      (acc, grp) => acc || this.authResolver.isAuthorized('addMember_Group_Member_policy', [grp]),
-      false
-    );
-
-    if (this.groups.length !== 0) {
-      this.routeAuth = this.authResolver.isAuthorized('getGroupById_int_policy', [
-        vo,
-        this.groups[0],
-      ]);
-    }
-  }
-
   addGroup(): void {
     const config = getDefaultDialogConfig();
     config.width = '850px';
     config.data = {
-      memberId: this.memberId,
+      memberId: this.member.id,
       membersGroups: new Set<number>(this.groups.map((grp) => grp.id)),
       theme: 'member-theme',
     };
@@ -153,7 +141,7 @@ export class MemberGroupsComponent implements OnInit {
     const config = getDefaultDialogConfig();
     config.width = '650px';
     config.data = {
-      memberId: this.memberId,
+      memberId: this.member.id,
       groups: this.selection.selected,
       theme: 'member-theme',
     };
diff --git a/apps/admin-gui/src/app/vos/pages/member-detail-page/member-resources/member-resources.component.ts b/apps/admin-gui/src/app/vos/pages/member-detail-page/member-resources/member-resources.component.ts
index 0ff2569f0..ae98e5b4b 100644
--- a/apps/admin-gui/src/app/vos/pages/member-detail-page/member-resources/member-resources.component.ts
+++ b/apps/admin-gui/src/app/vos/pages/member-detail-page/member-resources/member-resources.component.ts
@@ -11,7 +11,7 @@ import { TABLE_MEMBER_RESOURCE_LIST } from '@perun-web-apps/config/table-config'
 import { ActivatedRoute } from '@angular/router';
 import { getDefaultDialogConfig } from '@perun-web-apps/perun/utils';
 import { AddMemberToResourceDialogComponent } from '../../../../shared/components/dialogs/add-member-to-resource-dialog/add-member-to-resource-dialog.component';
-import { GuiAuthResolver } from '@perun-web-apps/perun/services';
+import { EntityStorageService, GuiAuthResolver } from '@perun-web-apps/perun/services';
 
 @Component({
   selector: 'app-member-resources',
@@ -27,25 +27,25 @@ export class MemberResourcesComponent implements OnInit {
   tableId = TABLE_MEMBER_RESOURCE_LIST;
   routeAuth: boolean;
   addAuth: boolean;
+  voBean: PerunBean;
 
   constructor(
     private dialog: MatDialog,
     private memberManager: MembersManagerService,
     private resourceManager: ResourcesManagerService,
     private route: ActivatedRoute,
-    private authResolver: GuiAuthResolver
+    private authResolver: GuiAuthResolver,
+    private entityService: EntityStorageService
   ) {}
 
   ngOnInit(): void {
     this.loading = true;
-    this.route.parent.params.subscribe((parentParams) => {
-      const memberId = Number(parentParams['memberId']);
-
-      this.memberManager.getMemberById(memberId).subscribe((member) => {
-        this.member = member;
-        this.refreshTable();
-      });
-    });
+    this.member = this.entityService.getEntity();
+    this.voBean = { id: this.member.voId, beanName: 'Vo' };
+    this.addAuth =
+      this.authResolver.isAuthorized('getRichResources_Vo_policy', [this.voBean]) &&
+      this.authResolver.isAuthorized('addMembers_Group_List<Member>_policy', [this.voBean]);
+    this.refreshTable();
   }
 
   addResource(): void {
@@ -72,29 +72,16 @@ export class MemberResourcesComponent implements OnInit {
       .getAssignedRichResourcesWithMember(this.member.id)
       .subscribe((resources) => {
         this.resources = resources;
-        this.setAuthRights();
+        if (this.resources.length !== 0) {
+          this.routeAuth = this.authResolver.isAuthorized('getResourceById_int_policy', [
+            this.voBean,
+            this.resources[0],
+          ]);
+        }
         this.loading = false;
       });
   }
 
-  setAuthRights(): void {
-    const vo: PerunBean = {
-      id: this.member.voId,
-      beanName: 'Vo',
-    };
-
-    this.addAuth =
-      this.authResolver.isAuthorized('getRichResources_Vo_policy', [vo]) &&
-      this.authResolver.isAuthorized('addMembers_Group_List<Member>_policy', [vo]);
-
-    if (this.resources.length !== 0) {
-      this.routeAuth = this.authResolver.isAuthorized('getResourceById_int_policy', [
-        vo,
-        this.resources[0],
-      ]);
-    }
-  }
-
   applyFilter(filterValue: string): void {
     this.filterValue = filterValue;
   }

From 729d9ed9f6cac95510809cd606fa8ffda01257ad Mon Sep 17 00:00:00 2001
From: Adam Bodnar <adam.bodnar10@gmail.com>
Date: Tue, 29 Aug 2023 13:17:14 +0200
Subject: [PATCH 15/22] feat(admin): hide empty expandable sections

* empty sections are not shown
* authentication section under service account was reworked to be expandable
---
 .../service-identity-overview.component.html  |  5 +++++
 .../service-identity-overview.component.ts    | 22 ++++++++++++++++---
 .../expandable-tiles.component.html           |  2 +-
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/apps/admin-gui/src/app/users/pages/user-detail-page/user-settings/user-settings-service-identities/service-identity-detail-page/service-identity-overview/service-identity-overview.component.html b/apps/admin-gui/src/app/users/pages/user-detail-page/user-settings/user-settings-service-identities/service-identity-detail-page/service-identity-overview/service-identity-overview.component.html
index 4d3b97379..0d5d3a96f 100644
--- a/apps/admin-gui/src/app/users/pages/user-detail-page/user-settings/user-settings-service-identities/service-identity-detail-page/service-identity-overview/service-identity-overview.component.html
+++ b/apps/admin-gui/src/app/users/pages/user-detail-page/user-settings/user-settings-service-identities/service-identity-detail-page/service-identity-overview/service-identity-overview.component.html
@@ -1 +1,6 @@
 <perun-web-apps-menu-buttons-field [items]="navItems"></perun-web-apps-menu-buttons-field>
+<perun-web-apps-expandable-tiles
+  [items]="authenticationItems"
+  [title]="'MENU_ITEMS.USER.AUTHENTICATION'"
+  [sectionId]="'authentication'">
+</perun-web-apps-expandable-tiles>
diff --git a/apps/admin-gui/src/app/users/pages/user-detail-page/user-settings/user-settings-service-identities/service-identity-detail-page/service-identity-overview/service-identity-overview.component.ts b/apps/admin-gui/src/app/users/pages/user-detail-page/user-settings/user-settings-service-identities/service-identity-detail-page/service-identity-overview/service-identity-overview.component.ts
index f211301fb..f08783d97 100644
--- a/apps/admin-gui/src/app/users/pages/user-detail-page/user-settings/user-settings-service-identities/service-identity-detail-page/service-identity-overview/service-identity-overview.component.ts
+++ b/apps/admin-gui/src/app/users/pages/user-detail-page/user-settings/user-settings-service-identities/service-identity-detail-page/service-identity-overview/service-identity-overview.component.ts
@@ -10,6 +10,7 @@ import { User } from '@perun-web-apps/perun/openapi';
 })
 export class ServiceIdentityOverviewComponent implements OnInit {
   navItems: MenuItem[] = [];
+  authenticationItems: MenuItem[] = [];
   serviceAccount: User;
 
   constructor(private entityStorageService: EntityStorageService) {}
@@ -39,10 +40,25 @@ export class ServiceIdentityOverviewComponent implements OnInit {
         label: 'MENU_ITEMS.USER.DATA_QUOTAS',
         style: 'user-btn',
       },
+    ];
+
+    this.authenticationItems = [
+      {
+        cssIcon: 'perun-logins',
+        url: `/myProfile/service-identities/${this.serviceAccount.id}/authentication/logins`,
+        label: 'MENU_ITEMS.USER.LOGINS',
+        style: 'user-btn',
+      },
+      {
+        cssIcon: 'perun-certificates',
+        url: `/myProfile/service-identities/${this.serviceAccount.id}/authentication/certificates`,
+        label: 'MENU_ITEMS.USER.CERTIFICATES',
+        style: 'user-btn',
+      },
       {
-        cssIcon: 'perun-authentication',
-        url: `/myProfile/service-identities/${this.serviceAccount.id}/authentication`,
-        label: 'MENU_ITEMS.USER.AUTHENTICATION',
+        cssIcon: 'perun-key',
+        url: `/myProfile/service-identities/${this.serviceAccount.id}/authentication/ssh-keys`,
+        label: 'MENU_ITEMS.USER.SSH_KEYS',
         style: 'user-btn',
       },
     ];
diff --git a/libs/perun/components/src/lib/expandable-tiles/expandable-tiles.component.html b/libs/perun/components/src/lib/expandable-tiles/expandable-tiles.component.html
index 12285effb..3d2b65403 100644
--- a/libs/perun/components/src/lib/expandable-tiles/expandable-tiles.component.html
+++ b/libs/perun/components/src/lib/expandable-tiles/expandable-tiles.component.html
@@ -1,4 +1,4 @@
-<div *ngIf="{expanded: expanded | async} as ex" class="mt-4">
+<div *ngIf="items.length !== 0 && {expanded: expanded | async} as ex" class="mt-4">
   <button mat-button (click)="toggle()">
     <div class="d-flex align-items-center justify-content-start">
       <span class="fs-5">{{title | translate}}</span>

From 3d95de83a3cf16ebbf2adee1638e3613c31149dd Mon Sep 17 00:00:00 2001
From: HejdaJakub <kuba.hejda97@gmail.com>
Date: Tue, 29 Aug 2023 05:30:22 +0200
Subject: [PATCH 16/22] feat(admin): disable member invitation

* Invite button will be disabled if 'isInvitationEnabled' returns false.
* Invitation is enabled if invitation notification exists, application form exists and application can be sumbited - submin/auto-submit button exists in the form.
---
 .../group-members.component.html              |   6 +-
 .../group-members/group-members.component.ts  |  10 ++
 .../vo-members/vo-members.component.html      |  37 +++---
 .../vo-members/vo-members.component.ts        |   8 ++
 apps/admin-gui/src/assets/i18n/en.json        |   4 +-
 .../src/lib/api/registrarManager.service.ts   | 115 ++++++++++++++++++
 6 files changed, 160 insertions(+), 20 deletions(-)

diff --git a/apps/admin-gui/src/app/vos/pages/group-detail-page/group-members/group-members.component.html b/apps/admin-gui/src/app/vos/pages/group-detail-page/group-members/group-members.component.html
index 3ce949161..c16fa320f 100644
--- a/apps/admin-gui/src/app/vos/pages/group-detail-page/group-members/group-members.component.html
+++ b/apps/admin-gui/src/app/vos/pages/group-detail-page/group-members/group-members.component.html
@@ -20,12 +20,12 @@ <h1 class="page-subtitle">{{'GROUP_DETAIL.MEMBERS.TITLE' | translate}}</h1>
     </button>
   </span>
   <span
-    [matTooltipDisabled]="!(group | groupMembersActionButtonDisabled)"
+    [matTooltipDisabled]="!((group | groupMembersActionButtonDisabled) || inviteDisabled)"
     [matTooltipPosition]="'above'"
-    matTooltip="{{group | groupMembersActionButtonDisabledTooltip | translate}}">
+    matTooltip="{{inviteDisabled ? ('GROUP_DETAIL.MEMBERS.INVITE_DISABLED' | translate) : (group | groupMembersActionButtonDisabledTooltip | translate)}}">
     <button
       *ngIf="inviteAuth"
-      [disabled]="(group | groupMembersActionButtonDisabled)"
+      [disabled]="(group | groupMembersActionButtonDisabled) || inviteDisabled"
       [matMenuTriggerFor]="menu"
       class="me-2 dropdown-toggle"
       color="accent"
diff --git a/apps/admin-gui/src/app/vos/pages/group-detail-page/group-members/group-members.component.ts b/apps/admin-gui/src/app/vos/pages/group-detail-page/group-members/group-members.component.ts
index 6873caef0..49f9cac18 100644
--- a/apps/admin-gui/src/app/vos/pages/group-detail-page/group-members/group-members.component.ts
+++ b/apps/admin-gui/src/app/vos/pages/group-detail-page/group-members/group-members.component.ts
@@ -14,6 +14,7 @@ import {
   AttributesManagerService,
   GroupsManagerService,
   MemberGroupStatus,
+  RegistrarManagerService,
   RichGroup,
   RichMember,
   VoMemberStatuses,
@@ -57,6 +58,7 @@ export class GroupMembersComponent implements OnInit {
   addAuth: boolean;
   removeAuth: boolean;
   inviteAuth: boolean;
+  inviteDisabled = true;
   copyAuth: boolean;
   copyDisabled = false;
   blockManualMemberAdding: boolean;
@@ -89,6 +91,7 @@ export class GroupMembersComponent implements OnInit {
 
   constructor(
     private groupService: GroupsManagerService,
+    private registrarService: RegistrarManagerService,
     private dialog: MatDialog,
     private guiAuthResolver: GuiAuthResolver,
     private storeService: StoreService,
@@ -107,6 +110,13 @@ export class GroupMembersComponent implements OnInit {
     this.memberAttrNames = this.memberAttrNames.concat(this.storeService.getLoginAttributeNames());
     this.group = this.entityStorageService.getEntity();
     this.setAuthRights();
+    if (this.inviteAuth) {
+      this.registrarService
+        .isInvitationEnabled(this.group.voId, this.group.id)
+        .subscribe((enabled) => {
+          this.inviteDisabled = !enabled;
+        });
+    }
     void this.isManualAddingBlocked(this.group.voId).then(() => this.loadPage(this.group.id));
     this.isCopyMembersDisabled();
   }
diff --git a/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-members/vo-members.component.html b/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-members/vo-members.component.html
index dee152297..616b25736 100644
--- a/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-members/vo-members.component.html
+++ b/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-members/vo-members.component.html
@@ -16,23 +16,28 @@ <h1 class="page-subtitle">{{'VO_DETAIL.MEMBERS.TITLE' | translate}}</h1>
         {{'VO_DETAIL.MEMBERS.ADD_MEMBER' | translate}}
       </button>
     </div>
-    <button
-      *ngIf="inviteAuth"
-      [disabled]="blockManualMemberAdding"
-      [matMenuTriggerFor]="menu"
-      class="me-2 dropdown-toggle"
-      color="accent"
-      mat-flat-button>
-      {{'VO_DETAIL.MEMBERS.INVITE' | translate}}
-    </button>
-    <mat-menu #menu="matMenu">
-      <button *ngIf="inviteAuth" (click)="onInviteMember()" class="action-button" mat-menu-item>
-        {{'VO_DETAIL.MEMBERS.INVITE_ONE' | translate}}
-      </button>
-      <button *ngIf="inviteAuth" (click)="onBulkInvite()" class="action-button" mat-menu-item>
-        {{'VO_DETAIL.MEMBERS.INVITE_BULK' | translate}}
+    <span
+      [matTooltipDisabled]="!inviteDisabled"
+      [matTooltipPosition]="'above'"
+      matTooltip="{{'VO_DETAIL.MEMBERS.INVITE_DISABLED' | translate}}">
+      <button
+        *ngIf="inviteAuth"
+        [disabled]="blockManualMemberAdding || inviteDisabled"
+        [matMenuTriggerFor]="menu"
+        class="me-2 dropdown-toggle"
+        color="accent"
+        mat-flat-button>
+        {{'VO_DETAIL.MEMBERS.INVITE' | translate}}
       </button>
-    </mat-menu>
+      <mat-menu #menu="matMenu">
+        <button *ngIf="inviteAuth" (click)="onInviteMember()" class="action-button" mat-menu-item>
+          {{'VO_DETAIL.MEMBERS.INVITE_ONE' | translate}}
+        </button>
+        <button *ngIf="inviteAuth" (click)="onBulkInvite()" class="action-button" mat-menu-item>
+          {{'VO_DETAIL.MEMBERS.INVITE_BULK' | translate}}
+        </button>
+      </mat-menu>
+    </span>
     <button
       *ngIf="removeAuth"
       (click)="onRemoveMembers()"
diff --git a/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-members/vo-members.component.ts b/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-members/vo-members.component.ts
index 11f22127c..8578809da 100644
--- a/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-members/vo-members.component.ts
+++ b/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-members/vo-members.component.ts
@@ -11,6 +11,7 @@ import { MatDialog } from '@angular/material/dialog';
 import { RemoveMembersDialogComponent } from '../../../../shared/components/dialogs/remove-members-dialog/remove-members-dialog.component';
 import {
   AttributesManagerService,
+  RegistrarManagerService,
   RichMember,
   Vo,
   VoMemberStatuses,
@@ -56,10 +57,12 @@ export class VoMembersComponent implements OnInit {
   addAuth: boolean;
   removeAuth: boolean;
   inviteAuth: boolean;
+  inviteDisabled = true;
   routeAuth: boolean;
   blockManualMemberAdding: boolean;
 
   constructor(
+    private registrarService: RegistrarManagerService,
     private notificator: NotificatorService,
     private dialog: MatDialog,
     private authzService: GuiAuthResolver,
@@ -77,6 +80,11 @@ export class VoMembersComponent implements OnInit {
 
     this.vo = this.entityStorageService.getEntity();
     this.setAuthRights();
+    if (this.inviteAuth) {
+      this.registrarService.isInvitationEnabled(this.vo.id, null).subscribe((enabled) => {
+        this.inviteDisabled = !enabled;
+      });
+    }
 
     void this.isManualAddingBlocked(this.vo.id);
   }
diff --git a/apps/admin-gui/src/assets/i18n/en.json b/apps/admin-gui/src/assets/i18n/en.json
index e2772fc50..8bf27f525 100644
--- a/apps/admin-gui/src/assets/i18n/en.json
+++ b/apps/admin-gui/src/assets/i18n/en.json
@@ -365,7 +365,8 @@
       "FILTER_STATUS": "Filter by Status",
       "INVITE": "Invite",
       "INVITE_ONE": "Invite member",
-      "INVITE_BULK": "Invite multiple members"
+      "INVITE_BULK": "Invite multiple members",
+      "INVITE_DISABLED": "Application form is not setup correctly or invitation notification does not exist."
     },
     "OVERVIEW": {
       "INVITE_MEMBER": "Invite member",
@@ -690,6 +691,7 @@
       "INVITE": "Invite",
       "INVITE_ONE": "Invite member",
       "INVITE_BULK": "Invite multiple members",
+      "INVITE_DISABLED": "Application form is not setup correctly or invitation notification does not exist.",
       "SYNCHRONIZED": "Action is disabled on this group, group is filled with members from external source.",
       "FILTER_STATUS": "Filter by organizations status",
       "FILTER_GROUP_STATUS": "Filter by group status",
diff --git a/libs/perun/openapi/src/lib/api/registrarManager.service.ts b/libs/perun/openapi/src/lib/api/registrarManager.service.ts
index 4ec4eda01..643644c44 100644
--- a/libs/perun/openapi/src/lib/api/registrarManager.service.ts
+++ b/libs/perun/openapi/src/lib/api/registrarManager.service.ts
@@ -5417,6 +5417,121 @@ export class RegistrarManagerService {
     });
   }
 
+  /**
+   * Checks if invitation is enabled (invitation notification exists, application form exists and application form can be submitted).
+   * @param vo id of Vo
+   * @param group id of Group
+   * @param useNon if set to true sends the request to the backend server as 'non' instead of the usual (oauth, krb...).
+   * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+   * @param reportProgress flag to report request and response progress.
+   */
+  public isInvitationEnabled(
+    vo: number,
+    group?: number,
+    useNon?: boolean,
+    observe?: 'body',
+    reportProgress?: boolean,
+    options?: { httpHeaderAccept?: 'application/json'; context?: HttpContext }
+  ): Observable<boolean>;
+  public isInvitationEnabled(
+    vo: number,
+    group?: number,
+    useNon?: boolean,
+    observe?: 'response',
+    reportProgress?: boolean,
+    options?: { httpHeaderAccept?: 'application/json'; context?: HttpContext }
+  ): Observable<HttpResponse<boolean>>;
+  public isInvitationEnabled(
+    vo: number,
+    group?: number,
+    useNon?: boolean,
+    observe?: 'events',
+    reportProgress?: boolean,
+    options?: { httpHeaderAccept?: 'application/json'; context?: HttpContext }
+  ): Observable<HttpEvent<boolean>>;
+  public isInvitationEnabled(
+    vo: number,
+    group?: number,
+    useNon: boolean = false,
+    observe: any = 'body',
+    reportProgress: boolean = false,
+    options?: { httpHeaderAccept?: 'application/json'; context?: HttpContext }
+  ): Observable<any> {
+    if (vo === null || vo === undefined) {
+      throw new Error(
+        'Required parameter vo was null or undefined when calling isInvitationEnabled.'
+      );
+    }
+
+    let localVarQueryParameters = new HttpParams({ encoder: this.encoder });
+    if (vo !== undefined && vo !== null) {
+      localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, <any>vo, 'vo');
+    }
+    if (group !== undefined && group !== null) {
+      localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, <any>group, 'group');
+    }
+
+    let localVarHeaders = this.defaultHeaders;
+
+    let localVarCredential: string | undefined;
+    // authentication (BasicAuth) required
+    localVarCredential = this.configuration.lookupCredential('BasicAuth');
+    if (localVarCredential) {
+      localVarHeaders = localVarHeaders.set('Authorization', 'Basic ' + localVarCredential);
+    }
+
+    // authentication (BearerAuth) required
+    localVarCredential = this.configuration.lookupCredential('BearerAuth');
+    if (localVarCredential) {
+      localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential);
+    }
+
+    let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept;
+    if (localVarHttpHeaderAcceptSelected === undefined) {
+      // to determine the Accept header
+      const httpHeaderAccepts: string[] = ['application/json'];
+      localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+    }
+    if (localVarHttpHeaderAcceptSelected !== undefined) {
+      localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
+    }
+
+    let localVarHttpContext: HttpContext | undefined = options && options.context;
+    if (localVarHttpContext === undefined) {
+      localVarHttpContext = new HttpContext();
+    }
+
+    let responseType_: 'text' | 'json' | 'blob' = 'json';
+    if (localVarHttpHeaderAcceptSelected) {
+      if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
+        responseType_ = 'text';
+      } else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) {
+        responseType_ = 'json';
+      } else {
+        responseType_ = 'blob';
+      }
+    }
+
+    let requestUrl = `${this.configuration.basePath}/json/registrarManager/isInvitationEnabled`;
+    if (useNon) {
+      // replace the authentication part of url with 'non' authentication
+      let helperUrl = new URL(requestUrl);
+      let path = helperUrl.pathname.split('/');
+      path[1] = 'non';
+      helperUrl.pathname = path.join('/');
+      requestUrl = helperUrl.toString();
+    }
+    return this.httpClient.get<boolean>(requestUrl, {
+      context: localVarHttpContext,
+      params: localVarQueryParameters,
+      responseType: <any>responseType_,
+      withCredentials: this.configuration.withCredentials,
+      headers: localVarHeaders,
+      observe: observe,
+      reportProgress: reportProgress,
+    });
+  }
+
   /**
    * Manually rejects an application.
    * Expected to be called as a result of direct VO administrator action in the web UI.

From 93fdcbd3916e9f8d62db9a19e496703d433ab839 Mon Sep 17 00:00:00 2001
From: Adam Bodnar <adam.bodnar10@gmail.com>
Date: Tue, 29 Aug 2023 14:10:50 +0200
Subject: [PATCH 17/22] fix: do not filter attributes with empy value

Implicit filtering of attributes with empty values from table was removed.
It was added as an filtering option that can be toggled on/off.
---
 .../create-attribute-dialog.component.html    |  1 -
 .../one-entity-attribute-page.component.html  | 18 ++++++++++-------
 .../one-entity-attribute-page.component.ts    | 10 ++++------
 .../two-entity-attribute-page.component.html  | 14 +++++++++----
 .../two-entity-attribute-page.component.ts    | 13 +++++-------
 apps/admin-gui/src/assets/i18n/en.json        |  7 +++++++
 .../attributes-list.component.ts              | 20 ++++++++++---------
 7 files changed, 48 insertions(+), 35 deletions(-)

diff --git a/apps/admin-gui/src/app/shared/components/dialogs/create-attribute-dialog/create-attribute-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/create-attribute-dialog/create-attribute-dialog.component.html
index fd2561cc9..3ec282264 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/create-attribute-dialog/create-attribute-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/create-attribute-dialog/create-attribute-dialog.component.html
@@ -21,7 +21,6 @@ <h1 class="page-subtitle">{{'DIALOGS.CREATE_ATTRIBUTE.SET_NEW' | translate}}</h1
         [emptyListText]="'SHARED_LIB.PERUN.COMPONENTS.ATTRIBUTES_LIST.EMPTY_ATTRIBUTES'"
         [attributes]="attributes"
         [filterValue]="filterValue"
-        [inDialog]="true"
         [selection]="selected"
         [tableId]="tableId">
       </perun-web-apps-attributes-list>
diff --git a/apps/admin-gui/src/app/shared/components/one-entity-attribute-page/one-entity-attribute-page.component.html b/apps/admin-gui/src/app/shared/components/one-entity-attribute-page/one-entity-attribute-page.component.html
index 29c5242bd..09d32e443 100644
--- a/apps/admin-gui/src/app/shared/components/one-entity-attribute-page/one-entity-attribute-page.component.html
+++ b/apps/admin-gui/src/app/shared/components/one-entity-attribute-page/one-entity-attribute-page.component.html
@@ -5,18 +5,16 @@
   color="accent"
   data-cy="add-attributes"
   mat-flat-button>
-  {{'USER_DETAIL.SETTINGS.ATTRIBUTES.CREATE' | translate}}
+  {{'ATTRIBUTE_PAGE.CREATE' | translate}}
 </button>
-
 <button
   (click)="onSave()"
   class="me-2"
   color="accent"
   [disabled]="selection.selected.length === 0"
   mat-flat-button>
-  {{'USER_DETAIL.SETTINGS.ATTRIBUTES.SAVE' | translate}}
+  {{'ATTRIBUTE_PAGE.SAVE' | translate}}
 </button>
-
 <button
   (click)="onDelete()"
   [disabled]="selection.selected.length === 0"
@@ -24,21 +22,27 @@
   color="warn"
   data-cy="remove-attributes"
   mat-flat-button>
-  {{'USER_DETAIL.SETTINGS.ATTRIBUTES.DELETE' | translate}}
+  {{'ATTRIBUTE_PAGE.DELETE' | translate}}
 </button>
 <perun-web-apps-debounce-filter
   (filter)="applyFilter($event)"
-  [placeholder]="'SHARED_LIB.PERUN.COMPONENTS.ATTRIBUTES_LIST.FILTER'"></perun-web-apps-debounce-filter>
+  [placeholder]="'ATTRIBUTE_PAGE.FILTER'"
+  class="me-2">
+</perun-web-apps-debounce-filter>
+<mat-slide-toggle [(ngModel)]="filterEmpty" labelPosition="before">
+  {{'ATTRIBUTE_PAGE.FILTER_EMPTY' | translate}}
+</mat-slide-toggle>
 
 <ng-template #spinner>
   <perun-web-apps-loading-table></perun-web-apps-loading-table>
 </ng-template>
 <div class="position-relative">
   <perun-web-apps-attributes-list
+    #list
     *perunWebAppsLoader="loading; indicator: spinner"
     [attributes]="attributes"
-    #list
     [filterValue]="filterValue"
+    [filterEmpty]="filterEmpty"
     [selection]="selection"
     [tableId]="tableId">
   </perun-web-apps-attributes-list>
diff --git a/apps/admin-gui/src/app/shared/components/one-entity-attribute-page/one-entity-attribute-page.component.ts b/apps/admin-gui/src/app/shared/components/one-entity-attribute-page/one-entity-attribute-page.component.ts
index 9de50b0dc..374df259d 100644
--- a/apps/admin-gui/src/app/shared/components/one-entity-attribute-page/one-entity-attribute-page.component.ts
+++ b/apps/admin-gui/src/app/shared/components/one-entity-attribute-page/one-entity-attribute-page.component.ts
@@ -15,15 +15,13 @@ import { TABLE_ATTRIBUTES_SETTINGS } from '@perun-web-apps/config/table-config';
   styleUrls: ['./one-entity-attribute-page.component.css'],
 })
 export class OneEntityAttributePageComponent implements OnInit {
-  @Input()
-  entity: string;
-  @Input()
-  entityId: number;
-  @ViewChild('list')
-  list: AttributesListComponent;
+  @Input() entity: string;
+  @Input() entityId: number;
+  @ViewChild('list') list: AttributesListComponent;
   attributes: Attribute[] = [];
   selection = new SelectionModel<Attribute>(true, []);
   filterValue = '';
+  filterEmpty = true;
   tableId = TABLE_ATTRIBUTES_SETTINGS;
   loading = false;
 
diff --git a/apps/admin-gui/src/app/shared/components/two-entity-attribute-page/two-entity-attribute-page.component.html b/apps/admin-gui/src/app/shared/components/two-entity-attribute-page/two-entity-attribute-page.component.html
index 25bc599f4..9ce2a81db 100644
--- a/apps/admin-gui/src/app/shared/components/two-entity-attribute-page/two-entity-attribute-page.component.html
+++ b/apps/admin-gui/src/app/shared/components/two-entity-attribute-page/two-entity-attribute-page.component.html
@@ -49,7 +49,7 @@
       class="me-2 action-button"
       color="accent"
       mat-flat-button>
-      {{'MEMBER_DETAIL.SETTINGS.ATTRIBUTES.CREATE' | translate}}
+      {{'ATTRIBUTE_PAGE.CREATE' | translate}}
     </button>
 
     <button
@@ -58,7 +58,7 @@
       color="accent"
       [disabled]="selection.selected.length === 0"
       mat-flat-button>
-      {{'MEMBER_DETAIL.SETTINGS.ATTRIBUTES.SAVE' | translate}}
+      {{'ATTRIBUTE_PAGE.SAVE' | translate}}
     </button>
 
     <button
@@ -67,11 +67,16 @@
       [disabled]="selection.selected.length === 0"
       class="me-2"
       mat-flat-button>
-      {{'MEMBER_DETAIL.SETTINGS.ATTRIBUTES.DELETE' | translate}}
+      {{'ATTRIBUTE_PAGE.DELETE' | translate}}
     </button>
     <perun-web-apps-debounce-filter
       (filter)="applyFilter($event)"
-      [placeholder]="'SHARED_LIB.PERUN.COMPONENTS.ATTRIBUTES_LIST.FILTER'"></perun-web-apps-debounce-filter>
+      [placeholder]="'ATTRIBUTE_PAGE.FILTER'"
+      class="me-2">
+    </perun-web-apps-debounce-filter>
+    <mat-slide-toggle [(ngModel)]="filterEmpty" labelPosition="before">
+      {{'ATTRIBUTE_PAGE.FILTER_EMPTY' | translate}}
+    </mat-slide-toggle>
     <ng-template #spinner>
       <perun-web-apps-loading-table></perun-web-apps-loading-table>
     </ng-template>
@@ -81,6 +86,7 @@
         *perunWebAppsLoader="innerLoading; indicator: spinner"
         [attributes]="attributes"
         [filterValue]="filterValue"
+        [filterEmpty]="filterEmpty"
         [selection]="selection">
       </perun-web-apps-attributes-list>
     </div>
diff --git a/apps/admin-gui/src/app/shared/components/two-entity-attribute-page/two-entity-attribute-page.component.ts b/apps/admin-gui/src/app/shared/components/two-entity-attribute-page/two-entity-attribute-page.component.ts
index 2dbb485ec..ec753e5ae 100644
--- a/apps/admin-gui/src/app/shared/components/two-entity-attribute-page/two-entity-attribute-page.component.ts
+++ b/apps/admin-gui/src/app/shared/components/two-entity-attribute-page/two-entity-attribute-page.component.ts
@@ -28,14 +28,10 @@ import { GroupWithStatus, ResourceWithStatus } from '@perun-web-apps/perun/model
   styleUrls: ['./two-entity-attribute-page.component.scss'],
 })
 export class TwoEntityAttributePageComponent implements OnInit {
-  @ViewChild('list')
-  list: AttributesListComponent;
-  @Input()
-  firstEntityId: number;
-  @Input()
-  firstEntity: string;
-  @Input()
-  secondEntity: string;
+  @ViewChild('list') list: AttributesListComponent;
+  @Input() firstEntityId: number;
+  @Input() firstEntity: string;
+  @Input() secondEntity: string;
   entityValues: Resource[] | Facility[] | Group[] | RichMember[] | User[] = [];
   attributes: Attribute[] = [];
   selection = new SelectionModel<Attribute>(true, []);
@@ -44,6 +40,7 @@ export class TwoEntityAttributePageComponent implements OnInit {
   loading = false;
   innerLoading = false;
   filterValue = '';
+  filterEmpty = true;
   noEntityMessage: string;
 
   constructor(
diff --git a/apps/admin-gui/src/assets/i18n/en.json b/apps/admin-gui/src/assets/i18n/en.json
index 8bf27f525..d7a52c598 100644
--- a/apps/admin-gui/src/assets/i18n/en.json
+++ b/apps/admin-gui/src/assets/i18n/en.json
@@ -2696,6 +2696,13 @@
       "FILTER": "Filter by name, id or description"
     }
   },
+  "ATTRIBUTE_PAGE": {
+    "CREATE": "Create",
+    "SAVE": "Save",
+    "DELETE": "Delete",
+    "FILTER": "Filter attributes by Id, name, value or description",
+    "FILTER_EMPTY": "Filter empty attributes"
+  },
   "SHARED": {
     "COMPONENTS": {
       "RESOURCES_TAGS_LIST": {
diff --git a/libs/perun/components/src/lib/attributes-list/attributes-list.component.ts b/libs/perun/components/src/lib/attributes-list/attributes-list.component.ts
index c01b69330..7dd77d6c3 100644
--- a/libs/perun/components/src/lib/attributes-list/attributes-list.component.ts
+++ b/libs/perun/components/src/lib/attributes-list/attributes-list.component.ts
@@ -35,8 +35,8 @@ export class AttributesListComponent implements OnChanges, AfterViewInit {
   @Input() attributes: Attribute[] = [];
   @Input() selection = new SelectionModel<Attribute>(true, []);
   @Input() displayedColumns: string[] = ['select', 'id', 'displayName', 'value', 'description'];
-  @Input() inDialog = false;
   @Input() filterValue = '';
+  @Input() filterEmpty = false;
   @Input() tableId: string;
   @Input() readonly = false;
   @Input() hiddenColumns: string[] = [];
@@ -82,15 +82,17 @@ export class AttributesListComponent implements OnChanges, AfterViewInit {
       this.displayedColumns = this.displayedColumns.filter((column) => column !== 'id');
     }
 
-    const attributesWithoutEmptyObjects = this.attributes.filter((attribute) => {
-      if (typeof attribute.value === 'object') {
-        return Object.keys((attribute.value ?? '') as object).length > 0;
-      }
-      return true;
-    });
-
-    const filteredAttributes = filterCoreAttributes(attributesWithoutEmptyObjects);
+    let filteredAttributes = this.attributes;
+    if (this.filterEmpty) {
+      filteredAttributes = filteredAttributes.filter((attribute) => {
+        if (typeof attribute.value === 'object') {
+          return Object.keys((attribute.value ?? '') as object).length > 0;
+        }
+        return true;
+      });
+    }
 
+    filteredAttributes = filterCoreAttributes(filteredAttributes);
     this.dataSource = new MatTableDataSource<Attribute>(filteredAttributes);
     this.setDataSource();
   }

From 6fc47a5ea1701379f229064f3db522f038a8a92a Mon Sep 17 00:00:00 2001
From: HejdaJakub <kuba.hejda97@gmail.com>
Date: Fri, 25 Aug 2023 03:05:00 +0200
Subject: [PATCH 18/22] fix: open application in the new tab

* On a ctrl (command) + left mouse click is now opened the application in the new tab and routing is stopped in the parent tab.
* This is now implemented also for side menu, tables and inner page menu in user-profile (authentication and settings).
---
 .../side-menu/side-menu-item.service.ts       | 10 ++---
 .../side-menu-item.component.html             | 15 ++++---
 .../side-menu-item.component.ts               | 18 +++++---
 .../side-menu/side-menu.component.html        |  7 +++-
 .../authentication-overview.component.html    | 11 +++--
 .../authentication-overview.component.scss    |  2 +-
 .../settings-overview.component.html          | 11 +++--
 .../settings-overview.component.scss          |  2 +-
 .../src/lib/middle-click-router-link.ts       | 41 +++++++++++++++----
 9 files changed, 80 insertions(+), 37 deletions(-)

diff --git a/apps/admin-gui/src/app/shared/side-menu/side-menu-item.service.ts b/apps/admin-gui/src/app/shared/side-menu/side-menu-item.service.ts
index dc605223b..079166770 100644
--- a/apps/admin-gui/src/app/shared/side-menu/side-menu-item.service.ts
+++ b/apps/admin-gui/src/app/shared/side-menu/side-menu-item.service.ts
@@ -133,7 +133,7 @@ export class SideMenuItemService {
         {
           label: 'MENU_ITEMS.USER.SETTINGS',
           url: [`/myProfile/settings`],
-          activatedRegex: `^/myProfile/settings$`,
+          activatedRegex: `^/myProfile/settings$`, // this route is never activated (expandable submenu)
           children: [
             {
               label: 'MENU_ITEMS.USER.PASSWORD_RESET',
@@ -609,7 +609,7 @@ export class SideMenuItemService {
       links.push({
         label: 'MENU_ITEMS.VO.SETTINGS',
         url: [`/organizations/${vo.id}/settings`],
-        activatedRegex: '/organizations/\\d+/settings$',
+        activatedRegex: '/organizations/\\d+/settings$', // this route is never activated (expandable submenu)
         children: children,
         showChildren: 'settings',
       });
@@ -900,7 +900,7 @@ export class SideMenuItemService {
       links.push({
         label: 'MENU_ITEMS.FACILITY.SETTINGS',
         url: ['/facilities', facility.id.toString(), 'settings'],
-        activatedRegex: '/facilities/\\d+/settings$',
+        activatedRegex: '/facilities/\\d+/settings$', // this route is never activated (expandable submenu)
         children: children,
         showChildren: 'settings',
       });
@@ -1062,7 +1062,7 @@ export class SideMenuItemService {
       links.push({
         label: 'MENU_ITEMS.GROUP.SETTINGS',
         url: [`/organizations/${group.voId}/groups/${group.id}/settings`],
-        activatedRegex: '/organizations/\\d+/groups/\\d+/settings$',
+        activatedRegex: '/organizations/\\d+/groups/\\d+/settings$', // this route is never activated (expandable submenu)
         children: settingsChildrenLinks,
         showChildren: 'settings',
       });
@@ -1144,7 +1144,7 @@ export class SideMenuItemService {
       links.push({
         label: 'MENU_ITEMS.RESOURCE.SETTINGS',
         url: [baseUrl, `settings`],
-        activatedRegex: `${regexStart}/\\d+/resources/\\d+/settings$`,
+        activatedRegex: `${regexStart}/\\d+/resources/\\d+/settings$`, // this route is never activated (expandable submenu)
         children: children,
         showChildren: `settings`,
       });
diff --git a/apps/admin-gui/src/app/shared/side-menu/side-menu-item/side-menu-item.component.html b/apps/admin-gui/src/app/shared/side-menu/side-menu-item/side-menu-item.component.html
index 7d18322eb..9f9393ebf 100644
--- a/apps/admin-gui/src/app/shared/side-menu/side-menu-item/side-menu-item.component.html
+++ b/apps/admin-gui/src/app/shared/side-menu/side-menu-item/side-menu-item.component.html
@@ -1,14 +1,17 @@
 <div class="w-100">
   <div
-    [routerLink]="item.baseLink"
-    [perunWebAppsMiddleClickRouterLink]="item.baseLink"
     [ngStyle]="{'background': item.backgroundColorCss, 'border-top': !root ? dividerStyle: ''}"
     [matRippleColor]="rippleColor"
     [class.header-activated]="(currentUrl | activeSideMenuItem: item.baseColorClassRegex) && root"
     class="side-menu-item"
     matRipple>
     <div class="{{item.labelClass}}" matRipple>
-      <a [ngStyle]="{'color': item.textColorCss}" class="side-menu-item-label clickable">
+      <a
+        class="side-menu-item-label clickable"
+        [ngStyle]="{'color': item.textColorCss}"
+        (auxclick)="$event.preventDefault()"
+        [routerLink]="item.baseLink"
+        [perunWebAppsMiddleClickRouterLink]="item.baseLink">
         <mat-icon
           [ngStyle]="{'color': 'currentColor'}"
           [svgIcon]="item.icon"
@@ -26,8 +29,9 @@
       @rollInOut>
       <div *ngFor="let link of item.links">
         <a
-          (click)="linkClicked(link)"
-          [perunWebAppsMiddleClickRouterLink]="link.url"
+          (click)="navigateOrExpandSideMenu(link, $event)"
+          (auxclick)="$event.preventDefault()"
+          [perunWebAppsMiddleClickRouterLink]="link.children ? null : link.url"
           [ngClass]="(currentUrl | activeSideMenuItem: link.activatedRegex) && item.activatedClass"
           [ngStyle]="{'color': linkTextColor}"
           class="clickable d-flex"
@@ -42,6 +46,7 @@
         <div *ngIf="expandSections.get(link.showChildren)" @rollInOut class="overflow-hidden">
           <a
             *ngFor="let child of link?.children"
+            (auxclick)="$event.preventDefault()"
             [routerLink]="child.url"
             [perunWebAppsMiddleClickRouterLink]="child.url"
             [matRippleColor]="rippleColor"
diff --git a/apps/admin-gui/src/app/shared/side-menu/side-menu-item/side-menu-item.component.ts b/apps/admin-gui/src/app/shared/side-menu/side-menu-item/side-menu-item.component.ts
index 77f0165e8..e2404dbf0 100644
--- a/apps/admin-gui/src/app/shared/side-menu/side-menu-item/side-menu-item.component.ts
+++ b/apps/admin-gui/src/app/shared/side-menu/side-menu-item/side-menu-item.component.ts
@@ -43,12 +43,18 @@ export class SideMenuItemComponent {
     });
   }
 
-  linkClicked(link: SideMenuLink): void {
-    // Navigate or expand children based on item
-    if (!link.children) {
-      void this.router.navigate(link.url);
-    } else {
-      this.expandedTilesStore.setItem(link.showChildren);
+  /**
+   * Navigate or expand children based on item if ctrl (metaKey) is not pressed
+   * @param link SideMenuLink with url and list of children
+   * @param event mouse event used for detect ctrlKey (support for Windows/Linux keyboards) or metaKey (support for Mac keyboards)
+   */
+  navigateOrExpandSideMenu(link: SideMenuLink, event: MouseEvent): void {
+    if (!event.ctrlKey && !event.metaKey) {
+      if (!link.children) {
+        void this.router.navigate(link.url);
+      } else {
+        this.expandedTilesStore.setItem(link.showChildren);
+      }
     }
   }
 }
diff --git a/apps/user-profile/src/app/components/side-menu/side-menu.component.html b/apps/user-profile/src/app/components/side-menu/side-menu.component.html
index 8ccaf5bd1..e9765789c 100644
--- a/apps/user-profile/src/app/components/side-menu/side-menu.component.html
+++ b/apps/user-profile/src/app/components/side-menu/side-menu.component.html
@@ -1,5 +1,6 @@
 <mat-nav-list class="pt-0">
-  <mat-list-item
+  <a
+    mat-list-item
     (click)="item.external ? goToURL(item.link):shouldHideMenu()"
     *ngFor="let item of items"
     [class.activated]="isActive(item.activatedRegex)"
@@ -7,6 +8,8 @@
     [matRippleColor]="'rgba(255, 255, 255, 0.1)'"
     class="side-menu-item-height"
     routerLink="{{item.external ? null: item.link}}"
+    [perunWebAppsMiddleClickRouterLink]="[item.external ? null: item.link]"
+    (auxclick)="$event.preventDefault()"
     queryParamsHandling="merge">
     <div [ngStyle]="{'color': textColor}" class="d-flex flex-row">
       <mat-icon>{{item.icon}}</mat-icon>
@@ -14,5 +17,5 @@
         {{item.external ? (item | localisedText: lang:'label') : item.label | customTranslate: lang | translate}}
       </span>
     </div>
-  </mat-list-item>
+  </a>
 </mat-nav-list>
diff --git a/apps/user-profile/src/app/pages/authentication-page/authentication-overview/authentication-overview.component.html b/apps/user-profile/src/app/pages/authentication-page/authentication-overview/authentication-overview.component.html
index c6eb4b53d..ac4357c90 100644
--- a/apps/user-profile/src/app/pages/authentication-page/authentication-overview/authentication-overview.component.html
+++ b/apps/user-profile/src/app/pages/authentication-page/authentication-overview/authentication-overview.component.html
@@ -1,15 +1,18 @@
 <div [hidden]="loading">
-  <mat-list>
-    <mat-list-item
+  <mat-nav-list>
+    <a
+      mat-list-item
       *ngFor="let item of items"
       matRipple
       [routerLink]="item.url"
+      [perunWebAppsMiddleClickRouterLink]="[item.url]"
+      (auxclick)="$event.preventDefault()"
       queryParamsHandling="merge">
       <div class="d-flex flex-row">
         <mat-icon>{{item.icon}}</mat-icon>
         <p class="ms-2 mt-auto mb-auto">{{item.label | customTranslate | translate}}</p>
       </div>
-    </mat-list-item>
-  </mat-list>
+    </a>
+  </mat-nav-list>
 </div>
 <mat-spinner class="ms-auto me-auto" *ngIf="loading"></mat-spinner>
diff --git a/apps/user-profile/src/app/pages/authentication-page/authentication-overview/authentication-overview.component.scss b/apps/user-profile/src/app/pages/authentication-page/authentication-overview/authentication-overview.component.scss
index d305b4ff4..16e48049f 100644
--- a/apps/user-profile/src/app/pages/authentication-page/authentication-overview/authentication-overview.component.scss
+++ b/apps/user-profile/src/app/pages/authentication-page/authentication-overview/authentication-overview.component.scss
@@ -3,7 +3,7 @@
   color: grey;
 }
 
-mat-list-item:hover {
+mat-nav-list a:hover {
   background: var(--side-hover) !important;
   color: var(--side-text-hover) !important;
   cursor: pointer;
diff --git a/apps/user-profile/src/app/pages/settings-page/settings-overview/settings-overview.component.html b/apps/user-profile/src/app/pages/settings-page/settings-overview/settings-overview.component.html
index dc58e2d04..e7063157f 100644
--- a/apps/user-profile/src/app/pages/settings-page/settings-overview/settings-overview.component.html
+++ b/apps/user-profile/src/app/pages/settings-page/settings-overview/settings-overview.component.html
@@ -1,12 +1,15 @@
-<mat-list>
-  <mat-list-item
+<mat-nav-list>
+  <a
+    mat-list-item
     *ngFor="let item of items"
     matRipple
     [routerLink]="item.url"
+    [perunWebAppsMiddleClickRouterLink]="[item.url]"
+    (auxclick)="$event.preventDefault()"
     queryParamsHandling="merge">
     <div class="d-flex flex-row">
       <mat-icon>{{item.icon}}</mat-icon>
       <p class="ms-2 mt-auto mb-auto">{{item.label | customTranslate | translate}}</p>
     </div>
-  </mat-list-item>
-</mat-list>
+  </a>
+</mat-nav-list>
diff --git a/apps/user-profile/src/app/pages/settings-page/settings-overview/settings-overview.component.scss b/apps/user-profile/src/app/pages/settings-page/settings-overview/settings-overview.component.scss
index b0dc46372..5371158b3 100644
--- a/apps/user-profile/src/app/pages/settings-page/settings-overview/settings-overview.component.scss
+++ b/apps/user-profile/src/app/pages/settings-page/settings-overview/settings-overview.component.scss
@@ -1,4 +1,4 @@
-mat-list-item:hover {
+mat-nav-list a:hover {
   background: var(--side-hover) !important;
   color: var(--side-text-hover) !important;
   cursor: pointer;
diff --git a/libs/perun/directives/src/lib/middle-click-router-link.ts b/libs/perun/directives/src/lib/middle-click-router-link.ts
index 525a57311..3073bd6ea 100644
--- a/libs/perun/directives/src/lib/middle-click-router-link.ts
+++ b/libs/perun/directives/src/lib/middle-click-router-link.ts
@@ -1,4 +1,4 @@
-import { Directive, HostListener, Input } from '@angular/core';
+import { Directive, ElementRef, HostListener, Input, Renderer2 } from '@angular/core';
 
 @Directive({
   selector: '[perunWebAppsMiddleClickRouterLink]',
@@ -6,15 +6,38 @@ import { Directive, HostListener, Input } from '@angular/core';
 export class MiddleClickRouterLinkDirective {
   @Input() perunWebAppsMiddleClickRouterLink: string[];
 
+  constructor(private ref: ElementRef, private renderer: Renderer2) {
+    const htmlElement: HTMLElement = this.ref.nativeElement as HTMLElement;
+    this.renderer.listen(htmlElement, 'click', (event: MouseEvent) => {
+      // ctrl (command) + left mouse click will stop routing and open router link in the new tab
+      if (
+        // ctrlKey = support for Windows/Linux keyboards
+        // metaKey = support for Mac keyboards
+        (event.ctrlKey || event.metaKey) &&
+        event.button === 0 &&
+        this.perunWebAppsMiddleClickRouterLink
+      ) {
+        if (htmlElement.tagName.toLowerCase() === 'tr') {
+          // handle correct behavior for table 'tr' tag (with this directive)
+          event.stopImmediatePropagation();
+        } else {
+          // handle correct behavior primarily for 'a' tag in our apps (with this directive)
+          event.preventDefault();
+        }
+        window.open(this.getUrlWithParams());
+      }
+    });
+  }
+
   @HostListener('mouseup', ['$event']) onClick(event: MouseEvent): void {
-    if (
-      event.button === 1 &&
-      this.perunWebAppsMiddleClickRouterLink !== null &&
-      this.perunWebAppsMiddleClickRouterLink !== undefined
-    ) {
-      const fullUrl = this.perunWebAppsMiddleClickRouterLink.join('/');
-      const queryParams = location.search;
-      window.open(fullUrl + queryParams);
+    if (event.button === 1 && this.perunWebAppsMiddleClickRouterLink) {
+      window.open(this.getUrlWithParams());
     }
   }
+
+  private getUrlWithParams(): string {
+    const fullUrl = this.perunWebAppsMiddleClickRouterLink.join('/');
+    const queryParams = location.search;
+    return fullUrl + queryParams;
+  }
 }

From 7d955c90f7a864e170d16344cc5259339210b5fe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Aug 2023 19:17:25 +0000
Subject: [PATCH 19/22] build(deps): bump critters and
 @angular-devkit/build-angular

Bumps [critters](https://github.com/GoogleChromeLabs/critters/tree/HEAD/packages/critters) to 0.0.20 and updates ancestor dependency [@angular-devkit/build-angular](https://github.com/angular/angular-cli). These dependencies need to be updated together.


Updates `critters` from 0.0.19 to 0.0.20
- [Release notes](https://github.com/GoogleChromeLabs/critters/releases)
- [Changelog](https://github.com/GoogleChromeLabs/critters/blob/main/CHANGELOG.md)
- [Commits](https://github.com/GoogleChromeLabs/critters/commits/0.0.20/packages/critters)

Updates `@angular-devkit/build-angular` from 16.1.4 to 16.2.0
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Changelog](https://github.com/angular/angular-cli/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular-cli/compare/16.1.4...16.2.0)

---
updated-dependencies:
- dependency-name: critters
  dependency-type: indirect
- dependency-name: "@angular-devkit/build-angular"
  dependency-type: direct:development
...

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

diff --git a/package-lock.json b/package-lock.json
index f8ae516b5..177b44ef5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -49,7 +49,7 @@
         "zone.js": "0.13.1"
       },
       "devDependencies": {
-        "@angular-devkit/build-angular": "16.1.4",
+        "@angular-devkit/build-angular": "16.2.0",
         "@angular-devkit/core": "16.1.4",
         "@angular-devkit/schematics": "16.1.4",
         "@angular-eslint/eslint-plugin": "16.0.3",
@@ -130,6 +130,7 @@
       "version": "0.1601.4",
       "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1601.4.tgz",
       "integrity": "sha512-OOSbNlDy+Q3jY0oFHaq8kkna9HYI1zaS8IHeCIDP6T/ZIAVad4+HqXAL4SKQrKJikkoBQv1Z/eaDBL5XPFK9Bw==",
+      "dev": true,
       "dependencies": {
         "@angular-devkit/core": "16.1.4",
         "rxjs": "7.8.1"
@@ -141,39 +142,39 @@
       }
     },
     "node_modules/@angular-devkit/build-angular": {
-      "version": "16.1.4",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-16.1.4.tgz",
-      "integrity": "sha512-LiHM7R20fTHg/eM+Iabotj08edP5wVBQahRfVNLxERo8X6VJgSjVChnsh3AQJkRywlGuFe20AOQYpyLyN367Ug==",
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-16.2.0.tgz",
+      "integrity": "sha512-miylwjOqvlKmYrzS84bjRaJrecZxOXH9xsPVvQE8VBe8UKePJjRAL6yyOqXUOGtzlch2YmT98RAnuni7y0FEAw==",
       "dependencies": {
         "@ampproject/remapping": "2.2.1",
-        "@angular-devkit/architect": "0.1601.4",
-        "@angular-devkit/build-webpack": "0.1601.4",
-        "@angular-devkit/core": "16.1.4",
-        "@babel/core": "7.22.5",
-        "@babel/generator": "7.22.7",
+        "@angular-devkit/architect": "0.1602.0",
+        "@angular-devkit/build-webpack": "0.1602.0",
+        "@angular-devkit/core": "16.2.0",
+        "@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.4",
+        "@ngtools/webpack": "16.2.0",
         "@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",
@@ -182,31 +183,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.27",
+        "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"
       },
@@ -216,7 +217,7 @@
         "yarn": ">= 1.13.0"
       },
       "optionalDependencies": {
-        "esbuild": "0.17.19"
+        "esbuild": "0.18.17"
       },
       "peerDependencies": {
         "@angular/compiler-cli": "^16.0.0",
@@ -261,6 +262,417 @@
         }
       }
     },
+    "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/architect": {
+      "version": "0.1602.0",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1602.0.tgz",
+      "integrity": "sha512-ZRmUTBeD+uGr605eOHnsovEn6f1mOBI+kxP64DRvagNweX5TN04s3iyQ8jmLSAHQD9ush31LFxv3dVNxv3ceXQ==",
+      "dependencies": {
+        "@angular-devkit/core": "16.2.0",
+        "rxjs": "7.8.1"
+      },
+      "engines": {
+        "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/@angular-devkit/core": {
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-16.2.0.tgz",
+      "integrity": "sha512-l1k6Rqm3YM16BEn3CWyQKrk9xfu+2ux7Bw3oS+h1TO4/RoxO2PgHj8LLRh/WNrYVarhaqO7QZ5ePBkXNMkzJ1g==",
+      "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/@angular-devkit/build-angular/node_modules/@babel/core": {
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.9.tgz",
+      "integrity": "sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==",
+      "dependencies": {
+        "@ampproject/remapping": "^2.2.0",
+        "@babel/code-frame": "^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.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.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/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==",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/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"
+      ],
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/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"
+      ],
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/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"
+      ],
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/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"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/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"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/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"
+      ],
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/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"
+      ],
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/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"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/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"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/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"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/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"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/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"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/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"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/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"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/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"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-x64": {
+      "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"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/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"
+      ],
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/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"
+      ],
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/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"
+      ],
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/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"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/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"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/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"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.4.15",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
+    },
     "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",
@@ -306,10 +718,47 @@
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
+    "node_modules/@angular-devkit/build-angular/node_modules/esbuild": {
+      "version": "0.18.17",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.17.tgz",
+      "integrity": "sha512-1GJtYnUxsJreHYA0Y+iQz2UEykonY66HNWOb0yXYZi9/kNrORUEHVg87eQsCtqh59PEJ5YVZJO98JHznMJSWjg==",
+      "hasInstallScript": true,
+      "optional": 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/@angular-devkit/build-angular/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==",
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
@@ -355,11 +804,11 @@
       }
     },
     "node_modules/@angular-devkit/build-angular/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==",
       "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.4.13"
+        "@jridgewell/sourcemap-codec": "^1.4.15"
       },
       "engines": {
         "node": ">=12"
@@ -389,6 +838,20 @@
         "url": "https://github.com/inikulin/parse5?sponsor=1"
       }
     },
+    "node_modules/@angular-devkit/build-angular/node_modules/semver": {
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "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",
@@ -401,11 +864,11 @@
       }
     },
     "node_modules/@angular-devkit/build-webpack": {
-      "version": "0.1601.4",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1601.4.tgz",
-      "integrity": "sha512-GC1y//ScAYbYQ68Wri2QgTEekC4hRxBC+xEkYL9OFiAMQ4mcN+eYvbkQBX8enJwDMXpkYfLR6VV8cChjAVYIgg==",
+      "version": "0.1602.0",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1602.0.tgz",
+      "integrity": "sha512-KdSr6iAcO30i/LIGL8mYi+d1buVXuDCp2dptzEJ4vxReOMFJca90KLwb+tVHEqqnDb0WkNfWm8Ii2QYh2FrNyA==",
       "dependencies": {
-        "@angular-devkit/architect": "0.1601.4",
+        "@angular-devkit/architect": "0.1602.0",
         "rxjs": "7.8.1"
       },
       "engines": {
@@ -418,6 +881,45 @@
         "webpack-dev-server": "^4.0.0"
       }
     },
+    "node_modules/@angular-devkit/build-webpack/node_modules/@angular-devkit/architect": {
+      "version": "0.1602.0",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1602.0.tgz",
+      "integrity": "sha512-ZRmUTBeD+uGr605eOHnsovEn6f1mOBI+kxP64DRvagNweX5TN04s3iyQ8jmLSAHQD9ush31LFxv3dVNxv3ceXQ==",
+      "dependencies": {
+        "@angular-devkit/core": "16.2.0",
+        "rxjs": "7.8.1"
+      },
+      "engines": {
+        "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-webpack/node_modules/@angular-devkit/core": {
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-16.2.0.tgz",
+      "integrity": "sha512-l1k6Rqm3YM16BEn3CWyQKrk9xfu+2ux7Bw3oS+h1TO4/RoxO2PgHj8LLRh/WNrYVarhaqO7QZ5ePBkXNMkzJ1g==",
+      "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/@angular-devkit/core": {
       "version": "16.1.4",
       "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-16.1.4.tgz",
@@ -1034,9 +1536,9 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.22.7",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.7.tgz",
-      "integrity": "sha512-p+jPjMG+SI8yvIaxGgeW24u7q9+5+TGpZh8/CuB7RhBKd7RCy8FayNEFNNKrNK/eUcY/4ExQqLmyrvBXKsIcwQ==",
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.9.tgz",
+      "integrity": "sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==",
       "dependencies": {
         "@babel/types": "^7.22.5",
         "@jridgewell/gen-mapping": "^0.3.2",
@@ -1130,17 +1632,6 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-split-export-declaration": {
-      "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==",
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-create-class-features-plugin/node_modules/semver": {
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
@@ -1254,20 +1745,9 @@
       },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-split-export-declaration": {
-      "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==",
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
     "node_modules/@babel/helper-optimise-call-expression": {
@@ -1344,9 +1824,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==",
       "dependencies": {
         "@babel/types": "^7.22.5"
       },
@@ -1508,17 +1988,6 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-decorators/node_modules/@babel/helper-split-export-declaration": {
-      "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==",
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/plugin-proposal-private-property-in-object": {
       "version": "7.21.0-placeholder-for-preset-env.2",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
@@ -1943,17 +2412,6 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-split-export-declaration": {
-      "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==",
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/plugin-transform-computed-properties": {
       "version": "7.22.5",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz",
@@ -2421,16 +2879,16 @@
       }
     },
     "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==",
       "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"
@@ -2595,12 +3053,12 @@
       }
     },
     "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==",
       "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",
@@ -2625,13 +3083,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",
@@ -2656,7 +3114,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",
@@ -2674,11 +3132,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"
@@ -2734,9 +3192,9 @@
       "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA=="
     },
     "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==",
       "dependencies": {
         "regenerator-runtime": "^0.13.11"
       },
@@ -2777,17 +3235,6 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/traverse/node_modules/@babel/helper-split-export-declaration": {
-      "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==",
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "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",
@@ -3618,19 +4065,334 @@
       "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
       "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz",
+      "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==",
+      "cpu": [
+        "arm"
+      ],
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz",
+      "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz",
+      "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/darwin-arm64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz",
+      "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz",
+      "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz",
+      "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz",
+      "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz",
+      "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==",
+      "cpu": [
+        "arm"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz",
+      "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz",
+      "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==",
+      "cpu": [
+        "ia32"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz",
+      "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==",
+      "cpu": [
+        "loong64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz",
+      "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==",
+      "cpu": [
+        "mips64el"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz",
+      "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz",
+      "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==",
+      "cpu": [
+        "riscv64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz",
+      "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==",
+      "cpu": [
+        "s390x"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-x64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz",
+      "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz",
+      "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz",
+      "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz",
+      "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz",
+      "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz",
+      "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==",
+      "cpu": [
+        "ia32"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "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==",
+    "node_modules/@esbuild/win32-x64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz",
+      "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==",
       "cpu": [
         "x64"
       ],
       "optional": true,
       "os": [
-        "linux"
+        "win32"
       ],
       "engines": {
         "node": ">=12"
@@ -3840,6 +4602,7 @@
       "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",
@@ -3856,6 +4619,7 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
       "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "dev": true,
       "engines": {
         "node": ">=12"
       },
@@ -3867,6 +4631,7 @@
       "version": "6.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
       "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "dev": true,
       "engines": {
         "node": ">=12"
       },
@@ -3877,12 +4642,14 @@
     "node_modules/@isaacs/cliui/node_modules/emoji-regex": {
       "version": "9.2.2",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "dev": true
     },
     "node_modules/@isaacs/cliui/node_modules/string-width": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
       "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "dev": true,
       "dependencies": {
         "eastasianwidth": "^0.2.0",
         "emoji-regex": "^9.2.2",
@@ -3899,6 +4666,7 @@
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
       "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
       "dependencies": {
         "ansi-regex": "^6.0.1"
       },
@@ -3913,6 +4681,7 @@
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
       "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "dev": true,
       "dependencies": {
         "ansi-styles": "^6.1.0",
         "string-width": "^5.0.1",
@@ -5433,9 +6202,9 @@
       }
     },
     "node_modules/@ngtools/webpack": {
-      "version": "16.1.4",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-16.1.4.tgz",
-      "integrity": "sha512-+8bfavDH8eWxjlJFYr6bkjcRHhy95j+f8oNn7/sGLNu4L96nuE2AZ011XIu2dJahCnNiBvwc1EpkKa92t9rkaA==",
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-16.2.0.tgz",
+      "integrity": "sha512-c9jv4r7GnLTpnPOeF+a9yAm/3/2wwl9lMBU32i9hlY+q/Hqde4PiL95bUOLnRRL1I64DV7BFTlSZqSPgDpFXZQ==",
       "engines": {
         "node": "^16.14.0 || >=18.10.0",
         "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
@@ -5516,6 +6285,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.0.tgz",
       "integrity": "sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==",
+      "dev": true,
       "dependencies": {
         "semver": "^7.3.5"
       },
@@ -7380,6 +8150,7 @@
       "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"
@@ -9080,71 +9851,403 @@
         "@xtuc/long": "4.2.2"
       }
     },
-    "node_modules/@webassemblyjs/utf8": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
-      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA=="
-    },
-    "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz",
-      "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==",
+    "node_modules/@webassemblyjs/utf8": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
+      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA=="
+    },
+    "node_modules/@webassemblyjs/wasm-edit": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz",
+      "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-buffer": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/helper-wasm-section": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.11.6",
+        "@webassemblyjs/wasm-opt": "1.11.6",
+        "@webassemblyjs/wasm-parser": "1.11.6",
+        "@webassemblyjs/wast-printer": "1.11.6"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-gen": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz",
+      "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-opt": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz",
+      "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-buffer": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.11.6",
+        "@webassemblyjs/wasm-parser": "1.11.6"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-parser": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz",
+      "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
+      }
+    },
+    "node_modules/@webassemblyjs/wast-printer": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz",
+      "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.6",
+        "@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",
+      "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/@tootallnate/once": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/@wessberg/ts-evaluator/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==",
+      "dependencies": {
+        "acorn": "^7.1.1",
+        "acorn-walk": "^7.1.1"
+      }
+    },
+    "node_modules/@wessberg/ts-evaluator/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==",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "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==",
+      "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==",
+      "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==",
+      "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=="
+    },
+    "node_modules/@wessberg/ts-evaluator/node_modules/cssom": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
+      "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw=="
+    },
+    "node_modules/@wessberg/ts-evaluator/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==",
+      "dependencies": {
+        "abab": "^2.0.3",
+        "whatwg-mimetype": "^2.3.0",
+        "whatwg-url": "^8.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@wessberg/ts-evaluator/node_modules/domexception": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
+      "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
+      "dependencies": {
+        "webidl-conversions": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@wessberg/ts-evaluator/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==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@wessberg/ts-evaluator/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==",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "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==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@wessberg/ts-evaluator/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==",
+      "dependencies": {
+        "whatwg-encoding": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@wessberg/ts-evaluator/node_modules/http-proxy-agent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+      "dependencies": {
+        "@tootallnate/once": "1",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/@wessberg/ts-evaluator/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==",
+      "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/@wessberg/ts-evaluator/node_modules/parse5": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="
+    },
+    "node_modules/@wessberg/ts-evaluator/node_modules/saxes": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
+      "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
+      "dependencies": {
+        "xmlchars": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "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==",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@wessberg/ts-evaluator/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==",
+      "dependencies": {
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.2.0",
+        "url-parse": "^1.5.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@wessberg/ts-evaluator/node_modules/tr46": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
+      "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.6",
-        "@webassemblyjs/helper-buffer": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/helper-wasm-section": "1.11.6",
-        "@webassemblyjs/wasm-gen": "1.11.6",
-        "@webassemblyjs/wasm-opt": "1.11.6",
-        "@webassemblyjs/wasm-parser": "1.11.6",
-        "@webassemblyjs/wast-printer": "1.11.6"
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz",
-      "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/ieee754": "1.11.6",
-        "@webassemblyjs/leb128": "1.11.6",
-        "@webassemblyjs/utf8": "1.11.6"
+    "node_modules/@wessberg/ts-evaluator/node_modules/universalify": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+      "engines": {
+        "node": ">= 4.0.0"
       }
     },
-    "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz",
-      "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==",
+    "node_modules/@wessberg/ts-evaluator/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==",
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.6",
-        "@webassemblyjs/helper-buffer": "1.11.6",
-        "@webassemblyjs/wasm-gen": "1.11.6",
-        "@webassemblyjs/wasm-parser": "1.11.6"
+        "xml-name-validator": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
-    "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz",
-      "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==",
+    "node_modules/@wessberg/ts-evaluator/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==",
+      "engines": {
+        "node": ">=10.4"
+      }
+    },
+    "node_modules/@wessberg/ts-evaluator/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==",
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.6",
-        "@webassemblyjs/helper-api-error": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/ieee754": "1.11.6",
-        "@webassemblyjs/leb128": "1.11.6",
-        "@webassemblyjs/utf8": "1.11.6"
+        "iconv-lite": "0.4.24"
       }
     },
-    "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz",
-      "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==",
+    "node_modules/@wessberg/ts-evaluator/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=="
+    },
+    "node_modules/@wessberg/ts-evaluator/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==",
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.6",
-        "@xtuc/long": "4.2.2"
+        "lodash": "^4.7.0",
+        "tr46": "^2.1.0",
+        "webidl-conversions": "^6.1.0"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
+    "node_modules/@wessberg/ts-evaluator/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=="
+    },
     "node_modules/@xtuc/ieee754": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
@@ -9357,6 +10460,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
       "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
+      "devOptional": true,
       "dependencies": {
         "clean-stack": "^2.0.0",
         "indent-string": "^4.0.0"
@@ -10010,11 +11114,11 @@
       }
     },
     "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==",
       "dependencies": {
-        "find-cache-dir": "^3.3.2",
+        "find-cache-dir": "^4.0.0",
         "schema-utils": "^4.0.0"
       },
       "engines": {
@@ -10025,6 +11129,111 @@
         "webpack": ">=5"
       }
     },
+    "node_modules/babel-loader/node_modules/find-cache-dir": {
+      "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==",
+      "dependencies": {
+        "common-path-prefix": "^3.0.0",
+        "pkg-dir": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/babel-loader/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==",
+      "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/babel-loader/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==",
+      "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/babel-loader/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==",
+      "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/babel-loader/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==",
+      "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/babel-loader/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==",
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      }
+    },
+    "node_modules/babel-loader/node_modules/pkg-dir": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-7.0.0.tgz",
+      "integrity": "sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==",
+      "dependencies": {
+        "find-up": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/babel-loader/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==",
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/babel-plugin-const-enum": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-const-enum/-/babel-plugin-const-enum-1.2.0.tgz",
@@ -10413,6 +11622,11 @@
         "base64-js": "^1.1.2"
       }
     },
+    "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=="
+    },
     "node_modules/browser-resolve": {
       "version": "1.11.3",
       "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz",
@@ -10553,6 +11767,7 @@
       "version": "17.1.3",
       "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.3.tgz",
       "integrity": "sha512-jAdjGxmPxZh0IipMdR7fK/4sDSrHMLUV0+GvVUsjwyGNKHsh79kW/otg+GkbXwl6Uzvy9wsvHOX4nUoWldeZMg==",
+      "dev": true,
       "dependencies": {
         "@npmcli/fs": "^3.1.0",
         "fs-minipass": "^3.0.0",
@@ -10575,6 +11790,7 @@
       "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"
       }
@@ -10583,6 +11799,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.0.tgz",
       "integrity": "sha512-EUojgQaSPy6sxcqcZgQv6TVF6jiKvurji3AxhAivs/Ep4O1UpS8TusaxpybfFHZ2skRhLqzk6WR8nqNYIMMDeA==",
+      "dev": true,
       "dependencies": {
         "minipass": "^4.0.0"
       },
@@ -10594,6 +11811,7 @@
       "version": "4.2.8",
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.8.tgz",
       "integrity": "sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -10602,6 +11820,7 @@
       "version": "10.3.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.3.tgz",
       "integrity": "sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw==",
+      "dev": true,
       "dependencies": {
         "foreground-child": "^3.1.0",
         "jackspeak": "^2.0.3",
@@ -10623,6 +11842,7 @@
       "version": "7.14.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.14.1.tgz",
       "integrity": "sha512-ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA==",
+      "dev": true,
       "engines": {
         "node": ">=12"
       }
@@ -10631,6 +11851,7 @@
       "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"
       },
@@ -10645,6 +11866,7 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
       "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -10855,6 +12077,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
       "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+      "dev": true,
       "engines": {
         "node": ">=10"
       }
@@ -10881,6 +12104,7 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
       "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+      "devOptional": true,
       "engines": {
         "node": ">=6"
       }
@@ -11093,6 +12317,11 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "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=="
+    },
     "node_modules/common-tags": {
       "version": "1.8.2",
       "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz",
@@ -11724,9 +12953,9 @@
       "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="
     },
     "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==",
       "dependencies": {
         "chalk": "^4.1.0",
         "css-select": "^5.1.0",
@@ -12104,7 +13333,6 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
       "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
-      "devOptional": true,
       "dependencies": {
         "cssom": "~0.3.6"
       },
@@ -12115,8 +13343,7 @@
     "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==",
-      "devOptional": true
+      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="
     },
     "node_modules/cypress": {
       "version": "12.17.1",
@@ -12772,8 +13999,7 @@
     "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==",
-      "devOptional": true
+      "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA=="
     },
     "node_modules/dedent": {
       "version": "0.7.0",
@@ -13138,7 +14364,8 @@
     "node_modules/eastasianwidth": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
-      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "dev": true
     },
     "node_modules/easy-table": {
       "version": "1.1.0",
@@ -13599,9 +14826,9 @@
       }
     },
     "node_modules/esbuild": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.19.tgz",
-      "integrity": "sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz",
+      "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==",
       "hasInstallScript": true,
       "bin": {
         "esbuild": "bin/esbuild"
@@ -13610,34 +14837,34 @@
         "node": ">=12"
       },
       "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"
+        "@esbuild/android-arm": "0.18.20",
+        "@esbuild/android-arm64": "0.18.20",
+        "@esbuild/android-x64": "0.18.20",
+        "@esbuild/darwin-arm64": "0.18.20",
+        "@esbuild/darwin-x64": "0.18.20",
+        "@esbuild/freebsd-arm64": "0.18.20",
+        "@esbuild/freebsd-x64": "0.18.20",
+        "@esbuild/linux-arm": "0.18.20",
+        "@esbuild/linux-arm64": "0.18.20",
+        "@esbuild/linux-ia32": "0.18.20",
+        "@esbuild/linux-loong64": "0.18.20",
+        "@esbuild/linux-mips64el": "0.18.20",
+        "@esbuild/linux-ppc64": "0.18.20",
+        "@esbuild/linux-riscv64": "0.18.20",
+        "@esbuild/linux-s390x": "0.18.20",
+        "@esbuild/linux-x64": "0.18.20",
+        "@esbuild/netbsd-x64": "0.18.20",
+        "@esbuild/openbsd-x64": "0.18.20",
+        "@esbuild/sunos-x64": "0.18.20",
+        "@esbuild/win32-arm64": "0.18.20",
+        "@esbuild/win32-ia32": "0.18.20",
+        "@esbuild/win32-x64": "0.18.20"
       }
     },
     "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==",
+      "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==",
       "bin": {
         "esbuild": "bin/esbuild"
       },
@@ -13670,7 +14897,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
       "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
-      "devOptional": true,
       "dependencies": {
         "esprima": "^4.0.1",
         "estraverse": "^5.2.0",
@@ -13691,7 +14917,6 @@
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
       "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "devOptional": true,
       "engines": {
         "node": ">=4.0"
       }
@@ -13700,7 +14925,6 @@
       "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"
@@ -14971,6 +16195,7 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
       "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
+      "dev": true,
       "dependencies": {
         "cross-spawn": "^7.0.0",
         "signal-exit": "^4.0.1"
@@ -14986,6 +16211,7 @@
       "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"
       },
@@ -15262,6 +16488,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
       "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+      "dev": true,
       "dependencies": {
         "minipass": "^3.0.0"
       },
@@ -15279,6 +16506,19 @@
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
     },
+    "node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
     "node_modules/function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@@ -15668,6 +16908,17 @@
         "lodash": "^4.17.15"
       }
     },
+    "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==",
+      "dependencies": {
+        "@wessberg/ts-evaluator": "0.0.27"
+      },
+      "peerDependencies": {
+        "typescript": ">=3.7.5"
+      }
+    },
     "node_modules/gzip-size": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
@@ -16375,6 +17626,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
       "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "devOptional": true,
       "engines": {
         "node": ">=8"
       }
@@ -16820,8 +18072,7 @@
     "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==",
-      "devOptional": true
+      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ=="
     },
     "node_modules/is-regex": {
       "version": "1.1.4",
@@ -17162,6 +18413,7 @@
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.2.1.tgz",
       "integrity": "sha512-MXbxovZ/Pm42f6cDIDkl3xpwv1AGwObKwfmjs2nQePiy85tP3fatofl3FC1aBsOtP/6fq5SbtgHwWcMsLP+bDw==",
+      "dev": true,
       "dependencies": {
         "@isaacs/cliui": "^8.0.2"
       },
@@ -20241,6 +21493,7 @@
       "version": "3.3.4",
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.4.tgz",
       "integrity": "sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==",
+      "dev": true,
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -20252,6 +21505,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
       "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
+      "dev": true,
       "dependencies": {
         "minipass": "^3.0.0"
       },
@@ -20289,6 +21543,7 @@
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
       "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
+      "dev": true,
       "dependencies": {
         "minipass": "^3.0.0"
       },
@@ -20310,6 +21565,7 @@
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
       "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
+      "dev": true,
       "dependencies": {
         "minipass": "^3.0.0"
       },
@@ -20333,6 +21589,7 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
       "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+      "dev": true,
       "dependencies": {
         "minipass": "^3.0.0",
         "yallist": "^4.0.0"
@@ -20345,6 +21602,7 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
       "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "dev": true,
       "bin": {
         "mkdirp": "bin/cmd.js"
       },
@@ -23781,8 +25039,7 @@
     "node_modules/nwsapi": {
       "version": "2.2.7",
       "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz",
-      "integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==",
-      "devOptional": true
+      "integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ=="
     },
     "node_modules/nx": {
       "version": "16.5.2",
@@ -24050,6 +25307,14 @@
         "node": ">= 0.4"
       }
     },
+    "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==",
+      "engines": {
+        "node": ">= 10.12.0"
+      }
+    },
     "node_modules/object.assign": {
       "version": "4.1.4",
       "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
@@ -24406,6 +25671,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
       "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+      "devOptional": true,
       "dependencies": {
         "aggregate-error": "^3.0.0"
       },
@@ -24600,6 +25866,7 @@
       "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 || ^7.0.0"
@@ -24615,6 +25882,7 @@
       "version": "10.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.0.tgz",
       "integrity": "sha512-svTf/fzsKHffP42sujkO/Rjs37BCIsQVRCeNYIm9WN8rgT7ffoUnRtZCqU+6BqcSBdv8gwJeTz8knJpgACeQMw==",
+      "dev": true,
       "engines": {
         "node": "14 || >=16.14"
       }
@@ -24623,6 +25891,7 @@
       "version": "7.0.2",
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.2.tgz",
       "integrity": "sha512-eL79dXrE1q9dBbDCLg7xfn/vl7MS4F1gvJAgjJrQli/jbQWdUttuVawphqpffoIYfRdq78LHx6GP4bU/EQ2ATA==",
+      "dev": true,
       "engines": {
         "node": ">=16 || 14 >=14.17"
       }
@@ -24728,9 +25997,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==",
       "dependencies": {
         "eventemitter-asyncresource": "^1.0.0",
         "hdr-histogram-js": "^2.0.1",
@@ -24877,9 +26146,9 @@
       }
     },
     "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.27",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.27.tgz",
+      "integrity": "sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==",
       "funding": [
         {
           "type": "opencollective",
@@ -25011,13 +26280,12 @@
       }
     },
     "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==",
       "dependencies": {
-        "cosmiconfig": "^8.1.3",
+        "cosmiconfig": "^8.2.0",
         "jiti": "^1.18.2",
-        "klona": "^2.0.6",
         "semver": "^7.3.8"
       },
       "engines": {
@@ -25580,8 +26848,7 @@
     "node_modules/psl": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
-      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
-      "devOptional": true
+      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="
     },
     "node_modules/pump": {
       "version": "3.0.0",
@@ -25643,8 +26910,7 @@
     "node_modules/querystringify": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
-      "devOptional": true
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
     },
     "node_modules/queue-microtask": {
       "version": "1.2.3",
@@ -26506,9 +27772,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==",
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
         "immutable": "^4.0.0",
@@ -26522,11 +27788,10 @@
       }
     },
     "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==",
       "dependencies": {
-        "klona": "^2.0.6",
         "neo-async": "^2.6.2"
       },
       "engines": {
@@ -27619,6 +28884,7 @@
       "version": "10.0.1",
       "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.1.tgz",
       "integrity": "sha512-WVy6di9DlPOeBWEjMScpNipeSX2jIZBGEn5Uuo8Q7aIuFEuDX0pw8RxcOjlD1TWP4obi24ki7m/13+nFpcbXrw==",
+      "dev": true,
       "dependencies": {
         "minipass": "^4.0.0"
       },
@@ -27630,6 +28896,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.0.0.tgz",
       "integrity": "sha512-g2Uuh2jEKoht+zvO6vJqXmYpflPqzRBT+Th2h01DKh5z7wbY/AZ2gCQ78cP70YoHPyFdY30YBV5WxgLOEwOykw==",
+      "dev": true,
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -27977,6 +29244,7 @@
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -28030,6 +29298,7 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
       "dependencies": {
         "ansi-regex": "^5.0.1"
       },
@@ -28277,8 +29546,7 @@
     "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==",
-      "devOptional": true
+      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
     },
     "node_modules/tapable": {
       "version": "2.2.1",
@@ -28292,6 +29560,7 @@
       "version": "6.1.11",
       "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
       "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
+      "dev": true,
       "dependencies": {
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
@@ -28371,9 +29640,9 @@
       }
     },
     "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==",
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
         "acorn": "^8.8.2",
@@ -29021,9 +30290,9 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.5.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz",
-      "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz",
+      "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig=="
     },
     "node_modules/tsutils": {
       "version": "3.21.0",
@@ -29259,6 +30528,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz",
       "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==",
+      "dev": true,
       "dependencies": {
         "unique-slug": "^4.0.0"
       },
@@ -29270,6 +30540,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz",
       "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==",
+      "dev": true,
       "dependencies": {
         "imurmurhash": "^0.1.4"
       },
@@ -29369,7 +30640,6 @@
       "version": "1.5.10",
       "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
       "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
-      "devOptional": true,
       "dependencies": {
         "querystringify": "^2.1.1",
         "requires-port": "^1.0.0"
@@ -29464,13 +30734,13 @@
       }
     },
     "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==",
       "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"
@@ -29478,12 +30748,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": "*",
@@ -29496,6 +30770,9 @@
         "less": {
           "optional": true
         },
+        "lightningcss": {
+          "optional": true
+        },
         "sass": {
           "optional": true
         },
@@ -29510,6 +30787,15 @@
         }
       }
     },
+    "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.",
+      "dependencies": {
+        "browser-process-hrtime": "^1.0.0"
+      }
+    },
     "node_modules/w3c-xmlserializer": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz",
@@ -29606,9 +30892,9 @@
       }
     },
     "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==",
       "dependencies": {
         "@types/eslint-scope": "^3.7.3",
         "@types/estree": "^1.0.0",
@@ -29619,7 +30905,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",
@@ -29629,7 +30915,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",
@@ -29790,9 +31076,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==",
       "dependencies": {
         "@types/bonjour": "^3.5.9",
         "@types/connect-history-api-fallback": "^1.3.5",
@@ -29800,7 +31086,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",
@@ -30173,6 +31459,7 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -30189,6 +31476,7 @@
       "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"
       },
@@ -30203,6 +31491,7 @@
       "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"
       },
@@ -30213,7 +31502,8 @@
     "node_modules/wrap-ansi-cjs/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=="
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
     "node_modules/wrap-ansi/node_modules/ansi-styles": {
       "version": "4.3.0",
@@ -30266,7 +31556,6 @@
       "version": "7.5.9",
       "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
       "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
-      "dev": true,
       "engines": {
         "node": ">=8.3.0"
       },
@@ -30295,8 +31584,7 @@
     "node_modules/xmlchars": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
-      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
-      "devOptional": true
+      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="
     },
     "node_modules/xmldoc": {
       "version": "1.2.0",
diff --git a/package.json b/package.json
index d49af2204..88240dec7 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,7 @@
     "@nx/angular": "16.5.2"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "16.1.4",
+    "@angular-devkit/build-angular": "16.2.0",
     "@angular-devkit/core": "16.1.4",
     "@angular-devkit/schematics": "16.1.4",
     "@angular-eslint/eslint-plugin": "16.0.3",

From 2fbd16532df954982c5a5a56a7d632d02db1c2f0 Mon Sep 17 00:00:00 2001
From: sarkapalkovicova <sarka.palkovicova@gmail.com>
Date: Thu, 31 Aug 2023 13:23:11 +0200
Subject: [PATCH 20/22] fix(admin): indirect membership
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Refactored indirect membership’s origin dialog.
- Added column for type in the members list.
---
 apps/admin-gui/src/assets/i18n/en.json        |  8 ++--
 .../members-dynamic-list.component.html       | 18 +++++---
 .../members-dynamic-list.component.ts         |  4 +-
 .../member-tree-view-dialog.component.html    | 43 +++++++++++--------
 .../member-tree-view-dialog.component.scss    | 15 +++++++
 libs/perun/pipes/src/index.ts                 |  2 +
 .../pipes/src/lib/member-type-icon.pipe.ts    | 10 +++++
 .../pipes/src/lib/member-type-tooltip.pipe.ts | 15 +++++++
 .../perun/pipes/src/lib/perun-pipes.module.ts |  6 +++
 9 files changed, 93 insertions(+), 28 deletions(-)
 create mode 100644 libs/perun/pipes/src/lib/member-type-icon.pipe.ts
 create mode 100644 libs/perun/pipes/src/lib/member-type-tooltip.pipe.ts

diff --git a/apps/admin-gui/src/assets/i18n/en.json b/apps/admin-gui/src/assets/i18n/en.json
index d7a52c598..ae07b925b 100644
--- a/apps/admin-gui/src/assets/i18n/en.json
+++ b/apps/admin-gui/src/assets/i18n/en.json
@@ -2417,6 +2417,7 @@
     "ID": "Id",
     "VO_ID": "Organization Id",
     "USER_ID": "User Id",
+    "TYPE": "Type",
     "NAME": "Name",
     "STATUS": "Organization status",
     "GROUP_STATUS": "Group status",
@@ -2426,7 +2427,8 @@
     "ORGANIZATION": "Organization",
     "NO_MEMBERS_ALERT": "No members present",
     "NO_FILTER_RESULTS_ALERT": "No members are matching your query",
-    "INDIRECT_MEMBER": "Indirect member",
+    "INDIRECT_MEMBER": "Show indirect member origin",
+    "DIRECT_MEMBER": "Direct member",
     "CHECKBOX_TOOLTIP_INDIRECT": "Indirect members cannot be removed or copied",
     "CHECKBOX_TOOLTIP_UNALTERABLE": "Members from member organizations cannot be directly removed",
     "STATUS_TOOLTIP_INDIRECT": "Member status from member organization cannot be directly changed",
@@ -3281,8 +3283,8 @@
         "MEMBER_TREEVIEW_DIALOG": {
           "TITLE": "Indirect membership’s origin of {{name}}",
           "INFO": "Member is coming to this group through the following group hierarchy.",
-          "DIRECT": "(Direct membership)",
-          "INCLUDE": "(Included group)",
+          "DIRECT": "Direct membership",
+          "INCLUDE": "Included group",
           "FILTER": "Search by group name",
           "CLOSE": "Close",
           "NO_PATHS": "No paths include the entered group name.",
diff --git a/libs/perun/components/src/lib/members-dynamic-list/members-dynamic-list.component.html b/libs/perun/components/src/lib/members-dynamic-list/members-dynamic-list.component.html
index a816ba2f9..45856bca8 100644
--- a/libs/perun/components/src/lib/members-dynamic-list/members-dynamic-list.component.html
+++ b/libs/perun/components/src/lib/members-dynamic-list/members-dynamic-list.component.html
@@ -44,14 +44,18 @@
         <td *matCellDef="let member" class="static-column-size" mat-cell>{{member.id}}</td>
       </ng-container>
       <ng-container matColumnDef="type">
-        <th *matHeaderCellDef mat-header-cell mat-sort-header></th>
+        <th *matHeaderCellDef mat-header-cell mat-sort-header>
+          {{'MEMBERS_LIST.TYPE' | translate}}
+        </th>
         <td *matCellDef="let member" mat-cell>
-          <mat-icon
-            (click)="viewMemberGroupTree($event, member)"
-            *ngIf="member.membershipType !== 'DIRECT'"
-            [matTooltip]="'MEMBERS_LIST.INDIRECT_MEMBER' | translate"
-            >transfer_within_a_station</mat-icon
-          >
+          <span [matTooltip]="member.membershipType | memberTypeTooltip">
+            <button
+              (click)="viewMemberGroupTree($event, member)"
+              [disabled]="member.membershipType === 'DIRECT'"
+              mat-icon-button>
+              <mat-icon>{{member.membershipType | memberTypeIcon}}</mat-icon>
+            </button>
+          </span>
         </td>
       </ng-container>
       <ng-container matColumnDef="fullName">
diff --git a/libs/perun/components/src/lib/members-dynamic-list/members-dynamic-list.component.ts b/libs/perun/components/src/lib/members-dynamic-list/members-dynamic-list.component.ts
index 38c5a88b8..dfdc911f1 100644
--- a/libs/perun/components/src/lib/members-dynamic-list/members-dynamic-list.component.ts
+++ b/libs/perun/components/src/lib/members-dynamic-list/members-dynamic-list.component.ts
@@ -99,6 +99,8 @@ export class MembersDynamicListComponent implements AfterViewInit, OnInit, OnCha
     switch (column) {
       case 'id':
         return data.id.toString();
+      case 'type':
+        return data.membershipType;
       case 'fullName':
         if (data.user) {
           return parseFullName(data.user);
@@ -272,7 +274,7 @@ export class MembersDynamicListComponent implements AfterViewInit, OnInit, OnCha
   viewMemberGroupTree(event: Event, member: RichMember): void {
     event.stopPropagation();
     const config = getDefaultDialogConfig();
-    config.width = '800px';
+    config.width = '1000px';
     config.data = { member: member, groupId: this.groupId };
 
     this.dialog.open(MemberTreeViewDialogComponent, config);
diff --git a/libs/perun/dialogs/src/lib/member-tree-view-dialog/member-tree-view-dialog.component.html b/libs/perun/dialogs/src/lib/member-tree-view-dialog/member-tree-view-dialog.component.html
index 6c02de1d7..c377f14f5 100644
--- a/libs/perun/dialogs/src/lib/member-tree-view-dialog/member-tree-view-dialog.component.html
+++ b/libs/perun/dialogs/src/lib/member-tree-view-dialog/member-tree-view-dialog.component.html
@@ -7,7 +7,7 @@ <h1 mat-dialog-title>
       {{'SHARED_LIB.PERUN.COMPONENTS.MEMBER_TREEVIEW_DIALOG.TITLE' | translate:{ 'name': userName} }}
     </h1>
     <div *ngIf="dataSource" mat-dialog-content class="me-0">
-      <p>{{'SHARED_LIB.PERUN.COMPONENTS.MEMBER_TREEVIEW_DIALOG.INFO' | translate}}</p>
+      <p class="ms-2">{{'SHARED_LIB.PERUN.COMPONENTS.MEMBER_TREEVIEW_DIALOG.INFO' | translate}}</p>
 
       <mat-form-field class="filter-field ms-2">
         <mat-label>
@@ -15,44 +15,50 @@ <h1 mat-dialog-title>
         </mat-label>
         <input matInput [formControl]="formControl" />
       </mat-form-field>
-      <perun-web-apps-alert
-        *ngIf="!dataSource.data.length"
-        >{{'SHARED_LIB.PERUN.COMPONENTS.MEMBER_TREEVIEW_DIALOG.NO_PATHS'|translate}}</perun-web-apps-alert
-      >
+
+      <perun-web-apps-alert *ngIf="!dataSource.data.length">
+        {{'SHARED_LIB.PERUN.COMPONENTS.MEMBER_TREEVIEW_DIALOG.NO_PATHS'|translate}}
+      </perun-web-apps-alert>
+
       <mat-tree
         *ngIf="dataSource.data.length"
         [dataSource]="dataSource"
         [treeControl]="treeControl"
-        class="example-tree">
+        class="example-tree ms-2 bordered-tree description-text">
         <!-- This is the tree node template for leaf nodes -->
         <mat-tree-node *matTreeNodeDef="let node" matTreeNodeToggle>
-          <li class="mat-tree-node">
+          <li class="mat-tree-node node ps-2">
             <div
               class="row flex-nowrap"
               [class.cursor-pointer]="node.direct || node.include"
               [class.act-disabled]="!node.direct && !node.include"
               (click)="navigate(node.id, node.include)">
-              <div [ngStyle]="{'min-width': getMinWidth(node.level)}" class="mt-auto mb-auto">
+              <div
+                [ngStyle]="{'min-width': getMinWidth(node.level)}"
+                class="mt-auto mb-auto ms-3 d-flex">
                 <span>{{node.name | parseGroupName}}</span>
                 <span
                   *ngIf="node.direct"
                   class="text-muted ms-2"
-                  >{{'SHARED_LIB.PERUN.COMPONENTS.MEMBER_TREEVIEW_DIALOG.DIRECT' | translate}}</span
-                >
+                  matTooltip="{{'SHARED_LIB.PERUN.COMPONENTS.MEMBER_TREEVIEW_DIALOG.DIRECT' | translate}}">
+                  <mat-icon>person_pin_circle</mat-icon>
+                </span>
                 <span
                   *ngIf="node.include"
                   class="text-muted ms-2"
-                  >{{'SHARED_LIB.PERUN.COMPONENTS.MEMBER_TREEVIEW_DIALOG.INCLUDE' | translate}}</span
-                >
+                  matTooltip="{{'SHARED_LIB.PERUN.COMPONENTS.MEMBER_TREEVIEW_DIALOG.INCLUDE' | translate}}">
+                  <mat-icon>mediation</mat-icon>
+                </span>
+                <span class="text-muted ms-5 w-50">{{node.description}}</span>
               </div>
-              <span class="text-muted ms-3">{{node.description}}</span>
             </div>
           </li>
         </mat-tree-node>
+
         <!-- This is the tree node template for expandable nodes -->
         <mat-nested-tree-node *matTreeNodeDef="let node; when: hasChild">
           <li>
-            <div class="mat-tree-node">
+            <div class="mat-tree-node ps-2">
               <button
                 mat-icon-button
                 matTreeNodeToggle
@@ -66,8 +72,10 @@ <h1 mat-dialog-title>
                 [class.cursor-pointer]="node.direct || node.include"
                 [class.act-disabled]="!node.direct && !node.include"
                 (click)="navigate(node.id, node.include)"
-                class="row flex-nowrap">
-                <div [ngStyle]="{'min-width': getMinWidth(node.level)}" class="mt-auto mb-auto">
+                class="row">
+                <div
+                  [ngStyle]="{'min-width': getMinWidth(node.level)}"
+                  class="mt-auto mb-auto d-flex">
                   <span>{{node.name | parseGroupName}}</span>
                   <span
                     *ngIf="node.direct"
@@ -79,8 +87,8 @@ <h1 mat-dialog-title>
                     class="text-muted ms-2"
                     >{{'SHARED_LIB.PERUN.COMPONENTS.MEMBER_TREEVIEW_DIALOG.INCLUDE' | translate}}</span
                   >
+                  <span class="text-muted ms-5">{{node.description}}</span>
                 </div>
-                <span class="text-muted ms-3">{{node.description}}</span>
               </div>
             </div>
             <ul [class.example-tree-invisible]="!treeControl.isExpanded(node)">
@@ -90,6 +98,7 @@ <h1 mat-dialog-title>
         </mat-nested-tree-node>
       </mat-tree>
     </div>
+
     <div mat-dialog-actions>
       <div class="ms-auto">
         <button (click)="onCancel()" mat-stroked-button>
diff --git a/libs/perun/dialogs/src/lib/member-tree-view-dialog/member-tree-view-dialog.component.scss b/libs/perun/dialogs/src/lib/member-tree-view-dialog/member-tree-view-dialog.component.scss
index 289b06b29..522de77f0 100644
--- a/libs/perun/dialogs/src/lib/member-tree-view-dialog/member-tree-view-dialog.component.scss
+++ b/libs/perun/dialogs/src/lib/member-tree-view-dialog/member-tree-view-dialog.component.scss
@@ -7,6 +7,10 @@
   margin-top: 0;
   margin-bottom: 0;
   list-style-type: none;
+
+  &:hover {
+    background-color: rgba(0, 0, 0, 0.05);
+  }
 }
 
 .act-disabled {
@@ -22,3 +26,14 @@
   width: 100% !important;
   min-width: initial !important;
 }
+
+.bordered-tree {
+  border: 1px solid var(--bs-border-color-translucent);
+  border-radius: var(--bs-border-radius) !important;
+}
+
+.description-text {
+  text-overflow: ellipsis;
+  overflow: auto;
+  white-space: nowrap;
+}
diff --git a/libs/perun/pipes/src/index.ts b/libs/perun/pipes/src/index.ts
index 5c1cb8c0b..7e88746f4 100644
--- a/libs/perun/pipes/src/index.ts
+++ b/libs/perun/pipes/src/index.ts
@@ -43,3 +43,5 @@ export * from './lib/application-column-select-label.pipe';
 export * from './lib/selected-consent-statuses.pipe';
 export * from './lib/global-namespace.pipe';
 export * from './lib/last-successful-propagation.pipe';
+export * from './lib/member-type-icon.pipe';
+export * from './lib/member-type-tooltip.pipe';
diff --git a/libs/perun/pipes/src/lib/member-type-icon.pipe.ts b/libs/perun/pipes/src/lib/member-type-icon.pipe.ts
new file mode 100644
index 000000000..1824ac433
--- /dev/null
+++ b/libs/perun/pipes/src/lib/member-type-icon.pipe.ts
@@ -0,0 +1,10 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+  name: 'memberTypeIcon',
+})
+export class MemberTypeIconPipe implements PipeTransform {
+  transform(value: string): string {
+    return value === 'DIRECT' ? 'person_pin_circle' : 'transfer_within_a_station';
+  }
+}
diff --git a/libs/perun/pipes/src/lib/member-type-tooltip.pipe.ts b/libs/perun/pipes/src/lib/member-type-tooltip.pipe.ts
new file mode 100644
index 000000000..5d2f93055
--- /dev/null
+++ b/libs/perun/pipes/src/lib/member-type-tooltip.pipe.ts
@@ -0,0 +1,15 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import { PerunTranslateService } from '@perun-web-apps/perun/services';
+
+@Pipe({
+  name: 'memberTypeTooltip',
+})
+export class MemberTypeTooltipPipe implements PipeTransform {
+  constructor(private translate: PerunTranslateService) {}
+
+  transform(value: string): string {
+    const tooltip =
+      value === 'DIRECT' ? 'MEMBERS_LIST.DIRECT_MEMBER' : 'MEMBERS_LIST.INDIRECT_MEMBER';
+    return this.translate.instant(tooltip);
+  }
+}
diff --git a/libs/perun/pipes/src/lib/perun-pipes.module.ts b/libs/perun/pipes/src/lib/perun-pipes.module.ts
index 4d43be035..a9ca0b947 100644
--- a/libs/perun/pipes/src/lib/perun-pipes.module.ts
+++ b/libs/perun/pipes/src/lib/perun-pipes.module.ts
@@ -12,6 +12,8 @@ import { GetResourceRoutePipe } from './get-resource-route.pipe';
 import { ServiceStateBlockedToStringPipe } from './service-state-blocked-to-string.pipe';
 import { MemberStatusIconColorPipe } from './member-status-icon-color.pipe';
 import { MemberStatusIconPipe } from './member-status-icon.pipe';
+import { MemberTypeIconPipe } from './member-type-icon.pipe';
+import { MemberTypeTooltipPipe } from './member-type-tooltip.pipe';
 import { MemberStatusTooltipPipe } from './member-status-tooltip.pipe';
 import { MemberEmailPipe } from './member-email.pipe';
 import { MemberLoginsPipe } from './member-logins.pipe';
@@ -79,6 +81,8 @@ import { ActiveSideMenuItemPipe } from './active-side-menu-item.pipe';
     ServiceStateBlockedToStringPipe,
     MemberStatusIconColorPipe,
     MemberStatusIconPipe,
+    MemberTypeIconPipe,
+    MemberTypeTooltipPipe,
     MemberStatusTooltipPipe,
     MemberEmailPipe,
     MemberLoginsPipe,
@@ -145,6 +149,8 @@ import { ActiveSideMenuItemPipe } from './active-side-menu-item.pipe';
     ServiceStateBlockedToStringPipe,
     MemberStatusIconColorPipe,
     MemberStatusIconPipe,
+    MemberTypeIconPipe,
+    MemberTypeTooltipPipe,
     MemberStatusTooltipPipe,
     MemberEmailPipe,
     MemberLoginsPipe,

From d27a0e2e310070f05cf4dedd7827f38b423521e4 Mon Sep 17 00:00:00 2001
From: HejdaJakub <kuba.hejda97@gmail.com>
Date: Thu, 31 Aug 2023 06:17:48 +0200
Subject: [PATCH 21/22] fix(admin): key 'resources' duplicated in localStorage

* Expandable tiles functionality added 'resources' as a new key to localStorage, but this key had been already used by recently visited functionality.
* This caused that if expandable functionality change the value in localStorage to 'true', the resource list will be broken due to recently visited functionality.
* Key for expandable tiles in localStorage is changed to 'resourcesExpandable'.
---
 .../src/app/shared/side-menu/side-menu-item.service.ts      | 2 +-
 .../vo-detail-page/vo-overview/vo-overview.component.html   | 2 +-
 libs/perun/models/src/lib/ExpandabelTiles.ts                | 6 +++++-
 libs/perun/services/src/lib/expanded-tiles-store.service.ts | 2 +-
 libs/perun/utils/src/lib/perun-utils.ts                     | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/apps/admin-gui/src/app/shared/side-menu/side-menu-item.service.ts b/apps/admin-gui/src/app/shared/side-menu/side-menu-item.service.ts
index 079166770..37ef7f7b5 100644
--- a/apps/admin-gui/src/app/shared/side-menu/side-menu-item.service.ts
+++ b/apps/admin-gui/src/app/shared/side-menu/side-menu-item.service.ts
@@ -524,7 +524,7 @@ export class SideMenuItemService {
         url: [`/organizations/${vo.id}/resources`],
         activatedRegex: '/organizations/\\d+/resources$',
         children: children,
-        showChildren: 'resources',
+        showChildren: 'resourcesExpandable',
       });
     }
 
diff --git a/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-overview/vo-overview.component.html b/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-overview/vo-overview.component.html
index ddd95d53d..1f2717c51 100644
--- a/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-overview/vo-overview.component.html
+++ b/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-overview/vo-overview.component.html
@@ -4,7 +4,7 @@
   <perun-web-apps-expandable-tiles
     [items]="resourcesItems"
     [title]="'MENU_ITEMS.VO.RESOURCES'"
-    [sectionId]="'resources'">
+    [sectionId]="'resourcesExpandable'">
   </perun-web-apps-expandable-tiles>
   <perun-web-apps-expandable-tiles
     [items]="settingsItems"
diff --git a/libs/perun/models/src/lib/ExpandabelTiles.ts b/libs/perun/models/src/lib/ExpandabelTiles.ts
index be63e291e..3bba272d9 100644
--- a/libs/perun/models/src/lib/ExpandabelTiles.ts
+++ b/libs/perun/models/src/lib/ExpandabelTiles.ts
@@ -1 +1,5 @@
-export type ExpandableSectionId = 'settings' | 'resources' | 'visualizer' | 'authentication';
+export type ExpandableSectionId =
+  | 'settings'
+  | 'resourcesExpandable'
+  | 'visualizer'
+  | 'authentication';
diff --git a/libs/perun/services/src/lib/expanded-tiles-store.service.ts b/libs/perun/services/src/lib/expanded-tiles-store.service.ts
index ed70a195e..af2b06f43 100644
--- a/libs/perun/services/src/lib/expanded-tiles-store.service.ts
+++ b/libs/perun/services/src/lib/expanded-tiles-store.service.ts
@@ -16,7 +16,7 @@ export class ExpandedTilesStoreService {
   // Right now there is no check if all sections are initialized and needs to be kept manually updated
   private sections: ExpandableSectionId[] = [
     'settings',
-    'resources',
+    'resourcesExpandable',
     'visualizer',
     'authentication',
   ];
diff --git a/libs/perun/utils/src/lib/perun-utils.ts b/libs/perun/utils/src/lib/perun-utils.ts
index f01a6acf8..e69f75be7 100644
--- a/libs/perun/utils/src/lib/perun-utils.ts
+++ b/libs/perun/utils/src/lib/perun-utils.ts
@@ -267,7 +267,7 @@ export function getRecentlyVisitedItems(key: string): RecentItem[] {
  * @param key of localStorage
  * @param item entity that was visited
  */
-export function addRecentlyVisited(key: string, item: Vo | Facility | Group): void {
+export function addRecentlyVisited(key: string, item: Vo | Facility | Group | Resource): void {
   if (localStorage.getItem(key) === null) {
     // if user not have any in local storage
     const recent: number[] = [];

From 1df1e65d9164aa38da0f041636643b3a1e01bd8e Mon Sep 17 00:00:00 2001
From: Rastislav Krutak <492918@mail.muni.cz>
Date: Fri, 18 Aug 2023 09:54:27 +0200
Subject: [PATCH 22/22] fix(profile): navigation working properly in mailing
 lists settings

Fixed a problem of getting stuck in the mailing lists settings.
When navigating away from the component it clears the query params
and replaces the old url. The query params need to be removed also from
the new component. This is done in the onDestroyed method of the mailing lists.
---
 .../mailing-lists.component.ts                | 49 ++++++++++++++-----
 1 file changed, 37 insertions(+), 12 deletions(-)

diff --git a/libs/perun/components/src/lib/settings-mailing-lists/mailing-lists.component.ts b/libs/perun/components/src/lib/settings-mailing-lists/mailing-lists.component.ts
index 045523f4f..9039eaaab 100644
--- a/libs/perun/components/src/lib/settings-mailing-lists/mailing-lists.component.ts
+++ b/libs/perun/components/src/lib/settings-mailing-lists/mailing-lists.component.ts
@@ -1,5 +1,6 @@
 import { Component, Input, OnInit, OnDestroy } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import { Location, LocationStrategy, PathLocationStrategy } from '@angular/common';
+import { ActivatedRoute, NavigationStart, Router } from '@angular/router';
 import {
   Attribute,
   AttributesManagerService,
@@ -14,11 +15,13 @@ import {
 import { StoreService, NotificatorService } from '@perun-web-apps/perun/services';
 import { compareFnName } from '@perun-web-apps/perun/utils';
 import { TranslateService } from '@ngx-translate/core';
+import { filter, Subscription } from 'rxjs';
 
 @Component({
   selector: 'perun-web-apps-mailing-lists',
   templateUrl: './mailing-lists.component.html',
   styleUrls: ['./mailing-lists.component.scss'],
+  providers: [Location, { provide: LocationStrategy, useClass: PathLocationStrategy }],
 })
 export class MailingListsComponent implements OnInit, OnDestroy {
   @Input() user: User;
@@ -33,6 +36,7 @@ export class MailingListsComponent implements OnInit, OnDestroy {
   selectedVo: string = null;
   selectedResource: string = null;
   changeOptOut: string;
+  routingSubscription: Subscription;
 
   constructor(
     private store: StoreService,
@@ -43,18 +47,18 @@ export class MailingListsComponent implements OnInit, OnDestroy {
     private route: ActivatedRoute,
     private router: Router,
     private notificator: NotificatorService,
-    private translate: TranslateService
+    private translate: TranslateService,
+    private location: Location
   ) {}
 
   ngOnDestroy(): void {
-    if (!this.isService) {
-      void this.router.navigate([], {
-        relativeTo: this.route,
-        queryParams: { vo: null, resource: null },
-        replaceUrl: true,
-        queryParamsHandling: 'merge',
-      });
-    }
+    this.routingSubscription.unsubscribe();
+    // clear the query params in the new component
+    void this.router.navigate([location.pathname], {
+      replaceUrl: true,
+      queryParams: { vo: null, resource: null },
+      queryParamsHandling: 'merge',
+    });
   }
 
   ngOnInit(): void {
@@ -82,6 +86,17 @@ export class MailingListsComponent implements OnInit, OnDestroy {
         });
       })
       .unsubscribe();
+    this.routingSubscription = this.router.events
+      .pipe(filter((event): event is NavigationStart => event instanceof NavigationStart))
+      .subscribe((event) => {
+        if (!event.url.startsWith(location.pathname)) {
+          // clear the query params when navigating away
+          this.location.replaceState(
+            location.pathname,
+            this.clearParamsFromCurrUrl(['vo', 'resource'])
+          );
+        }
+      });
   }
 
   changeSelectedResource(resource: RichResource): void {
@@ -99,6 +114,7 @@ export class MailingListsComponent implements OnInit, OnDestroy {
       }
       void this.router.navigate([], {
         relativeTo: this.route,
+        replaceUrl: true,
         queryParams: { vo: this.selectedVo, resource: this.selectedResource, action: null },
         queryParamsHandling: 'merge',
       });
@@ -113,6 +129,7 @@ export class MailingListsComponent implements OnInit, OnDestroy {
     if (!this.isService) {
       void this.router.navigate([], {
         relativeTo: this.route,
+        replaceUrl: true,
         queryParams: { vo: this.selectedVo, resource: this.selectedResource },
         queryParamsHandling: 'merge',
       });
@@ -217,9 +234,9 @@ export class MailingListsComponent implements OnInit, OnDestroy {
     }
   }
 
-  applyFilter(filter: string): void {
+  applyFilter(mailingListsFilter: string): void {
     this.filteredVos = this.vos.filter((vo) =>
-      vo.name.toLowerCase().includes(filter.toLowerCase())
+      vo.name.toLowerCase().includes(mailingListsFilter.toLowerCase())
     );
   }
 
@@ -230,6 +247,7 @@ export class MailingListsComponent implements OnInit, OnDestroy {
     if (!this.isService) {
       void this.router.navigate([], {
         relativeTo: this.route,
+        replaceUrl: true,
         queryParams: { vo: this.selectedVo, resource: this.selectedResource },
         queryParamsHandling: 'merge',
       });
@@ -241,9 +259,16 @@ export class MailingListsComponent implements OnInit, OnDestroy {
     if (!this.isService) {
       void this.router.navigate([], {
         relativeTo: this.route,
+        replaceUrl: true,
         queryParams: { vo: this.selectedVo, resource: this.selectedResource },
         queryParamsHandling: 'merge',
       });
     }
   }
+
+  clearParamsFromCurrUrl(paramsToClear: string[]): string {
+    const searchParams = new URLSearchParams(location.search);
+    paramsToClear.forEach((param) => searchParams.delete(param));
+    return searchParams.toString();
+  }
 }