From 670216248be206caf497f74687aa62ed13af1c01 Mon Sep 17 00:00:00 2001
From: paf <paf@titelfrei.de>
Date: Fri, 15 Jan 2021 10:07:38 +0100
Subject: [PATCH] improve display of players in file list
---
.../files/files.component.html | 10 +++++--
.../workspace-admin/files/files.component.ts | 30 ++++++++++++++++---
2 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/src/app/workspace-admin/files/files.component.html b/src/app/workspace-admin/files/files.component.html
index 2d7639f8..d0a058e1 100644
--- a/src/app/workspace-admin/files/files.component.html
+++ b/src/app/workspace-admin/files/files.component.html
@@ -27,10 +27,14 @@
</ng-container>
</div>
<mat-card class="full-file-report">
- <mat-card-header *ngIf="element.info.label || element.info.id">
+ <mat-card-header *ngIf="element.info.label || element.id">
<mat-card-title>
- {{element.info.label || '#' + element.info.id}}
- <span *ngIf="element.info.label && element.info.id" style="color:silver">#{{element.info.id}}</span>
+ {{element.info.label}}
+ <span
+ *ngIf="element.id !== element.name.toUpperCase()"
+ style="{{element.info.label ? 'color:silver' : ''}}">
+ #{{element.id}}
+ </span>
</mat-card-title>
<mat-card-subtitle>{{element.info.description}}</mat-card-subtitle>
</mat-card-header>
diff --git a/src/app/workspace-admin/files/files.component.ts b/src/app/workspace-admin/files/files.component.ts
index 4ebf8bf1..bfffbcf6 100644
--- a/src/app/workspace-admin/files/files.component.ts
+++ b/src/app/workspace-admin/files/files.component.ts
@@ -11,6 +11,7 @@ import {
ConfirmDialogComponent, ConfirmDialogData, MessageDialogComponent,
MessageDialogData, MessageType
} from 'iqb-components';
+import { map } from 'rxjs/operators';
import { WorkspaceDataService } from '../workspacedata.service';
import { GetFileResponseData } from '../workspace.interfaces';
import { BackendService, FileDeletionReport } from '../backend.service';
@@ -58,6 +59,7 @@ export class FilesComponent implements OnInit {
constructor(
@Inject('SERVER_URL') private serverUrl: string,
+ @Inject('VERONA_API_VERSION_SUPPORTED') private veronaApiVersionSupported: string,
private bs: BackendService,
public wds: WorkspaceDataService,
public confirmDialog: MatDialog,
@@ -137,14 +139,14 @@ export class FilesComponent implements OnInit {
this.serverfiles = new MatTableDataSource([]);
this.mds.setSpinnerOff();
} else {
- this.bs.getFiles().subscribe(
- (fileList: GetFileResponseData[]) => {
+ this.bs.getFiles()
+ .pipe(map(fileList => this.addFrontendChecksToFiles(fileList)))
+ .subscribe((fileList: GetFileResponseData[]) => {
this.serverfiles = new MatTableDataSource(fileList);
this.serverfiles.sort = this.sort;
this.fileStats = FilesComponent.getStats(fileList);
this.mds.setSpinnerOff();
- }
- );
+ });
}
}
@@ -173,6 +175,26 @@ export class FilesComponent implements OnInit {
return stats;
}
+ private addFrontendChecksToFiles(fileList: GetFileResponseData[]): GetFileResponseData[] {
+ return fileList.map(files => this.addFrontendChecksToFile(files));
+ }
+
+ private addFrontendChecksToFile(file: GetFileResponseData): GetFileResponseData {
+ if (typeof file.info['verona-version'] !== 'undefined') {
+ const fileMayor = file.info['verona-version'].toString().split('.').shift();
+ const systemMayor = this.veronaApiVersionSupported.split('.').shift();
+ if (fileMayor !== systemMayor) {
+ if (typeof file.report.error === 'undefined') {
+ // eslint-disable-next-line no-param-reassign
+ file.report.error = [];
+ }
+ file.report.error.push(`Verona Version of this Player is not compatible
+ with this system's version (\`${this.veronaApiVersionSupported}\`)!`);
+ }
+ }
+ return file;
+ }
+
public download(element: GetFileResponseData): void {
this.mds.setSpinnerOn();
this.bs.downloadFile(element.type, element.name)
--
GitLab