Merge branch 'master' into production

Author: HejdaJakub

.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 },

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()

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');
+  });
 });

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}}

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}}

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>

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>

apps/admin-gui/src/app/shared/components/dialogs/delete-application-form-item-dialog/delete-application-form-item-dialog.component.html

@@ -1,17 +1,23 @@
 <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>
     {{'DIALOGS.DELETE_APPLICATION_FORM_ITEM.CANCEL_BUTTON' | translate}}
   </button>
   <button
     (click)="submit()"
+    [disabled]="deletionDisabled"
     class="ms-2"
     color="warn"
     data-cy="delete-application-form-item-dialog"

apps/admin-gui/src/app/shared/components/dialogs/delete-application-form-item-dialog/delete-application-form-item-dialog.component.ts

@@ -1,13 +1,24 @@
-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',
   templateUrl: './delete-application-form-item-dialog.component.html',
   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);

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>