Merge branch 'master' into production

Author: HejdaJakub

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

@@ -68,7 +68,9 @@ describe('Perun admin management with role Perun admin', () => {
         .type('testAttrE2E', {force: true})
         .get('[data-cy=attribute-description-input]')
         .type('test attribute for E2E tests', {force: true})
-        .get('[data-cy=toggle-read-critical]')
+        .get('[data-cy=checkbox-read-operation]')
+        .click()
+        .get('[data-cy=checkbox-read-critical]')
         .click()
         .get('[data-cy=create-attr-definition-button]')
         .click()

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

@@ -132,7 +132,7 @@ describe('Facility management with role Facility admin', () => {
       .get('[data-cy=attributes]')
       .click()
       .get('[data-cy=add-attributes]')
-      .click()
+      .click({ force: true })
       .get('.mat-mdc-dialog-container')
       .find('[data-cy=filter-input]') // finds the data-cy attribute inside the dialog container
       .type('Login namespace', {force: true})
@@ -165,7 +165,7 @@ describe('Facility management with role Facility admin', () => {
       .get(`[data-cy=${deleteAttribute}-checkbox]`)
       .click()
       .get('[data-cy=remove-attributes]')
-      .click()
+      .click({ force: true })
       .get('[data-cy=delete-attributes]')
       .click()
       .intercept('**/attributesManager/getAttributes/**')

apps/admin-gui-e2e/src/e2e/groups/group-admin.cy.js

@@ -260,7 +260,7 @@ describe('Group management with role Group admin', () => {
         .get(`[data-cy=${dbGroupManager}-checkbox]`)
         .click()
         .get('[data-cy=remove-manager-button]')
-        .click()
+        .click({ force: true })
         .intercept('**/authzResolver/getRichAdmins**')
         .as('getRichAdmins')
         .get('[data-cy=remove-manager-button-dialog]')

apps/admin-gui-e2e/src/e2e/vos/vo-admin.cy.js

@@ -50,7 +50,7 @@ describe('VO management with role VO admin', () => {
       .get('[data-cy=attributes]')
       .click()
       .get('[data-cy=add-attributes]')
-      .click()
+      .click({ force: true })
       // get attribute Notification default language
       .get(`[data-cy=${addedAttribute}-value]`)
       .type('en', {force: true})
@@ -82,7 +82,7 @@ describe('VO management with role VO admin', () => {
       .get('[data-cy=link-to-aup-checkbox]')
       .click()
       .get('[data-cy=remove-attributes]')
-      .click()
+      .click({ force: true })
       .intercept('**/attributesManager/getAttributes/vo**')
       .as('getAttributes')
       .get('[data-cy=delete-attributes]')

apps/admin-gui/src/app/admin/admin-routing.module.ts

@@ -11,30 +11,27 @@ import { UserDestinationGraphComponent } from './pages/admin-page/admin-visualiz
 import { AdminUsersComponent } from './pages/admin-page/admin-users/admin-users.component';
 import { AdminUserDetailPageComponent } from './pages/admin-user-detail-page/admin-user-detail-page.component';
 import { UserOverviewComponent } from '../users/pages/user-detail-page/user-overview/user-overview.component';
-import { UserOrganizationsComponent } from '../users/pages/user-detail-page/user-organizations/user-organizations.component';
-import { UserGroupsComponent } from '../users/pages/user-detail-page/user-groups/user-groups.component';
 import { UserAttributesComponent } from '../users/pages/user-detail-page/user-attributes/user-attributes.component';
 import { AdminExtSourcesComponent } from './pages/admin-page/admin-ext-sources/admin-ext-sources.component';
 import { UserRolesComponent } from '../users/pages/user-detail-page/user-settings/user-roles/user-roles.component';
 import { UserSettingsServiceIdentitiesComponent } from '../users/pages/user-detail-page/user-settings/user-settings-service-identities/user-settings-service-identities.component';
 import { UserIdentitiesComponent } from '../users/pages/user-detail-page/user-identities/user-identities.component';
 import { AdminServicesComponent } from './pages/admin-page/admin-services/admin-services.component';
-import { UserResourcesComponent } from '../users/pages/user-detail-page/user-resources/user-resources.component';
 import { IdentityDetailComponent } from '../shared/components/identity-detail/identity-detail.component';
 import { ServiceDetailPageComponent } from './pages/admin-page/admin-services/service-detail-page/service-detail-page.component';
 import { ServiceOverviewComponent } from './pages/admin-page/admin-services/service-detail-page/service-overview/service-overview.component';
 import { ServiceRequiredAttributesComponent } from './pages/admin-page/admin-services/service-detail-page/service-required-attributes/service-required-attributes.component';
 import { UserSettingsAssociatedUsersComponent } from '../users/pages/user-detail-page/user-settings/user-settings-associated-users/user-settings-associated-users.component';
 import { ServiceDestinationsComponent } from './pages/admin-page/admin-services/service-detail-page/service-destinations/service-destinations.component';
 import { AdminOwnersComponent } from './pages/admin-page/admin-owners/admin-owners.component';
-import { UserFacilitiesComponent } from '../users/pages/user-detail-page/user-facilities/user-facilities.component';
 import { UserAccountsComponent } from '../users/pages/user-detail-page/user-accounts/user-accounts.component';
 import { AdminAuditLogComponent } from './pages/admin-page/admin-audit-log/admin-audit-log.component';
 import { AdminConsentHubsComponent } from './pages/admin-page/admin-consent-hubs/admin-consent-hubs.component';
 import { AdminSearcherComponent } from './pages/admin-page/admin-searcher/admin-searcher.component';
 import { RouteAuthGuardService } from '../shared/route-auth-guard.service';
 import { UserBansComponent } from '../users/pages/user-detail-page/user-bans/user-bans.component';
 import { AdminBlockedLoginsComponent } from './pages/admin-page/admin-blocked-logins/admin-blocked-logins.component';
+import { UserAssignmentsComponent } from '../users/pages/user-detail-page/user-assignments/user-assignments.component';
 
 const routes: Routes = [
   {
@@ -135,36 +132,21 @@ const routes: Routes = [
         component: UserAccountsComponent,
         data: { animation: 'UserAccountsPage' },
       },
+      {
+        path: 'assignments',
+        component: UserAssignmentsComponent,
+        data: { animation: 'UserAssignmentsPage' },
+      },
       {
         path: 'attributes',
         component: UserAttributesComponent,
         data: { animation: 'UserAttributesPage' },
       },
-      {
-        path: 'organizations',
-        component: UserOrganizationsComponent,
-        data: { animation: 'UserOrganizationsPage', showPrincipal: false },
-      },
-      {
-        path: 'groups',
-        component: UserGroupsComponent,
-        data: { animation: 'UserGroupsPage', showPrincipal: false },
-      },
       {
         path: 'identities',
         component: UserIdentitiesComponent,
         data: { animation: 'UserIdentitiesPage' },
       },
-      {
-        path: 'facilities',
-        component: UserFacilitiesComponent,
-        data: { animation: 'UserFacilitiesPage' },
-      },
-      {
-        path: 'resources',
-        component: UserResourcesComponent,
-        data: { animation: 'UserRoles' },
-      },
       {
         path: 'identities/:identityId',
         component: IdentityDetailComponent,

apps/admin-gui/src/app/shared/components/dialogs/add-group-manager-dialog/add-group-manager-dialog.component.ts

@@ -1,17 +1,16 @@
 import { Component, Inject, OnInit } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { TranslateService } from '@ngx-translate/core';
-import { NotificatorService } from '@perun-web-apps/perun/services';
+import { NotificatorService, PerunTranslateService } from '@perun-web-apps/perun/services';
 import { ActivatedRoute, Router } from '@angular/router';
 import { SelectionModel } from '@angular/cdk/collections';
 import { Observable } from 'rxjs';
 import { UntypedFormControl } from '@angular/forms';
 import { map, startWith } from 'rxjs/operators';
 import {
   AuthzResolverService,
-  Facility,
   Group,
   GroupsManagerService,
+  PerunBean,
   RoleManagementRules,
   Vo,
   VosManagerService,
@@ -21,7 +20,7 @@ import { TABLE_SELECT_GROUP_MANAGER_DIALOG } from '@perun-web-apps/config/table-
 import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete';
 
 export interface AddGroupManagerDialogData {
-  complementaryObject: Vo | Group | Facility;
+  complementaryObject: PerunBean;
   availableRoles: RoleManagementRules[];
   theme: string;
   selectedRole: Role;
@@ -60,15 +59,13 @@ export class AddGroupManagerDialogComponent implements OnInit {
     private authzService: AuthzResolverService,
     private voService: VosManagerService,
     private groupService: GroupsManagerService,
-    private translate: TranslateService,
+    private translate: PerunTranslateService,
     private notificator: NotificatorService,
     protected route: ActivatedRoute,
     protected router: Router
   ) {
-    translate.get('DIALOGS.ADD_GROUPS.TITLE').subscribe((value: string) => (this.title = value));
-    translate
-      .get('DIALOGS.ADD_GROUPS.SUCCESS')
-      .subscribe((value: string) => (this.successMessage = value));
+    this.title = this.translate.instant('DIALOGS.ADD_GROUPS.TITLE');
+    this.successMessage = this.translate.instant('DIALOGS.ADD_GROUPS.SUCCESS');
   }
 
   displayFn(vo?: Vo): string | undefined {

apps/admin-gui/src/app/shared/components/dialogs/add-manager-dialog/add-manager-dialog.component.ts

@@ -1,25 +1,26 @@
 import { Component, Inject, OnInit } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { TranslateService } from '@ngx-translate/core';
-import { NotificatorService, StoreService } from '@perun-web-apps/perun/services';
+import {
+  NotificatorService,
+  PerunTranslateService,
+  StoreService,
+} from '@perun-web-apps/perun/services';
 import { SelectionModel } from '@angular/cdk/collections';
 import { ActivatedRoute, Router } from '@angular/router';
 import {
   AuthzResolverService,
-  Facility,
-  Group,
+  PerunBean,
   RichUser,
   RoleManagementRules,
   UsersManagerService,
-  Vo,
 } from '@perun-web-apps/perun/openapi';
 import { Role } from '@perun-web-apps/perun/models';
 import { TABLE_ADD_MANAGER } from '@perun-web-apps/config/table-config';
 import { Urns } from '@perun-web-apps/perun/urns';
 import { UntypedFormControl, Validators } from '@angular/forms';
 
 export interface AddManagerDialogData {
-  complementaryObject: Vo | Group | Facility;
+  complementaryObject: PerunBean;
   theme: string;
   availableRoles: RoleManagementRules[];
   selectedRole: Role;
@@ -48,16 +49,14 @@ export class AddManagerDialogComponent implements OnInit {
     @Inject(MAT_DIALOG_DATA) private data: AddManagerDialogData,
     private authzService: AuthzResolverService,
     private usersService: UsersManagerService,
-    private translate: TranslateService,
+    private translate: PerunTranslateService,
     private notificator: NotificatorService,
     private storeService: StoreService,
     protected route: ActivatedRoute,
     protected router: Router
   ) {
-    translate.get('DIALOGS.ADD_MANAGERS.TITLE').subscribe((value: string) => (this.title = value));
-    translate
-      .get('DIALOGS.ADD_MANAGERS.SUCCESS')
-      .subscribe((value: string) => (this.successMessage = value));
+    this.title = this.translate.instant('DIALOGS.ADD_MANAGERS.TITLE');
+    this.successMessage = this.translate.instant('DIALOGS.ADD_MANAGERS.SUCCESS');
   }
 
   ngOnInit(): void {

apps/admin-gui/src/app/shared/components/dialogs/add-role-dialog/add-role-dialog.component.ts

@@ -15,6 +15,7 @@ import {
 import { SelectionModel } from '@angular/cdk/collections';
 import { ToEnrichedFacilityPipe } from '@perun-web-apps/perun/pipes';
 import { DebounceFilterComponent } from '@perun-web-apps/perun/components';
+import { combineLatestWith } from 'rxjs/operators';
 
 export interface AddRoleDialogData {
   entityId: number;
@@ -64,6 +65,7 @@ export class AddRoleDialogComponent implements OnInit {
   }
 
   loadObjects(): void {
+    this.loading = true;
     if (this.rules.some((rule) => rule.primaryObject === 'Facility')) {
       // Not callable by SELF, need to check privilege
       this.facilityService.getAllFacilities().subscribe({
@@ -74,12 +76,18 @@ export class AddRoleDialogComponent implements OnInit {
     if (this.rules.some((rule) => rule.primaryObject === 'Vo')) {
       this.voService.getMyVos().subscribe({ next: (vos) => (this.vos = vos) });
     }
+
     this.groupService
       .getAllGroupsFromAllVos()
-      .subscribe({ next: (groups) => (this.groups = groups) });
-    this.resourceService.getAllResources().subscribe({
-      next: (resources) => (this.resources = resources),
-    });
+      .pipe(combineLatestWith(this.resourceService.getAllResources()))
+      .subscribe({
+        next: ([groups, resources]) => {
+          this.groups = groups;
+          this.resources = resources;
+          this.loading = false;
+        },
+        error: () => (this.loading = false),
+      });
   }
 
   cancel(): void {

apps/admin-gui/src/app/shared/components/dialogs/create-attribute-definition-dialog/create-attribute-definition-dialog.component.html

@@ -77,15 +77,16 @@ <h1 mat-dialog-title>{{'DIALOGS.CREATE_ATTRIBUTE_DEFINITION.TITLE' | translate}}
         </mat-form-field>
       </form>
 
-      <perun-web-apps-attribute-unique-toggle [attDef]="attDef | async">
-      </perun-web-apps-attribute-unique-toggle>
+      <perun-web-apps-attribute-unique-checkbox [attDef]="attDef | async">
+      </perun-web-apps-attribute-unique-checkbox>
 
-      <perun-web-apps-attribute-critical-operations-toggles
+      <perun-web-apps-attribute-critical-operations-checkboxes
+        [attDef]="attDef"
         (readOperationChanged)="finalReadOperations=$event"
         (readGlobalChanged)="finalReadGlobal=$event"
         (writeOperationChanged)="finalWriteOperations=$event"
         (writeGlobalChanged)="finalWriteGlobal=$event">
-      </perun-web-apps-attribute-critical-operations-toggles>
+      </perun-web-apps-attribute-critical-operations-checkboxes>
 
       <perun-web-apps-attribute-rights-tab-group [collections]="collections">
       </perun-web-apps-attribute-rights-tab-group>

apps/admin-gui/src/app/shared/components/dialogs/edit-attribute-definition-dialog/edit-attribute-definition-dialog.component.html

@@ -42,10 +42,11 @@ <h1 mat-dialog-title>{{'DIALOGS.EDIT_ATTRIBUTE_DEFINITION.TITLE' | translate}}</
           >
         </div>
 
-        <perun-web-apps-attribute-unique-toggle [attDef]="attDef">
-        </perun-web-apps-attribute-unique-toggle>
+        <perun-web-apps-attribute-unique-checkbox [attDef]="attDef">
+        </perun-web-apps-attribute-unique-checkbox>
 
-        <perun-web-apps-attribute-critical-operations-toggles
+        <perun-web-apps-attribute-critical-operations-checkboxes
+          [attDef]="attDef"
           [readOperation]="initReadOperations"
           [readGlobal]="initReadGlobal"
           [writeOperation]="initWriteOperations"
@@ -54,7 +55,7 @@ <h1 mat-dialog-title>{{'DIALOGS.EDIT_ATTRIBUTE_DEFINITION.TITLE' | translate}}</
           (readGlobalChanged)="finalReadGlobal=$event"
           (writeOperationChanged)="finalWriteOperations=$event"
           (writeGlobalChanged)="finalWriteGlobal=$event">
-        </perun-web-apps-attribute-critical-operations-toggles>
+        </perun-web-apps-attribute-critical-operations-checkboxes>
 
         <perun-web-apps-attribute-rights-tab-group
           [attDef]="attDef"