feat(admin): allow sorting members by email, org and statuses

* backend resolver respects GUI's current setting in showing the values
* email: 1. user preferred mail, 2. member mail
* organization: 1. member organization, 2. (IdP's) user organization

Author: Johaney-s

angular.json

@@ -71,7 +71,9 @@
         </td>
       </ng-container>
       <ng-container matColumnDef="status">
-        <th *matHeaderCellDef mat-header-cell>{{'MEMBERS_LIST.STATUS' | translate}}</th>
+        <th *matHeaderCellDef mat-header-cell mat-sort-header>
+          {{'MEMBERS_LIST.STATUS' | translate}}
+        </th>
         <td *matCellDef="let member" mat-cell>
           <i
             (click)="openMembershipDialog($event, member)"
@@ -87,7 +89,9 @@
         </td>
       </ng-container>
       <ng-container matColumnDef="groupStatus">
-        <th *matHeaderCellDef mat-header-cell>{{'MEMBERS_LIST.GROUP_STATUS' | translate}}</th>
+        <th *matHeaderCellDef mat-header-cell mat-sort-header>
+          {{'MEMBERS_LIST.GROUP_STATUS' | translate}}
+        </th>
         <td *matCellDef="let member" mat-cell>
           <i
             (click)="openMembershipDialog($event, member, groupId)"
@@ -103,11 +107,15 @@
         </td>
       </ng-container>
       <ng-container matColumnDef="organization">
-        <th *matHeaderCellDef mat-header-cell>{{'MEMBERS_LIST.ORGANIZATION' | translate}}</th>
+        <th *matHeaderCellDef mat-header-cell mat-sort-header>
+          {{'MEMBERS_LIST.ORGANIZATION' | translate}}
+        </th>
         <td *matCellDef="let member" mat-cell>{{member | memberOrganization}}</td>
       </ng-container>
       <ng-container matColumnDef="email">
-        <th *matHeaderCellDef mat-header-cell>{{'MEMBERS_LIST.EMAIL' | translate}}</th>
+        <th *matHeaderCellDef mat-header-cell mat-sort-header>
+          {{'MEMBERS_LIST.EMAIL' | translate}}
+        </th>
         <td *matCellDef="let member" mat-cell>{{member | memberEmail}}</td>
       </ng-container>
       <ng-container matColumnDef="logins">

libs/perun/components/src/lib/members-dynamic-list/members-dynamic-list.component.html

@@ -18,7 +18,12 @@ import {
   TableCheckbox,
   EntityStorageService,
 } from '@perun-web-apps/perun/services';
-import { MemberGroupStatus, RichMember, VoMemberStatuses } from '@perun-web-apps/perun/openapi';
+import {
+  MemberGroupStatus,
+  MembersOrderColumn,
+  RichMember,
+  VoMemberStatuses,
+} from '@perun-web-apps/perun/openapi';
 import { MatDialog } from '@angular/material/dialog';
 import {
   TABLE_ITEMS_COUNT_OPTIONS,
@@ -204,7 +209,7 @@ export class MembersDynamicListComponent implements AfterViewInit, OnInit, OnCha
 
   loadMembersPage(): void {
     const sortDirection = this.sort.direction === 'asc' ? 'ASCENDING' : 'DESCENDING';
-    const sortColumn = this.sort.active === 'fullName' ? 'NAME' : 'ID';
+    const sortColumn = this.getSortColumn(this.sort.active);
     this.dataSource.loadMembers(
       this.voId,
       this.attrNames,
@@ -232,7 +237,7 @@ export class MembersDynamicListComponent implements AfterViewInit, OnInit, OnCha
 
   exportAllData(format: string): void {
     const sortDirection = this.sort.direction === 'asc' ? 'ASCENDING' : 'DESCENDING';
-    const sortColumn = this.sort.active === 'fullName' ? 'NAME' : 'ID';
+    const sortColumn = this.getSortColumn(this.sort.active);
 
     const config = getDefaultDialogConfig();
     config.width = '300px';
@@ -271,4 +276,21 @@ export class MembersDynamicListComponent implements AfterViewInit, OnInit, OnCha
 
     this.dialog.open(MemberTreeViewDialogComponent, config);
   }
+
+  getSortColumn(value: string): MembersOrderColumn {
+    switch (value) {
+      case 'fullName':
+        return 'NAME';
+      case 'organization':
+        return 'ORGANIZATION';
+      case 'email':
+        return 'EMAIL';
+      case 'status':
+        return 'STATUS';
+      case 'groupStatus':
+        return 'GROUP_STATUS';
+      default:
+        return 'ID';
+    }
+  }
 }

libs/perun/components/src/lib/members-dynamic-list/members-dynamic-list.component.ts

@@ -100,6 +100,7 @@ model/inputAddApplicationMailForGroup.ts
 model/inputAddApplicationMailForVo.ts
 model/inputAddDestinationToMultipleServices.ts
 model/inputAddDestinationsDefinedByHostsOnFacility.ts
+model/inputAddMemberCandidates.ts
 model/inputAssignResourceTagToResource.ts
 model/inputAssignResourceTagsToResource.ts
 model/inputAttributeDefinition.ts
@@ -150,6 +151,7 @@ model/inputGetPaginatedUsers.ts
 model/inputGetResources.ts
 model/inputGetUsers.ts
 model/inputInvitationsFromCsv.ts
+model/inputInviteMemberCandidates.ts
 model/inputLockPublications.ts
 model/inputRemoveResourceTagFromResource.ts
 model/inputRemoveResourceTagsFromResource.ts

libs/perun/openapi/src/lib/.openapi-generator/FILES

@@ -41,7 +41,7 @@ import { Configuration } from '../configuration';
   providedIn: 'root',
 })
 export class AuditMessagesManagerService {
-  protected basePath = 'https://perun.cesnet.cz/krb/rpc';
+  protected basePath = 'https://api-dev.perun-aai.org/ba/rpc';
   public defaultHeaders = new HttpHeaders();
   public configuration = new Configuration();
   public encoder: HttpParameterCodec;
@@ -109,6 +109,7 @@ export class AuditMessagesManagerService {
   /**
    * Log arbitrary auditer message/event to the audit log.
    * @param msg Message to be logged
+   * @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.
    */
@@ -215,6 +216,7 @@ export class AuditMessagesManagerService {
   /**
    * Creates new auditer consumer with last processed id which equals current auditer log max id.
    * @param consumerName
+   * @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.
    */
@@ -324,6 +326,7 @@ export class AuditMessagesManagerService {
 
   /**
    * Get list of names of all possible events.
+   * @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.
    */
@@ -413,6 +416,7 @@ export class AuditMessagesManagerService {
 
   /**
    * Get all auditer consumers as a map with key=value pairs like String(name)=Integer(lastProcessedId).
+   * @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.
    */
@@ -502,6 +506,7 @@ export class AuditMessagesManagerService {
 
   /**
    * Get count of all messages stored in auditer logs.
+   * @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.
    */
@@ -591,6 +596,7 @@ export class AuditMessagesManagerService {
 
   /**
    * Get ID of last (newest) message in auditer logs.
+   * @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.
    */
@@ -681,6 +687,7 @@ export class AuditMessagesManagerService {
   /**
    * Returns 100 newest audit messages from audit log. If there is a less messages than 100, then all of them are returned OR Returns exact number of newest audit messages defined by \'count\' param (disregarding message IDs). If there is less messages present, then all of them are returned..
    * @param count Messages limit
+   * @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.
    */
@@ -781,6 +788,7 @@ export class AuditMessagesManagerService {
   /**
    * Returns all messages with IDs within the range from max(ID) to (max(ID)-count), where number of returned messages is equal or less than \'count\' param, because some IDs could be skipped in the sequence.
    * @param count Number of IDs to subtract from max_id
+   * @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.
    */
@@ -888,6 +896,7 @@ export class AuditMessagesManagerService {
    * Returns \"count\" number of messages that are more or equal than the given ID (ascending order), i.e. the method returns newer messages by provided ID.
    * @param id Starting id from which the messages will be taken
    * @param count Number of messages that will be returned
+   * @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.
    */
@@ -1006,6 +1015,7 @@ export class AuditMessagesManagerService {
   /**
    * Get page of audit messages. Total count is only estimated.
    * @param InputGetMessagesPage
+   * @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.
    */
@@ -1114,6 +1124,7 @@ export class AuditMessagesManagerService {
   /**
    * Returns list of AuditMessages from audit log with IDs > lastProcessedId for registered auditer consumer specified by consumerName param.
    * @param consumerName
+   * @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.
    */
@@ -1225,6 +1236,7 @@ export class AuditMessagesManagerService {
    * Set ID of last processed message for specified consumer.
    * @param consumerName
    * @param lastProcessedId id of message to what consumer will be set
+   * @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.
    */