Merge branch 'master' into production

Author: HejdaJakub

.gitignore

@@ -69,3 +69,5 @@ apps/linker/src/styles.scss
 apps/password-reset/src/styles.scss
 apps/publications/src/styles.scss
 apps/user-profile/src/styles.scss
+
+.nx/cache

.prettierignore

@@ -51,3 +51,5 @@ Thumbs.db
 .editorconfig
 .gitignore
 .prettierrc
+
+/.nx/cache

apps/admin-gui-e2e/project.json

@@ -18,7 +18,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "options": {
         "lintFilePatterns": ["apps/admin-gui-e2e/**/*.{js,ts}"]
       },

apps/admin-gui-e2e/src/e2e/admin/perun-admin.cy.js

@@ -295,7 +295,7 @@ describe('Perun admin management with role Perun admin', () => {
       .type(dbSearcherAttrValue, {force: true})
       .get(`[data-cy=search-select-input]`)
       .click()
-      .get('[data-cy=find-input] > div > input')
+      .get('[data-cy=find-input] > div > div > input')
       .type(dbSearcherAttrDisplayName, {force: true})
       .get('mat-option')
       .contains(dbSearcherAttrDisplayName)

apps/admin-gui-e2e/src/e2e/admin/perun-observer.cy.js

@@ -105,7 +105,7 @@ describe('Perun admin management with role Perun observer', () => {
       .type(dbSearcherAttrValue, {force: true})
       .get(`[data-cy=search-select-input]`)
       .click()
-      .get('[data-cy=find-input] > div > input')
+      .get('[data-cy=find-input] > div > div > input')
       .type(dbSearcherAttrDisplayName, {force: true})
       .get('mat-option')
       .contains(dbSearcherAttrDisplayName)

apps/admin-gui-e2e/src/e2e/facilities/facility-admin.cy.js

@@ -77,7 +77,7 @@ describe('Facility management with role Facility admin', () => {
       .wait('@getAllVos')
       .get('[data-cy=create-resource-select-vo]')
       .click()
-      .get('[data-cy=find-input] > div > input')
+      .get('[data-cy=find-input] > div > div > input')
       .type(dbVoName, {force: true})
       .get('mat-option')
       .contains(dbVoName)

apps/admin-gui/project.json

@@ -111,7 +111,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "options": {
         "lintFilePatterns": ["apps/admin-gui/src/**/*.ts", "apps/admin-gui/src/**/*.html"]
       },

apps/admin-gui/src/app/admin/pages/admin-page/admin-attributes/admin-attributes.component.ts

@@ -1,6 +1,9 @@
 import { Component, HostBinding, OnInit } from '@angular/core';
 import { SelectionModel } from '@angular/cdk/collections';
-import { DeleteAttributeDefinitionDialogComponent } from '../../../../shared/components/dialogs/delete-attribute-definition-dialog/delete-attribute-definition-dialog.component';
+import {
+  DeleteAttributeDefinitionDialogComponent,
+  DeleteAttributeDefinitionDialogData,
+} from '../../../../shared/components/dialogs/delete-attribute-definition-dialog/delete-attribute-definition-dialog.component';
 import { MatDialog } from '@angular/material/dialog';
 import { CreateAttributeDefinitionDialogComponent } from '../../../../shared/components/dialogs/create-attribute-definition-dialog/create-attribute-definition-dialog.component';
 import { getDefaultDialogConfig } from '@perun-web-apps/perun/utils';
@@ -28,15 +31,15 @@ export class AdminAttributesComponent implements OnInit {
   constructor(
     private dialog: MatDialog,
     private attributesManager: AttributesManagerService,
-    public authResolver: GuiAuthResolver
+    public authResolver: GuiAuthResolver,
   ) {}
 
   ngOnInit(): void {
     this.refreshTable();
   }
 
   onCreate(): void {
-    const config = getDefaultDialogConfig();
+    const config = getDefaultDialogConfig<never>();
     config.width = '650px';
 
     const dialogRef = this.dialog.open(CreateAttributeDefinitionDialogComponent, config);
@@ -49,7 +52,7 @@ export class AdminAttributesComponent implements OnInit {
   }
 
   onDelete(): void {
-    const config = getDefaultDialogConfig();
+    const config = getDefaultDialogConfig<DeleteAttributeDefinitionDialogData>();
     config.width = '450px';
     config.data = {
       attributes: this.selected.selected,
@@ -79,7 +82,7 @@ export class AdminAttributesComponent implements OnInit {
   }
 
   onImport(): void {
-    const config = getDefaultDialogConfig();
+    const config = getDefaultDialogConfig<never>();
     config.width = '700px';
 
     const dialogRef = this.dialog.open(AttributeImportDialogComponent, config);

apps/admin-gui/src/app/admin/pages/admin-page/admin-audit-log/admin-audit-log.component.ts

@@ -19,7 +19,7 @@ export class AdminAuditLogComponent implements OnInit {
 
   constructor(
     private auditMessagesManagerService: AuditMessagesManagerService,
-    private cd: ChangeDetectorRef
+    private cd: ChangeDetectorRef,
   ) {}
 
   ngOnInit(): void {

apps/admin-gui/src/app/admin/pages/admin-page/admin-blocked-logins/admin-blocked-logins.component.ts

@@ -36,7 +36,7 @@ export class AdminBlockedLoginsComponent implements OnInit {
     private cd: ChangeDetectorRef,
     private dialog: MatDialog,
     private attributesService: AttributesManagerService,
-    public authResolver: GuiAuthResolver
+    public authResolver: GuiAuthResolver,
   ) {}
 
   refreshTable(): void {
@@ -103,7 +103,7 @@ export class AdminBlockedLoginsComponent implements OnInit {
     this.selectedNamespaces.splice(
       0,
       this.selectedNamespaces.length,
-      ...namespaces.map((namespace) => (namespace === '' ? null : namespace))
+      ...namespaces.map((namespace) => (namespace === '' ? null : namespace)),
     );
   }