From f3ce516f5108045fe1568434fab1499f4dde25d2 Mon Sep 17 00:00:00 2001 From: klemenoslaj Date: Thu, 28 Feb 2019 14:52:32 +0100 Subject: [PATCH 1/3] chore: disable vscode auto format on save --- .vscode/settings.json | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..7c2feb7 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "editor.formatOnSave": false +} From 6e8550cb5937ae02b5a1dfd6c94b5921f2e380f7 Mon Sep 17 00:00:00 2001 From: klemenoslaj Date: Sat, 2 Mar 2019 18:06:10 +0100 Subject: [PATCH 2/3] chore: configure index_size of editorconfig --- .editorconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index 6e87a00..9b73521 100644 --- a/.editorconfig +++ b/.editorconfig @@ -4,7 +4,7 @@ root = true [*] charset = utf-8 indent_style = space -indent_size = 2 +indent_size = 4 insert_final_newline = true trim_trailing_whitespace = true From d18d1640e728f9cd766a73529e6352b12ff562c9 Mon Sep 17 00:00:00 2001 From: klemenoslaj Date: Sun, 3 Mar 2019 22:46:52 +0100 Subject: [PATCH 3/3] refactor: fix tsconfig configuration and codestyle --- README.md | 43 ++++++++++++------- .../action-abstract/action-abstract.spec.ts | 6 +-- .../lib/action-abstract/action-abstract.ts | 4 +- .../core/src/lib/action-group/action-group.ts | 4 +- .../core/src/lib/action-outlet.directive.ts | 2 +- 5 files changed, 36 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index df94280..017001d 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,31 @@ -
- -[![Codacy Badge](https://api.codacy.com/project/badge/Grade/f495c18616434c3ca2fafe26f89a818f)](https://app.codacy.com/app/klemenoslaj/ng-action-outlet?utm_source=github.com&utm_medium=referral&utm_content=klemenoslaj/ng-action-outlet&utm_campaign=Badge_Grade_Settings) -[![Travis build](https://img.shields.io/travis/klemenoslaj/ng-action-outlet/master.svg)](https://travis-ci.org/klemenoslaj/ng-action-outlet) -[![Coveralls github](https://img.shields.io/coveralls/klemenoslaj/ng-action-outlet/master.svg)](https://coveralls.io/github/klemenoslaj/ng-action-outlet?branch=master) -[![David](https://img.shields.io/david/klemenoslaj/ng-action-outlet/master.svg)](https://david-dm.org/klemenoslaj/ng-action-outlet) - -[![Compodoc tag](./docs/images/coverage-badge.svg)](https://klemenoslaj.github.io/ng-action-outlet/coverage.html) -[![License](https://img.shields.io/npm/l/@ng-action-outlet/core.svg)](https://github.com/klemenoslaj/ng-action-outlet/blob/master/LICENSE) -[![GitHub tag](https://img.shields.io/github/tag/klemenoslaj/ng-action-outlet.svg)](https://github.com/klemenoslaj/ng-action-outlet/releases) -[![Known Vulnerabilities](https://snyk.io/test/github/klemenoslaj/ng-action-outlet/badge.svg?targetFile=package.json)](https://snyk.io/test/github/klemenoslaj/ng-action-outlet?targetFile=package.json) - -[![Angular Style Guide](https://mgechev.github.io/angular2-style-guide/images/badge.svg)](https://angular.io/styleguide) - -
+

+ + + + + + + + + + +
+ + + + + + + + + + +
+ + + + +

# [NgActionOutlet](https://klemenoslaj.github.io/ng-action-outlet/) diff --git a/projects/core/src/lib/action-abstract/action-abstract.spec.ts b/projects/core/src/lib/action-abstract/action-abstract.spec.ts index 48600a6..5274b7d 100644 --- a/projects/core/src/lib/action-abstract/action-abstract.spec.ts +++ b/projects/core/src/lib/action-abstract/action-abstract.spec.ts @@ -1,4 +1,4 @@ -import { BehaviorSubject, never, Observable } from 'rxjs'; +import { BehaviorSubject, NEVER, Observable } from 'rxjs'; import { filter } from 'rxjs/operators'; import { TestScheduler } from 'rxjs/testing'; @@ -6,8 +6,8 @@ import { ActionGroup } from '../action-group/action-group'; import { ActionAbstract, ActionState } from './action-abstract'; class ActionAbstractTest extends ActionAbstract { - changes$: any = never(); - fire$: any = never(); + changes$: any = NEVER; + fire$: any = NEVER; state: BehaviorSubject; diff --git a/projects/core/src/lib/action-abstract/action-abstract.ts b/projects/core/src/lib/action-abstract/action-abstract.ts index e6838fd..5ff46f1 100644 --- a/projects/core/src/lib/action-abstract/action-abstract.ts +++ b/projects/core/src/lib/action-abstract/action-abstract.ts @@ -1,5 +1,5 @@ import { Type } from '@angular/core'; -import { BehaviorSubject, Observable, never } from 'rxjs'; +import { BehaviorSubject, Observable, NEVER } from 'rxjs'; import { distinctUntilChanged , filter, switchMap, takeUntil } from 'rxjs/operators'; import { ActionAbstractComponentImpl, ActionAbstractEvent, ActionAbstractOptions } from '../action-abstract/action-abstract.model'; @@ -246,7 +246,7 @@ export abstract class ActionAbstract(observable: Observable): Observable { return this.state.pipe( - switchMap(state => state === ActionState.Inactive ? (never()) : observable) + switchMap(state => state === ActionState.Inactive ? (NEVER) : observable) ); } diff --git a/projects/core/src/lib/action-group/action-group.ts b/projects/core/src/lib/action-group/action-group.ts index 66384ce..8db995a 100644 --- a/projects/core/src/lib/action-group/action-group.ts +++ b/projects/core/src/lib/action-group/action-group.ts @@ -1,5 +1,5 @@ import { Type } from '@angular/core'; -import { BehaviorSubject, Observable, never, merge } from 'rxjs'; +import { BehaviorSubject, Observable, NEVER, merge } from 'rxjs'; import { map } from 'rxjs/operators'; import { ActionAbstract } from '../action-abstract/action-abstract'; @@ -106,7 +106,7 @@ export class ActionGroup extends ActionAbstract action._setParent(this)))); this.dropdown = new BehaviorSubject(this.options.dropdown); - this.fire$ = this.handleLivecycle(never(), false); + this.fire$ = this.handleLivecycle(NEVER, false); this.children$ = this.handleLivecycle(this.children.asObservable()); this.dropdown$ = this.handleLivecycleDistinct(this.dropdown.asObservable()); diff --git a/projects/core/src/lib/action-outlet.directive.ts b/projects/core/src/lib/action-outlet.directive.ts index d5655b7..59c416f 100644 --- a/projects/core/src/lib/action-outlet.directive.ts +++ b/projects/core/src/lib/action-outlet.directive.ts @@ -135,6 +135,6 @@ export class ActionOutletDirective implements OnDestroy { * @param injector `Injector` from current directive instance */ getComponentType(action: AnyAction, injector: Injector): Type { - return action.getForcedComponent() || >injector.get(action.constructor); + return action.getForcedComponent() || >injector.get(action.constructor); } }