From 649c9d8f4a29bbed130d92eff45b8834fb270d6c Mon Sep 17 00:00:00 2001 From: FrancescoBorzi Date: Mon, 15 Jul 2019 21:44:28 +0200 Subject: [PATCH] refactor: module flags-selector --- src/app/app.module.ts | 7 ----- .../flags-selector-btn.component.spec.ts | 7 ++--- .../flags-selector-modal.component.spec.ts | 9 ++----- .../flags-selector/flags-selector.module.ts | 27 +++++++++++++++++++ 4 files changed, 31 insertions(+), 19 deletions(-) create mode 100644 src/app/components/editors/shared/selectors/flags-selector/flags-selector.module.ts diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 9cc6e4e127..135dd8ad8c 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -50,10 +50,6 @@ import { NpcTrainerComponent } from './components/editors/creature/npc-trainer/n import { SpawnsComponent } from './components/editors/creature/spawns/spawns.component'; import { SpawnsAddonComponent } from './components/editors/creature/spawns-addon/spawns-addon.component'; import { QueryErrorComponent } from './components/editors/shared/query-output/query-error/query-error.component'; -import { ItemSelectorBtnComponent } from './components/editors/shared/selectors/item-selector/item-selector-btn.component'; -import { ItemSelectorModalComponent } from './components/editors/shared/selectors/item-selector/item-selector-modal.component'; -import { FlagsSelectorModalComponent } from './components/editors/shared/selectors/flags-selector/flags-selector-modal.component'; -import { FlagsSelectorBtnComponent } from './components/editors/shared/selectors/flags-selector/flags-selector-btn.component'; import { uiSwitchConfig } from './config/ui-switch.config'; import { SingleValueSelectorBtnComponent @@ -69,7 +65,6 @@ const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = { @NgModule({ entryComponents: [ - FlagsSelectorModalComponent, SingleValueSelectorModalComponent, ], declarations: [ @@ -79,8 +74,6 @@ const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = { SidebarComponent, MainWindowComponent, QueryErrorComponent, - FlagsSelectorModalComponent, - FlagsSelectorBtnComponent, SingleValueSelectorModalComponent, SingleValueSelectorBtnComponent, HighlightjsWrapperComponent, diff --git a/src/app/components/editors/shared/selectors/flags-selector/flags-selector-btn.component.spec.ts b/src/app/components/editors/shared/selectors/flags-selector/flags-selector-btn.component.spec.ts index f400ceb462..448193707b 100644 --- a/src/app/components/editors/shared/selectors/flags-selector/flags-selector-btn.component.spec.ts +++ b/src/app/components/editors/shared/selectors/flags-selector/flags-selector-btn.component.spec.ts @@ -1,7 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { ModalModule } from 'ngx-bootstrap'; import { FlagsSelectorBtnComponent } from './flags-selector-btn.component'; +import { FlagsSelectorModule } from './flags-selector.module'; describe('FlagsSelectorBtnComponent', () => { let component: FlagsSelectorBtnComponent; @@ -9,10 +9,7 @@ describe('FlagsSelectorBtnComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ FlagsSelectorBtnComponent ], - imports: [ - ModalModule.forRoot(), - ] + imports: [ FlagsSelectorModule ], }) .compileComponents(); })); diff --git a/src/app/components/editors/shared/selectors/flags-selector/flags-selector-modal.component.spec.ts b/src/app/components/editors/shared/selectors/flags-selector/flags-selector-modal.component.spec.ts index 2aec976dee..0a8a519a6a 100644 --- a/src/app/components/editors/shared/selectors/flags-selector/flags-selector-modal.component.spec.ts +++ b/src/app/components/editors/shared/selectors/flags-selector/flags-selector-modal.component.spec.ts @@ -1,10 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { BsModalRef } from 'ngx-bootstrap'; -import { UiSwitchModule } from 'ngx-ui-switch'; import { FlagsSelectorModalComponent } from './flags-selector-modal.component'; -import { CommonTestModule } from '../../../../../test-utils/common-test.module'; import { FlagsService } from '../../../../../services/helpers/flags.service'; +import { FlagsSelectorModule } from './flags-selector.module'; describe('FlagsSelectorModalComponent', () => { let component: FlagsSelectorModalComponent; @@ -13,11 +12,7 @@ describe('FlagsSelectorModalComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ FlagsSelectorModalComponent ], - imports: [ - CommonTestModule, - UiSwitchModule, - ], + imports: [ FlagsSelectorModule ], providers: [ BsModalRef, ], diff --git a/src/app/components/editors/shared/selectors/flags-selector/flags-selector.module.ts b/src/app/components/editors/shared/selectors/flags-selector/flags-selector.module.ts new file mode 100644 index 0000000000..f77be35e7e --- /dev/null +++ b/src/app/components/editors/shared/selectors/flags-selector/flags-selector.module.ts @@ -0,0 +1,27 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { ModalModule } from 'ngx-bootstrap'; +import { UiSwitchModule } from 'ngx-ui-switch'; + +import { FlagsSelectorModalComponent } from './flags-selector-modal.component'; +import { FlagsSelectorBtnComponent } from './flags-selector-btn.component'; +import { uiSwitchConfig } from '../../../../../config/ui-switch.config'; + +@NgModule({ + entryComponents: [ + FlagsSelectorModalComponent, + ], + declarations: [ + FlagsSelectorModalComponent, + FlagsSelectorBtnComponent, + ], + imports: [ + BrowserModule, + ModalModule.forRoot(), + UiSwitchModule.forRoot(uiSwitchConfig), + ], + exports: [ + FlagsSelectorBtnComponent, + ], +}) +export class FlagsSelectorModule {}