From cac08a8b448e63c8933d77c5947158244dfa69f4 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Tue, 9 Nov 2021 15:04:46 +0300 Subject: [PATCH] fix some issues due to ts strict mode --- .../src/lib/directives/autofocus.directive.ts | 8 +- .../lib/directives/permission.directive.ts | 4 +- .../core/src/lib/services/list.service.ts | 4 +- .../core/src/lib/utils/localization-utils.ts | 4 +- .../email-setting-group.component.html | 4 +- .../email-setting-group.component.ts | 2 +- .../config/src/providers/features.token.ts | 2 +- .../setting-management.component.ts | 4 +- .../components/tenants/tenants.component.html | 8 +- .../components/tenants/tenants.component.ts | 2 +- .../nav-items/languages.component.ts | 2 +- .../nav-items/nav-items.component.html | 2 +- .../components/routes/routes.component.html | 9 +- .../lib/components/routes/routes.component.ts | 2 + .../abstract-actions.component.ts | 2 +- .../src/lib/directives/disabled.directive.ts | 2 +- .../src/lib/directives/prop-data.directive.ts | 6 +- .../extensions/src/lib/utils/enum.util.ts | 8 +- .../src/lib/utils/localization.util.ts | 10 +- npm/ng-packs/yarn.lock | 3113 +++++++++-------- 20 files changed, 1708 insertions(+), 1490 deletions(-) diff --git a/npm/ng-packs/packages/core/src/lib/directives/autofocus.directive.ts b/npm/ng-packs/packages/core/src/lib/directives/autofocus.directive.ts index 2f9cc13a7e..c417fe4610 100644 --- a/npm/ng-packs/packages/core/src/lib/directives/autofocus.directive.ts +++ b/npm/ng-packs/packages/core/src/lib/directives/autofocus.directive.ts @@ -8,17 +8,17 @@ export class AutofocusDirective implements AfterViewInit { private _delay = 0; @Input('autofocus') - set delay(val: number | undefined) { - this._delay = val ?? 0; + set delay(val: number | undefined | string) { + this._delay = Number(val) || 0; } - get delay() { + get delay(): number { return this._delay; } constructor(private elRef: ElementRef) {} ngAfterViewInit(): void { - setTimeout(() => this.elRef.nativeElement.focus(), this.delay); + setTimeout(() => this.elRef.nativeElement.focus(), this.delay as number); } } 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 08d7d5abe7..2054a0d529 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 @@ -16,7 +16,7 @@ import { PermissionService } from '../services/permission.service'; selector: '[abpPermission]', }) export class PermissionDirective implements OnDestroy, OnChanges { - @Input('abpPermission') condition!: string; + @Input('abpPermission') condition: string | undefined; subscription!: Subscription; @@ -33,7 +33,7 @@ export class PermissionDirective implements OnDestroy, OnChanges { } this.subscription = this.permissionService - .getGrantedPolicy$(this.condition) + .getGrantedPolicy$(this.condition || '') .pipe(distinctUntilChanged()) .subscribe(isGranted => { this.vcRef.clear(); 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 dc79e67f66..e130e3d64f 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 @@ -21,7 +21,7 @@ import { PagedResultDto } from '../models/dtos'; import { LIST_QUERY_DEBOUNCE_TIME } from '../tokens/list.token'; @Injectable() -export class ListService implements OnDestroy { +export class ListService implements OnDestroy { private _filter = ''; set filter(value: string) { this._filter = value; @@ -112,7 +112,7 @@ export class ListService implements OnDes switchMap(query => streamCreatorCallback(query).pipe(catchError(() => of(null)))), filter(Boolean), tap(() => this._isLoading$.next(false)), - shareReplay({ bufferSize: 1, refCount: true }), + shareReplay({ bufferSize: 1, refCount: true }), takeUntil(this.destroy$), ); } diff --git a/npm/ng-packs/packages/core/src/lib/utils/localization-utils.ts b/npm/ng-packs/packages/core/src/lib/utils/localization-utils.ts index 02bbc3f338..59a0e99051 100644 --- a/npm/ng-packs/packages/core/src/lib/utils/localization-utils.ts +++ b/npm/ng-packs/packages/core/src/lib/utils/localization-utils.ts @@ -35,7 +35,7 @@ export function createLocalizationPipeKeyGenerator( ) { const findLocalization = createLocalizationFinder(localization); - return (resourceNames: string[], keys: string[], defaultKey: string) => { + return (resourceNames: string[], keys: string[], defaultKey: string | undefined) => { const { resourceName, key } = findLocalization(resourceNames, keys); return !resourceName ? defaultKey : resourceName === '_' ? key : `${resourceName}::${key}`; }; @@ -45,7 +45,7 @@ function createLocalizationFinder(localization: ApplicationLocalizationConfigura const localize = createLocalizer(localization); return (resourceNames: string[], keys: string[]) => { - resourceNames = resourceNames.concat(localization.defaultResourceName).filter(Boolean); + resourceNames = resourceNames.concat(localization.defaultResourceName || '').filter(Boolean); const resourceCount = resourceNames.length; const keyCount = keys.length; diff --git a/npm/ng-packs/packages/setting-management/config/src/components/email-setting-group/email-setting-group.component.html b/npm/ng-packs/packages/setting-management/config/src/components/email-setting-group/email-setting-group.component.html index 6017609d1e..ff6d51f692 100644 --- a/npm/ng-packs/packages/setting-management/config/src/components/email-setting-group/email-setting-group.component.html +++ b/npm/ng-packs/packages/setting-management/config/src/components/email-setting-group/email-setting-group.component.html @@ -2,7 +2,7 @@
-
+
@@ -41,7 +41,7 @@ - +
@@ -63,7 +63,7 @@ providerKey: { value: providerKey }, visible: { value: visibleFeatures, twoWay: true } }, - outputs: { visibleChange: onVisibleFeaturesChange }, + outputs: { visibleChange: $any(onVisibleFeaturesChange) }, componentKey: featureManagementKey }" [(visible)]="visibleFeatures" 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 10c50a9676..dfee9ada2e 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 @@ -34,7 +34,7 @@ export class TenantsComponent implements OnInit { visibleFeatures = false; - providerKey: string; + providerKey!: string; modalBusy = false; diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/nav-items/languages.component.ts b/npm/ng-packs/packages/theme-basic/src/lib/components/nav-items/languages.component.ts index edf43a7ce5..9dd27b28e1 100644 --- a/npm/ng-packs/packages/theme-basic/src/lib/components/nav-items/languages.component.ts +++ b/npm/ng-packs/packages/theme-basic/src/lib/components/nav-items/languages.component.ts @@ -7,7 +7,7 @@ import { map } from 'rxjs/operators'; selector: 'abp-languages', template: `