fix(admin): fix prettier

* run prettier write
* fixed console error

Author: mattjoke

apps/admin-gui/src/app/vos/components/applications-dynamic-list/applications-dynamic-list.component.html

@@ -108,27 +108,13 @@
         <td *matCellDef="let application" mat-cell>{{application.fedInfo}}</td>
       </ng-container>
 
-      <ng-container matColumnDef="formData">
-        <th *matHeaderCellDef mat-header-cell>{{'APPLICATIONS_LIST.FORM_DATA' | translate}}</th>
-        <td *matCellDef="let application; let i = index" mat-cell>
-          <ng-container *ngIf="showMoreData; else elseBlock">
-            <ng-container *ngFor="let data of application.formData">
-              {{getFormDataString(data)}}
-            </ng-container>
-          </ng-container>
-          <ng-template #elseBlock>
-            <ng-container *ngFor="let data of application.formData.slice(0,5)">
-              {{getFormDataString(data).substring(0,70)}}...
-            </ng-container>
-          </ng-template>
-          <button
-            mat-raised-button
-            (click)="showMoreData = !showMoreData;"
-            (mouseenter)="disableRouting = true"
-            (mouseleave)="disableRouting = false">
-            Show {{showMoreData? 'less' : 'all'}} form data
-          </button>
-        </td>
+      <ng-container *ngFor="let col of parsedColumns; let i = index">
+        <ng-container matColumnDef="{{col}}">
+          <th *matHeaderCellDef mat-header-cell>{{col}}</th>
+          <td *matCellDef="let application" mat-cell>
+            {{getValue(application.formData, col)}}
+          </td>
+        </ng-container>
       </ng-container>
 
       <tr *matHeaderRowDef="displayedColumns" mat-header-row></tr>

apps/admin-gui/src/app/vos/components/applications-dynamic-list/applications-dynamic-list.component.ts

@@ -80,7 +80,7 @@ export class ApplicationsDynamicListComponent implements OnInit, OnChanges, Afte
   refreshTable = false;
 
   @Input()
-  showMoreData = false;
+  parsedColumns: string[] = [];
 
   dataSource: DynamicDataSource<Application>;
 
@@ -103,6 +103,7 @@ export class ApplicationsDynamicListComponent implements OnInit, OnChanges, Afte
       this.dynamicPaginatingService,
       this.authResolver
     );
+
     this.dataSource.loadApplications(
       this.tableConfigService.getTablePageSize(this.tableId),
       0,
@@ -117,6 +118,16 @@ export class ApplicationsDynamicListComponent implements OnInit, OnChanges, Afte
       this.group?.id ?? null,
       this.getVoId()
     );
+
+    this.dataSource.loading$.subscribe((val) => {
+      if (val) return;
+      if (!this.displayedColumns.includes('fedInfo')) {
+        this.parsedColumns = [];
+        return;
+      }
+      const data = <RichApplication>this.dataSource.getData()[0];
+      this.parseColumns(data.formData);
+    });
   }
 
   ngOnChanges() {
@@ -303,4 +314,23 @@ export class ApplicationsDynamicListComponent implements OnInit, OnChanges, Afte
   getFormDataString(data: ApplicationFormItemData) {
     return this.stringify(data.formItem);
   }
+
+  parseColumns(array: Array<ApplicationFormItemData>) {
+    array.forEach((val) => {
+      if (!this.displayedColumns.includes(val.shortname)) {
+        this.displayedColumns.push(val.shortname);
+      }
+      if (!this.parsedColumns.includes(val.shortname)) {
+        this.parsedColumns.push(val.shortname);
+      }
+    });
+  }
+
+  getValue(array: Array<ApplicationFormItemData>, colName: string) {
+    const filter = array.filter((value) => value.shortname === colName);
+    if (filter.length === 0) {
+      return '';
+    }
+    return filter[0].value ?? filter[0].prefilledValue;
+  }
 }

apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-applications/vo-applications.component.ts

@@ -51,7 +51,6 @@ export class VoApplicationsComponent implements OnInit {
     'modifiedBy',
     'modifiedAt',
     'fedInfo',
-    'formData'
   ];
   currentColumns: string[] = [];
   filterValue = '';

libs/perun/openapi/src/lib/api.module.ts

@@ -2,7 +2,6 @@ import { NgModule, ModuleWithProviders, SkipSelf, Optional } from '@angular/core
 import { Configuration } from './configuration';
 import { HttpClient } from '@angular/common/http';
 
-
 import { AttributesManagerService } from './api/attributesManager.service';
 import { AuditMessagesManagerService } from './api/auditMessagesManager.service';
 import { AuthzResolverService } from './api/authzResolver.service';
@@ -25,9 +24,9 @@ import { UtilsService } from './api/utils.service';
 import { VosManagerService } from './api/vosManager.service';
 
 @NgModule({
-  imports:      [],
+  imports: [],
   declarations: [],
-  exports:      [],
+  exports: [],
   providers: [
     AttributesManagerService,
     AuditMessagesManagerService,
@@ -48,24 +47,26 @@ import { VosManagerService } from './api/vosManager.service';
     TasksManagerService,
     UsersManagerService,
     UtilsService,
-    VosManagerService ]
+    VosManagerService,
+  ],
 })
 export class ApiModule {
-    public static forRoot(configurationFactory: () => Configuration): ModuleWithProviders<any> {
-        return {
-            ngModule: ApiModule,
-            providers: [ { provide: Configuration, useFactory: configurationFactory } ]
-        };
-    }
+  public static forRoot(configurationFactory: () => Configuration): ModuleWithProviders<any> {
+    return {
+      ngModule: ApiModule,
+      providers: [{ provide: Configuration, useFactory: configurationFactory }],
+    };
+  }
 
-    constructor( @Optional() @SkipSelf() parentModule: ApiModule,
-                 @Optional() http: HttpClient) {
-        if (parentModule) {
-            throw new Error('ApiModule is already loaded. Import in your base AppModule only.');
-        }
-        if (!http) {
-            throw new Error('You need to import the HttpClientModule in your AppModule! \n' +
-            'See also https://github.com/angular/angular/issues/20575');
-        }
+  constructor(@Optional() @SkipSelf() parentModule: ApiModule, @Optional() http: HttpClient) {
+    if (parentModule) {
+      throw new Error('ApiModule is already loaded. Import in your base AppModule only.');
+    }
+    if (!http) {
+      throw new Error(
+        'You need to import the HttpClientModule in your AppModule! \n' +
+          'See also https://github.com/angular/angular/issues/20575'
+      );
     }
+  }
 }

libs/perun/openapi/src/lib/api/api.ts

@@ -38,4 +38,25 @@ export * from './utils.service';
 import { UtilsService } from './utils.service';
 export * from './vosManager.service';
 import { VosManagerService } from './vosManager.service';
-export const APIS = [AttributesManagerService, AuditMessagesManagerService, AuthzResolverService, CabinetManagerService, DatabaseManagerService, ExtSourcesManagerService, FacilitiesManagerService, FacilitiesManagerByFacilityNameService, GroupsManagerService, IntegrationManagerService, MembersManagerService, OwnersManagerService, RTMessagesManagerService, RegistrarManagerService, ResourcesManagerService, ServicesManagerService, TasksManagerService, UsersManagerService, UtilsService, VosManagerService];
+export const APIS = [
+  AttributesManagerService,
+  AuditMessagesManagerService,
+  AuthzResolverService,
+  CabinetManagerService,
+  DatabaseManagerService,
+  ExtSourcesManagerService,
+  FacilitiesManagerService,
+  FacilitiesManagerByFacilityNameService,
+  GroupsManagerService,
+  IntegrationManagerService,
+  MembersManagerService,
+  OwnersManagerService,
+  RTMessagesManagerService,
+  RegistrarManagerService,
+  ResourcesManagerService,
+  ServicesManagerService,
+  TasksManagerService,
+  UsersManagerService,
+  UtilsService,
+  VosManagerService,
+];