fix(admin): fixed a bug where consent status column would not display on facility assigned users page

Author: xflord

apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-allowed-users/facility-allowed-users.component.html

@@ -72,7 +72,7 @@ <h1 class="page-subtitle">{{'FACILITY_DETAIL.ALLOWED_USERS.TITLE' | translate}}<
       (loading$)="loading$ = $event"
       [attrNames]="attributes"
       [disableRouting]="!routeAuth"
-      [displayedColumns]="['id', 'name', 'email', 'logins', 'organization']"
+      [displayedColumns]="globalForceConsents && facilityForceConsents ? ['id', 'name', 'email', 'logins', 'organization', 'consentStatus' ] : ['id', 'name', 'email', 'logins', 'organization']"
       [onlyAllowed]="allowed"
       [facilityId]="facility.id"
       [searchString]="filterValue"
@@ -81,7 +81,6 @@ <h1 class="page-subtitle">{{'FACILITY_DETAIL.ALLOWED_USERS.TITLE' | translate}}<
       [tableId]="tableId"
       [voId]="selectedVo?.id"
       [consentStatuses]="selectedConsentStatuses"
-      [includeConsents]="globalForceConsents && facilityForceConsents"
       [updateTable]="update">
     </perun-web-apps-users-dynamic-list>
   </div>

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

@@ -73,7 +73,6 @@ export class UsersDynamicListComponent implements OnInit, OnChanges, AfterViewIn
   @Input() serviceId: number;
   @Input() onlyAllowed: boolean;
   @Input() consentStatuses: ConsentStatus[];
-  @Input() includeConsents = false;
   @Output() loading$: EventEmitter<Observable<boolean>> = new EventEmitter<Observable<boolean>>();
 
   consents: Consent[];
@@ -127,9 +126,6 @@ export class UsersDynamicListComponent implements OnInit, OnChanges, AfterViewIn
     if (!this.authResolver.isPerunAdminOrObserver()) {
       this.displayedColumns = this.displayedColumns.filter((column) => column !== 'id');
     }
-    if (this.includeConsents) {
-      this.displayedColumns.push('consentStatus');
-    }
 
     this.dataSource = new DynamicDataSource<RichUser>(
       this.dynamicPaginatingService,
@@ -158,6 +154,7 @@ export class UsersDynamicListComponent implements OnInit, OnChanges, AfterViewIn
     if (this.dataSource) {
       this.child.paginator.pageIndex = 0;
       this.loadUsersPage();
+      this.loadConsents();
     }
   }
 
@@ -196,7 +193,7 @@ export class UsersDynamicListComponent implements OnInit, OnChanges, AfterViewIn
   }
 
   loadConsents(): void {
-    if (this.includeConsents) {
+    if (this.displayedColumns.includes('consentStatus')) {
       this.consentService
         .getConsentHubByFacility(this.facilityId)
         .subscribe((consentHub) =>
@@ -256,7 +253,7 @@ export class UsersDynamicListComponent implements OnInit, OnChanges, AfterViewIn
 
   getConsentsForUsers(users: RichUser[]): UserWithConsentStatus[] | RichUser[] {
     const result: UserWithConsentStatus[] = [];
-    if (this.includeConsents) {
+    if (this.displayedColumns.includes('consentStatus')) {
       users.forEach((user) => {
         const uwc: UserWithConsentStatus = user;
         uwc.consent = this.translate.instant(