diff --git a/npm/ng-packs/packages/core/src/lib/directives/permission.directive.ts b/npm/ng-packs/packages/core/src/lib/directives/permission.directive.ts index a103b11a46..e06c6d404c 100644 --- a/npm/ng-packs/packages/core/src/lib/directives/permission.directive.ts +++ b/npm/ng-packs/packages/core/src/lib/directives/permission.directive.ts @@ -23,7 +23,7 @@ export class PermissionDirective implements OnDestroy, OnChanges, AfterViewInit subscription!: Subscription; - cdrSubject = new ReplaySubject(); + cdrSubject = new ReplaySubject(); rendered = false; diff --git a/npm/ng-packs/packages/core/src/lib/services/config-state.service.ts b/npm/ng-packs/packages/core/src/lib/services/config-state.service.ts index 552b96ed05..98a1635df4 100644 --- a/npm/ng-packs/packages/core/src/lib/services/config-state.service.ts +++ b/npm/ng-packs/packages/core/src/lib/services/config-state.service.ts @@ -2,7 +2,10 @@ import { Injectable } from '@angular/core'; import { Observable, Subject } from 'rxjs'; import { map, switchMap, take } from 'rxjs/operators'; import { AbpApplicationConfigurationService } from '../proxy/volo/abp/asp-net-core/mvc/application-configurations/abp-application-configuration.service'; -import { ApplicationConfigurationDto, ApplicationGlobalFeatureConfigurationDto } from '../proxy/volo/abp/asp-net-core/mvc/application-configurations/models'; +import { + ApplicationConfigurationDto, + ApplicationGlobalFeatureConfigurationDto, +} from '../proxy/volo/abp/asp-net-core/mvc/application-configurations/models'; import { InternalStore } from '../utils/internal-store-utils'; @Injectable({ @@ -15,7 +18,7 @@ export class ConfigStateService { return this.store.sliceUpdate; } - private updateSubject = new Subject(); + private updateSubject = new Subject(); constructor(private abpConfigService: AbpApplicationConfigurationService) { this.initUpdateStream(); @@ -147,8 +150,11 @@ export class ConfigStateService { return this.store.sliceState(state => state.globalFeatures); } - private isGlobalFeatureEnabled(key: string, globalFeatures: ApplicationGlobalFeatureConfigurationDto) { - const features = globalFeatures.enabledFeatures || [] + private isGlobalFeatureEnabled( + key: string, + globalFeatures: ApplicationGlobalFeatureConfigurationDto, + ) { + const features = globalFeatures.enabledFeatures || []; return features.some(f => key === f); } @@ -159,9 +165,6 @@ export class ConfigStateService { getGlobalFeatureIsEnabled$(key: string) { return this.store.sliceState(state => this.isGlobalFeatureEnabled(key, state.globalFeatures)); } - - - } function splitKeys(keys: string[] | string): string[] { diff --git a/npm/ng-packs/packages/core/src/lib/services/http-wait.service.ts b/npm/ng-packs/packages/core/src/lib/services/http-wait.service.ts index 7292490a4b..792c67ed70 100644 --- a/npm/ng-packs/packages/core/src/lib/services/http-wait.service.ts +++ b/npm/ng-packs/packages/core/src/lib/services/http-wait.service.ts @@ -24,7 +24,7 @@ export class HttpWaitService { }); private delay: number; - private destroy$ = new Subject(); + private destroy$ = new Subject(); constructor(injector: Injector) { this.delay = injector.get(LOADER_DELAY, 500); diff --git a/npm/ng-packs/packages/core/src/lib/services/list.service.ts b/npm/ng-packs/packages/core/src/lib/services/list.service.ts index e6de814b77..3025b91682 100644 --- a/npm/ng-packs/packages/core/src/lib/services/list.service.ts +++ b/npm/ng-packs/packages/core/src/lib/services/list.service.ts @@ -80,7 +80,7 @@ export class ListService implements private _isLoading$ = new BehaviorSubject(false); - private destroy$ = new Subject(); + private destroy$ = new Subject(); private delay: MonoTypeOperatorFunction; diff --git a/npm/ng-packs/packages/core/src/lib/services/router-wait.service.ts b/npm/ng-packs/packages/core/src/lib/services/router-wait.service.ts index e53ca3a1b1..96e66a00e3 100644 --- a/npm/ng-packs/packages/core/src/lib/services/router-wait.service.ts +++ b/npm/ng-packs/packages/core/src/lib/services/router-wait.service.ts @@ -15,7 +15,7 @@ export interface RouterWaitState { }) export class RouterWaitService { private store = new InternalStore({ loading: false }); - private destroy$ = new Subject(); + private destroy$ = new Subject(); private delay: number; constructor(private routerEvents: RouterEvents, injector: Injector) { this.delay = injector.get(LOADER_DELAY, 500); diff --git a/npm/ng-packs/packages/core/src/lib/tests/api.interceptor.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/api.interceptor.spec.ts index f731e4e7e5..7715dd69db 100644 --- a/npm/ng-packs/packages/core/src/lib/tests/api.interceptor.spec.ts +++ b/npm/ng-packs/packages/core/src/lib/tests/api.interceptor.spec.ts @@ -36,7 +36,7 @@ describe('ApiInterceptor', () => { sessionState.getTenant.andReturn({ id: 'Volosoft', name: 'Volosoft' }); const request = new HttpRequest('GET', 'https://abp.io'); - const handleRes$ = new Subject(); + const handleRes$ = new Subject(); const handler = { handle: (req: HttpRequest) => { @@ -59,7 +59,7 @@ describe('ApiInterceptor', () => { const spyDeleteRequest = jest.spyOn(httpWaitService, 'deleteRequest'); const request = new HttpRequest('GET', 'https://abp.io'); - const handleRes$ = new Subject(); + const handleRes$ = new Subject(); const handler = { handle: (req: HttpRequest) => { diff --git a/npm/ng-packs/packages/core/src/lib/tests/routes.service.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/routes.service.spec.ts index d8f482f9d9..a9cea565f6 100644 --- a/npm/ng-packs/packages/core/src/lib/tests/routes.service.spec.ts +++ b/npm/ng-packs/packages/core/src/lib/tests/routes.service.spec.ts @@ -4,7 +4,7 @@ import { RoutesService } from '../services'; import { DummyInjector } from './utils/common.utils'; import { mockPermissionService } from './utils/permission-service.spec.utils'; -const updateStream$ = new Subject(); +const updateStream$ = new Subject(); export const mockRoutesService = (injectorPayload = {} as { [key: string]: any }) => { const injector = new DummyInjector({ diff --git a/npm/ng-packs/packages/core/src/lib/validators/url.validator.ts b/npm/ng-packs/packages/core/src/lib/validators/url.validator.ts index da941aee6f..db4355eb02 100644 --- a/npm/ng-packs/packages/core/src/lib/validators/url.validator.ts +++ b/npm/ng-packs/packages/core/src/lib/validators/url.validator.ts @@ -1,5 +1,5 @@ import { AbstractControl, ValidatorFn } from '@angular/forms'; -import { isNullOrUndefined } from '../utils'; +import { isNullOrEmpty } from '../utils'; export interface UrlError { url: true; @@ -7,11 +7,11 @@ export interface UrlError { export function validateUrl(): ValidatorFn { return (control: AbstractControl): UrlError | null => { - if (isNullOrUndefined(control.value)) return null; + if (isNullOrEmpty(control.value)) return null; return isValidUrl(control.value) ? null : { url: true }; }; -} +} function isValidUrl(value: string): boolean { if (/^http(s)?:\/\/[^/]/.test(value) || /^ftp:\/\/[^/]/.test(value)) { diff --git a/npm/ng-packs/packages/theme-shared/src/lib/services/confirmation.service.ts b/npm/ng-packs/packages/theme-shared/src/lib/services/confirmation.service.ts index 02840743da..f93e850aaf 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/services/confirmation.service.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/services/confirmation.service.ts @@ -13,7 +13,7 @@ export class ConfirmationService { private containerComponentRef!: ComponentRef; clear = (status: Confirmation.Status = Confirmation.Status.dismiss) => { - this.confirmation$.next(); + this.confirmation$.next(null); this.status$.next(status); }; diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/modal.component.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/modal.component.spec.ts index e1f15db581..a875eb27c7 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/tests/modal.component.spec.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/modal.component.spec.ts @@ -178,7 +178,7 @@ describe('ModalComponent', () => { .pipe( take(2), delay(0), - reduce((acc, v) => acc.concat(v), []), + reduce((acc, v) => acc.concat(v)), ) .subscribe(([event1, event2]) => { expect(event1.returnValue).toBe(false);