{}
@@ -87,7 +87,7 @@ describe('CreatureSpawn integration tests', () => {
expect(page.getInputById('currentwaypoint').disabled).toBe(true);
expect(page.getInputById('curhealth').disabled).toBe(true);
expect(page.getInputById('curmana').disabled).toBe(true);
- expect(page.getInputById('MovementType').disabled).toBe(true);
+ expect(page.getDebugElementByCss('#MovementType select').nativeElement.disabled).toBe(true);
expect(page.getInputById('npcflag').disabled).toBe(true);
expect(page.getInputById('unit_flags').disabled).toBe(true);
expect(page.getInputById('dynamicflags').disabled).toBe(true);
diff --git a/libs/features/creature/src/creature-template-addon/creature-template-addon.component.ts b/libs/features/creature/src/creature-template-addon/creature-template-addon.component.ts
index 59f9bbda6f..dbdc7d61ba 100644
--- a/libs/features/creature/src/creature-template-addon/creature-template-addon.component.ts
+++ b/libs/features/creature/src/creature-template-addon/creature-template-addon.component.ts
@@ -8,15 +8,13 @@ import {
EMOTE,
} from '@keira/shared/acore-world-model';
import { SingleRowEditorComponent } from '@keira/shared/base-abstract-classes';
-import { QueryOutputComponent } from '@keira/shared/base-editor-components';
+import { QueryOutputComponent, TopBarComponent } from '@keira/shared/base-editor-components';
import { SingleValueSelectorBtnComponent } from '@keira/shared/selectors';
import { TranslateModule } from '@ngx-translate/core';
import { TooltipModule } from 'ngx-bootstrap/tooltip';
import { CreatureHandlerService } from '../creature-handler.service';
import { CreatureTemplateAddonService } from './creature-template-addon.service';
-import { TopBarComponent } from '@keira/shared/base-editor-components';
-
@Component({
changeDetection: ChangeDetectionStrategy.OnPush,
selector: 'keira-creature-template-addon',
diff --git a/libs/features/creature/src/creature-template-movement/creature-template-movement.component.ts b/libs/features/creature/src/creature-template-movement/creature-template-movement.component.ts
index 5c00923f31..ded595cda0 100644
--- a/libs/features/creature/src/creature-template-movement/creature-template-movement.component.ts
+++ b/libs/features/creature/src/creature-template-movement/creature-template-movement.component.ts
@@ -1,14 +1,12 @@
import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
-import { SingleRowEditorComponent } from '@keira/shared/base-abstract-classes';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { CREATURE_TEMPLATE_MOVEMENT_TABLE, CreatureTemplateMovement } from '@keira/shared/acore-world-model';
+import { SingleRowEditorComponent } from '@keira/shared/base-abstract-classes';
+import { QueryOutputComponent, TopBarComponent } from '@keira/shared/base-editor-components';
+import { TranslateModule } from '@ngx-translate/core';
+import { TooltipModule } from 'ngx-bootstrap/tooltip';
import { CreatureHandlerService } from '../creature-handler.service';
import { CreatureTemplateMovementService } from './creature-template-movement.service';
-import { TooltipModule } from 'ngx-bootstrap/tooltip';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { QueryOutputComponent } from '@keira/shared/base-editor-components';
-import { TranslateModule } from '@ngx-translate/core';
-
-import { TopBarComponent } from '@keira/shared/base-editor-components';
@Component({
changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/libs/features/creature/src/creature-template-resistance/creature-template-resistance.component.html b/libs/features/creature/src/creature-template-resistance/creature-template-resistance.component.html
index b40a38646c..2e6eaf16a4 100644
--- a/libs/features/creature/src/creature-template-resistance/creature-template-resistance.component.html
+++ b/libs/features/creature/src/creature-template-resistance/creature-template-resistance.component.html
@@ -15,13 +15,11 @@
-
-
+ id="School"
+ [optionList]="CREATURE_TEMPLATE_RESISTANCE_SCHOOL"
+ >
diff --git a/libs/features/creature/src/creature-template-spell/creature-template-spell.component.ts b/libs/features/creature/src/creature-template-spell/creature-template-spell.component.ts
index 4bce72a31d..746fb4c355 100644
--- a/libs/features/creature/src/creature-template-spell/creature-template-spell.component.ts
+++ b/libs/features/creature/src/creature-template-spell/creature-template-spell.component.ts
@@ -1,16 +1,16 @@
+import { AsyncPipe } from '@angular/common';
import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
-import { MultiRowEditorComponent } from '@keira/shared/base-abstract-classes';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { CREATURE_TEMPLATE_SPELL_TABLE, CreatureTemplateSpell } from '@keira/shared/acore-world-model';
-import { CreatureHandlerService } from '../creature-handler.service';
-import { CreatureTemplateSpellService } from './creature-template-spell.service';
+import { MultiRowEditorComponent } from '@keira/shared/base-abstract-classes';
+import { EditorButtonsComponent, IconComponent, QueryOutputComponent, TopBarComponent } from '@keira/shared/base-editor-components';
+import { SqliteQueryService } from '@keira/shared/db-layer';
+import { SpellSelectorBtnComponent } from '@keira/shared/selectors';
+import { TranslateModule } from '@ngx-translate/core';
import { NgxDatatableModule } from '@siemens/ngx-datatable';
-import { EditorButtonsComponent } from '@keira/shared/base-editor-components';
import { TooltipModule } from 'ngx-bootstrap/tooltip';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { QueryOutputComponent } from '@keira/shared/base-editor-components';
-import { TranslateModule } from '@ngx-translate/core';
-
-import { TopBarComponent } from '@keira/shared/base-editor-components';
+import { CreatureHandlerService } from '../creature-handler.service';
+import { CreatureTemplateSpellService } from './creature-template-spell.service';
@Component({
changeDetection: ChangeDetectionStrategy.OnPush,
@@ -26,6 +26,9 @@ import { TopBarComponent } from '@keira/shared/base-editor-components';
TooltipModule,
EditorButtonsComponent,
NgxDatatableModule,
+ SpellSelectorBtnComponent,
+ IconComponent,
+ AsyncPipe,
],
})
export class CreatureTemplateSpellComponent extends MultiRowEditorComponent
{
@@ -33,6 +36,9 @@ export class CreatureTemplateSpellComponent extends MultiRowEditorComponent {}
@@ -26,7 +26,10 @@ describe('CreatureTemplateSpell integration tests', () => {
CreatureTemplateSpellComponent,
TranslateTestingModule,
],
- providers: [{ provide: SqliteService, useValue: instance(mock(SqliteService)) }],
+ providers: [
+ { provide: SqliteService, useValue: instance(mock(SqliteService)) },
+ { provide: SqliteQueryService, useValue: instance(mock(SqliteQueryService)) },
+ ],
}).compileComponents();
}));
@@ -55,6 +58,10 @@ describe('CreatureTemplateSpell integration tests', () => {
fixture.autoDetectChanges(true);
fixture.detectChanges();
+ const sqliteQueryService = TestBed.inject(SqliteQueryService);
+ const mockIntermediateResult = 'some result';
+ spyOn(sqliteQueryService, 'getDisplayIdBySpellId').and.returnValue(of(mockIntermediateResult));
+
return { handlerService, queryService, querySpy, fixture, component, page };
}
@@ -120,7 +127,7 @@ describe('CreatureTemplateSpell integration tests', () => {
'(1234, 0, 0, 0);',
);
- page.setInputValueById('Index', '1');
+ page.setInputValueById('Index', '1: 1');
page.expectDiffQueryToContain(
'DELETE FROM `creature_template_spell` WHERE (`CreatureID` = 1234) AND (`Index` IN (1));\n' +
'INSERT INTO `creature_template_spell` (`CreatureID`, `Index`, `Spell`, `VerifiedBuild`) VALUES\n' +
@@ -137,7 +144,7 @@ describe('CreatureTemplateSpell integration tests', () => {
it('adding a row and changing its values should correctly update the queries', () => {
const { page } = setup(true);
page.addNewRow();
- page.setInputValueById('Index', '1');
+ page.setInputValueById('Index', '1: 1');
page.duplicateSelectedRow();
page.expectDiffQueryToContain(
@@ -204,18 +211,18 @@ describe('CreatureTemplateSpell integration tests', () => {
it('editing existing rows should correctly work', () => {
const { page } = setup(false);
page.clickRowOfDatatable(1);
- page.setInputValueById('Index', 111);
+ page.setInputValueById('Spell', '3');
page.expectDiffQueryToContain(
- 'DELETE FROM `creature_template_spell` WHERE (`CreatureID` = 1234) AND (`Index` IN (1, 111));\n' +
+ 'DELETE FROM `creature_template_spell` WHERE (`CreatureID` = 1234) AND (`Index` IN (1));\n' +
'INSERT INTO `creature_template_spell` (`CreatureID`, `Index`, `Spell`, `VerifiedBuild`) VALUES\n' +
- '(1234, 111, 0, 0);',
+ '(1234, 1, 3, 0);',
);
page.expectFullQueryToContain(
'DELETE FROM `creature_template_spell` WHERE (`CreatureID` = 1234);\n' +
'INSERT INTO `creature_template_spell` (`CreatureID`, `Index`, `Spell`, `VerifiedBuild`) VALUES\n' +
'(1234, 0, 0, 0),\n' +
- '(1234, 111, 0, 0),\n' +
+ '(1234, 1, 3, 0),\n' +
'(1234, 2, 0, 0);',
);
page.removeElement();
@@ -227,23 +234,23 @@ describe('CreatureTemplateSpell integration tests', () => {
expect(page.getEditorTableRowsCount()).toBe(4);
page.clickRowOfDatatable(1);
- page.setInputValueById('Index', 10);
+ page.setInputValueById('Index', '7: 7');
expect(page.getEditorTableRowsCount()).toBe(4);
page.deleteRow(2);
expect(page.getEditorTableRowsCount()).toBe(3);
page.expectDiffQueryToContain(
- 'DELETE FROM `creature_template_spell` WHERE (`CreatureID` = 1234) AND (`Index` IN (1, 2, 10, 3));\n' +
+ 'DELETE FROM `creature_template_spell` WHERE (`CreatureID` = 1234) AND (`Index` IN (1, 2, 7, 3));\n' +
'INSERT INTO `creature_template_spell` (`CreatureID`, `Index`, `Spell`, `VerifiedBuild`) VALUES\n' +
- '(1234, 10, 0, 0),\n' +
+ '(1234, 7, 0, 0),\n' +
'(1234, 3, 0, 0);',
);
page.expectFullQueryToContain(
'DELETE FROM `creature_template_spell` WHERE (`CreatureID` = 1234);\n' +
'INSERT INTO `creature_template_spell` (`CreatureID`, `Index`, `Spell`, `VerifiedBuild`) VALUES\n' +
'(1234, 0, 0, 0),\n' +
- '(1234, 10, 0, 0),\n' +
+ '(1234, 7, 0, 0),\n' +
'(1234, 3, 0, 0);',
);
page.removeElement();
@@ -252,7 +259,7 @@ describe('CreatureTemplateSpell integration tests', () => {
it('using the same row id for multiple rows should correctly show an error', () => {
const { page } = setup(false);
page.clickRowOfDatatable(2);
- page.setInputValueById('Index', 0);
+ page.setInputValueById('Index', '0: 0');
page.expectUniqueError();
page.removeElement();
diff --git a/libs/features/creature/src/creature-text/creature-text.component.html b/libs/features/creature/src/creature-text/creature-text.component.html
index 12b0a50335..ee9a46ebd4 100644
--- a/libs/features/creature/src/creature-text/creature-text.component.html
+++ b/libs/features/creature/src/creature-text/creature-text.component.html
@@ -25,13 +25,11 @@
-
-
+ id="Type"
+ [optionList]="TEXT_TYPE"
+ >
@@ -51,14 +49,12 @@
-
-
+
@@ -82,13 +78,11 @@
-
-
+ id="TextRange"
+ [optionList]="TEXT_RANGE"
+ >
diff --git a/libs/features/creature/src/creature-text/creature-text.component.ts b/libs/features/creature/src/creature-text/creature-text.component.ts
index 769567cf68..48bfa0ea36 100644
--- a/libs/features/creature/src/creature-text/creature-text.component.ts
+++ b/libs/features/creature/src/creature-text/creature-text.component.ts
@@ -3,7 +3,12 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { CreatureText, EMOTE, TEXT_RANGE, TEXT_TYPE } from '@keira/shared/acore-world-model';
import { MultiRowEditorComponent } from '@keira/shared/base-abstract-classes';
import { EditorButtonsComponent, QueryOutputComponent, TopBarComponent } from '@keira/shared/base-editor-components';
-import { LanguageSelectorBtnComponent, SingleValueSelectorBtnComponent, SoundEntriesSelectorBtnComponent } from '@keira/shared/selectors';
+import {
+ GenericOptionSelectorComponent,
+ LanguageSelectorBtnComponent,
+ SingleValueSelectorBtnComponent,
+ SoundEntriesSelectorBtnComponent,
+} from '@keira/shared/selectors';
import { TranslateModule } from '@ngx-translate/core';
import { NgxDatatableModule } from '@siemens/ngx-datatable';
import { TooltipModule } from 'ngx-bootstrap/tooltip';
@@ -27,6 +32,7 @@ import { CreatureTextService } from './creature-text.service';
SingleValueSelectorBtnComponent,
LanguageSelectorBtnComponent,
SoundEntriesSelectorBtnComponent,
+ GenericOptionSelectorComponent,
],
})
export class CreatureTextComponent extends MultiRowEditorComponent {
diff --git a/libs/features/creature/src/creature-text/creature-text.integration.spec.ts b/libs/features/creature/src/creature-text/creature-text.integration.spec.ts
index 3d53458a00..07793a5e0a 100644
--- a/libs/features/creature/src/creature-text/creature-text.integration.spec.ts
+++ b/libs/features/creature/src/creature-text/creature-text.integration.spec.ts
@@ -1,16 +1,16 @@
import { TestBed, waitForAsync } from '@angular/core/testing';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { RouterTestingModule } from '@angular/router/testing';
+import { CreatureText } from '@keira/shared/acore-world-model';
import { MysqlQueryService, SqliteService } from '@keira/shared/db-layer';
import { MultiRowEditorPageObject, TranslateTestingModule } from '@keira/shared/test-utils';
-import { CreatureText } from '@keira/shared/acore-world-model';
import { ModalModule } from 'ngx-bootstrap/modal';
import { ToastrModule } from 'ngx-toastr';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { of } from 'rxjs';
+import { instance, mock } from 'ts-mockito';
import { CreatureHandlerService } from '../creature-handler.service';
import { SaiCreatureHandlerService } from '../sai-creature-handler.service';
import { CreatureTextComponent } from './creature-text.component';
-import { instance, mock } from 'ts-mockito';
class CreatureTextPage extends MultiRowEditorPageObject {}
describe('CreatureText integration tests', () => {
@@ -68,14 +68,14 @@ describe('CreatureText integration tests', () => {
expect(page.getInputById('GroupID').disabled).toBe(true);
expect(page.getInputById('ID').disabled).toBe(true);
expect(page.getInputById('Text').disabled).toBe(true);
- expect(page.getInputById('Type').disabled).toBe(true);
+ expect(page.getDebugElementByCss('#Type select').nativeElement.disabled).toBe(true);
expect(page.getInputById('Language').disabled).toBe(true);
expect(page.getInputById('Probability').disabled).toBe(true);
- expect(page.getInputById('Emote').disabled).toBe(true);
+ expect(page.getDebugElementByCss('#Emote select').nativeElement.disabled).toBe(true);
expect(page.getInputById('Duration').disabled).toBe(true);
expect(page.getInputById('Sound').disabled).toBe(true);
expect(page.getInputById('BroadcastTextId').disabled).toBe(true);
- expect(page.getInputById('TextRange').disabled).toBe(true);
+ expect(page.getDebugElementByCss('#TextRange select').nativeElement.disabled).toBe(true);
expect(page.getInputById('comment').disabled).toBe(true);
expect(page.getEditorTableRowsCount()).toBe(0);
});
diff --git a/libs/features/creature/src/npc-trainer/npc-trainer.component.html b/libs/features/creature/src/npc-trainer/npc-trainer.component.html
index 2ec5a05c10..d0409e513d 100644
--- a/libs/features/creature/src/npc-trainer/npc-trainer.component.html
+++ b/libs/features/creature/src/npc-trainer/npc-trainer.component.html
@@ -74,7 +74,11 @@
-
+
+
+
+
+
{{ sqliteQueryService.getSpellNameById(row.SpellID) | async }}
diff --git a/libs/features/creature/src/npc-trainer/npc-trainer.component.ts b/libs/features/creature/src/npc-trainer/npc-trainer.component.ts
index 7f8a4e7e77..25a20c60f5 100644
--- a/libs/features/creature/src/npc-trainer/npc-trainer.component.ts
+++ b/libs/features/creature/src/npc-trainer/npc-trainer.component.ts
@@ -1,19 +1,16 @@
+import { AsyncPipe } from '@angular/common';
import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
-import { MultiRowEditorComponent } from '@keira/shared/base-abstract-classes';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { NpcTrainer } from '@keira/shared/acore-world-model';
-import { CreatureHandlerService } from '../creature-handler.service';
-import { NpcTrainerService } from './npc-trainer.service';
+import { MultiRowEditorComponent } from '@keira/shared/base-abstract-classes';
+import { EditorButtonsComponent, IconComponent, QueryOutputComponent, TopBarComponent } from '@keira/shared/base-editor-components';
+import { SqliteQueryService } from '@keira/shared/db-layer';
+import { SkillSelectorBtnComponent, SpellSelectorBtnComponent } from '@keira/shared/selectors';
+import { TranslateModule } from '@ngx-translate/core';
import { NgxDatatableModule } from '@siemens/ngx-datatable';
-import { EditorButtonsComponent } from '@keira/shared/base-editor-components';
-import { SkillSelectorBtnComponent } from '@keira/shared/selectors';
import { TooltipModule } from 'ngx-bootstrap/tooltip';
-import { SpellSelectorBtnComponent } from '@keira/shared/selectors';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { QueryOutputComponent } from '@keira/shared/base-editor-components';
-import { TranslateModule } from '@ngx-translate/core';
-import { AsyncPipe } from '@angular/common';
-import { TopBarComponent } from '@keira/shared/base-editor-components';
-import { SqliteQueryService } from '@keira/shared/db-layer';
+import { CreatureHandlerService } from '../creature-handler.service';
+import { NpcTrainerService } from './npc-trainer.service';
@Component({
changeDetection: ChangeDetectionStrategy.OnPush,
@@ -33,6 +30,7 @@ import { SqliteQueryService } from '@keira/shared/db-layer';
EditorButtonsComponent,
NgxDatatableModule,
AsyncPipe,
+ IconComponent,
],
})
export class NpcTrainerComponent extends MultiRowEditorComponent {
diff --git a/libs/features/creature/src/npc-vendor/npc-vendor.component.ts b/libs/features/creature/src/npc-vendor/npc-vendor.component.ts
index e84a7f070c..321684220c 100644
--- a/libs/features/creature/src/npc-vendor/npc-vendor.component.ts
+++ b/libs/features/creature/src/npc-vendor/npc-vendor.component.ts
@@ -1,18 +1,15 @@
+import { AsyncPipe } from '@angular/common';
import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
-import { MultiRowEditorComponent } from '@keira/shared/base-abstract-classes';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { NpcVendor } from '@keira/shared/acore-world-model';
-import { CreatureHandlerService } from '../creature-handler.service';
-import { NpcVendorService } from './npc-vendor.service';
-import { NgxDatatableModule } from '@siemens/ngx-datatable';
-import { EditorButtonsComponent } from '@keira/shared/base-editor-components';
-import { TooltipModule } from 'ngx-bootstrap/tooltip';
+import { MultiRowEditorComponent } from '@keira/shared/base-abstract-classes';
+import { EditorButtonsComponent, IconComponent, QueryOutputComponent, TopBarComponent } from '@keira/shared/base-editor-components';
import { ItemExtendedCostSelectorBtnComponent, ItemSelectorBtnComponent } from '@keira/shared/selectors';
-import { IconComponent } from '@keira/shared/base-editor-components';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { QueryOutputComponent } from '@keira/shared/base-editor-components';
import { TranslateModule } from '@ngx-translate/core';
-import { AsyncPipe } from '@angular/common';
-import { TopBarComponent } from '@keira/shared/base-editor-components';
+import { NgxDatatableModule } from '@siemens/ngx-datatable';
+import { TooltipModule } from 'ngx-bootstrap/tooltip';
+import { CreatureHandlerService } from '../creature-handler.service';
+import { NpcVendorService } from './npc-vendor.service';
@Component({
changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/libs/features/creature/src/sai-creature/sai-creature.component.ts b/libs/features/creature/src/sai-creature/sai-creature.component.ts
index 3eb8748239..b52fe273eb 100644
--- a/libs/features/creature/src/sai-creature/sai-creature.component.ts
+++ b/libs/features/creature/src/sai-creature/sai-creature.component.ts
@@ -1,17 +1,13 @@
import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
-import { SaiEditorComponent } from '@keira/shared/sai-editor';
-import { SaiCreatureHandlerService } from '../sai-creature-handler.service';
-import { SaiCreatureEditorService } from './sai-creature-editor.service';
-import { TimedActionlistComponent } from '@keira/shared/sai-editor';
-import { NgxDatatableModule } from '@siemens/ngx-datatable';
-import { EditorButtonsComponent } from '@keira/shared/base-editor-components';
-import { FlagsSelectorBtnComponent } from '@keira/shared/selectors';
-import { TooltipModule } from 'ngx-bootstrap/tooltip';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { QueryOutputComponent } from '@keira/shared/base-editor-components';
+import { EditorButtonsComponent, QueryOutputComponent } from '@keira/shared/base-editor-components';
+import { SaiEditorComponent, SaiTopBarComponent, TimedActionlistComponent } from '@keira/shared/sai-editor';
+import { FlagsSelectorBtnComponent } from '@keira/shared/selectors';
import { TranslateModule } from '@ngx-translate/core';
-
-import { SaiTopBarComponent } from '@keira/shared/sai-editor';
+import { NgxDatatableModule } from '@siemens/ngx-datatable';
+import { TooltipModule } from 'ngx-bootstrap/tooltip';
+import { SaiCreatureHandlerService } from '../sai-creature-handler.service';
+import { SaiCreatureEditorService } from './sai-creature-editor.service';
@Component({
changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/libs/features/gameobject/src/gameobject-loot-template/gameobject-loot-template.component.ts b/libs/features/gameobject/src/gameobject-loot-template/gameobject-loot-template.component.ts
index 62d0bc7013..b63c15997f 100644
--- a/libs/features/gameobject/src/gameobject-loot-template/gameobject-loot-template.component.ts
+++ b/libs/features/gameobject/src/gameobject-loot-template/gameobject-loot-template.component.ts
@@ -1,13 +1,12 @@
import { ChangeDetectionStrategy, Component, inject, OnInit } from '@angular/core';
-import { LootTemplateIdComponent } from '@keira/shared/base-abstract-classes';
import { GameobjectLootTemplate } from '@keira/shared/acore-world-model';
+import { LootTemplateIdComponent } from '@keira/shared/base-abstract-classes';
+import { TopBarComponent } from '@keira/shared/base-editor-components';
+import { LootEditorComponent } from '@keira/shared/loot-editor';
+import { TranslateModule } from '@ngx-translate/core';
import { QueryError } from 'mysql2';
import { GameobjectHandlerService } from '../gameobject-handler.service';
import { GameobjectLootTemplateService } from './gameobject-loot-template.service';
-import { LootEditorComponent } from '@keira/shared/loot-editor';
-import { TranslateModule } from '@ngx-translate/core';
-
-import { TopBarComponent } from '@keira/shared/base-editor-components';
@Component({
changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/libs/features/gameobject/src/gameobject-questitem/gameobject-questitem.component.ts b/libs/features/gameobject/src/gameobject-questitem/gameobject-questitem.component.ts
index 42d085a209..fc5e4bb550 100644
--- a/libs/features/gameobject/src/gameobject-questitem/gameobject-questitem.component.ts
+++ b/libs/features/gameobject/src/gameobject-questitem/gameobject-questitem.component.ts
@@ -1,17 +1,14 @@
+import { AsyncPipe } from '@angular/common';
import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
-import { MultiRowEditorComponent } from '@keira/shared/base-abstract-classes';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { GameobjectQuestitem } from '@keira/shared/acore-world-model';
-import { GameobjectHandlerService } from '../gameobject-handler.service';
-import { GameobjectQuestitemService } from './gameobject-questitem.service';
-import { NgxDatatableModule } from '@siemens/ngx-datatable';
-import { EditorButtonsComponent } from '@keira/shared/base-editor-components';
+import { MultiRowEditorComponent } from '@keira/shared/base-abstract-classes';
+import { EditorButtonsComponent, IconComponent, QueryOutputComponent, TopBarComponent } from '@keira/shared/base-editor-components';
import { ItemSelectorBtnComponent } from '@keira/shared/selectors';
-import { IconComponent } from '@keira/shared/base-editor-components';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { QueryOutputComponent } from '@keira/shared/base-editor-components';
import { TranslateModule } from '@ngx-translate/core';
-import { AsyncPipe } from '@angular/common';
-import { TopBarComponent } from '@keira/shared/base-editor-components';
+import { NgxDatatableModule } from '@siemens/ngx-datatable';
+import { GameobjectHandlerService } from '../gameobject-handler.service';
+import { GameobjectQuestitemService } from './gameobject-questitem.service';
@Component({
changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/libs/features/gameobject/src/gameobject-spawn-addon/gameobject-spawn-addon.component.ts b/libs/features/gameobject/src/gameobject-spawn-addon/gameobject-spawn-addon.component.ts
index 954836eb24..8147e17f8a 100644
--- a/libs/features/gameobject/src/gameobject-spawn-addon/gameobject-spawn-addon.component.ts
+++ b/libs/features/gameobject/src/gameobject-spawn-addon/gameobject-spawn-addon.component.ts
@@ -1,16 +1,14 @@
import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
-import { MultiRowEditorComponent } from '@keira/shared/base-abstract-classes';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { GameobjectSpawnAddon, INVISIBILITY_TYPE } from '@keira/shared/acore-world-model';
-import { GameobjectHandlerService } from '../gameobject-handler.service';
-import { GameobjectSpawnAddonService } from './gameobject-spawn-addon.service';
-import { NgxDatatableModule } from '@siemens/ngx-datatable';
+import { MultiRowEditorComponent } from '@keira/shared/base-abstract-classes';
+import { QueryOutputComponent, TopBarComponent } from '@keira/shared/base-editor-components';
import { SingleValueSelectorBtnComponent } from '@keira/shared/selectors';
-import { TooltipModule } from 'ngx-bootstrap/tooltip';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { QueryOutputComponent } from '@keira/shared/base-editor-components';
import { TranslateModule } from '@ngx-translate/core';
-
-import { TopBarComponent } from '@keira/shared/base-editor-components';
+import { NgxDatatableModule } from '@siemens/ngx-datatable';
+import { TooltipModule } from 'ngx-bootstrap/tooltip';
+import { GameobjectHandlerService } from '../gameobject-handler.service';
+import { GameobjectSpawnAddonService } from './gameobject-spawn-addon.service';
@Component({
changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/libs/features/gameobject/src/gameobject-spawn/gameobject-spawn.component.ts b/libs/features/gameobject/src/gameobject-spawn/gameobject-spawn.component.ts
index dcce2344be..a976bb7825 100644
--- a/libs/features/gameobject/src/gameobject-spawn/gameobject-spawn.component.ts
+++ b/libs/features/gameobject/src/gameobject-spawn/gameobject-spawn.component.ts
@@ -1,17 +1,14 @@
import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
-import { MultiRowEditorComponent } from '@keira/shared/base-abstract-classes';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { GameobjectSpawn, PHASE_MASK, SPAWN_MASK } from '@keira/shared/acore-world-model';
-import { GameobjectHandlerService } from '../gameobject-handler.service';
-import { GameobjectSpawnService } from './gameobject-spawn.service';
-import { NgxDatatableModule } from '@siemens/ngx-datatable';
-import { EditorButtonsComponent } from '@keira/shared/base-editor-components';
-import { TooltipModule } from 'ngx-bootstrap/tooltip';
+import { MultiRowEditorComponent } from '@keira/shared/base-abstract-classes';
+import { EditorButtonsComponent, QueryOutputComponent, TopBarComponent } from '@keira/shared/base-editor-components';
import { AreaSelectorBtnComponent, FlagsSelectorBtnComponent, MapSelectorBtnComponent } from '@keira/shared/selectors';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { QueryOutputComponent } from '@keira/shared/base-editor-components';
import { TranslateModule } from '@ngx-translate/core';
-
-import { TopBarComponent } from '@keira/shared/base-editor-components';
+import { NgxDatatableModule } from '@siemens/ngx-datatable';
+import { TooltipModule } from 'ngx-bootstrap/tooltip';
+import { GameobjectHandlerService } from '../gameobject-handler.service';
+import { GameobjectSpawnService } from './gameobject-spawn.service';
@Component({
changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/libs/features/gameobject/src/gameobject-template-addon/gameobject-template-addon.component.ts b/libs/features/gameobject/src/gameobject-template-addon/gameobject-template-addon.component.ts
index eea952e15f..aaa7c678ce 100644
--- a/libs/features/gameobject/src/gameobject-template-addon/gameobject-template-addon.component.ts
+++ b/libs/features/gameobject/src/gameobject-template-addon/gameobject-template-addon.component.ts
@@ -1,16 +1,13 @@
import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
-import { SingleRowEditorComponent } from '@keira/shared/base-abstract-classes';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { GAMEOBJECT_FLAGS, GameobjectTemplateAddon } from '@keira/shared/acore-world-model';
+import { SingleRowEditorComponent } from '@keira/shared/base-abstract-classes';
+import { QueryOutputComponent, TopBarComponent } from '@keira/shared/base-editor-components';
+import { FactionSelectorBtnComponent, FlagsSelectorBtnComponent } from '@keira/shared/selectors';
+import { TranslateModule } from '@ngx-translate/core';
+import { TooltipModule } from 'ngx-bootstrap/tooltip';
import { GameobjectHandlerService } from '../gameobject-handler.service';
import { GameobjectTemplateAddonService } from './gameobject-template-addon.service';
-import { FlagsSelectorBtnComponent } from '@keira/shared/selectors';
-import { FactionSelectorBtnComponent } from '@keira/shared/selectors';
-import { TooltipModule } from 'ngx-bootstrap/tooltip';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { QueryOutputComponent } from '@keira/shared/base-editor-components';
-import { TranslateModule } from '@ngx-translate/core';
-
-import { TopBarComponent } from '@keira/shared/base-editor-components';
@Component({
changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/libs/features/gameobject/src/sai-gameobject/sai-gameobject.component.ts b/libs/features/gameobject/src/sai-gameobject/sai-gameobject.component.ts
index 8ce67b3dc2..8bdf996945 100644
--- a/libs/features/gameobject/src/sai-gameobject/sai-gameobject.component.ts
+++ b/libs/features/gameobject/src/sai-gameobject/sai-gameobject.component.ts
@@ -1,16 +1,13 @@
import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
-import { SaiEditorComponent } from '@keira/shared/sai-editor';
-import { SaiGameobjectHandlerService } from '../sai-gameobject-handler.service';
-import { SaiGameobjectEditorService } from './sai-gameobject-editor.service';
-import { TimedActionlistComponent } from '@keira/shared/sai-editor';
-import { NgxDatatableModule } from '@siemens/ngx-datatable';
-import { EditorButtonsComponent } from '@keira/shared/base-editor-components';
-import { FlagsSelectorBtnComponent } from '@keira/shared/selectors';
-import { TooltipModule } from 'ngx-bootstrap/tooltip';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { QueryOutputComponent } from '@keira/shared/base-editor-components';
+import { EditorButtonsComponent, QueryOutputComponent } from '@keira/shared/base-editor-components';
+import { SaiEditorComponent, SaiTopBarComponent, TimedActionlistComponent } from '@keira/shared/sai-editor';
+import { FlagsSelectorBtnComponent } from '@keira/shared/selectors';
import { TranslateModule } from '@ngx-translate/core';
-import { SaiTopBarComponent } from '@keira/shared/sai-editor';
+import { NgxDatatableModule } from '@siemens/ngx-datatable';
+import { TooltipModule } from 'ngx-bootstrap/tooltip';
+import { SaiGameobjectHandlerService } from '../sai-gameobject-handler.service';
+import { SaiGameobjectEditorService } from './sai-gameobject-editor.service';
@Component({
changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/libs/features/gossip/src/gossip-menu/gossip-menu.component.ts b/libs/features/gossip/src/gossip-menu/gossip-menu.component.ts
index 9f969de1ce..9195084464 100644
--- a/libs/features/gossip/src/gossip-menu/gossip-menu.component.ts
+++ b/libs/features/gossip/src/gossip-menu/gossip-menu.component.ts
@@ -1,18 +1,16 @@
+import { AsyncPipe } from '@angular/common';
import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
-import { MultiRowEditorComponent } from '@keira/shared/base-abstract-classes';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { GossipMenu } from '@keira/shared/acore-world-model';
-import { GossipHandlerService } from '../gossip-handler.service';
-import { GossipMenuService } from './gossip-menu.service';
+import { MultiRowEditorComponent } from '@keira/shared/base-abstract-classes';
+import { EditorButtonsComponent, QueryOutputComponent, TopBarComponent } from '@keira/shared/base-editor-components';
+import { MysqlQueryService } from '@keira/shared/db-layer';
+import { NpcTextSelectorBtnComponent } from '@keira/shared/selectors';
+import { TranslateModule } from '@ngx-translate/core';
import { NgxDatatableModule } from '@siemens/ngx-datatable';
-import { EditorButtonsComponent } from '@keira/shared/base-editor-components';
import { TooltipModule } from 'ngx-bootstrap/tooltip';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { QueryOutputComponent } from '@keira/shared/base-editor-components';
-import { TranslateModule } from '@ngx-translate/core';
-import { AsyncPipe } from '@angular/common';
-import { TopBarComponent } from '@keira/shared/base-editor-components';
-import { NpcTextSelectorBtnComponent } from '@keira/shared/selectors';
-import { MysqlQueryService } from '@keira/shared/db-layer';
+import { GossipHandlerService } from '../gossip-handler.service';
+import { GossipMenuService } from './gossip-menu.service';
@Component({
changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/libs/features/item/src/item-loot-template/item-loot-template.component.ts b/libs/features/item/src/item-loot-template/item-loot-template.component.ts
index 08aa8bae85..4393df2a2e 100644
--- a/libs/features/item/src/item-loot-template/item-loot-template.component.ts
+++ b/libs/features/item/src/item-loot-template/item-loot-template.component.ts
@@ -1,11 +1,10 @@
import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
-import { LootTemplateComponent } from '@keira/shared/base-abstract-classes';
import { ItemLootTemplate } from '@keira/shared/acore-world-model';
+import { LootTemplateComponent } from '@keira/shared/base-abstract-classes';
+import { TopBarComponent } from '@keira/shared/base-editor-components';
+import { LootEditorComponent } from '@keira/shared/loot-editor';
import { ItemHandlerService } from '../item-handler.service';
import { ItemLootTemplateService } from './item-loot-template.service';
-import { LootEditorComponent } from '@keira/shared/loot-editor';
-
-import { TopBarComponent } from '@keira/shared/base-editor-components';
@Component({
changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/libs/features/smart-scripts/src/sai-search-entity/sai-search-entity.component.ts b/libs/features/smart-scripts/src/sai-search-entity/sai-search-entity.component.ts
index ffcd2172c6..5b1728b5af 100644
--- a/libs/features/smart-scripts/src/sai-search-entity/sai-search-entity.component.ts
+++ b/libs/features/smart-scripts/src/sai-search-entity/sai-search-entity.component.ts
@@ -1,8 +1,7 @@
import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
-import { FormControl, FormGroup, Validators, FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { FormControl, FormGroup, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms';
import { SAI_TYPES, SmartScripts } from '@keira/shared/acore-world-model';
-import { GameobjectSelectorBtnComponent } from '@keira/shared/selectors';
-import { CreatureSelectorBtnComponent } from '@keira/shared/selectors';
+import { CreatureSelectorBtnComponent, GameobjectSelectorBtnComponent } from '@keira/shared/selectors';
import { SaiHandlerService } from '@keira/shared/sai-editor';
import { getEnumKeys, ModelForm } from '@keira/shared/utils';
diff --git a/libs/features/spell/src/spell-dbc/base/spell-dbc-base.component.ts b/libs/features/spell/src/spell-dbc/base/spell-dbc-base.component.ts
index dd610d12d6..864d085c94 100644
--- a/libs/features/spell/src/spell-dbc/base/spell-dbc-base.component.ts
+++ b/libs/features/spell/src/spell-dbc/base/spell-dbc-base.component.ts
@@ -2,8 +2,8 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
import {
DISPEL_TYPE,
- SPELL_DBC_CAST_TIME,
SPELL_DBC_CASTER_AURA_STATE,
+ SPELL_DBC_CAST_TIME,
SPELL_DBC_DAMAGE_CLASS,
SPELL_DBC_POWER_TYPE,
SPELL_DBC_PREVENTION_TYPE,
@@ -12,11 +12,10 @@ import {
SPELL_SCHOOL_MASK,
SpellDbc,
} from '@keira/shared/acore-world-model';
+import { FlagsSelectorBtnComponent, SingleValueSelectorBtnComponent } from '@keira/shared/selectors';
import { ModelForm } from '@keira/shared/utils';
-import { FlagsSelectorBtnComponent } from '@keira/shared/selectors';
-import { SingleValueSelectorBtnComponent } from '@keira/shared/selectors';
-import { TooltipModule } from 'ngx-bootstrap/tooltip';
import { TranslateModule } from '@ngx-translate/core';
+import { TooltipModule } from 'ngx-bootstrap/tooltip';
@Component({
changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/libs/shared/selectors/src/selectors/boolean-option-selector/boolean-option-selector.component.spec.ts b/libs/shared/selectors/src/selectors/boolean-option-selector/boolean-option-selector.component.spec.ts
index b04d870a9c..7bbae565d3 100644
--- a/libs/shared/selectors/src/selectors/boolean-option-selector/boolean-option-selector.component.spec.ts
+++ b/libs/shared/selectors/src/selectors/boolean-option-selector/boolean-option-selector.component.spec.ts
@@ -55,16 +55,12 @@ describe('BooleanOptionSelectorComponent', () => {
const { page, host } = setup();
const select = page.getDebugElementByCss('select').nativeElement;
- select.value = '1: 1';
- select.dispatchEvent(new Event('change'));
- page.detectChanges();
+ page.setInputValue(select, '1: 1');
expect(host.mockFormControl.value).toEqual(1);
expect(select.selectedOptions[0].innerText).toEqual('1 - SELECTORS.ENABLED');
- select.value = '0: 0';
- select.dispatchEvent(new Event('change'));
- page.detectChanges();
+ page.setInputValue(select, '0: 0');
expect(host.mockFormControl.value).toEqual(0);
expect(select.selectedOptions[0].innerText).toEqual('0 - SELECTORS.DISABLED');
diff --git a/libs/shared/selectors/src/selectors/generic-option-selector/generic-option-selector.component.spec.ts b/libs/shared/selectors/src/selectors/generic-option-selector/generic-option-selector.component.spec.ts
index 62d7569ca9..9369792013 100644
--- a/libs/shared/selectors/src/selectors/generic-option-selector/generic-option-selector.component.spec.ts
+++ b/libs/shared/selectors/src/selectors/generic-option-selector/generic-option-selector.component.spec.ts
@@ -57,16 +57,12 @@ describe('GenericOptionSelectorComponent', () => {
const { page, host } = setup();
const select = page.getDebugElementByCss('select').nativeElement;
- select.value = '1: 1';
- select.dispatchEvent(new Event('change'));
- page.detectChanges();
+ page.setInputValue(select, '1: 1');
expect(host.mockFormControl.value).toEqual(1);
expect(select.selectedOptions[0].label).toEqual('1 - The Burning Crusade');
- select.value = '0: 0';
- select.dispatchEvent(new Event('change'));
- page.detectChanges();
+ page.setInputValue(select, '0: 0');
expect(host.mockFormControl.value).toEqual(0);
expect(select.selectedOptions[0].label).toEqual('0 - Classic');
diff --git a/libs/shared/selectors/src/selectors/item-extended-cost-selector/item-extended-cost-selector-btn.component.ts b/libs/shared/selectors/src/selectors/item-extended-cost-selector/item-extended-cost-selector-btn.component.ts
index b9710173a7..5311f32e53 100644
--- a/libs/shared/selectors/src/selectors/item-extended-cost-selector/item-extended-cost-selector-btn.component.ts
+++ b/libs/shared/selectors/src/selectors/item-extended-cost-selector/item-extended-cost-selector-btn.component.ts
@@ -1,7 +1,7 @@
import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { ItemExtendedCostSelectorModalComponent } from './item-extended-cost-selector-modal.component';
import { BaseSelectorBtnComponent } from '../base-selector/base-selector-btn.component';
+import { ItemExtendedCostSelectorModalComponent } from './item-extended-cost-selector-modal.component';
@Component({
changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/libs/shared/selectors/src/selectors/item-extended-cost-selector/item-extended-cost-selector-modal.component.html b/libs/shared/selectors/src/selectors/item-extended-cost-selector/item-extended-cost-selector-modal.component.html
index daecfe53c3..f36a70de64 100644
--- a/libs/shared/selectors/src/selectors/item-extended-cost-selector/item-extended-cost-selector-modal.component.html
+++ b/libs/shared/selectors/src/selectors/item-extended-cost-selector/item-extended-cost-selector-modal.component.html
@@ -123,15 +123,50 @@
-
+
+
+ @if (row.reqItemId1 !== 0) {
+
+ }
+ {{ row.reqItemId1 }}
+
+
-
+
+
+ @if (row.reqItemId2 !== 0) {
+
+ }
+ {{ row.reqItemId2 }}
+
+
-
+
+
+ @if (row.reqItemId3 !== 0) {
+
+ }
+ {{ row.reqItemId3 }}
+
+
-
+
+
+ @if (row.reqItemId4 !== 0) {
+
+ }
+ {{ row.reqItemId4 }}
+
+
-
+
+
+ @if (row.reqItemId5 !== 0) {
+
+ }
+ {{ row.reqItemId5 }}
+
+
diff --git a/libs/shared/selectors/src/selectors/item-extended-cost-selector/item-extended-cost-selector-modal.component.ts b/libs/shared/selectors/src/selectors/item-extended-cost-selector/item-extended-cost-selector-modal.component.ts
index bc08069783..d8cc8590db 100644
--- a/libs/shared/selectors/src/selectors/item-extended-cost-selector/item-extended-cost-selector-modal.component.ts
+++ b/libs/shared/selectors/src/selectors/item-extended-cost-selector/item-extended-cost-selector-modal.component.ts
@@ -7,14 +7,14 @@ import { ItemExtendedCostSearchService } from '../../search/item-extended-cost-s
import { SearchSelectorModalComponent } from '../base-selector/search-selector-modal.component';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { HighlightjsWrapperComponent } from '@keira/shared/base-editor-components';
+import { HighlightjsWrapperComponent, IconComponent } from '@keira/shared/base-editor-components';
@Component({
changeDetection: ChangeDetectionStrategy.OnPush,
selector: 'keira-item-extended-cost-selector-modal',
templateUrl: './item-extended-cost-selector-modal.component.html',
standalone: true,
- imports: [FormsModule, ReactiveFormsModule, HighlightjsWrapperComponent, NgxDatatableModule, TranslateModule],
+ imports: [FormsModule, ReactiveFormsModule, HighlightjsWrapperComponent, NgxDatatableModule, TranslateModule, IconComponent],
})
export class ItemExtendedCostSelectorModalComponent extends SearchSelectorModalComponent {
protected entityIdField = ITEM_EXTENDED_COST_ID;
diff --git a/libs/shared/selectors/src/selectors/spell-selector/spell-selector-modal.component.html b/libs/shared/selectors/src/selectors/spell-selector/spell-selector-modal.component.html
index a434277270..23deebe4ed 100644
--- a/libs/shared/selectors/src/selectors/spell-selector/spell-selector-modal.component.html
+++ b/libs/shared/selectors/src/selectors/spell-selector/spell-selector-modal.component.html
@@ -41,7 +41,11 @@
{{ row.ID }}
-
+
+
+ {{ row.spellName }}
+
+