nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-1163: fixes eslint issues

This commit is contained in:
Mustapha Zorgati 2020-03-18 05:49:53 +01:00
parent 9b79968f9b
commit 8f4e261679
21 changed files with 305 additions and 305 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/src/app/administration/access-items-management/access-items-management.component.ts
View File

@ -16,8 +16,8 @@ import { AlertService } from 'app/services/alert/alert.service';
import { RequestInProgressService } from '../../services/requestInProgress/request-in-progress.service';
import { AccessIdsService } from '../../shared/services/access-ids/access-ids.service';
import { AccessIdDefinition } from '../../models/access-id';
import { ErrorsService } from "../../services/errors/errors.service";
import { ERROR_TYPES } from "../../models/errors";
import { ErrorsService } from '../../services/errors/errors.service';
import { ERROR_TYPES } from '../../models/errors';
@Component({
selector: 'taskana-access-items-management',

2
web/src/app/administration/classification/details/classification-details.component.ts
View File

@ -26,7 +26,7 @@ import { FormsValidatorService } from 'app/shared/services/forms/forms-validator
import { ImportExportService } from 'app/administration/services/import-export/import-export.service';
import { CustomFieldsService } from '../../../services/custom-fields/custom-fields.service';
import { ERROR_TYPES } from '../../../models/errors';
import { ErrorsService } from "../../../services/errors/errors.service";
import { ErrorsService } from '../../../services/errors/errors.service';
@Component({
selector: 'taskana-classification-details',

8
web/src/app/administration/components/import-export/import-export.component.ts
View File

@ -10,10 +10,10 @@ import { AlertService } from 'app/services/alert/alert.service';
import { AlertModel, AlertType } from 'app/models/alert';
import { UploadService } from 'app/shared/services/upload/upload.service';
import { ImportExportService } from 'app/administration/services/import-export/import-export.service';
import { HttpErrorResponse } from '@angular/common/http';
import { ERROR_TYPES } from '../../../models/errors';
import { ErrorsService } from "../../../services/errors/errors.service";
import { ErrorModel } from "../../../models/error-model";
import { HttpErrorResponse } from "@angular/common/http";
import { ErrorsService } from '../../../services/errors/errors.service';
import { ErrorModel } from '../../../models/error-model';
@Component({
selector: 'taskana-import-export-component',
@ -23,7 +23,7 @@ import { HttpErrorResponse } from "@angular/common/http";
export class ImportExportComponent implements OnInit {
@Input() currentSelection: TaskanaType;
@ViewChild('selectedFile', {static: true})
@ViewChild('selectedFile', { static: true })
selectedFileInput;
domains: string[] = [];

10
web/src/app/administration/workbasket/details/access-items/access-items.component.ts
View File

@ -8,10 +8,8 @@ import { WorkbasketAccessItemsResource } from 'app/models/workbasket-access-item
import { ACTION } from 'app/models/action';
import { AlertModel, AlertType } from 'app/models/alert';
import {
SavingInformation,
SavingWorkbasketService
} from 'app/administration/services/saving-workbaskets/saving-workbaskets.service';
import { SavingInformation,
SavingWorkbasketService } from 'app/administration/services/saving-workbaskets/saving-workbaskets.service';
import { GeneralModalService } from 'app/services/general-modal/general-modal.service';
import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service';
import { AlertService } from 'app/services/alert/alert.service';
@ -21,7 +19,7 @@ import { highlight } from 'app/shared/animations/validation.animation';
import { FormsValidatorService } from 'app/shared/services/forms/forms-validator.service';
import { AccessIdDefinition } from 'app/models/access-id';
import { ERROR_TYPES } from '../../../../models/errors';
import { ErrorsService } from "../../../../services/errors/errors.service";
import { ErrorsService } from '../../../../services/errors/errors.service';
@Component({
selector: 'taskana-workbasket-access-items',
@ -217,7 +215,7 @@ export class AccessItemsComponent implements OnChanges, OnDestroy {
private cloneAccessItems(inputaccessItem): Array<WorkbasketAccessItems> {
return this.AccessItemsForm.value.accessItemsGroups.map(
(accessItems: WorkbasketAccessItems) => ({...accessItems})
(accessItems: WorkbasketAccessItems) => ({ ...accessItems })
);
}

2
web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.ts
View File

@ -19,7 +19,7 @@ import { Page } from 'app/models/page';
import { OrientationService } from 'app/services/orientation/orientation.service';
import { Orientation } from 'app/models/orientation';
import { ERROR_TYPES } from '../../../../models/errors';
import { ErrorsService } from "../../../../services/errors/errors.service";
import { ErrorsService } from '../../../../services/errors/errors.service';
export enum Side {
LEFT,

5
web/src/app/administration/workbasket/details/information/workbasket-information.component.ts
View File

@ -19,7 +19,7 @@ import { CustomFieldsService } from 'app/services/custom-fields/custom-fields.se
import { RemoveConfirmationService } from 'app/services/remove-confirmation/remove-confirmation.service';
import { FormsValidatorService } from 'app/shared/services/forms/forms-validator.service';
import { ERROR_TYPES } from '../../../../models/errors';
import { ErrorsService } from "../../../../services/errors/errors.service";
import { ErrorsService } from '../../../../services/errors/errors.service';
@Component({
selector: 'taskana-workbasket-information',
@ -169,8 +169,7 @@ implements OnInit, OnChanges, OnDestroy {
error => {
this.errorsService.updateError(ERROR_TYPES.REMOVE_ERR_2,
error,
new Map<String,String>([["workbasketId", this.workbasket.workbasketId]])
);
new Map<String, String>([['workbasketId', this.workbasket.workbasketId]]));
this.requestInProgressService.setRequestInProgress(false);
}
);

2
web/src/app/administration/workbasket/details/workbasket-details.component.ts
View File

@ -12,7 +12,7 @@ import { ImportExportService } from 'app/administration/services/import-export/i
import { GeneralModalService } from '../../../services/general-modal/general-modal.service';
import { MessageModal } from '../../../models/message-modal';
import { ERROR_TYPES } from '../../../models/errors';
import { ErrorsService } from "../../../services/errors/errors.service";
import { ErrorsService } from '../../../services/errors/errors.service';
@Component({
selector: 'taskana-workbasket-details',

24
web/src/app/app.component.ts
View File

@ -1,17 +1,17 @@
import {Component, HostListener, OnDestroy, OnInit} from '@angular/core';
import {NavigationStart, Router} from '@angular/router';
import {Subscription} from 'rxjs';
import { Component, HostListener, OnDestroy, OnInit } from '@angular/core';
import { NavigationStart, Router } from '@angular/router';
import { Subscription } from 'rxjs';
import {FormsValidatorService} from 'app/shared/services/forms/forms-validator.service';
import {MessageModal} from './models/message-modal';
import { FormsValidatorService } from 'app/shared/services/forms/forms-validator.service';
import { MessageModal } from './models/message-modal';
import {GeneralModalService} from './services/general-modal/general-modal.service';
import {RequestInProgressService} from './services/requestInProgress/request-in-progress.service';
import {OrientationService} from './services/orientation/orientation.service';
import {SelectedRouteService} from './services/selected-route/selected-route';
import {UploadService} from './shared/services/upload/upload.service';
import {ErrorModel} from "./models/error-model";
import {ErrorsService} from "./services/errors/errors.service";
import { GeneralModalService } from './services/general-modal/general-modal.service';
import { RequestInProgressService } from './services/requestInProgress/request-in-progress.service';
import { OrientationService } from './services/orientation/orientation.service';
import { SelectedRouteService } from './services/selected-route/selected-route';
import { UploadService } from './shared/services/upload/upload.service';
import { ErrorModel } from './models/error-model';
import { ErrorsService } from './services/errors/errors.service';
@Component({
selector: 'taskana-root',

4
web/src/app/guards/domain.guard.ts
View File

@ -3,8 +3,8 @@ import { CanActivate } from '@angular/router';
import { Injectable } from '@angular/core';
import { DomainService } from 'app/services/domain/domain.service';
import { catchError, map } from 'rxjs/operators';
import { ErrorsService } from "../services/errors/errors.service";
import { ERROR_TYPES } from "../models/errors";
import { ErrorsService } from '../services/errors/errors.service';
import { ERROR_TYPES } from '../models/errors';
@Injectable()
export class DomainGuard implements CanActivate {

4
web/src/app/guards/history.guard.ts
View File

@ -4,7 +4,7 @@ import { Observable, of } from 'rxjs';
import { TaskanaEngineService } from 'app/services/taskana-engine/taskana-engine.service';
import { catchError, map } from 'rxjs/operators';
import { ERROR_TYPES } from '../models/errors';
import { ErrorsService } from "../services/errors/errors.service";
import { ErrorsService } from '../services/errors/errors.service';
@Injectable({
providedIn: 'root'
@ -29,7 +29,7 @@ export class HistoryGuard implements CanActivate {
return this.navigateToWorkplace();
}),
catchError(() => {
this.errorsService.updateError(ERROR_TYPES.FETCH_ERR_6)
this.errorsService.updateError(ERROR_TYPES.FETCH_ERR_6);
return of(this.navigateToWorkplace());
})
);

2
web/src/app/history/task-query/task-query.component.ts
View File

@ -11,7 +11,7 @@ import { TaskHistoryEventResourceData } from 'app/models/task-history-event-reso
import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service';
import { TaskHistoryEventData } from '../../models/task-history-event';
import { TaskQueryService } from '../services/task-query/task-query.service';
import { ErrorsService } from "../../services/errors/errors.service";
import { ErrorsService } from '../../services/errors/errors.service';
@Component({
selector: 'taskana-task-query',

6
web/src/app/models/error-model.ts
View File

@ -1,5 +1,5 @@
import { HttpErrorResponse } from '@angular/common/http';
import { ERROR_TYPES, errors } from './errors';
import { HttpErrorResponse } from "@angular/common/http";
export class ErrorModel {
public readonly errObj: HttpErrorResponse;
@ -11,8 +11,8 @@ export class ErrorModel {
this.message = errors.get(key).text;
this.errObj = passedError;
if (addition) {
addition.forEach((value: string, key: string) => {
this.message.replace(`{${key}}`, value);
addition.forEach((value: string, replacementKey: string) => {
this.message.replace(`{${replacementKey}}`, value);
});
}
}

1
web/src/app/models/errors.ts
View File

@ -32,7 +32,6 @@ export enum ERROR_TYPES {
GENERAL_ERR,
ACCESS_ERR,
MARK_ERR,
NONE,
// ALERTS
INFO_ALERT,

2
web/src/app/services/errors/errors.service.ts
View File

@ -1,8 +1,8 @@
import { Injectable } from '@angular/core';
import { Observable, Subject } from 'rxjs';
import { HttpErrorResponse } from '@angular/common/http';
import { ErrorModel } from '../../models/error-model';
import { ERROR_TYPES } from '../../models/errors';
import { HttpErrorResponse } from "@angular/common/http";
@Injectable({
providedIn: 'root'

2
web/src/app/shared/alert/alert.component.ts
View File

@ -13,7 +13,7 @@ import { expandTop } from '../animations/expand.animation';
export class AlertComponent implements OnInit {
alert: AlertModel;
private timeoutId: any; //NodeJS.Timer cannot be imported..
private timeoutId: any; // NodeJS.Timer cannot be imported..
constructor(private alertService: AlertService) { }
ngOnInit() {

4
web/src/app/shared/error-message-modal/error-modal.component.spec.ts
View File

@ -1,6 +1,6 @@
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import {ErrorModalComponent} from './error-modal.component';
import { ErrorModalComponent } from './error-modal.component';
describe('GeneralMessageModalComponent', () => {
let component: ErrorModalComponent;

8
web/src/app/shared/error-message-modal/error-modal.component.ts
View File

@ -1,7 +1,7 @@
import {Component, EventEmitter, OnInit, Output, ViewChild} from '@angular/core';
import {ErrorModel} from "../../models/error-model";
import {Subscription} from "rxjs";
import {ErrorsService} from "../../services/errors/errors.service";
import { Component, EventEmitter, OnInit, Output, ViewChild } from '@angular/core';
import { Subscription } from 'rxjs';
import { ErrorModel } from '../../models/error-model';
import { ErrorsService } from '../../services/errors/errors.service';
@Component({
selector: 'error-modal',

8
web/src/app/shared/services/httpClientInterceptor/http-client-interceptor.service.ts
View File

@ -4,8 +4,8 @@ import { Observable } from 'rxjs';
import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service';
import { environment } from 'environments/environment';
import { tap } from 'rxjs/operators';
import { ErrorsService } from "../../../services/errors/errors.service";
import { ERROR_TYPES } from "../../../models/errors";
import { ErrorsService } from '../../../services/errors/errors.service';
import { ERROR_TYPES } from '../../../models/errors';
@Injectable()
export class HttpClientInterceptor implements HttpInterceptor {
@ -17,9 +17,9 @@ export class HttpClientInterceptor implements HttpInterceptor {
}
intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
let req = request.clone({headers: request.headers.set('Content-Type', 'application/hal+json')});
let req = request.clone({ headers: request.headers.set('Content-Type', 'application/hal+json') });
if (!environment.production) {
req = req.clone({headers: req.headers.set('Authorization', 'Basic YWRtaW46YWRtaW4=')});
req = req.clone({ headers: req.headers.set('Authorization', 'Basic YWRtaW46YWRtaW4=') });
}
return next.handle(req).pipe(tap(() => {
}, error => {

2
web/src/app/shared/shared.module.ts
View File

@ -15,7 +15,6 @@ import { ClassificationsService } from 'app/shared/services/classifications/clas
* Components
*/
import { GeneralMessageModalComponent } from 'app/shared/general-message-modal/general-message-modal.component';
import { ErrorModalComponent } from "./error-message-modal/error-modal.component";
import { SpinnerComponent } from 'app/shared/spinner/spinner.component';
import { AlertComponent } from 'app/shared/alert/alert.component';
import { MasterAndDetailComponent } from 'app/shared/master-and-detail/master-and-detail.component';
@ -25,6 +24,7 @@ import { RemoveConfirmationComponent } from 'app/shared/remove-confirmation/remo
import { FilterComponent } from 'app/shared/filter/filter.component';
import { IconTypeComponent } from 'app/administration/components/type-icon/icon-type.component';
import { FieldErrorDisplayComponent } from 'app/shared/field-error-display/field-error-display.component';
import { ErrorModalComponent } from './error-message-modal/error-modal.component';
import { SortComponent } from './sort/sort.component';
import { PaginationComponent } from './pagination/pagination.component';
import { NumberPickerComponent } from './number-picker/number-picker.component';

8
web/src/app/shared/spinner/spinner.component.ts
View File

@ -1,6 +1,6 @@
import { Component, EventEmitter, Input, OnDestroy, Output, ViewChild } from '@angular/core';
import { ERROR_TYPES } from '../../models/errors';
import { ErrorsService } from "../../services/errors/errors.service";
import { ErrorsService } from '../../services/errors/errors.service';
declare let $: any;
@ -14,16 +14,20 @@ export class SpinnerComponent implements OnDestroy {
showSpinner: boolean;
@Input()
delay = 250;
@Input()
isModal = false;
@Input()
positionClass: string;
@Output()
spinnerIsRunning = new EventEmitter<boolean>();
private currentTimeout: any;
private requestTimeout: any;
private maxRequestTimeout = 10000;
@ViewChild('spinnerModal', {static: true})
@ViewChild('spinnerModal', { static: true })
private modal;
constructor(private errorsService: ErrorsService) {

16
web/src/app/workplace/taskdetails/taskdetails.component.ts
View File

@ -16,7 +16,7 @@ import { Workbasket } from 'app/models/workbasket';
import { WorkplaceService } from 'app/workplace/services/workplace.service';
import { MasterAndDetailService } from 'app/services/masterAndDetail/master-and-detail.service';
import { ERROR_TYPES } from '../../models/errors';
import { ErrorsService } from "../../services/errors/errors.service";
import { ErrorsService } from '../../services/errors/errors.service';
@Component({
selector: 'taskana-task-details',
@ -68,10 +68,10 @@ export class TaskdetailsComponent implements OnInit, OnDestroy {
}
resetTask(): void {
this.task = {...this.taskClone};
this.task = { ...this.taskClone };
this.task.customAttributes = this.taskClone.customAttributes.slice(0);
this.task.callbackInfo = this.taskClone.callbackInfo.slice(0);
this.task.primaryObjRef = {...this.taskClone.primaryObjRef};
this.task.primaryObjRef = { ...this.taskClone.primaryObjRef };
this.alertService.triggerAlert(new AlertModel(AlertType.INFO, 'Reset edited fields'));
}
@ -97,7 +97,7 @@ export class TaskdetailsComponent implements OnInit, OnDestroy {
}
openTask() {
this.router.navigate([{outlets: {detail: `task/${this.currentId}`}}], {relativeTo: this.route.parent});
this.router.navigate([{ outlets: { detail: `task/${this.currentId}` } }], { relativeTo: this.route.parent });
}
workOnTaskDisabled(): boolean {
@ -126,7 +126,7 @@ export class TaskdetailsComponent implements OnInit, OnDestroy {
backClicked(): void {
delete this.task;
this.taskService.selectTask(this.task);
this.router.navigate(['./'], {relativeTo: this.route.parent});
this.router.navigate(['./'], { relativeTo: this.route.parent });
}
ngOnDestroy(): void {
@ -174,7 +174,7 @@ export class TaskdetailsComponent implements OnInit, OnDestroy {
this.task = task;
this.taskService.selectTask(this.task);
this.taskService.publishUpdatedTask(task);
this.router.navigate([`../${task.taskId}`], {relativeTo: this.route});
this.router.navigate([`../${task.taskId}`], { relativeTo: this.route });
}, err => {
this.requestInProgressService.setRequestInProgress(false);
// new Key ALERT_TYPES.DANGER_ALERT_2
@ -189,9 +189,9 @@ export class TaskdetailsComponent implements OnInit, OnDestroy {
}
private cloneTask() {
this.taskClone = {...this.task};
this.taskClone = { ...this.task };
this.taskClone.customAttributes = this.task.customAttributes.slice(0);
this.taskClone.callbackInfo = this.task.callbackInfo.slice(0);
this.taskClone.primaryObjRef = {...this.task.primaryObjRef};
this.taskClone.primaryObjRef = { ...this.task.primaryObjRef };
}
}