refactor: module flags-selector

azerothcore · Jul 15, 2019 · 649c9d8 · 649c9d8
1 parent 96650d5
commit 649c9d8
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 19 deletions.
diff --git 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/...p/components/editors/shared/selectors/flags-selector/flags-selector-btn.component.spec.ts b/...p/components/editors/shared/selectors/flags-selector/flags-selector-btn.component.spec.ts
@@ -1,18 +1,15 @@
 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;
   let fixture: ComponentFixture<FlagsSelectorBtnComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ FlagsSelectorBtnComponent ],
-      imports: [
-        ModalModule.forRoot(),
-      ]
+      imports: [ FlagsSelectorModule ],
     })
     .compileComponents();
   }));

diff --git a/...components/editors/shared/selectors/flags-selector/flags-selector-modal.component.spec.ts b/...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
@@ -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 {}