fix(admin): Bugfixes of perun admin section

* one bigger bug founded in page user-account
* the other are just 1 line improvements

Author: xkureck

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

@@ -14,6 +14,8 @@ import { GuiAuthResolver } from '@perun-web-apps/perun/services';
   styleUrls: ['./admin-services.component.scss'],
 })
 export class AdminServicesComponent implements OnInit {
+  static id = 'AdminServicesComponent';
+
   services: Service[];
   selection = new SelectionModel<Service>(true, []);
   loading = false;

apps/admin-gui/src/app/admin/pages/admin-page/admin-services/service-detail-page/service-detail-page.component.ts

@@ -81,7 +81,7 @@ export class ServiceDetailPageComponent implements OnInit {
     const dialogRef = this.dialog.open(DeleteServiceDialogComponent, config);
 
     dialogRef.afterClosed().subscribe((result) => {
-      if (result !== undefined) {
+      if (result) {
         void this.router.navigate(['/admin/services']);
       }
     });

apps/admin-gui/src/app/core/services/common/cache-route-reuse-strategy.ts

@@ -20,6 +20,7 @@ import { VoSelectPageComponent } from '../../../vos/pages/vo-select-page/vo-sele
 import { FacilitySelectPageComponent } from '../../../facilities/pages/facility-select-page/facility-select-page.component';
 import { VoSettingsSponsoredMembersComponent } from '../../../vos/pages/vo-detail-page/vo-settings/vo-settings-sponsored-members/vo-settings-sponsored-members.component';
 import { AdminSearcherComponent } from '../../../admin/pages/admin-page/admin-searcher/admin-searcher.component';
+import { AdminServicesComponent } from '../../../admin/pages/admin-page/admin-services/admin-services.component';
 
 export class CachedRoute {
   routeHandle: DetachedRouteHandle;
@@ -64,7 +65,7 @@ export class CacheRouteReuseStrategy implements RouteReuseStrategy {
     },
     {
       type: 'admin',
-      components: [AdminUsersComponent.id, AdminSearcherComponent.id],
+      components: [AdminUsersComponent.id, AdminSearcherComponent.id, AdminServicesComponent.id],
     },
     {
       type: 'entitySelect',

apps/admin-gui/src/app/shared/components/audit-messages-list/audit-messages-list.component.ts

@@ -64,6 +64,8 @@ export class AuditMessagesListComponent implements OnInit, OnChanges, AfterViewI
         return data.event.name.split('.').pop();
       case 'actor':
         return data.actor;
+      case 'event.message':
+        return data.event.message;
       default:
         return '';
     }

apps/admin-gui/src/app/shared/components/dialogs/create-edit-service-dialog/create-edit-service-dialog.component.ts

@@ -77,13 +77,16 @@ export class CreateEditServiceDialogComponent implements OnInit {
           beanName: '',
         },
       })
-      .subscribe(() => {
-        this.notificator.showSuccess(
-          this.translate.instant('DIALOGS.CREATE_EDIT_SERVICE.CREATE_SUCCESS') as string
-        );
-        this.dialogRef.close(true);
-        this.loading = false;
-      });
+      .subscribe(
+        () => {
+          this.notificator.showSuccess(
+            this.translate.instant('DIALOGS.CREATE_EDIT_SERVICE.CREATE_SUCCESS') as string
+          );
+          this.dialogRef.close(true);
+          this.loading = false;
+        },
+        () => (this.loading = false)
+      );
   }
 
   onEdit(): void {
@@ -102,13 +105,16 @@ export class CreateEditServiceDialogComponent implements OnInit {
           beanName: this.data.service.beanName,
         },
       })
-      .subscribe(() => {
-        this.notificator.showSuccess(
-          this.translate.instant('DIALOGS.CREATE_EDIT_SERVICE.EDIT_SUCCESS') as string
-        );
-        this.dialogRef.close(true);
-        this.loading = false;
-      });
+      .subscribe(
+        () => {
+          this.notificator.showSuccess(
+            this.translate.instant('DIALOGS.CREATE_EDIT_SERVICE.EDIT_SUCCESS') as string
+          );
+          this.dialogRef.close(true);
+          this.loading = false;
+        },
+        () => (this.loading = false)
+      );
   }
 
   onCancel(): void {

apps/admin-gui/src/app/shared/components/dialogs/edit-enforce-consents-dialog/edit-enforce-consents-dialog.component.html

@@ -15,11 +15,11 @@ <h1 mat-dialog-title>
     <p class="mt-2 mb-2">{{this.data.consentHubName}}</p>
     <mat-divider></mat-divider>
 
-    <div class="font-weight-bold mt-3">
+    <perun-web-apps-alert alert_type="warn">
       {{this.data.enforceConsents
       ? ('DIALOGS.EDIT_ENFORCE_CONSENTS_FLAG.DISABLE_BOLD_DESCRIPTION' | translate)
       : ('DIALOGS.EDIT_ENFORCE_CONSENTS_FLAG.ENFORCE_BOLD_DESCRIPTION' | translate)}}
-    </div>
+    </perun-web-apps-alert>
   </div>
   <div mat-dialog-actions>
     <button mat-flat-button class="ml-auto" (click)="onCancel()">

apps/admin-gui/src/app/shared/components/two-entity-attribute-page/two-entity-attribute-page.component.ts

@@ -192,6 +192,7 @@ export class TwoEntityAttributePageComponent implements OnInit {
 
   getAttributes(entityId: number): void {
     this.innerLoading = true;
+    this.selection.clear();
     switch (this.firstEntity) {
       case 'member':
         switch (this.secondEntity) {

apps/admin-gui/src/app/users/pages/user-detail-page/user-accounts/user-accounts.component.html

@@ -31,7 +31,10 @@ <h1 class="page-title">{{'USER_DETAIL.ACCOUNTS.TITLE' | translate}}</h1>
         <perun-web-apps-groups-list
           *ngIf="!loading"
           [groups]="groups"
-          [displayedColumns]="['id', 'recent', 'name', 'description', 'groupStatus', 'expiration']">
+          [memberId]="member.id"
+          [memberGroupStatus]="member.groupStatus"
+          (refreshTable)="loadMember(selectedVo)"
+          [displayedColumns]="['id', 'recent', 'name', 'description', 'expiration']">
         </perun-web-apps-groups-list>
       </div>
     </ng-template>

apps/admin-gui/src/app/users/pages/user-detail-page/user-accounts/user-accounts.component.ts

@@ -8,6 +8,7 @@ import {
   Vo,
 } from '@perun-web-apps/perun/openapi';
 import { ActivatedRoute } from '@angular/router';
+import { Urns } from '@perun-web-apps/perun/urns';
 
 @Component({
   selector: 'app-perun-web-apps-user-accounts',
@@ -52,7 +53,7 @@ export class UserAccountsComponent implements OnInit {
         this.member = member;
         this.groupService
           .getMemberRichGroupsWithAttributesByNames(this.member.id, [
-            'urn:perun:member_group:attribute-def:virt:groupStatus',
+            Urns.MEMBER_DEF_GROUP_EXPIRATION,
           ])
           .subscribe(
             (groups) => {

apps/admin-gui/src/app/users/pages/user-detail-page/user-groups/user-groups.component.html

@@ -14,7 +14,7 @@ <h1 *ngIf="!this.showPrincipal" class="page-subtitle">
   *ngIf="!memberRefresh"
   [disableMembers]="false"
   [groups]="membersGroups"
-  [displayedColumns]="['id', 'vo', 'name', 'description', 'status']"
+  [displayedColumns]="['id', 'vo', 'name', 'description']"
   [filter]="memberFilterValue"
   [tableId]="tableId">
 </perun-web-apps-groups-list>

libs/perun/components/src/lib/groups-list/groups-list.component.ts

@@ -428,6 +428,6 @@ export class GroupsListComponent implements AfterViewInit, OnChanges {
 
   getStatusAttribute(grp: RichGroup): string {
     const filter = grp.attributes.find((att) => att.baseFriendlyName === 'groupStatus');
-    return filter !== null ? (filter.value as string) : '';
+    return filter?.value ? (filter.value as string) : '';
   }
 }