refactor(buttons): reuse code + minor improvements (#561)

azerothcore · Apr 1, 2020 · 3203d34 · 3203d34
1 parent ab9ae2c
commit 3203d34
Show file tree

Hide file tree

Showing 99 changed files with 369 additions and 343 deletions.
diff --git a/src/app/features/conditions/select-conditions/select-conditions.component.html b/src/app/features/conditions/select-conditions/select-conditions.component.html
@@ -35,14 +35,9 @@
         <input [formControlName]="'limit'" class="form-control form-control-sm" id="limit" placeholder="Limit">
       </div>
       <div class="col-sm-12 col-md-6 mt-1 mt-md-0">
+        <keira-search-button [searchService]="selectService"></keira-search-button>
         <button
-          class="btn btn-primary btn-sm mr-2"
-          id="search-btn"
-          [disabled]="selectService.queryForm.invalid"
-          (click)="selectService.onSearch()"
-        >Search existing</button>
-        <button
-          class="btn btn-success btn-sm mt-1 mt-sm-0"
+          class="btn btn-success btn-sm mt-1 ml-2 mt-sm-0"
           id="create-new-btn"
           [disabled]="selectService.queryForm.invalid"
           (click)="onCreateNew()"

diff --git a/src/app/features/conditions/select-conditions/select-conditions.module.ts b/src/app/features/conditions/select-conditions/select-conditions.module.ts
@@ -9,6 +9,7 @@ import { QueryOutputModule } from '@keira-shared/modules/query-output/query-outp
 import { SelectConditionsComponent } from './select-conditions.component';
 import { CreateModule } from '@keira-shared/modules/create/create.module';
 import { highlightOptions } from '@keira-config/highlight.config';
+import { SearchButtonsModule } from '@keira-shared/modules/search-button/search-buttons.module';
 
 @NgModule({
   declarations: [
@@ -22,6 +23,7 @@ import { highlightOptions } from '@keira-config/highlight.config';
     CreateModule,
     HighlightModule.forRoot(highlightOptions),
     NgxDatatableModule,
+    SearchButtonsModule,
   ],
   exports: [
     SelectConditionsComponent,

diff --git a/src/app/features/creature/creature-loot-template/creature-loot-template.module.ts b/src/app/features/creature/creature-loot-template/creature-loot-template.module.ts
@@ -13,6 +13,7 @@ import { FlagsSelectorModule } from '@keira-shared/modules/selectors/flags-selec
 import { NgxDatatableModule } from '@swimlane/ngx-datatable';
 import { CreatureLootTemplateService } from './creature-loot-template.service';
 import { IconModule } from '@keira-shared/modules/icon/icon.module';
+import { EditorButtonsModule } from '@keira-shared/modules/editor-buttons/editor-buttons.module';
 
 @NgModule({
   declarations: [
@@ -29,6 +30,7 @@ import { IconModule } from '@keira-shared/modules/icon/icon.module';
     ItemSelectorModule,
     FlagsSelectorModule,
     IconModule,
+    EditorButtonsModule,
   ],
   exports: [
     CreatureLootTemplateComponent,

diff --git a/src/app/features/creature/creature-questitem/creature-questitem.component.html b/src/app/features/creature/creature-questitem/creature-questitem.component.html
@@ -49,18 +49,7 @@
     <div class="row">
       <div class="col-12">
 
-        <button
-          id="delete-selected-row-btn"
-          class="btn btn-danger btn-sm mr-2"
-          (click)="editorService.deleteSelectedRow()"
-          [disabled]="editorService.selectedRowId === null"
-        >Delete selected row</button>
-
-        <button
-          id="add-new-row-btn"
-          class="btn btn-success btn-sm"
-          (click)="editorService.addNewRow()"
-        >Add new row</button>
+        <keira-editor-buttons [editorService]="editorService"></keira-editor-buttons>
 
         <ngx-datatable
           id="editor-table"

diff --git a/src/app/features/creature/creature-questitem/creature-questitem.module.ts b/src/app/features/creature/creature-questitem/creature-questitem.module.ts
@@ -11,6 +11,7 @@ import { CreatureQuestitemComponent } from './creature-questitem.component';
 import { ItemSelectorModule } from '@keira-shared/modules/selectors/item-selector/item-selector.module';
 import { CreatureQuestitemService } from './creature-questitem.service';
 import { IconModule } from '@keira-shared/modules/icon/icon.module';
+import { EditorButtonsModule } from '@keira-shared/modules/editor-buttons/editor-buttons.module';
 
 @NgModule({
   declarations: [
@@ -25,6 +26,7 @@ import { IconModule } from '@keira-shared/modules/icon/icon.module';
     ItemSelectorModule,
     ToastrModule.forRoot(toastrConfig),
     IconModule,
+    EditorButtonsModule,
   ],
   exports: [
     CreatureQuestitemComponent,

diff --git a/src/app/features/creature/creature-spawn/creature-spawn.component.html b/src/app/features/creature/creature-spawn/creature-spawn.component.html
@@ -170,18 +170,7 @@
     <div class="row">
       <div class="col-12">
 
-        <button
-          id="delete-selected-row-btn"
-          class="btn btn-danger btn-sm mr-2"
-          (click)="editorService.deleteSelectedRow()"
-          [disabled]="editorService.selectedRowId === null"
-        >Delete selected row</button>
-
-        <button
-          id="add-new-row-btn"
-          class="btn btn-success btn-sm"
-          (click)="editorService.addNewRow()"
-        >Add new row</button>
+        <keira-editor-buttons [editorService]="editorService"></keira-editor-buttons>
 
         <ngx-datatable
           id="editor-table"

diff --git a/src/app/features/creature/creature-spawn/creature-spawn.module.ts b/src/app/features/creature/creature-spawn/creature-spawn.module.ts
@@ -14,6 +14,7 @@ import { SingleValueSelectorModule } from '@keira-shared/modules/selectors/singl
 import { CreatureSpawnService } from './creature-spawn.service';
 import { MapSelectorModule } from '@keira-shared/modules/selectors/map-selector/map-selector.module';
 import { AreaSelectorModule } from '@keira-shared/modules/selectors/area-selector/area-selector.module';
+import { EditorButtonsModule } from '@keira-shared/modules/editor-buttons/editor-buttons.module';
 
 @NgModule({
   declarations: [
@@ -31,6 +32,7 @@ import { AreaSelectorModule } from '@keira-shared/modules/selectors/area-selecto
     SingleValueSelectorModule,
     MapSelectorModule,
     AreaSelectorModule,
+    EditorButtonsModule,
   ],
   exports: [
     CreatureSpawnComponent,

diff --git a/src/app/features/creature/npc-trainer/npc-trainer.component.html b/src/app/features/creature/npc-trainer/npc-trainer.component.html
@@ -80,18 +80,7 @@
     <div class="row">
       <div class="col-12">
 
-        <button
-          id="delete-selected-row-btn"
-          class="btn btn-danger btn-sm mr-2"
-          (click)="editorService.deleteSelectedRow()"
-          [disabled]="editorService.selectedRowId === null"
-        >Delete selected row</button>
-
-        <button
-          id="add-new-row-btn"
-          class="btn btn-success btn-sm"
-          (click)="editorService.addNewRow()"
-        >Add new row</button>
+        <keira-editor-buttons [editorService]="editorService"></keira-editor-buttons>
 
         <ngx-datatable
           id="editor-table"

diff --git a/src/app/features/creature/npc-trainer/npc-trainer.module.ts b/src/app/features/creature/npc-trainer/npc-trainer.module.ts
@@ -12,6 +12,7 @@ import { NpcTrainerComponent } from './npc-trainer.component';
 import { NpcTrainerService } from './npc-trainer.service';
 import { SpellSelectorModule } from '@keira-shared/modules/selectors/spell-selector/spell-selector.module';
 import { SkillSelectorModule } from '@keira-shared/modules/selectors/skill-selector/skill-selector.module';
+import { EditorButtonsModule } from '@keira-shared/modules/editor-buttons/editor-buttons.module';
 
 @NgModule({
   declarations: [
@@ -27,6 +28,7 @@ import { SkillSelectorModule } from '@keira-shared/modules/selectors/skill-selec
     NgxDatatableModule,
     SpellSelectorModule,
     SkillSelectorModule,
+    EditorButtonsModule,
   ],
   exports: [
     NpcTrainerComponent,

diff --git a/src/app/features/creature/npc-vendor/npc-vendor.component.html b/src/app/features/creature/npc-vendor/npc-vendor.component.html
diff --git a/src/app/features/creature/npc-vendor/npc-vendor.module.ts b/src/app/features/creature/npc-vendor/npc-vendor.module.ts
@@ -13,6 +13,7 @@ import { ItemSelectorModule } from '@keira-shared/modules/selectors/item-selecto
 import { NpcVendorService } from './npc-vendor.service';
 import { IconModule } from '@keira-shared/modules/icon/icon.module';
 import { ItemExtendedCostSelectorModule } from '@keira-shared/modules/selectors/item-extended-cost-selector/item-extended-cost-selector.module';
+import { EditorButtonsModule } from '@keira-shared/modules/editor-buttons/editor-buttons.module';
 
 @NgModule({
   declarations: [
@@ -29,6 +30,7 @@ import { ItemExtendedCostSelectorModule } from '@keira-shared/modules/selectors/
     ItemSelectorModule,
     IconModule,
     ItemExtendedCostSelectorModule,
+    EditorButtonsModule,
   ],
   exports: [
     NpcVendorComponent,

diff --git a/src/app/features/creature/pickpocketing-loot-template/pickpocketing-loot-template.module.ts b/src/app/features/creature/pickpocketing-loot-template/pickpocketing-loot-template.module.ts
@@ -13,6 +13,7 @@ import { ItemSelectorModule } from '@keira-shared/modules/selectors/item-selecto
 import { FlagsSelectorModule } from '@keira-shared/modules/selectors/flags-selector/flags-selector.module';
 import { PickpocketingLootTemplateService } from './pickpocketing-loot-template.service';
 import { IconModule } from '@keira-shared/modules/icon/icon.module';
+import { EditorButtonsModule } from '@keira-shared/modules/editor-buttons/editor-buttons.module';
 
 @NgModule({
   declarations: [
@@ -29,6 +30,7 @@ import { IconModule } from '@keira-shared/modules/icon/icon.module';
     ItemSelectorModule,
     FlagsSelectorModule,
     IconModule,
+    EditorButtonsModule,
   ],
   exports: [
     PickpocketingLootTemplateComponent,

diff --git a/src/app/features/creature/sai-creature/sai-creature.component.integration.spec.ts b/src/app/features/creature/sai-creature/sai-creature.component.integration.spec.ts
@@ -12,7 +12,7 @@ import { SaiCreatureHandlerService } from '../sai-creature-handler.service';
 
 class SaiCreaturePage extends MultiRowEditorPageObject<SaiCreatureComponent> {}
 
-describe('SaiEditorComponent integration tests', () => {
+describe('SaiCreatureComponent integration tests', () => {
   let component: SaiCreatureComponent;
   let fixture: ComponentFixture<SaiCreatureComponent>;
   let handlerService: SaiCreatureHandlerService;

diff --git a/src/app/features/creature/sai-creature/sai-creature.module.ts b/src/app/features/creature/sai-creature/sai-creature.module.ts
@@ -13,6 +13,7 @@ import { SingleValueSelectorModule } from '@keira-shared/modules/selectors/singl
 import { SaiCreatureComponent } from './sai-creature.component';
 import { SaiEditorModule } from '@keira-shared/modules/sai-editor/sai-editor.module';
 import { SaiCreatureEditorService } from './sai-creature-editor.service';
+import { EditorButtonsModule } from '@keira-shared/modules/editor-buttons/editor-buttons.module';
 
 @NgModule({
   declarations: [
@@ -29,6 +30,7 @@ import { SaiCreatureEditorService } from './sai-creature-editor.service';
     FlagsSelectorModule,
     SingleValueSelectorModule,
     SaiEditorModule,
+    EditorButtonsModule,
   ],
   exports: [
     SaiCreatureComponent,

diff --git a/src/app/features/creature/select-creature/select-creature.component.html b/src/app/features/creature/select-creature/select-creature.component.html
@@ -31,12 +31,7 @@
         <input [formControlName]="'limit'" class="form-control form-control-sm" id="limit" placeholder="Limit">
       </div>
       <div class="col-2">
-        <button
-          class="btn btn-primary btn-sm"
-          id="search-btn"
-          [disabled]="selectService.queryForm.invalid"
-          (click)="selectService.onSearch()"
-        >Search</button>
+        <keira-search-button [searchService]="selectService"></keira-search-button>
       </div>
     </div>
     <code [highlight]="selectService.query"></code>

diff --git a/src/app/features/creature/select-creature/select-creature.module.ts b/src/app/features/creature/select-creature/select-creature.module.ts
@@ -10,6 +10,7 @@ import { SelectCreatureComponent } from './select-creature.component';
 import { CreateModule } from '@keira-shared/modules/create/create.module';
 import { highlightOptions } from '@keira-config/highlight.config';
 import { SelectCreatureService } from './select-creature.service';
+import { SearchButtonsModule } from '@keira-shared/modules/search-button/search-buttons.module';
 
 @NgModule({
   declarations: [
@@ -23,6 +24,7 @@ import { SelectCreatureService } from './select-creature.service';
     CreateModule,
     HighlightModule.forRoot(highlightOptions),
     NgxDatatableModule,
+    SearchButtonsModule,
   ],
   exports: [
     SelectCreatureComponent,

diff --git a/src/app/features/creature/skinning-loot-template/skinning-loot-template.module.ts b/src/app/features/creature/skinning-loot-template/skinning-loot-template.module.ts
@@ -13,6 +13,7 @@ import { ItemSelectorModule } from '@keira-shared/modules/selectors/item-selecto
 import { FlagsSelectorModule } from '@keira-shared/modules/selectors/flags-selector/flags-selector.module';
 import { SkinningLootTemplateService } from './skinning-loot-template.service';
 import { IconModule } from '@keira-shared/modules/icon/icon.module';
+import { EditorButtonsModule } from '@keira-shared/modules/editor-buttons/editor-buttons.module';
 
 @NgModule({
   declarations: [
@@ -29,6 +30,7 @@ import { IconModule } from '@keira-shared/modules/icon/icon.module';
     ItemSelectorModule,
     FlagsSelectorModule,
     IconModule,
+    EditorButtonsModule,
   ],
   exports: [
     SkinningLootTemplateComponent,

diff --git a/src/app/features/gameobject/gameobject-loot-template/gameobject-loot-template.component.html b/src/app/features/gameobject/gameobject-loot-template/gameobject-loot-template.component.html
@@ -116,18 +116,7 @@
     <div class="row">
       <div class="col-12">
 
-        <button
-          id="delete-selected-row-btn"
-          class="btn btn-danger btn-sm mr-2"
-          (click)="editorService.deleteSelectedRow()"
-          [disabled]="editorService.selectedRowId === null"
-        >Delete selected row</button>
-
-        <button
-          id="add-new-row-btn"
-          class="btn btn-success btn-sm"
-          (click)="editorService.addNewRow()"
-        >Add new row</button>
+        <keira-editor-buttons [editorService]="editorService"></keira-editor-buttons>
 
         <ngx-datatable
           id="editor-table"

diff --git a/src/app/features/gameobject/gameobject-loot-template/gameobject-loot-template.module.ts b/src/app/features/gameobject/gameobject-loot-template/gameobject-loot-template.module.ts
@@ -14,6 +14,7 @@ import { NgxDatatableModule } from '@swimlane/ngx-datatable';
 import { GameobjectLootTemplateService } from './gameobject-loot-template.service';
 import { GameobjectHandlerService } from '../gameobject-handler.service';
 import { IconModule } from '@keira-shared/modules/icon/icon.module';
+import { EditorButtonsModule } from '@keira-shared/modules/editor-buttons/editor-buttons.module';
 
 @NgModule({
   declarations: [
@@ -30,6 +31,7 @@ import { IconModule } from '@keira-shared/modules/icon/icon.module';
     FlagsSelectorModule,
     NgxDatatableModule,
     IconModule,
+    EditorButtonsModule,
   ],
   exports: [
     GameobjectLootTemplateComponent,

diff --git a/src/app/features/gameobject/gameobject-questitem/gameobject-questitem.component.html b/src/app/features/gameobject/gameobject-questitem/gameobject-questitem.component.html
@@ -50,18 +50,7 @@
     <div class="row">
       <div class="col-12">
 
-        <button
-          id="delete-selected-row-btn"
-          class="btn btn-danger btn-sm mr-2"
-          (click)="editorService.deleteSelectedRow()"
-          [disabled]="editorService.selectedRowId === null"
-        >Delete selected row</button>
-
-        <button
-          id="add-new-row-btn"
-          class="btn btn-success btn-sm"
-          (click)="editorService.addNewRow()"
-        >Add new row</button>
+        <keira-editor-buttons [editorService]="editorService"></keira-editor-buttons>
 
         <ngx-datatable
           id="editor-table"

diff --git a/src/app/features/gameobject/gameobject-questitem/gameobject-questitem.module.ts b/src/app/features/gameobject/gameobject-questitem/gameobject-questitem.module.ts
@@ -11,6 +11,7 @@ import { GameobjectQuestitemComponent } from './gameobject-questitem.component';
 import { ItemSelectorModule } from '@keira-shared/modules/selectors/item-selector/item-selector.module';
 import { GameobjectQuestitemService } from './gameobject-questitem.service';
 import { IconModule } from '@keira-shared/modules/icon/icon.module';
+import { EditorButtonsModule } from '@keira-shared/modules/editor-buttons/editor-buttons.module';
 
 @NgModule({
   declarations: [
@@ -25,6 +26,7 @@ import { IconModule } from '@keira-shared/modules/icon/icon.module';
     ItemSelectorModule,
     ToastrModule.forRoot(toastrConfig),
     IconModule,
+    EditorButtonsModule,
   ],
   exports: [
     GameobjectQuestitemComponent,

diff --git a/src/app/features/gameobject/gameobject-spawn/gameobject-spawn.component.html b/src/app/features/gameobject/gameobject-spawn/gameobject-spawn.component.html
@@ -141,18 +141,7 @@
     <div class="row">
       <div class="col-12">
 
-        <button
-          id="delete-selected-row-btn"
-          class="btn btn-danger btn-sm mr-2"
-          (click)="editorService.deleteSelectedRow()"
-          [disabled]="editorService.selectedRowId === null"
-        >Delete selected row</button>
-
-        <button
-          id="add-new-row-btn"
-          class="btn btn-success btn-sm"
-          (click)="editorService.addNewRow()"
-        >Add new row</button>
+        <keira-editor-buttons [editorService]="editorService"></keira-editor-buttons>
 
         <ngx-datatable
           id="editor-table"

diff --git a/src/app/features/gameobject/gameobject-spawn/gameobject-spawn.module.ts b/src/app/features/gameobject/gameobject-spawn/gameobject-spawn.module.ts
@@ -14,6 +14,7 @@ import { SingleValueSelectorModule } from '@keira-shared/modules/selectors/singl
 import { GameobjectSpawnService } from './gameobject-spawn.service';
 import { MapSelectorModule } from '@keira-shared/modules/selectors/map-selector/map-selector.module';
 import { AreaSelectorModule } from '@keira-shared/modules/selectors/area-selector/area-selector.module';
+import { EditorButtonsModule } from '@keira-shared/modules/editor-buttons/editor-buttons.module';
 
 @NgModule({
   declarations: [
@@ -31,6 +32,7 @@ import { AreaSelectorModule } from '@keira-shared/modules/selectors/area-selecto
     SingleValueSelectorModule,
     MapSelectorModule,
     AreaSelectorModule,
+    EditorButtonsModule,
   ],
   exports: [
     GameobjectSpawnComponent,

diff --git a/src/app/features/gameobject/sai-gameobject/sai-gameobject.component.integration.spec.ts b/src/app/features/gameobject/sai-gameobject/sai-gameobject.component.integration.spec.ts
@@ -12,7 +12,7 @@ import { GameobjectHandlerService } from '../gameobject-handler.service';
 
 class SaiGameobjectPage extends MultiRowEditorPageObject<SaiGameobjectComponent> {}
 
-describe('SaiEditorComponent integration tests', () => {
+describe('SaiGameobjectComponent integration tests', () => {
   let component: SaiGameobjectComponent;
   let fixture: ComponentFixture<SaiGameobjectComponent>;
   let handlerService: SaiGameobjectHandlerService;