From fcf9ebe0c95af4223a98fa09690120594904993c Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Fri, 3 Apr 2020 08:39:02 +0300 Subject: [PATCH] fix: fix lint error --- npm/ng-packs/angular.json | 6 +++++- .../identity/src/lib/components/roles/roles.component.ts | 6 +++--- .../src/lib/components/tenants/tenants.component.ts | 6 +++--- .../src/lib/components/modal/modal.component.ts | 6 +++--- .../packages/theme-shared/src/lib/handlers/error.handler.ts | 4 ++-- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/npm/ng-packs/angular.json b/npm/ng-packs/angular.json index 1f13192da0..39a10f827b 100644 --- a/npm/ng-packs/angular.json +++ b/npm/ng-packs/angular.json @@ -519,7 +519,11 @@ "lint": { "builder": "@angular-devkit/build-angular:tslint", "options": { - "tsConfig": ["apps/dev-app/tsconfig.app.json", "apps/dev-app/tsconfig.spec.json"], + "tsConfig": [ + "apps/dev-app/tsconfig.dev.json", + "apps/dev-app/tsconfig.prod.json", + "apps/dev-app/tsconfig.spec.json" + ], "exclude": ["**/node_modules/**"] } } diff --git a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.ts b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.ts index 546ff48483..20b1114669 100644 --- a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.ts +++ b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.ts @@ -1,5 +1,5 @@ import { ABP } from '@abp/ng.core'; -import { ConfirmationService, Toaster } from '@abp/ng.theme.shared'; +import { ConfirmationService, Confirmation } from '@abp/ng.theme.shared'; import { Component, ElementRef, OnInit, ViewChild } from '@angular/core'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { Select, Store } from '@ngxs/store'; @@ -116,8 +116,8 @@ export class RolesComponent implements OnInit { .warn('AbpIdentity::RoleDeletionConfirmationMessage', 'AbpIdentity::AreYouSure', { messageLocalizationParams: [name], }) - .subscribe((status: Toaster.Status) => { - if (status === Toaster.Status.confirm) { + .subscribe((status: Confirmation.Status) => { + if (status === Confirmation.Status.confirm) { this.store.dispatch(new DeleteRole(id)).subscribe(() => this.get()); } }); diff --git a/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts b/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts index 788953096f..de7a6ad644 100644 --- a/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts +++ b/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts @@ -1,5 +1,5 @@ import { ABP } from '@abp/ng.core'; -import { ConfirmationService, Toaster } from '@abp/ng.theme.shared'; +import { ConfirmationService, Confirmation } from '@abp/ng.theme.shared'; import { Component, OnInit, TemplateRef, ViewChild, ChangeDetectorRef } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { Select, Store } from '@ngxs/store'; @@ -252,8 +252,8 @@ export class TenantsComponent implements OnInit { messageLocalizationParams: [name], }, ) - .subscribe((status: Toaster.Status) => { - if (status === Toaster.Status.confirm) { + .subscribe((status: Confirmation.Status) => { + if (status === Confirmation.Status.confirm) { this.store.dispatch(new DeleteTenant(id)).subscribe(() => this.get()); } }); diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts index 8aaaa58076..e00cda5b55 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts @@ -14,7 +14,7 @@ import { import { fromEvent, Subject } from 'rxjs'; import { debounceTime, filter, takeUntil } from 'rxjs/operators'; import { fadeAnimation } from '../../animations/modal.animations'; -import { Toaster } from '../../models/toaster'; +import { Confirmation } from '../../models/confirmation'; import { ConfirmationService } from '../../services/confirmation.service'; import { ButtonComponent } from '../button/button.component'; @@ -133,9 +133,9 @@ export class ModalComponent implements OnDestroy { 'AbpAccount::AreYouSureYouWantToCancelEditingWarningMessage', 'AbpAccount::AreYouSure', ) - .subscribe((status: Toaster.Status) => { + .subscribe((status: Confirmation.Status) => { this.isConfirmationOpen = false; - if (status === Toaster.Status.confirm) { + if (status === Confirmation.Status.confirm) { this.visible = false; } }); diff --git a/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts b/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts index 1f221a42e9..c84bf30470 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts @@ -17,7 +17,7 @@ import { Observable, Subject } from 'rxjs'; import snq from 'snq'; import { HttpErrorWrapperComponent } from '../components/http-error-wrapper/http-error-wrapper.component'; import { HttpErrorConfig, ErrorScreenErrorCodes } from '../models/common'; -import { Toaster } from '../models/toaster'; +import { Confirmation } from '../models/confirmation'; import { ConfirmationService } from '../services/confirmation.service'; export const DEFAULT_ERROR_MESSAGES = { @@ -185,7 +185,7 @@ export class ErrorHandler { message?: Config.LocalizationParam, title?: Config.LocalizationParam, body?: any, - ): Observable { + ): Observable { if (body) { if (body.details) { message = body.details;