From fa923cf36674231f11eadfbef85360212b8534f7 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Mon, 20 Jun 2022 21:37:24 +0300 Subject: [PATCH] try fix --- .eslintrc.json | 48 ++++++++++++++----- README.md | 12 +++-- src/lib/form/base-form.component.ts | 2 +- src/lib/listing/sync-width.directive.ts | 2 +- .../workflow/models/entity-wrapper.model.ts | 2 +- .../workflow/models/workflow-column.model.ts | 2 +- .../workflow/models/workflow-config.model.ts | 2 +- src/lib/services/composite-route.guard.ts | 3 +- 8 files changed, 50 insertions(+), 23 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 6d379a1..a151ffb 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,11 +1,23 @@ { - "extends": ["../../.eslintrc.json"], - "ignorePatterns": ["!**/*"], + "extends": [ + "../../.eslintrc.json" + ], + "env": { + "browser": true, + "node": true + }, + "ignorePatterns": [ + "!**/*" + ], "overrides": [ { - "files": ["**/*.ts"], + "files": [ + "**/*.ts" + ], "parserOptions": { - "project": ["libs/common-ui/tsconfig.json"] + "project": [ + "tsconfig.json" + ] }, "rules": { "@angular-eslint/directive-selector": [ @@ -37,27 +49,41 @@ "error", { "selector": "memberLike", - "modifiers": ["private"], - "format": ["camelCase"], + "modifiers": [ + "private" + ], + "format": [ + "camelCase" + ], "leadingUnderscore": "allow" }, { "selector": "memberLike", - "modifiers": ["protected"], - "format": ["camelCase"], + "modifiers": [ + "protected" + ], + "format": [ + "camelCase" + ], "leadingUnderscore": "allow" }, { "selector": "memberLike", - "modifiers": ["private"], - "format": ["UPPER_CASE", "camelCase"], + "modifiers": [ + "private" + ], + "format": [ + "UPPER_CASE", + "camelCase" + ], "leadingUnderscore": "allow" } ], "no-underscore-dangle": "off", "no-param-reassign": "error", "consistent-return": "off", - "@typescript-eslint/restrict-template-expressions": "off" + "@typescript-eslint/restrict-template-expressions": "off", + "@typescript-eslint/lines-between-class-members": "off" } } ] diff --git a/README.md b/README.md index 12025a9..f028b15 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,14 @@ ## Installation -Install submodule at `libs/common-ui`. +Install submodule at `{libs,projects}/common-ui`. Install dependencies: -- `yarn add keycloak-angular keycloak-js ngx-toastr @biesbjerg/ngx-translate-extract-marker @ngx-translate/core @ngx-translate/http-loader dayjs lodash-es ngx-translate-messageformat-compiler` -- `yarn add @types/lodash-es -D` -- `ng add @angular/material` +- ```sh + yarn add keycloak-angular keycloak-js ngx-toastr @biesbjerg/ngx-translate-extract-marker @ngx-translate/core @ngx-translate/http-loader dayjs lodash-es ngx-translate-messageformat-compiler + ``` +- `yarn add @types/lodash-es -D` +- `ng add @angular/material` In `app.module.ts` add: @@ -45,7 +47,7 @@ section: ... "paths": { ... - "@iqser/common-ui": ["libs/common-ui/src/index.ts"] + "@iqser/common-ui": ["{libs,projects}/common-ui/src/index.ts"] }, "allowSyntheticDefaultImports": true }, diff --git a/src/lib/form/base-form.component.ts b/src/lib/form/base-form.component.ts index ab961b9..9455bef 100644 --- a/src/lib/form/base-form.component.ts +++ b/src/lib/form/base-form.component.ts @@ -19,5 +19,5 @@ export abstract class BaseFormComponent extends AutoUnsubscribe { return !this.valid || !this.changed; } - abstract save(); + abstract save(): unknown; } diff --git a/src/lib/listing/sync-width.directive.ts b/src/lib/listing/sync-width.directive.ts index fac4287..478b361 100644 --- a/src/lib/listing/sync-width.directive.ts +++ b/src/lib/listing/sync-width.directive.ts @@ -14,7 +14,7 @@ export class SyncWidthDirective implements OnDestroy { } ngOnDestroy(): void { - clearInterval(this._interval); + window.clearInterval(this._interval); } @HostListener('window:resize') diff --git a/src/lib/listing/workflow/models/entity-wrapper.model.ts b/src/lib/listing/workflow/models/entity-wrapper.model.ts index 874905a..5ca2fdb 100644 --- a/src/lib/listing/workflow/models/entity-wrapper.model.ts +++ b/src/lib/listing/workflow/models/entity-wrapper.model.ts @@ -1,5 +1,5 @@ -import { IListable } from '@iqser/common-ui'; import { BehaviorSubject, Observable } from 'rxjs'; +import { IListable } from '../../models'; export class EntityWrapper { readonly classes$: BehaviorSubject>; diff --git a/src/lib/listing/workflow/models/workflow-column.model.ts b/src/lib/listing/workflow/models/workflow-column.model.ts index 537e0bf..3b57a09 100644 --- a/src/lib/listing/workflow/models/workflow-column.model.ts +++ b/src/lib/listing/workflow/models/workflow-column.model.ts @@ -1,5 +1,5 @@ -import { IListable } from '@iqser/common-ui'; import { BehaviorSubject } from 'rxjs'; +import { IListable } from '../../models'; export interface WorkflowColumn { key: K; diff --git a/src/lib/listing/workflow/models/workflow-config.model.ts b/src/lib/listing/workflow/models/workflow-config.model.ts index ed9e360..500a8f8 100644 --- a/src/lib/listing/workflow/models/workflow-config.model.ts +++ b/src/lib/listing/workflow/models/workflow-config.model.ts @@ -1,4 +1,4 @@ -import { IListable } from '@iqser/common-ui'; +import { IListable } from '../../models'; import { WorkflowColumn } from './workflow-column.model'; export interface WorkflowConfig { diff --git a/src/lib/services/composite-route.guard.ts b/src/lib/services/composite-route.guard.ts index ab9f2ae..148d03a 100644 --- a/src/lib/services/composite-route.guard.ts +++ b/src/lib/services/composite-route.guard.ts @@ -7,8 +7,7 @@ import { LoadingService } from '../loading'; providedIn: 'root', }) export class CompositeRouteGuard implements CanActivate { - constructor(protected readonly _injector: Injector, private readonly _loadingService: LoadingService) { - } + constructor(protected readonly _injector: Injector, private readonly _loadingService: LoadingService) {} async canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise { this._loadingService.start();