TSK-1163: fixes eslint issues
This commit is contained in:
parent
9b79968f9b
commit
8f4e261679
|
@ -16,8 +16,8 @@ import { AlertService } from 'app/services/alert/alert.service';
|
||||||
import { RequestInProgressService } from '../../services/requestInProgress/request-in-progress.service';
|
import { RequestInProgressService } from '../../services/requestInProgress/request-in-progress.service';
|
||||||
import { AccessIdsService } from '../../shared/services/access-ids/access-ids.service';
|
import { AccessIdsService } from '../../shared/services/access-ids/access-ids.service';
|
||||||
import { AccessIdDefinition } from '../../models/access-id';
|
import { AccessIdDefinition } from '../../models/access-id';
|
||||||
import { ErrorsService } from "../../services/errors/errors.service";
|
import { ErrorsService } from '../../services/errors/errors.service';
|
||||||
import { ERROR_TYPES } from "../../models/errors";
|
import { ERROR_TYPES } from '../../models/errors';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'taskana-access-items-management',
|
selector: 'taskana-access-items-management',
|
||||||
|
|
|
@ -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 { ImportExportService } from 'app/administration/services/import-export/import-export.service';
|
||||||
import { CustomFieldsService } from '../../../services/custom-fields/custom-fields.service';
|
import { CustomFieldsService } from '../../../services/custom-fields/custom-fields.service';
|
||||||
import { ERROR_TYPES } from '../../../models/errors';
|
import { ERROR_TYPES } from '../../../models/errors';
|
||||||
import { ErrorsService } from "../../../services/errors/errors.service";
|
import { ErrorsService } from '../../../services/errors/errors.service';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'taskana-classification-details',
|
selector: 'taskana-classification-details',
|
||||||
|
|
|
@ -10,10 +10,10 @@ import { AlertService } from 'app/services/alert/alert.service';
|
||||||
import { AlertModel, AlertType } from 'app/models/alert';
|
import { AlertModel, AlertType } from 'app/models/alert';
|
||||||
import { UploadService } from 'app/shared/services/upload/upload.service';
|
import { UploadService } from 'app/shared/services/upload/upload.service';
|
||||||
import { ImportExportService } from 'app/administration/services/import-export/import-export.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 { ERROR_TYPES } from '../../../models/errors';
|
||||||
import { ErrorsService } from "../../../services/errors/errors.service";
|
import { ErrorsService } from '../../../services/errors/errors.service';
|
||||||
import { ErrorModel } from "../../../models/error-model";
|
import { ErrorModel } from '../../../models/error-model';
|
||||||
import { HttpErrorResponse } from "@angular/common/http";
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'taskana-import-export-component',
|
selector: 'taskana-import-export-component',
|
||||||
|
|
|
@ -8,10 +8,8 @@ import { WorkbasketAccessItemsResource } from 'app/models/workbasket-access-item
|
||||||
import { ACTION } from 'app/models/action';
|
import { ACTION } from 'app/models/action';
|
||||||
import { AlertModel, AlertType } from 'app/models/alert';
|
import { AlertModel, AlertType } from 'app/models/alert';
|
||||||
|
|
||||||
import {
|
import { SavingInformation,
|
||||||
SavingInformation,
|
SavingWorkbasketService } from 'app/administration/services/saving-workbaskets/saving-workbaskets.service';
|
||||||
SavingWorkbasketService
|
|
||||||
} from 'app/administration/services/saving-workbaskets/saving-workbaskets.service';
|
|
||||||
import { GeneralModalService } from 'app/services/general-modal/general-modal.service';
|
import { GeneralModalService } from 'app/services/general-modal/general-modal.service';
|
||||||
import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service';
|
import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service';
|
||||||
import { AlertService } from 'app/services/alert/alert.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 { FormsValidatorService } from 'app/shared/services/forms/forms-validator.service';
|
||||||
import { AccessIdDefinition } from 'app/models/access-id';
|
import { AccessIdDefinition } from 'app/models/access-id';
|
||||||
import { ERROR_TYPES } from '../../../../models/errors';
|
import { ERROR_TYPES } from '../../../../models/errors';
|
||||||
import { ErrorsService } from "../../../../services/errors/errors.service";
|
import { ErrorsService } from '../../../../services/errors/errors.service';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'taskana-workbasket-access-items',
|
selector: 'taskana-workbasket-access-items',
|
||||||
|
|
|
@ -19,7 +19,7 @@ import { Page } from 'app/models/page';
|
||||||
import { OrientationService } from 'app/services/orientation/orientation.service';
|
import { OrientationService } from 'app/services/orientation/orientation.service';
|
||||||
import { Orientation } from 'app/models/orientation';
|
import { Orientation } from 'app/models/orientation';
|
||||||
import { ERROR_TYPES } from '../../../../models/errors';
|
import { ERROR_TYPES } from '../../../../models/errors';
|
||||||
import { ErrorsService } from "../../../../services/errors/errors.service";
|
import { ErrorsService } from '../../../../services/errors/errors.service';
|
||||||
|
|
||||||
export enum Side {
|
export enum Side {
|
||||||
LEFT,
|
LEFT,
|
||||||
|
|
|
@ -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 { RemoveConfirmationService } from 'app/services/remove-confirmation/remove-confirmation.service';
|
||||||
import { FormsValidatorService } from 'app/shared/services/forms/forms-validator.service';
|
import { FormsValidatorService } from 'app/shared/services/forms/forms-validator.service';
|
||||||
import { ERROR_TYPES } from '../../../../models/errors';
|
import { ERROR_TYPES } from '../../../../models/errors';
|
||||||
import { ErrorsService } from "../../../../services/errors/errors.service";
|
import { ErrorsService } from '../../../../services/errors/errors.service';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'taskana-workbasket-information',
|
selector: 'taskana-workbasket-information',
|
||||||
|
@ -169,8 +169,7 @@ implements OnInit, OnChanges, OnDestroy {
|
||||||
error => {
|
error => {
|
||||||
this.errorsService.updateError(ERROR_TYPES.REMOVE_ERR_2,
|
this.errorsService.updateError(ERROR_TYPES.REMOVE_ERR_2,
|
||||||
error,
|
error,
|
||||||
new Map<String,String>([["workbasketId", this.workbasket.workbasketId]])
|
new Map<String, String>([['workbasketId', this.workbasket.workbasketId]]));
|
||||||
);
|
|
||||||
this.requestInProgressService.setRequestInProgress(false);
|
this.requestInProgressService.setRequestInProgress(false);
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
|
@ -12,7 +12,7 @@ import { ImportExportService } from 'app/administration/services/import-export/i
|
||||||
import { GeneralModalService } from '../../../services/general-modal/general-modal.service';
|
import { GeneralModalService } from '../../../services/general-modal/general-modal.service';
|
||||||
import { MessageModal } from '../../../models/message-modal';
|
import { MessageModal } from '../../../models/message-modal';
|
||||||
import { ERROR_TYPES } from '../../../models/errors';
|
import { ERROR_TYPES } from '../../../models/errors';
|
||||||
import { ErrorsService } from "../../../services/errors/errors.service";
|
import { ErrorsService } from '../../../services/errors/errors.service';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'taskana-workbasket-details',
|
selector: 'taskana-workbasket-details',
|
||||||
|
|
|
@ -10,8 +10,8 @@ import {RequestInProgressService} from './services/requestInProgress/request-in-
|
||||||
import { OrientationService } from './services/orientation/orientation.service';
|
import { OrientationService } from './services/orientation/orientation.service';
|
||||||
import { SelectedRouteService } from './services/selected-route/selected-route';
|
import { SelectedRouteService } from './services/selected-route/selected-route';
|
||||||
import { UploadService } from './shared/services/upload/upload.service';
|
import { UploadService } from './shared/services/upload/upload.service';
|
||||||
import {ErrorModel} from "./models/error-model";
|
import { ErrorModel } from './models/error-model';
|
||||||
import {ErrorsService} from "./services/errors/errors.service";
|
import { ErrorsService } from './services/errors/errors.service';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'taskana-root',
|
selector: 'taskana-root',
|
||||||
|
|
|
@ -3,8 +3,8 @@ import { CanActivate } from '@angular/router';
|
||||||
import { Injectable } from '@angular/core';
|
import { Injectable } from '@angular/core';
|
||||||
import { DomainService } from 'app/services/domain/domain.service';
|
import { DomainService } from 'app/services/domain/domain.service';
|
||||||
import { catchError, map } from 'rxjs/operators';
|
import { catchError, map } from 'rxjs/operators';
|
||||||
import { ErrorsService } from "../services/errors/errors.service";
|
import { ErrorsService } from '../services/errors/errors.service';
|
||||||
import { ERROR_TYPES } from "../models/errors";
|
import { ERROR_TYPES } from '../models/errors';
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class DomainGuard implements CanActivate {
|
export class DomainGuard implements CanActivate {
|
||||||
|
|
|
@ -4,7 +4,7 @@ import { Observable, of } from 'rxjs';
|
||||||
import { TaskanaEngineService } from 'app/services/taskana-engine/taskana-engine.service';
|
import { TaskanaEngineService } from 'app/services/taskana-engine/taskana-engine.service';
|
||||||
import { catchError, map } from 'rxjs/operators';
|
import { catchError, map } from 'rxjs/operators';
|
||||||
import { ERROR_TYPES } from '../models/errors';
|
import { ERROR_TYPES } from '../models/errors';
|
||||||
import { ErrorsService } from "../services/errors/errors.service";
|
import { ErrorsService } from '../services/errors/errors.service';
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
providedIn: 'root'
|
providedIn: 'root'
|
||||||
|
@ -29,7 +29,7 @@ export class HistoryGuard implements CanActivate {
|
||||||
return this.navigateToWorkplace();
|
return this.navigateToWorkplace();
|
||||||
}),
|
}),
|
||||||
catchError(() => {
|
catchError(() => {
|
||||||
this.errorsService.updateError(ERROR_TYPES.FETCH_ERR_6)
|
this.errorsService.updateError(ERROR_TYPES.FETCH_ERR_6);
|
||||||
return of(this.navigateToWorkplace());
|
return of(this.navigateToWorkplace());
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|
|
@ -11,7 +11,7 @@ import { TaskHistoryEventResourceData } from 'app/models/task-history-event-reso
|
||||||
import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service';
|
import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service';
|
||||||
import { TaskHistoryEventData } from '../../models/task-history-event';
|
import { TaskHistoryEventData } from '../../models/task-history-event';
|
||||||
import { TaskQueryService } from '../services/task-query/task-query.service';
|
import { TaskQueryService } from '../services/task-query/task-query.service';
|
||||||
import { ErrorsService } from "../../services/errors/errors.service";
|
import { ErrorsService } from '../../services/errors/errors.service';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'taskana-task-query',
|
selector: 'taskana-task-query',
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
|
import { HttpErrorResponse } from '@angular/common/http';
|
||||||
import { ERROR_TYPES, errors } from './errors';
|
import { ERROR_TYPES, errors } from './errors';
|
||||||
import { HttpErrorResponse } from "@angular/common/http";
|
|
||||||
|
|
||||||
export class ErrorModel {
|
export class ErrorModel {
|
||||||
public readonly errObj: HttpErrorResponse;
|
public readonly errObj: HttpErrorResponse;
|
||||||
|
@ -11,8 +11,8 @@ export class ErrorModel {
|
||||||
this.message = errors.get(key).text;
|
this.message = errors.get(key).text;
|
||||||
this.errObj = passedError;
|
this.errObj = passedError;
|
||||||
if (addition) {
|
if (addition) {
|
||||||
addition.forEach((value: string, key: string) => {
|
addition.forEach((value: string, replacementKey: string) => {
|
||||||
this.message.replace(`{${key}}`, value);
|
this.message.replace(`{${replacementKey}}`, value);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,7 +32,6 @@ export enum ERROR_TYPES {
|
||||||
GENERAL_ERR,
|
GENERAL_ERR,
|
||||||
ACCESS_ERR,
|
ACCESS_ERR,
|
||||||
MARK_ERR,
|
MARK_ERR,
|
||||||
NONE,
|
|
||||||
|
|
||||||
// ALERTS
|
// ALERTS
|
||||||
INFO_ALERT,
|
INFO_ALERT,
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
import { Injectable } from '@angular/core';
|
import { Injectable } from '@angular/core';
|
||||||
import { Observable, Subject } from 'rxjs';
|
import { Observable, Subject } from 'rxjs';
|
||||||
|
import { HttpErrorResponse } from '@angular/common/http';
|
||||||
import { ErrorModel } from '../../models/error-model';
|
import { ErrorModel } from '../../models/error-model';
|
||||||
import { ERROR_TYPES } from '../../models/errors';
|
import { ERROR_TYPES } from '../../models/errors';
|
||||||
import { HttpErrorResponse } from "@angular/common/http";
|
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
providedIn: 'root'
|
providedIn: 'root'
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import { Component, EventEmitter, OnInit, Output, ViewChild } from '@angular/core';
|
import { Component, EventEmitter, OnInit, Output, ViewChild } from '@angular/core';
|
||||||
import {ErrorModel} from "../../models/error-model";
|
import { Subscription } from 'rxjs';
|
||||||
import {Subscription} from "rxjs";
|
import { ErrorModel } from '../../models/error-model';
|
||||||
import {ErrorsService} from "../../services/errors/errors.service";
|
import { ErrorsService } from '../../services/errors/errors.service';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'error-modal',
|
selector: 'error-modal',
|
||||||
|
|
|
@ -4,8 +4,8 @@ import { Observable } from 'rxjs';
|
||||||
import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service';
|
import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service';
|
||||||
import { environment } from 'environments/environment';
|
import { environment } from 'environments/environment';
|
||||||
import { tap } from 'rxjs/operators';
|
import { tap } from 'rxjs/operators';
|
||||||
import { ErrorsService } from "../../../services/errors/errors.service";
|
import { ErrorsService } from '../../../services/errors/errors.service';
|
||||||
import { ERROR_TYPES } from "../../../models/errors";
|
import { ERROR_TYPES } from '../../../models/errors';
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class HttpClientInterceptor implements HttpInterceptor {
|
export class HttpClientInterceptor implements HttpInterceptor {
|
||||||
|
|
|
@ -15,7 +15,6 @@ import { ClassificationsService } from 'app/shared/services/classifications/clas
|
||||||
* Components
|
* Components
|
||||||
*/
|
*/
|
||||||
import { GeneralMessageModalComponent } from 'app/shared/general-message-modal/general-message-modal.component';
|
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 { SpinnerComponent } from 'app/shared/spinner/spinner.component';
|
||||||
import { AlertComponent } from 'app/shared/alert/alert.component';
|
import { AlertComponent } from 'app/shared/alert/alert.component';
|
||||||
import { MasterAndDetailComponent } from 'app/shared/master-and-detail/master-and-detail.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 { FilterComponent } from 'app/shared/filter/filter.component';
|
||||||
import { IconTypeComponent } from 'app/administration/components/type-icon/icon-type.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 { 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 { SortComponent } from './sort/sort.component';
|
||||||
import { PaginationComponent } from './pagination/pagination.component';
|
import { PaginationComponent } from './pagination/pagination.component';
|
||||||
import { NumberPickerComponent } from './number-picker/number-picker.component';
|
import { NumberPickerComponent } from './number-picker/number-picker.component';
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import { Component, EventEmitter, Input, OnDestroy, Output, ViewChild } from '@angular/core';
|
import { Component, EventEmitter, Input, OnDestroy, Output, ViewChild } from '@angular/core';
|
||||||
import { ERROR_TYPES } from '../../models/errors';
|
import { ERROR_TYPES } from '../../models/errors';
|
||||||
import { ErrorsService } from "../../services/errors/errors.service";
|
import { ErrorsService } from '../../services/errors/errors.service';
|
||||||
|
|
||||||
declare let $: any;
|
declare let $: any;
|
||||||
|
|
||||||
|
@ -14,12 +14,16 @@ export class SpinnerComponent implements OnDestroy {
|
||||||
showSpinner: boolean;
|
showSpinner: boolean;
|
||||||
@Input()
|
@Input()
|
||||||
delay = 250;
|
delay = 250;
|
||||||
|
|
||||||
@Input()
|
@Input()
|
||||||
isModal = false;
|
isModal = false;
|
||||||
|
|
||||||
@Input()
|
@Input()
|
||||||
positionClass: string;
|
positionClass: string;
|
||||||
|
|
||||||
@Output()
|
@Output()
|
||||||
spinnerIsRunning = new EventEmitter<boolean>();
|
spinnerIsRunning = new EventEmitter<boolean>();
|
||||||
|
|
||||||
private currentTimeout: any;
|
private currentTimeout: any;
|
||||||
private requestTimeout: any;
|
private requestTimeout: any;
|
||||||
private maxRequestTimeout = 10000;
|
private maxRequestTimeout = 10000;
|
||||||
|
|
|
@ -16,7 +16,7 @@ import { Workbasket } from 'app/models/workbasket';
|
||||||
import { WorkplaceService } from 'app/workplace/services/workplace.service';
|
import { WorkplaceService } from 'app/workplace/services/workplace.service';
|
||||||
import { MasterAndDetailService } from 'app/services/masterAndDetail/master-and-detail.service';
|
import { MasterAndDetailService } from 'app/services/masterAndDetail/master-and-detail.service';
|
||||||
import { ERROR_TYPES } from '../../models/errors';
|
import { ERROR_TYPES } from '../../models/errors';
|
||||||
import { ErrorsService } from "../../services/errors/errors.service";
|
import { ErrorsService } from '../../services/errors/errors.service';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'taskana-task-details',
|
selector: 'taskana-task-details',
|
||||||
|
|
Loading…
Reference in New Issue