From 5f129eb17031973c9ebf2ebfee10bdc1cbf5e955 Mon Sep 17 00:00:00 2001
From: paf <philipp.franck@dainst.de>
Date: Thu, 6 Feb 2020 16:30:50 +0100
Subject: [PATCH] linting
---
package-lock.json | 6 +--
src/app/app-routing.module.ts | 2 +-
src/app/app.interceptor.ts | 5 +-
src/app/app.module.ts | 8 ++--
src/app/backend.service.ts | 2 +-
src/app/iqb-files/iqb-files.module.ts | 2 +-
src/app/start/start.component.ts | 2 +-
src/app/superadmin/backend.service.ts | 2 +-
src/app/superadmin/superadmin.module.ts | 6 +--
src/app/superadmin/users/users.component.ts | 2 +-
.../workspaces/workspaces.component.ts | 6 ++-
src/app/workspace/backend.service.ts | 20 ++++----
src/app/workspace/files/files.component.ts | 2 +-
.../workspace/monitor/monitor.component.ts | 16 ++++---
.../workspace/results/results.component.ts | 46 +++++++++++--------
.../workspace/syscheck/syscheck.component.ts | 10 ++--
src/app/workspace/workspace.component.ts | 4 +-
src/app/workspace/workspace.interceptor.ts | 9 ++--
src/app/workspace/workspace.module.ts | 8 ++--
src/app/workspace/workspacedata.service.ts | 9 ++--
20 files changed, 89 insertions(+), 78 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index b567444e..d4bb37cc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6058,9 +6058,9 @@
"dev": true
},
"iqb-components": {
- "version": "1.5.0",
- "resolved": "https://registry.npmjs.org/iqb-components/-/iqb-components-1.5.0.tgz",
- "integrity": "sha512-nQKc3VyD9/Sc8XQA3J2lW640YC5yqN9iFmGYHCy+gUleg/T/3tHz+Ph4paOWzis/OEcXU9hjBNpGk8OQ2SaR/A==",
+ "version": "1.6.1",
+ "resolved": "https://registry.npmjs.org/iqb-components/-/iqb-components-1.6.1.tgz",
+ "integrity": "sha512-plAWvMTwCaJPVNgq1dlb76lNQKqniGS9Yiz7VGJCd1Z/8DgFDiemCtLd2UVqNJ7sQDdpx2k3JEztuTk1S2fA9w==",
"requires": {
"tslib": "^1.9.0"
}
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 935020af..055813bf 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -2,7 +2,7 @@ import { AboutComponent } from './about/about.component';
import { StartComponent } from './start/start.component';
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
-import {WorkspaceComponent} from "./workspace";
+import { WorkspaceComponent } from './workspace';
const routes: Routes = [
diff --git a/src/app/app.interceptor.ts b/src/app/app.interceptor.ts
index 102baac4..2e8cf43a 100644
--- a/src/app/app.interceptor.ts
+++ b/src/app/app.interceptor.ts
@@ -1,7 +1,6 @@
import { MainDataService } from './maindata.service';
import { Injectable } from '@angular/core';
-import { HttpInterceptor, HttpRequest,
- HttpHandler, HttpEvent } from '@angular/common/http';
+import { HttpInterceptor, HttpRequest, HttpHandler, HttpEvent } from '@angular/common/http';
import { Observable } from 'rxjs';
@Injectable()
@@ -12,7 +11,7 @@ export class AuthInterceptor implements HttpInterceptor {
intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
const loginData = this.mds.loginData$.getValue();
if (loginData !== null) {
- let authDataStr = request.headers.get('AuthToken');
+ const authDataStr = request.headers.get('AuthToken');
let authData = {};
if (authDataStr) {
authData = JSON.parse(authDataStr);
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index faa25c4d..f4180792 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -1,7 +1,7 @@
import { AboutComponent } from './about/about.component';
import { BrowserModule } from '@angular/platform-browser';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import {HTTP_INTERCEPTORS, HttpClientModule} from '@angular/common/http';
+import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
import { NgModule} from '@angular/core';
import { LocationStrategy, HashLocationStrategy } from '@angular/common';
import { ReactiveFormsModule } from '@angular/forms';
@@ -25,9 +25,9 @@ import { AppRoutingModule } from './app-routing.module';
import { StartComponent } from './start/start.component';
import { FlexLayoutModule } from '@angular/flex-layout';
-import {IqbComponentsModule} from "iqb-components";
-import {AuthInterceptor} from "./app.interceptor";
-import {WorkspaceModule} from "./workspace";
+import { IqbComponentsModule } from 'iqb-components';
+import { AuthInterceptor } from './app.interceptor';
+import { WorkspaceModule } from './workspace';
@NgModule({
declarations: [
diff --git a/src/app/backend.service.ts b/src/app/backend.service.ts
index d615e2fd..8b23dd41 100644
--- a/src/app/backend.service.ts
+++ b/src/app/backend.service.ts
@@ -3,7 +3,7 @@ import { Injectable, Inject } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { Observable } from 'rxjs';
import { catchError } from 'rxjs/operators';
-import {ErrorHandler, ServerError} from "iqb-components";
+import { ErrorHandler, ServerError } from 'iqb-components';
@Injectable()
diff --git a/src/app/iqb-files/iqb-files.module.ts b/src/app/iqb-files/iqb-files.module.ts
index 02d6c9ab..49b63fb5 100644
--- a/src/app/iqb-files/iqb-files.module.ts
+++ b/src/app/iqb-files/iqb-files.module.ts
@@ -8,7 +8,7 @@ import { MatCardModule } from '@angular/material/card';
import { MatProgressBarModule } from '@angular/material/progress-bar';
import { MatIconModule } from '@angular/material/icon';
import { CommonModule } from '@angular/common';
-import {IqbComponentsModule} from "iqb-components";
+import { IqbComponentsModule } from 'iqb-components';
@NgModule({
diff --git a/src/app/start/start.component.ts b/src/app/start/start.component.ts
index ba5b72eb..275c0388 100644
--- a/src/app/start/start.component.ts
+++ b/src/app/start/start.component.ts
@@ -5,7 +5,7 @@ import { Router } from '@angular/router';
import { Component, OnInit, OnDestroy } from '@angular/core';
import { FormGroup, FormBuilder, Validators } from '@angular/forms';
import { Subscription } from 'rxjs';
-import {ServerError} from "iqb-components";
+import { ServerError } from 'iqb-components';
@Component({
diff --git a/src/app/superadmin/backend.service.ts b/src/app/superadmin/backend.service.ts
index a0bf23ce..750e1493 100644
--- a/src/app/superadmin/backend.service.ts
+++ b/src/app/superadmin/backend.service.ts
@@ -1,4 +1,4 @@
-import {Injectable, Inject} from '@angular/core';
+import { Injectable, Inject } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { Observable, of } from 'rxjs';
import { catchError } from 'rxjs/operators';
diff --git a/src/app/superadmin/superadmin.module.ts b/src/app/superadmin/superadmin.module.ts
index 2d0619c7..de70a895 100644
--- a/src/app/superadmin/superadmin.module.ts
+++ b/src/app/superadmin/superadmin.module.ts
@@ -14,8 +14,8 @@ import { MatTableModule } from '@angular/material/table';
import { MatTabsModule } from '@angular/material/tabs';
import { MatToolbarModule } from '@angular/material/toolbar';
import { MatTooltipModule } from '@angular/material/tooltip';
- import {FlexLayoutModule} from '@angular/flex-layout';
- import { ReactiveFormsModule } from '@angular/forms';
+import { FlexLayoutModule } from '@angular/flex-layout';
+import { ReactiveFormsModule } from '@angular/forms';
import { SuperadminRoutingModule } from './superadmin-routing.module';
import { WorkspacesComponent } from './workspaces/workspaces.component';
@@ -27,7 +27,7 @@ import { NewuserComponent } from './users/newuser/newuser.component';
import { NewpasswordComponent } from './users/newpassword/newpassword.component';
import { NewworkspaceComponent } from './workspaces/newworkspace/newworkspace.component';
import { EditworkspaceComponent } from './workspaces/editworkspace/editworkspace.component';
-import {IqbComponentsModule} from "iqb-components";
+import { IqbComponentsModule } from 'iqb-components';
@NgModule({
diff --git a/src/app/superadmin/users/users.component.ts b/src/app/superadmin/users/users.component.ts
index 4cc23e19..62dde2f2 100644
--- a/src/app/superadmin/users/users.component.ts
+++ b/src/app/superadmin/users/users.component.ts
@@ -13,7 +13,7 @@ import { SelectionModel } from '@angular/cdk/collections';
import {
ConfirmDialogComponent, ConfirmDialogData, MessageDialogComponent,
MessageDialogData, MessageType
-} from "iqb-components";
+} from 'iqb-components';
import { Subscription } from 'rxjs';
import { MainDataService } from 'src/app/maindata.service';
diff --git a/src/app/superadmin/workspaces/workspaces.component.ts b/src/app/superadmin/workspaces/workspaces.component.ts
index 86a001c3..96dac73a 100644
--- a/src/app/superadmin/workspaces/workspaces.component.ts
+++ b/src/app/superadmin/workspaces/workspaces.component.ts
@@ -10,8 +10,10 @@ import { MatSnackBar } from '@angular/material/snack-bar';
import { MatSort } from '@angular/material/sort';
import { FormGroup } from '@angular/forms';
import { SelectionModel } from '@angular/cdk/collections';
-import { ConfirmDialogComponent, ConfirmDialogData, MessageDialogComponent,
- MessageDialogData, MessageType } from "iqb-components";
+import {
+ ConfirmDialogComponent, ConfirmDialogData,
+ MessageDialogComponent, MessageDialogData, MessageType
+} from 'iqb-components';
import { Subscription } from 'rxjs';
import { MainDataService } from 'src/app/maindata.service';
diff --git a/src/app/workspace/backend.service.ts b/src/app/workspace/backend.service.ts
index 2f8fa97c..1f0e48d0 100644
--- a/src/app/workspace/backend.service.ts
+++ b/src/app/workspace/backend.service.ts
@@ -4,7 +4,7 @@ import {Injectable, Inject} from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { Observable } from 'rxjs';
import { catchError } from 'rxjs/operators';
-import { ErrorHandler, ServerError } from "iqb-components";
+import { ErrorHandler, ServerError } from 'iqb-components';
@Injectable()
@@ -44,7 +44,7 @@ export class BackendService {
);
}
- getBookletsStarted(groups: string[]): Observable<BookletsStarted[] | ServerError>{
+ getBookletsStarted(groups: string[]): Observable<BookletsStarted[] | ServerError> {
return this.http
.post<BookletsStarted[]>(this.serverUrl + 'getBookletsStarted.php', {g: groups})
.pipe(
@@ -52,7 +52,7 @@ export class BackendService {
);
}
- lockBooklets(groups: string[]): Observable<boolean | ServerError>{
+ lockBooklets(groups: string[]): Observable<boolean | ServerError> {
return this.http
.post<boolean>(this.serverUrlSlim + 'lock', {g: groups})
.pipe(
@@ -60,7 +60,7 @@ export class BackendService {
);
}
- unlockBooklets(groups: string[]): Observable<boolean | ServerError>{
+ unlockBooklets(groups: string[]): Observable<boolean | ServerError> {
return this.http
.post<boolean>(this.serverUrlSlim + 'unlock', {g: groups})
.pipe(
@@ -68,7 +68,7 @@ export class BackendService {
);
}
- getMonitorData(): Observable<MonitorData[] | ServerError>{
+ getMonitorData(): Observable<MonitorData[] | ServerError> {
return this.http
.post<MonitorData[]>(this.serverUrl + 'getMonitorData.php', {})
.pipe(
@@ -76,7 +76,7 @@ export class BackendService {
);
}
- getResultData(): Observable<ResultData[]>{
+ getResultData(): Observable<ResultData[]> {
return this.http
.post<ResultData[]>(this.serverUrl + 'getResultData.php', {})
.pipe(
@@ -84,7 +84,7 @@ export class BackendService {
);
}
- getResponses(groups: string[]): Observable<UnitResponse[]>{
+ getResponses(groups: string[]): Observable<UnitResponse[]> {
return this.http
.post<UnitResponse[]>(this.serverUrl + 'getResponses.php', {g: groups})
.pipe(
@@ -92,7 +92,7 @@ export class BackendService {
);
}
- getLogs(groups: string[]): Observable<LogData[]>{
+ getLogs(groups: string[]): Observable<LogData[]> {
return this.http
.post<LogData[]>(this.serverUrl + 'getLogs.php', {g: groups})
.pipe(
@@ -100,7 +100,7 @@ export class BackendService {
);
}
- getReviews(groups: string[]): Observable<ReviewData[]>{
+ getReviews(groups: string[]): Observable<ReviewData[]> {
return this.http
.post<ReviewData[]>(this.serverUrl + 'getReviews.php', {g: groups})
.pipe(
@@ -108,7 +108,7 @@ export class BackendService {
);
}
- deleteData(groups: string[]): Observable<boolean | ServerError>{
+ deleteData(groups: string[]): Observable<boolean | ServerError> {
return this.http
.post<boolean>(this.serverUrl + 'deleteData.php', {g: groups})
.pipe(
diff --git a/src/app/workspace/files/files.component.ts b/src/app/workspace/files/files.component.ts
index 447344b8..45445a2e 100644
--- a/src/app/workspace/files/files.component.ts
+++ b/src/app/workspace/files/files.component.ts
@@ -2,7 +2,7 @@ import { MainDataService } from '../../maindata.service';
import { WorkspaceDataService } from '../workspacedata.service';
import { GetFileResponseData, CheckWorkspaceResponseData } from '../workspace.interfaces';
import { ConfirmDialogComponent, ConfirmDialogData, MessageDialogComponent,
- MessageDialogData, MessageType, ServerError } from "iqb-components";
+ MessageDialogData, MessageType, ServerError } from 'iqb-components';
import { Subscription } from 'rxjs';
import { MatTableDataSource } from '@angular/material/table';
import { MatSnackBar } from '@angular/material/snack-bar';
diff --git a/src/app/workspace/monitor/monitor.component.ts b/src/app/workspace/monitor/monitor.component.ts
index 8dbad30b..a4b46ba2 100644
--- a/src/app/workspace/monitor/monitor.component.ts
+++ b/src/app/workspace/monitor/monitor.component.ts
@@ -9,7 +9,7 @@ import { SelectionModel } from '@angular/cdk/collections';
import { saveAs } from 'file-saver';
import { MonitorData } from '../workspace.interfaces';
import { Subscription } from 'rxjs';
-import {ServerError} from "iqb-components";
+import { ServerError } from 'iqb-components';
@Component({
@@ -47,7 +47,7 @@ export class MonitorComponent implements OnInit, OnDestroy {
this.monitorDataSource = new MatTableDataSource<MonitorData>(monitorData);
this.monitorDataSource.sort = this.sort;
}
- )
+ );
}
@@ -80,11 +80,15 @@ export class MonitorComponent implements OnInit, OnDestroy {
let myCsvData = 'groupname' + columnDelimiter + 'loginname' + columnDelimiter + 'code' + columnDelimiter +
'bookletname' + columnDelimiter + 'locked' + columnDelimiter + 'laststart' + lineDelimiter;
bookletList.forEach((b: BookletsStarted) => {
- myCsvData += '"' + b.groupname + '"' + columnDelimiter + '"' + b.loginname + '"' + columnDelimiter + '"' + b.code + '"' + columnDelimiter +
- '"' + b.bookletname + '"' + columnDelimiter + '"' + (b.locked ? 'X' : '-') + '"' + columnDelimiter + '"' + b.laststart + '"' + lineDelimiter;
+ myCsvData += '"' + b.groupname + '"' + columnDelimiter
+ + '"' + b.loginname + '"' + columnDelimiter
+ + '"' + b.code + '"' + columnDelimiter
+ + '"' + b.bookletname + '"' + columnDelimiter
+ + '"' + (b.locked ? 'X' : '-') + '"' + columnDelimiter
+ + '"' + b.laststart + '"' + lineDelimiter;
});
- const blob = new Blob([myCsvData], {type: "text/csv;charset=utf-8"});
- saveAs(blob, "iqb-testcenter-bookletsStarted.csv");
+ const blob = new Blob([myCsvData], {type: 'text/csv;charset=utf-8'});
+ saveAs(blob, 'iqb-testcenter-bookletsStarted.csv');
} else {
this.snackBar.open('Keine Daten verfügbar.', 'Fehler', {duration: 3000});
}
diff --git a/src/app/workspace/results/results.component.ts b/src/app/workspace/results/results.component.ts
index 5cec77cd..4c4bfe54 100644
--- a/src/app/workspace/results/results.component.ts
+++ b/src/app/workspace/results/results.component.ts
@@ -1,6 +1,6 @@
import { LogData } from '../workspace.interfaces';
import { WorkspaceDataService } from '../workspacedata.service';
-import { ConfirmDialogComponent, ConfirmDialogData } from "iqb-components";
+import { ConfirmDialogComponent, ConfirmDialogData } from 'iqb-components';
import { Component, OnInit, ViewChild, OnDestroy } from '@angular/core';
import { BackendService } from '../backend.service';
import { MatDialog } from '@angular/material/dialog';
@@ -52,7 +52,7 @@ export class ResultsComponent implements OnInit, OnDestroy {
this.resultDataSource = new MatTableDataSource<ResultData>(resultData);
this.resultDataSource.sort = this.sort;
}
- )
+ );
}
}
@@ -81,13 +81,23 @@ export class ResultsComponent implements OnInit, OnDestroy {
if (responseData.length > 0) {
const columnDelimiter = ';';
const lineDelimiter = '\n';
- let myCsvData = 'groupname' + columnDelimiter + 'loginname' + columnDelimiter + 'code' + columnDelimiter +
- 'bookletname' + columnDelimiter + 'unitname' + columnDelimiter + 'responses' + columnDelimiter +
- 'restorePoint' + columnDelimiter + 'responseType' + columnDelimiter + 'response-ts' + columnDelimiter +
- 'restorePoint-ts' + columnDelimiter + 'laststate' + lineDelimiter;
+ let myCsvData = 'groupname' + columnDelimiter
+ + 'loginname' + columnDelimiter
+ + 'code' + columnDelimiter
+ + 'bookletname' + columnDelimiter
+ + 'unitname' + columnDelimiter
+ + 'responses' + columnDelimiter
+ + 'restorePoint' + columnDelimiter
+ + 'responseType' + columnDelimiter
+ + 'response-ts' + columnDelimiter
+ + 'restorePoint-ts' + columnDelimiter
+ + 'laststate' + lineDelimiter;
responseData.forEach((resp: UnitResponse) => {
- myCsvData += '"' + resp.groupname + '"' + columnDelimiter + '"' + resp.loginname + '"' + columnDelimiter + '"' + resp.code + '"' + columnDelimiter +
- '"' + resp.bookletname + '"' + columnDelimiter + '"' + resp.unitname + '"' + columnDelimiter;
+ myCsvData += '"' + resp.groupname + '"' + columnDelimiter
+ + '"' + resp.loginname + '"' + columnDelimiter
+ + '"' + resp.code + '"' + columnDelimiter
+ + '"' + resp.bookletname + '"' + columnDelimiter
+ + '"' + resp.unitname + '"' + columnDelimiter;
if ((resp.responses !== null) && (resp.responses.length > 0)) {
myCsvData += resp.responses.replace(/\\"/g, '""') + columnDelimiter;
} else {
@@ -110,14 +120,14 @@ export class ResultsComponent implements OnInit, OnDestroy {
myCsvData += lineDelimiter;
}
});
- const blob = new Blob([myCsvData], {type: "text/csv;charset=utf-8"});
- saveAs(blob, "iqb-testcenter-responses.csv");
+ const blob = new Blob([myCsvData], {type: 'text/csv;charset=utf-8'});
+ saveAs(blob, 'iqb-testcenter-responses.csv');
} else {
this.snackBar.open('Keine Daten verfügbar.', 'Fehler', {duration: 3000});
}
this.tableselectionCheckbox.clear();
this.dataLoading = false;
- })
+ });
}
}
@@ -142,7 +152,7 @@ export class ResultsComponent implements OnInit, OnDestroy {
allCategories.push(s_trimmed);
}
}
- })
+ });
});
const columnDelimiter = ';';
@@ -172,14 +182,14 @@ export class ResultsComponent implements OnInit, OnDestroy {
myCsvData += '"' + resp.reviewtime + '"' + columnDelimiter + '"' + resp.entry + '"' + lineDelimiter;
}
});
- const blob = new Blob([myCsvData], {type: "text/csv;charset=utf-8"});
- saveAs(blob, "iqb-testcenter-reviews.csv");
+ const blob = new Blob([myCsvData], {type: 'text/csv;charset=utf-8'});
+ saveAs(blob, 'iqb-testcenter-reviews.csv');
} else {
this.snackBar.open('Keine Daten verfügbar.', 'Fehler', {duration: 3000});
}
this.tableselectionCheckbox.clear();
this.dataLoading = false;
- })
+ });
}
}
@@ -206,14 +216,14 @@ export class ResultsComponent implements OnInit, OnDestroy {
resp.timestamp.toString() + '"' + columnDelimiter + resp.logentry.replace(/\\"/g, '""') + lineDelimiter;
}
});
- const blob = new Blob([myCsvData], {type: "text/csv;charset=utf-8"});
- saveAs(blob, "iqb-testcenter-logs.csv");
+ const blob = new Blob([myCsvData], {type: 'text/csv;charset=utf-8'});
+ saveAs(blob, 'iqb-testcenter-logs.csv');
} else {
this.snackBar.open('Keine Daten verfügbar.', 'Fehler', {duration: 3000});
}
this.tableselectionCheckbox.clear();
this.dataLoading = false;
- })
+ });
}
}
diff --git a/src/app/workspace/syscheck/syscheck.component.ts b/src/app/workspace/syscheck/syscheck.component.ts
index 8d1952fc..2cf19b77 100644
--- a/src/app/workspace/syscheck/syscheck.component.ts
+++ b/src/app/workspace/syscheck/syscheck.component.ts
@@ -1,4 +1,4 @@
-import { ConfirmDialogComponent, ConfirmDialogData } from "iqb-components";
+import { ConfirmDialogComponent, ConfirmDialogData } from 'iqb-components';
import { Component, OnInit, ViewChild } from '@angular/core';
import { BackendService } from '../backend.service';
import { MatDialog } from '@angular/material/dialog';
@@ -43,7 +43,7 @@ export class SyscheckComponent implements OnInit {
this.resultDataSource = new MatTableDataSource<SysCheckStatistics>(resultData);
this.resultDataSource.sort = this.sort;
}
- )
+ );
}
isAllSelected() {
@@ -74,14 +74,14 @@ export class SyscheckComponent implements OnInit {
reportData.forEach((repLine: string) => {
myCsvData += repLine + lineDelimiter;
});
- var blob = new Blob([myCsvData], {type: "text/csv;charset=utf-8"});
- saveAs(blob, "iqb-testcenter-syscheckreports.csv");
+ const blob = new Blob([myCsvData], {type: 'text/csv;charset=utf-8'});
+ saveAs(blob, 'iqb-testcenter-syscheckreports.csv');
} else {
this.snackBar.open('Keine Daten verfügbar.', 'Fehler', {duration: 3000});
}
this.tableselectionCheckbox.clear();
this.dataLoading = false;
- })
+ });
}
}
diff --git a/src/app/workspace/workspace.component.ts b/src/app/workspace/workspace.component.ts
index 9c59a47d..1b7ed70c 100644
--- a/src/app/workspace/workspace.component.ts
+++ b/src/app/workspace/workspace.component.ts
@@ -13,14 +13,12 @@ export class WorkspaceComponent implements OnInit, OnDestroy {
private routingSubscription: Subscription = null;
private logindataSubscription: Subscription = null;
- // CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
constructor(
private route: ActivatedRoute,
public mds: MainDataService,
public wds: WorkspaceDataService
) { }
- // CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
ngOnInit() {
this.routingSubscription = this.route.params.subscribe(params => {
const ws = Number(params['ws']);
@@ -32,7 +30,7 @@ export class WorkspaceComponent implements OnInit, OnDestroy {
});
}
- // % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % %
+
ngOnDestroy() {
if (this.routingSubscription !== null) {
this.routingSubscription.unsubscribe();
diff --git a/src/app/workspace/workspace.interceptor.ts b/src/app/workspace/workspace.interceptor.ts
index d4d8e278..fa6ed546 100644
--- a/src/app/workspace/workspace.interceptor.ts
+++ b/src/app/workspace/workspace.interceptor.ts
@@ -1,7 +1,6 @@
import { WorkspaceDataService } from './workspacedata.service';
-import {Injectable} from '@angular/core';
-import { HttpInterceptor, HttpRequest,
- HttpHandler, HttpEvent } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { HttpInterceptor, HttpRequest, HttpHandler, HttpEvent } from '@angular/common/http';
import { Observable } from 'rxjs';
@Injectable()
@@ -12,7 +11,7 @@ export class WorkspaceInterceptor implements HttpInterceptor {
intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
const ws = this.wds.workspaceId$.getValue();
if (ws >= 0) {
- let authDataStr = request.headers.get('AuthToken');
+ const authDataStr = request.headers.get('AuthToken');
let authData = {};
if (authDataStr) {
authData = JSON.parse(authDataStr);
@@ -22,7 +21,7 @@ export class WorkspaceInterceptor implements HttpInterceptor {
setHeaders: {
AuthToken: JSON.stringify(authData)
}
- }))
+ }));
} else {
return next.handle(request);
}
diff --git a/src/app/workspace/workspace.module.ts b/src/app/workspace/workspace.module.ts
index a8a78062..ead27930 100644
--- a/src/app/workspace/workspace.module.ts
+++ b/src/app/workspace/workspace.module.ts
@@ -28,11 +28,11 @@ import { MatToolbarModule } from '@angular/material/toolbar';
import { MatTooltipModule } from '@angular/material/tooltip';
import { MonitorComponent } from './monitor/monitor.component';
import { MatExpansionModule } from '@angular/material/expansion';
-import {MatGridListModule} from '@angular/material/grid-list';
+import { MatGridListModule } from '@angular/material/grid-list';
import { SyscheckComponent } from './syscheck/syscheck.component';
-import {IqbComponentsModule} from 'iqb-components';
-import {HTTP_INTERCEPTORS} from "@angular/common/http";
-import {WorkspaceInterceptor} from "./workspace.interceptor";
+import { IqbComponentsModule } from 'iqb-components';
+import { HTTP_INTERCEPTORS } from '@angular/common/http';
+import { WorkspaceInterceptor } from './workspace.interceptor';
@NgModule({
imports: [
diff --git a/src/app/workspace/workspacedata.service.ts b/src/app/workspace/workspacedata.service.ts
index 06c068b6..8e2d9b5c 100644
--- a/src/app/workspace/workspacedata.service.ts
+++ b/src/app/workspace/workspacedata.service.ts
@@ -3,25 +3,24 @@ import { Injectable } from '@angular/core';
import { ServerError } from 'iqb-components';
@Injectable()
-
export class WorkspaceDataService {
public workspaceId$ = new BehaviorSubject<number>(-1);
public globalErrorMsg$ = new BehaviorSubject<ServerError>(null);
- public get ws() : number {
+ public get ws(): number {
return this.workspaceId$.getValue();
}
private _wsRole = '';
- public get wsRole() : string {
+ public get wsRole(): string {
return this._wsRole;
}
private _wsName = '';
- public get wsName() : string {
+ public get wsName(): string {
return this._wsName;
}
public navLinks = [];
- // .. .. .. .. .. .. .. .. .. .. .. .. .. .. .. .. .. .. .. .. .. .. .. .. .. .. ..
+
private navLinksRW = [
{path: 'files', label: 'Dateien'},
// {path: 'syscheck', label: 'System-Check Berichte'},
--
GitLab