Merge b7d249d into d97fef3

azerothcore · Aug 12, 2019 · 4d66962 · 4d66962
2 parents d97fef3 + b7d249d
commit 4d66962
Show file tree

Hide file tree

Showing 25 changed files with 111 additions and 111 deletions.
diff --git a/.../spawns-addon/spawns-addon.component.html → ...addon/creature-spawn-addon.component.html b/.../spawns-addon/spawns-addon.component.html → ...addon/creature-spawn-addon.component.html
diff --git a/.../spawns-addon/spawns-addon.component.scss → ...addon/creature-spawn-addon.component.scss b/.../spawns-addon/spawns-addon.component.scss → ...addon/creature-spawn-addon.component.scss
diff --git a/...re/spawns-addon/spawns-addon.component.ts → ...n-addon/creature-spawn-addon.component.ts b/...re/spawns-addon/spawns-addon.component.ts → ...n-addon/creature-spawn-addon.component.ts
@@ -2,26 +2,26 @@ import { Component } from '@angular/core';
 
 import { MultiRowEditorComponent } from '../../shared/multi-row-editor.component';
 import { CreatureHandlerService } from '../../../../services/handlers/creature-handler.service';
-import { SpawnsAddon } from '../../../../types/spawns-addon.type';
-import { SpawnsAddonService } from '../../../../services/editors/creature/spawns-addon.service';
+import { CreatureSpawnAddon } from '../../../../types/creature-spawn-addon.type';
+import { CreatureSpawnAddonService } from '../../../../services/editors/creature/creature-spawn-addon.service';
 import { EMOTE } from '../../../../constants/options/emote';
 import { CREATURE_ADDON_BYTES_1 } from '../../../../constants/options/creature-addon-bytes1';
 import { CREATURE_ADDON_BYTES_2 } from '../../../../constants/options/creature-addon-bytes2';
 
 @Component({
-  selector: 'app-spawns-addon',
-  templateUrl: './spawns-addon.component.html',
-  styleUrls: ['./spawns-addon.component.scss']
+  selector: 'app-creature-spawn-addon',
+  templateUrl: './creature-spawn-addon.component.html',
+  styleUrls: ['./creature-spawn-addon.component.scss']
 })
-export class SpawnsAddonComponent extends MultiRowEditorComponent<SpawnsAddon> {
+export class CreatureSpawnAddonComponent extends MultiRowEditorComponent<CreatureSpawnAddon> {
 
   public readonly EMOTE = EMOTE;
   public readonly CREATURE_ADDON_BYTES_1 = CREATURE_ADDON_BYTES_1;
   public readonly CREATURE_ADDON_BYTES_2 = CREATURE_ADDON_BYTES_2;
 
   /* istanbul ignore next */ // because of: https://github.com/gotwarlost/istanbul/issues/690
   constructor(
-    public editorService: SpawnsAddonService,
+    public editorService: CreatureSpawnAddonService,
     public handlerService: CreatureHandlerService,
   ) {
     super(editorService, handlerService);

diff --git a/...ns-addon/spawns-addon.integration.spec.ts → .../creature-spawn-addon.integration.spec.ts b/...ns-addon/spawns-addon.integration.spec.ts → .../creature-spawn-addon.integration.spec.ts
@@ -3,37 +3,37 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
 import Spy = jasmine.Spy;
 
-import { SpawnsAddonComponent } from './spawns-addon.component';
-import { SpawnsAddonModule } from './spawns-addon.module';
+import { CreatureSpawnAddonComponent } from './creature-spawn-addon.component';
+import { CreatureSpawnAddonModule } from './creature-spawn-addon.module';
 import { QueryService } from '../../../../services/query.service';
-import { SpawnsAddon } from '../../../../types/spawns-addon.type';
+import { CreatureSpawnAddon } from '../../../../types/creature-spawn-addon.type';
 import { CreatureHandlerService } from '../../../../services/handlers/creature-handler.service';
 import { MultiRowEditorPageObject } from '../../../../test-utils/multi-row-editor-page-object';
-import { SpawnsAddonService } from '../../../../services/editors/creature/spawns-addon.service';
+import { CreatureSpawnAddonService } from '../../../../services/editors/creature/creature-spawn-addon.service';
 
-class SpawnsAddonPage extends MultiRowEditorPageObject<SpawnsAddonComponent> {}
+class CreatureSpawnAddonPage extends MultiRowEditorPageObject<CreatureSpawnAddonComponent> {}
 
-describe('SpawnsAddon integration tests', () => {
-  let component: SpawnsAddonComponent;
-  let fixture: ComponentFixture<SpawnsAddonComponent>;
+describe('CreatureSpawnAddon integration tests', () => {
+  let component: CreatureSpawnAddonComponent;
+  let fixture: ComponentFixture<CreatureSpawnAddonComponent>;
   let queryService: QueryService;
   let querySpy: Spy;
   let handlerService: CreatureHandlerService;
-  let page: SpawnsAddonPage;
+  let page: CreatureSpawnAddonPage;
 
   const id = 1234;
 
-  const originalRow0 = new SpawnsAddon();
-  const originalRow1 = new SpawnsAddon();
-  const originalRow2 = new SpawnsAddon();
+  const originalRow0 = new CreatureSpawnAddon();
+  const originalRow1 = new CreatureSpawnAddon();
+  const originalRow2 = new CreatureSpawnAddon();
   originalRow0.guid = 0;
   originalRow1.guid = 1;
   originalRow2.guid = 2;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [
-        SpawnsAddonModule,
+        CreatureSpawnAddonModule,
         RouterTestingModule,
       ],
     })
@@ -48,13 +48,13 @@ describe('SpawnsAddon integration tests', () => {
     queryService = TestBed.get(QueryService);
     querySpy = spyOn(queryService, 'query').and.returnValue(of());
 
-    spyOn(TestBed.get(SpawnsAddonService), 'selectQuery').and.returnValue(of(
+    spyOn(TestBed.get(CreatureSpawnAddonService), 'selectQuery').and.returnValue(of(
       { results: creatingNew ? [] : [originalRow0, originalRow1, originalRow2] }
     ));
 
-    fixture = TestBed.createComponent(SpawnsAddonComponent);
+    fixture = TestBed.createComponent(CreatureSpawnAddonComponent);
     component = fixture.componentInstance;
-    page = new SpawnsAddonPage(fixture);
+    page = new CreatureSpawnAddonPage(fixture);
     fixture.autoDetectChanges(true);
     fixture.detectChanges();
   }

diff --git a/...ature/spawns-addon/spawns-addon.module.ts → ...pawn-addon/creature-spawn-addon.module.ts b/...ature/spawns-addon/spawns-addon.module.ts → ...pawn-addon/creature-spawn-addon.module.ts
@@ -6,12 +6,12 @@ import { NgxDatatableModule } from '@swimlane/ngx-datatable';
 
 import { TopBarModule } from '../../shared/top-bar/top-bar.module';
 import { QueryOutputModule } from '../../shared/query-output/query-output.module';
-import { SpawnsAddonComponent } from './spawns-addon.component';
+import { CreatureSpawnAddonComponent } from './creature-spawn-addon.component';
 import { SingleValueSelectorModule } from '../../shared/selectors/single-value-selector/single-value-selector.module';
 
 @NgModule({
   declarations: [
-    SpawnsAddonComponent,
+    CreatureSpawnAddonComponent,
   ],
   imports: [
     BrowserModule,
@@ -23,7 +23,7 @@ import { SingleValueSelectorModule } from '../../shared/selectors/single-value-s
     SingleValueSelectorModule,
   ],
   exports: [
-    SpawnsAddonComponent,
+    CreatureSpawnAddonComponent,
   ],
 })
-export class SpawnsAddonModule {}
+export class CreatureSpawnAddonModule {}
diff --git a/...ors/creature/spawns/spawns.component.html → ...ature-spawn/creature-spawn.component.html b/...ors/creature/spawns/spawns.component.html → ...ature-spawn/creature-spawn.component.html
diff --git a/...ors/creature/spawns/spawns.component.scss → ...ature-spawn/creature-spawn.component.scss b/...ors/creature/spawns/spawns.component.scss → ...ature-spawn/creature-spawn.component.scss
diff --git a/...itors/creature/spawns/spawns.component.ts → ...reature-spawn/creature-spawn.component.ts b/...itors/creature/spawns/spawns.component.ts → ...reature-spawn/creature-spawn.component.ts
@@ -2,8 +2,8 @@ import { Component } from '@angular/core';
 
 import { MultiRowEditorComponent } from '../../shared/multi-row-editor.component';
 import { CreatureHandlerService } from '../../../../services/handlers/creature-handler.service';
-import { Spawns } from '../../../../types/spawns.type';
-import { SpawnsService } from '../../../../services/editors/creature/spawns.service';
+import { CreatureSpawn } from '../../../../types/creature-spawn.type';
+import { CreatureSpawnService } from '../../../../services/editors/creature/creature-spawn.service';
 import { MOVEMENT_TYPE } from '../../../../constants/options/movement-type';
 import { NPC_FLAGS } from '../../../../constants/flags/npc-flags';
 import { UNIT_FLAGS } from '../../../../constants/flags/unit-flags';
@@ -12,11 +12,11 @@ import { SPAWN_MASK } from '../../../../constants/flags/spawn-mask';
 import { PHASE_MASK } from '../../../../constants/flags/phase-mask';
 
 @Component({
-  selector: 'app-spawns',
-  templateUrl: './spawns.component.html',
-  styleUrls: ['./spawns.component.scss']
+  selector: 'app-creature-spawn',
+  templateUrl: './creature-spawn.component.html',
+  styleUrls: ['./creature-spawn.component.scss']
 })
-export class SpawnsComponent extends MultiRowEditorComponent<Spawns> {
+export class CreatureSpawnComponent extends MultiRowEditorComponent<CreatureSpawn> {
 
   public readonly UNIT_FLAGS = UNIT_FLAGS;
   public readonly MOVEMENT_TYPE = MOVEMENT_TYPE;
@@ -30,7 +30,7 @@ export class SpawnsComponent extends MultiRowEditorComponent<Spawns> {
 
   /* istanbul ignore next */ // because of: https://github.com/gotwarlost/istanbul/issues/690
   constructor(
-    public editorService: SpawnsService,
+    public editorService: CreatureSpawnService,
     public handlerService: CreatureHandlerService,
   ) {
     super(editorService, handlerService);

diff --git a/...reature/spawns/spawns.integration.spec.ts → ...-spawn/creature-spawn.integration.spec.ts b/...reature/spawns/spawns.integration.spec.ts → ...-spawn/creature-spawn.integration.spec.ts
@@ -3,28 +3,28 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
 import Spy = jasmine.Spy;
 
-import { SpawnsComponent } from './spawns.component';
-import { SpawnsModule } from './spawns.module';
+import { CreatureSpawnComponent } from './creature-spawn.component';
+import { CreatureSpawnModule } from './creature-spawn.module';
 import { QueryService } from '../../../../services/query.service';
-import { Spawns } from '../../../../types/spawns.type';
+import { CreatureSpawn } from '../../../../types/creature-spawn.type';
 import { CreatureHandlerService } from '../../../../services/handlers/creature-handler.service';
 import { MultiRowEditorPageObject } from '../../../../test-utils/multi-row-editor-page-object';
 
-class SpawnsPage extends MultiRowEditorPageObject<SpawnsComponent> {}
+class CreatureSpawnPage extends MultiRowEditorPageObject<CreatureSpawnComponent> {}
 
-describe('Spawns integration tests', () => {
-  let component: SpawnsComponent;
-  let fixture: ComponentFixture<SpawnsComponent>;
+describe('CreatureSpawn integration tests', () => {
+  let component: CreatureSpawnComponent;
+  let fixture: ComponentFixture<CreatureSpawnComponent>;
   let queryService: QueryService;
   let querySpy: Spy;
   let handlerService: CreatureHandlerService;
-  let page: SpawnsPage;
+  let page: CreatureSpawnPage;
 
   const id = 1234;
 
-  const originalRow0 = new Spawns();
-  const originalRow1 = new Spawns();
-  const originalRow2 = new Spawns();
+  const originalRow0 = new CreatureSpawn();
+  const originalRow1 = new CreatureSpawn();
+  const originalRow2 = new CreatureSpawn();
   originalRow0.id = originalRow1.id = originalRow2.id = id;
   originalRow0.guid = 0;
   originalRow1.guid = 1;
@@ -33,7 +33,7 @@ describe('Spawns integration tests', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [
-        SpawnsModule,
+        CreatureSpawnModule,
         RouterTestingModule,
       ],
     })
@@ -52,9 +52,9 @@ describe('Spawns integration tests', () => {
       { results: creatingNew ? [] : [originalRow0, originalRow1, originalRow2] }
     ));
 
-    fixture = TestBed.createComponent(SpawnsComponent);
+    fixture = TestBed.createComponent(CreatureSpawnComponent);
     component = fixture.componentInstance;
-    page = new SpawnsPage(fixture);
+    page = new CreatureSpawnPage(fixture);
     fixture.autoDetectChanges(true);
     fixture.detectChanges();
   }

diff --git a/.../editors/creature/spawns/spawns.module.ts → ...e/creature-spawn/creature-spawn.module.ts b/.../editors/creature/spawns/spawns.module.ts → ...e/creature-spawn/creature-spawn.module.ts
@@ -6,13 +6,13 @@ import { NgxDatatableModule } from '@swimlane/ngx-datatable';
 
 import { TopBarModule } from '../../shared/top-bar/top-bar.module';
 import { QueryOutputModule } from '../../shared/query-output/query-output.module';
-import { SpawnsComponent } from './spawns.component';
+import { CreatureSpawnComponent } from './creature-spawn.component';
 import { FlagsSelectorModule } from '../../shared/selectors/flags-selector/flags-selector.module';
 import { SingleValueSelectorModule } from '../../shared/selectors/single-value-selector/single-value-selector.module';
 
 @NgModule({
   declarations: [
-    SpawnsComponent,
+    CreatureSpawnComponent,
   ],
   imports: [
     BrowserModule,
@@ -25,7 +25,7 @@ import { SingleValueSelectorModule } from '../../shared/selectors/single-value-s
     SingleValueSelectorModule,
   ],
   exports: [
-    SpawnsComponent,
+    CreatureSpawnComponent,
   ],
 })
-export class SpawnsModule {}
+export class CreatureSpawnModule {}
diff --git a/.../components/editors/creature/creature-template-addon/creature-template-addon.component.ts b/.../components/editors/creature/creature-template-addon/creature-template-addon.component.ts
@@ -5,7 +5,7 @@ import { CreatureHandlerService } from '../../../../services/handlers/creature-h
 import { CreatureTemplateAddon } from '../../../../types/creature-template-addon.type';
 import { CreatureTemplateAddonService } from '../../../../services/editors/creature/creature-template-addon.service';
 import { EMOTE } from '../../../../constants/options/emote';
-import { SPAWNS_ADDON_TABLE } from '../../../../types/spawns-addon.type';
+import { CREATURE_SPAWN_ADDON_TABLE } from '../../../../types/creature-spawn-addon.type';
 import { CREATURE_ADDON_BYTES_1 } from '../../../../constants/options/creature-addon-bytes1';
 import { CREATURE_ADDON_BYTES_2 } from '../../../../constants/options/creature-addon-bytes2';
 
@@ -17,7 +17,7 @@ import { CREATURE_ADDON_BYTES_2 } from '../../../../constants/options/creature-a
 export class CreatureTemplateAddonComponent extends SingleRowEditorComponent<CreatureTemplateAddon> {
 
   public get docUrl() {
-    return this.WIKI_BASE_URL + SPAWNS_ADDON_TABLE; // they share the same doc page
+    return this.WIKI_BASE_URL + CREATURE_SPAWN_ADDON_TABLE; // they share the same doc page
   }
 
   public readonly EMOTE = EMOTE;

diff --git a/src/app/components/editors/creature/creature.module.ts b/src/app/components/editors/creature/creature.module.ts
@@ -9,8 +9,8 @@ import { NpcTrainerModule } from './npc-trainer/npc-trainer.module';
 import { PickpocketingLootTemplateModule } from './pickpocketing-loot-template/pickpocketing-loot-template.module';
 import { SelectCreatureModule } from './select-creature/select-creature.module';
 import { SkinningLootTemplateModule } from './skinning-loot-template/skinning-loot-template.module';
-import { SpawnsModule } from './spawns/spawns.module';
-import { SpawnsAddonModule } from './spawns-addon/spawns-addon.module';
+import { CreatureSpawnModule } from './creature-spawn/creature-spawn.module';
+import { CreatureSpawnAddonModule } from './creature-spawn-addon/creature-spawn-addon.module';
 import { NpcVendorModule } from './npc-vendor/npc-vendor.module';
 import { CreatureQuestitemModule } from './creature-questitem/creature-questitem.module';
 
@@ -26,8 +26,8 @@ const modules = [
   PickpocketingLootTemplateModule,
   SelectCreatureModule,
   SkinningLootTemplateModule,
-  SpawnsModule,
-  SpawnsAddonModule,
+  CreatureSpawnModule,
+  CreatureSpawnAddonModule,
 ];
 
 @NgModule({

diff --git a/src/app/components/main-window/sidebar/sidebar.component.html b/src/app/components/main-window/sidebar/sidebar.component.html
@@ -112,13 +112,13 @@
                       </a>
                     </li>
                     <li>
-                      <a href="#" routerLinkActive="active" [routerLink]="'creature/spawns'">
-                        Spawns
+                      <a href="#" routerLinkActive="active" [routerLink]="'creature/creature-spawn'">
+                        Spawn
                       </a>
                     </li>
                     <li>
-                      <a href="#" routerLinkActive="active" [routerLink]="'creature/spawns-addon'">
-                        Spawns Addon
+                      <a href="#" routerLinkActive="active" [routerLink]="'creature/creature-spawn-addon'">
+                        Spawn Addon
                       </a>
                     </li>
                   </ng-container>

diff --git a/src/app/config/app-routing.module.ts b/src/app/config/app-routing.module.ts
@@ -19,8 +19,8 @@ import {
 } from '../components/editors/creature/pickpocketing-loot-template/pickpocketing-loot-template.component';
 import { SkinningLootTemplateComponent } from '../components/editors/creature/skinning-loot-template/skinning-loot-template.component';
 import { NpcTrainerComponent } from '../components/editors/creature/npc-trainer/npc-trainer.component';
-import { SpawnsComponent } from '../components/editors/creature/spawns/spawns.component';
-import { SpawnsAddonComponent } from '../components/editors/creature/spawns-addon/spawns-addon.component';
+import { CreatureSpawnComponent } from '../components/editors/creature/creature-spawn/creature-spawn.component';
+import { CreatureSpawnAddonComponent } from '../components/editors/creature/creature-spawn-addon/creature-spawn-addon.component';
 import { ComingSoonComponent } from '../components/editors/coming-soon/coming-soon.component';
 import { QuestTemplateComponent } from '../components/editors/quest/quest-template/quest-template.component';
 import { QuestHandlerService } from '../services/handlers/quest-handler.service';
@@ -94,13 +94,13 @@ const routes: Routes = [
         canActivate: [CreatureHandlerService],
       },
       {
-        path: 'spawns',
-        component: SpawnsComponent,
+        path: 'creature-spawn',
+        component: CreatureSpawnComponent,
         canActivate: [CreatureHandlerService],
       },
       {
-        path: 'spawns-addon',
-        component: SpawnsAddonComponent,
+        path: 'creature-spawn-addon',
+        component: CreatureSpawnAddonComponent,
         canActivate: [CreatureHandlerService],
       },
     ]

diff --git a/...ors/creature/spawns-addon.service.spec.ts → ...ture/creature-spawn-addon.service.spec.ts b/...ors/creature/spawns-addon.service.spec.ts → ...ture/creature-spawn-addon.service.spec.ts
@@ -2,11 +2,11 @@ import { TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { instance } from 'ts-mockito';
 
-import { SpawnsAddonService } from './spawns-addon.service';
+import { CreatureSpawnAddonService } from './creature-spawn-addon.service';
 import { QueryService } from '../../query.service';
 import { MockedQueryService } from '../../../test-utils/mocks';
 
-describe('SpawnsAddonService', () => {
+describe('CreatureSpawnAddonService', () => {
   beforeEach(() => TestBed.configureTestingModule({
     imports: [
       RouterTestingModule,
@@ -17,7 +17,7 @@ describe('SpawnsAddonService', () => {
   }));
 
   it('selectQuery should correctly work', () => {
-    const service: SpawnsAddonService = TestBed.get(SpawnsAddonService);
+    const service: CreatureSpawnAddonService = TestBed.get(CreatureSpawnAddonService);
     const querySpy = spyOn(TestBed.get(QueryService), 'query');
     const id = 123;