From 8083118b3585c0dad832e78dfad3dbbedfe48ce0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefano=20Borz=C3=AC?= Date: Thu, 7 Sep 2023 13:32:24 +0200 Subject: [PATCH] feat: add event_param6 to SAI editor (#2441) --- ...sai-creature.component.integration.spec.ts | 9 +- ...i-gameobject.component.integration.spec.ts | 8 +- .../modules/sai-editor/constants/sai-event.ts | 10 +- .../sai-editor/sai-editor.component.html | 20 +++- .../sai-editor.component.integration.spec.ts | 109 +++++++++--------- .../sai-editor/sai-editor.component.ts | 9 +- .../modules/sai-editor/sai-editor.service.ts | 2 + src/app/shared/types/smart-scripts.type.ts | 1 + 8 files changed, 101 insertions(+), 67 deletions(-) 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 index bf8f3eb4e9..8c7a894a4d 100644 --- 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 @@ -75,6 +75,7 @@ describe('SaiCreatureComponent integration tests', () => { expect(page.getInputById('event_param3').disabled).toBe(true); expect(page.getInputById('event_param4').disabled).toBe(true); expect(page.getInputById('event_param5').disabled).toBe(true); + expect(page.getInputById('event_param6').disabled).toBe(true); expect(page.getInputById('action_type').disabled).toBe(true); expect(page.getInputById('action_param1').disabled).toBe(true); expect(page.getInputById('action_param2').disabled).toBe(true); @@ -114,13 +115,13 @@ describe('SaiCreatureComponent integration tests', () => { page.expectFullQueryToContain( 'DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 1234);\n' + 'INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, ' + - '`event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, ' + + '`event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, ' + '`action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, ' + '`target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, ' + '`target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES\n' + - "(1234, 0, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ''),\n" + - "(1234, 0, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ''),\n" + - "(1234, 0, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');\n", + "(1234, 0, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ''),\n" + + "(1234, 0, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ''),\n" + + "(1234, 0, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');\n", ); expect(page.getEditorTableRowsCount()).toBe(3); }); 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 index ecd1765aae..73752ee7ce 100644 --- 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 @@ -114,13 +114,13 @@ describe('SaiGameobjectComponent integration tests', () => { page.expectFullQueryToContain( 'DELETE FROM `smart_scripts` WHERE (`source_type` = 1 AND `entryorguid` = 1234);\n' + 'INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, ' + - '`event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, ' + + '`event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, ' + '`action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, ' + '`target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, ' + '`target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES\n' + - "(1234, 1, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ''),\n" + - "(1234, 1, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ''),\n" + - "(1234, 1, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');\n", + "(1234, 1, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ''),\n" + + "(1234, 1, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ''),\n" + + "(1234, 1, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');\n", ); expect(page.getEditorTableRowsCount()).toBe(3); }); diff --git a/src/app/shared/modules/sai-editor/constants/sai-event.ts b/src/app/shared/modules/sai-editor/constants/sai-event.ts index dc6cd3ca9e..1154c1bdf0 100644 --- a/src/app/shared/modules/sai-editor/constants/sai-event.ts +++ b/src/app/shared/modules/sai-editor/constants/sai-event.ts @@ -94,11 +94,13 @@ export const SAI_EVENT_PARAM2_NAMES: string[] = []; export const SAI_EVENT_PARAM3_NAMES: string[] = []; export const SAI_EVENT_PARAM4_NAMES: string[] = []; export const SAI_EVENT_PARAM5_NAMES: string[] = []; +export const SAI_EVENT_PARAM6_NAMES: string[] = []; export const SAI_EVENT_PARAM1_TOOLTIPS: string[] = []; export const SAI_EVENT_PARAM2_TOOLTIPS: string[] = []; export const SAI_EVENT_PARAM3_TOOLTIPS: string[] = []; export const SAI_EVENT_PARAM4_TOOLTIPS: string[] = []; export const SAI_EVENT_PARAM5_TOOLTIPS: string[] = []; +export const SAI_EVENT_PARAM6_TOOLTIPS: string[] = []; // SMART_EVENT_UPDATE_IC SAI_EVENT_TOOLTIPS[SAI_EVENTS.UPDATE_IC] = @@ -179,7 +181,7 @@ SAI_EVENT_PARAM1_TOOLTIPS[SAI_EVENTS.SPELLHIT] = 'Use 0 for any'; SAI_EVENT_PARAM2_TOOLTIPS[SAI_EVENTS.SPELLHIT] = 'Use 0 for any'; // SMART_EVENT_RANGE -SAI_EVENT_TOOLTIPS[SAI_EVENTS.RANGE] = 'When the source\'s current target is within a certain range'; +SAI_EVENT_TOOLTIPS[SAI_EVENTS.RANGE] = "When the source's current target is within a certain range"; SAI_EVENT_PARAM1_NAMES[SAI_EVENTS.RANGE] = 'MinDist'; SAI_EVENT_PARAM2_NAMES[SAI_EVENTS.RANGE] = 'MaxDist'; SAI_EVENT_PARAM3_NAMES[SAI_EVENTS.RANGE] = 'RepeatMin'; @@ -644,7 +646,8 @@ SAI_EVENT_PARAM4_TOOLTIPS[SAI_EVENTS.NEAR_UNIT_NEGATION] = 'Range in yards to ch SAI_EVENT_PARAM5_TOOLTIPS[SAI_EVENTS.NEAR_UNIT_NEGATION] = 'Check Timer (ms).'; // SMART_EVENT_AREA_CASTING -SAI_EVENT_TOOLTIPS[SAI_EVENTS.AREA_CASTING] = 'Check threat list for hostiles casting. If none are found, repeat in 1200ms. This is mostly used for interrupt spells when used with CAST Action and INVOKER Target.'; +SAI_EVENT_TOOLTIPS[SAI_EVENTS.AREA_CASTING] = + 'Check threat list for hostiles casting. If none are found, repeat in 1200ms. This is mostly used for interrupt spells when used with CAST Action and INVOKER Target.'; SAI_EVENT_PARAM1_NAMES[SAI_EVENTS.AREA_CASTING] = 'InitialMin'; SAI_EVENT_PARAM2_NAMES[SAI_EVENTS.AREA_CASTING] = 'InitialMax'; SAI_EVENT_PARAM3_NAMES[SAI_EVENTS.AREA_CASTING] = 'RepeatMin'; @@ -657,7 +660,8 @@ SAI_EVENT_PARAM4_TOOLTIPS[SAI_EVENTS.AREA_CASTING] = 'ms'; SAI_EVENT_PARAM5_TOOLTIPS[SAI_EVENTS.AREA_CASTING] = '0: unlimited'; // SMART_EVENT_AREA_RANGE -SAI_EVENT_TOOLTIPS[SAI_EVENTS.AREA_RANGE] = 'Check threat list for hostiles in range. If none are found, repeat in 1200ms. This is mostly used to make creatures cast AoEs if a player is within range.'; +SAI_EVENT_TOOLTIPS[SAI_EVENTS.AREA_RANGE] = + 'Check threat list for hostiles in range. If none are found, repeat in 1200ms. This is mostly used to make creatures cast AoEs if a player is within range.'; SAI_EVENT_PARAM1_NAMES[SAI_EVENTS.AREA_RANGE] = 'InitialMin'; SAI_EVENT_PARAM2_NAMES[SAI_EVENTS.AREA_RANGE] = 'InitialMax'; SAI_EVENT_PARAM3_NAMES[SAI_EVENTS.AREA_RANGE] = 'RepeatMin'; diff --git a/src/app/shared/modules/sai-editor/sai-editor.component.html b/src/app/shared/modules/sai-editor/sai-editor.component.html index 6b28432a49..bee37da9f8 100644 --- a/src/app/shared/modules/sai-editor/sai-editor.component.html +++ b/src/app/shared/modules/sai-editor/sai-editor.component.html @@ -232,6 +232,24 @@ + +
+
+ +
+ +
+ +
+
@@ -527,7 +545,7 @@
- +
diff --git a/src/app/shared/modules/sai-editor/sai-editor.component.integration.spec.ts b/src/app/shared/modules/sai-editor/sai-editor.component.integration.spec.ts index c44d8d9964..b8f7e95fa1 100644 --- a/src/app/shared/modules/sai-editor/sai-editor.component.integration.spec.ts +++ b/src/app/shared/modules/sai-editor/sai-editor.component.integration.spec.ts @@ -2,6 +2,7 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { SAI_ACTIONS } from '@keira-shared/modules/sai-editor/constants/sai-actions'; import { SAI_EVENTS } from '@keira-shared/modules/sai-editor/constants/sai-event'; +import { TranslateTestingModule } from '@keira-shared/testing/translate-module'; import { ModalModule } from 'ngx-bootstrap/modal'; import { ToastrModule } from 'ngx-toastr'; import { of } from 'rxjs'; @@ -11,7 +12,6 @@ import { SAI_TYPES, SmartScripts } from '../../types/smart-scripts.type'; import { SaiEditorComponent } from './sai-editor.component'; import { SaiEditorModule } from './sai-editor.module'; import { SaiHandlerService } from './sai-handler.service'; -import { TranslateTestingModule } from '@keira-shared/testing/translate-module'; import Spy = jasmine.Spy; class SaiEditorPage extends MultiRowEditorPageObject { @@ -162,6 +162,7 @@ describe('SaiEditorComponent integration tests', () => { expect(page.getInputById('event_param3').disabled).toBe(true); expect(page.getInputById('event_param4').disabled).toBe(true); expect(page.getInputById('event_param5').disabled).toBe(true); + expect(page.getInputById('event_param6').disabled).toBe(true); expect(page.getInputById('action_type').disabled).toBe(true); expect(page.getInputById('action_param1').disabled).toBe(true); expect(page.getInputById('action_param2').disabled).toBe(true); @@ -194,13 +195,13 @@ describe('SaiEditorComponent integration tests', () => { const expectedQuery = 'DELETE FROM `smart_scripts` WHERE (`entryorguid` = 1234) AND (`source_type` = 0) AND (`id` IN (0, 1, 2));\n' + 'INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, ' + - '`event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, ' + + '`event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, ' + '`action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, ' + '`target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, ' + '`target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES\n' + - "(1234, 0, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ''),\n" + - "(1234, 0, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ''),\n" + - "(1234, 0, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');"; + "(1234, 0, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ''),\n" + + "(1234, 0, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ''),\n" + + "(1234, 0, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');"; querySpy.calls.reset(); page.addNewRow(); @@ -221,80 +222,80 @@ describe('SaiEditorComponent integration tests', () => { page.expectDiffQueryToContain( 'DELETE FROM `smart_scripts` WHERE (`entryorguid` = 1234) AND (`source_type` = 0) AND (`id` IN (0));\n' + 'INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, ' + - '`event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, ' + + '`event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, ' + '`action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, ' + '`target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, ' + '`target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES\n' + - "(1234, 0, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');", + "(1234, 0, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');", ); page.expectFullQueryToContain( 'DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 1234);\n' + 'INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, ' + - '`event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, ' + + '`event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, ' + '`action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, ' + '`target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, ' + '`target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES\n' + - "(1234, 0, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');", + "(1234, 0, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');", ); page.setInputValueById('event_chance', 1); page.expectDiffQueryToContain( 'DELETE FROM `smart_scripts` WHERE (`entryorguid` = 1234) AND (`source_type` = 0) AND (`id` IN (0));\n' + 'INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, ' + - '`event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, ' + + '`event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, ' + '`action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, ' + '`target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, ' + '`target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES\n' + - "(1234, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');\n", + "(1234, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');\n", ); page.expectFullQueryToContain( 'DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 1234);\n' + 'INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, ' + - '`event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, ' + + '`event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, ' + '`action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, ' + '`target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, ' + '`target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES\n' + - "(1234, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');\n", + "(1234, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');\n", ); page.setInputValueById('event_param1', '2'); page.expectDiffQueryToContain( 'DELETE FROM `smart_scripts` WHERE (`entryorguid` = 1234) AND (`source_type` = 0) AND (`id` IN (0));\n' + 'INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, ' + - '`event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, ' + + '`event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, ' + '`action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, ' + '`target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, ' + '`target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES\n' + - "(1234, 0, 0, 0, 0, 0, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');\n", + "(1234, 0, 0, 0, 0, 0, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');\n", ); page.expectFullQueryToContain( 'DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 1234);\n' + 'INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, ' + - '`event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, ' + + '`event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, ' + '`action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, ' + '`target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, ' + '`target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES\n' + - "(1234, 0, 0, 0, 0, 0, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');\n", + "(1234, 0, 0, 0, 0, 0, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');\n", ); page.setInputValueById('action_param2', '123'); page.expectDiffQueryToContain( 'DELETE FROM `smart_scripts` WHERE (`entryorguid` = 1234) AND (`source_type` = 0) AND (`id` IN (0));\n' + 'INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, ' + - '`event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, ' + + '`event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, ' + '`action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, ' + '`target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, ' + '`target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES\n' + - "(1234, 0, 0, 0, 0, 0, 1, 0, 2, 0, 0, 0, 0, 0, 0, 123, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');\n", + "(1234, 0, 0, 0, 0, 0, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 123, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');\n", ); page.expectFullQueryToContain( 'DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 1234);\n' + 'INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, ' + - '`event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, ' + + '`event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, ' + '`action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, ' + '`target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, ' + '`target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES\n' + - "(1234, 0, 0, 0, 0, 0, 1, 0, 2, 0, 0, 0, 0, 0, 0, 123, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');\n", + "(1234, 0, 0, 0, 0, 0, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 123, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');\n", ); }); @@ -334,13 +335,13 @@ describe('SaiEditorComponent integration tests', () => { page.expectFullQueryToContain( 'DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 1234);\n' + 'INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, ' + - '`event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, ' + + '`event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, ' + '`action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, ' + '`target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, ' + '`target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES\n' + - "(1234, 0, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ''),\n" + - "(1234, 0, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ''),\n" + - "(1234, 0, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');\n", + "(1234, 0, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ''),\n" + + "(1234, 0, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ''),\n" + + "(1234, 0, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');\n", ); expect(page.getEditorTableRowsCount()).toBe(3); }); @@ -352,12 +353,12 @@ describe('SaiEditorComponent integration tests', () => { page.expectFullQueryToContain( 'DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 1234);\n' + 'INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, ' + - '`event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, ' + + '`event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, ' + '`action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, ' + '`target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, ' + '`target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES\n' + - "(1234, 0, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ''),\n" + - "(1234, 0, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');\n", + "(1234, 0, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ''),\n" + + "(1234, 0, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');\n", ); page.deleteRow(1); @@ -368,11 +369,11 @@ describe('SaiEditorComponent integration tests', () => { page.expectFullQueryToContain( 'DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 1234);\n' + 'INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, ' + - '`event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, ' + + '`event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, ' + '`action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, ' + '`target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, ' + '`target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES\n' + - "(1234, 0, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');\n", + "(1234, 0, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');\n", ); page.deleteRow(0); @@ -391,23 +392,23 @@ describe('SaiEditorComponent integration tests', () => { page.expectDiffQueryToContain( 'DELETE FROM `smart_scripts` WHERE (`entryorguid` = 1234) AND (`source_type` = 0) AND (`id` IN (1, 2));\n' + 'INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, ' + - '`event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, ' + + '`event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, ' + '`action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, ' + '`target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, ' + '`target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES\n' + - "(1234, 0, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, ''),\n" + - "(1234, 0, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, '');\n", + "(1234, 0, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, ''),\n" + + "(1234, 0, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, '');\n", ); page.expectFullQueryToContain( 'DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 1234);\n' + 'INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, ' + - '`event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, ' + + '`event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, ' + '`action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, ' + '`target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, ' + '`target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES\n' + - "(1234, 0, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ''),\n" + - "(1234, 0, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, ''),\n" + - "(1234, 0, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, '');\n", + "(1234, 0, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ''),\n" + + "(1234, 0, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, ''),\n" + + "(1234, 0, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, '');\n", ); }); @@ -425,23 +426,23 @@ describe('SaiEditorComponent integration tests', () => { page.expectDiffQueryToContain( 'DELETE FROM `smart_scripts` WHERE (`entryorguid` = 1234) AND (`source_type` = 0) AND (`id` IN (1, 2, 3));\n' + 'INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, ' + - '`event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, ' + + '`event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, ' + '`action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, ' + '`target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, ' + '`target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES\n' + - "(1234, 0, 1, 0, 0, 0, 100, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ''),\n" + - "(1234, 0, 3, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');\n", + "(1234, 0, 1, 0, 0, 0, 100, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ''),\n" + + "(1234, 0, 3, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');\n", ); page.expectFullQueryToContain( 'DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 1234);\n' + 'INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, ' + - '`event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, ' + + '`event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, ' + '`action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, ' + '`target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, ' + '`target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES\n' + - "(1234, 0, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ''),\n" + - "(1234, 0, 1, 0, 0, 0, 100, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ''),\n" + - "(1234, 0, 3, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');\n", + "(1234, 0, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ''),\n" + + "(1234, 0, 1, 0, 0, 0, 100, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ''),\n" + + "(1234, 0, 3, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');\n", ); }); @@ -464,23 +465,23 @@ describe('SaiEditorComponent integration tests', () => { page.expectDiffQueryToContain( 'DELETE FROM `smart_scripts` WHERE (`entryorguid` = 1234) AND (`source_type` = 0) AND (`id` IN (0));\n' + 'INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, ' + - '`event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, ' + + '`event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, ' + '`action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, ' + '`target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, ' + '`target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES\n' + - "(1234, 0, 0, 0, 0, 0, 100, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');", + "(1234, 0, 0, 0, 0, 0, 100, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');", ); page.expectFullQueryToContain( 'DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 1234);\n' + 'INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, ' + - '`event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, ' + + '`event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, ' + '`action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, ' + '`target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, ' + '`target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES\n' + - "(1234, 0, 0, 0, 0, 0, 100, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ''),\n" + - "(1234, 0, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ''),\n" + - "(1234, 0, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');\n", + "(1234, 0, 0, 0, 0, 0, 100, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ''),\n" + + "(1234, 0, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ''),\n" + + "(1234, 0, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');\n", ); })); @@ -518,13 +519,13 @@ describe('SaiEditorComponent integration tests', () => { '-- Mock template query\n\n' + 'DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 1234);\n' + 'INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, ' + - '`event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, ' + + '`event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, ' + '`action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, ' + '`target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, ' + '`target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES\n' + - "(1234, 0, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ''),\n" + - "(1234, 0, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ''),\n" + - "(1234, 0, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');\n", + "(1234, 0, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ''),\n" + + "(1234, 0, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ''),\n" + + "(1234, 0, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '');\n", ); expect(page.getEditorTableRowsCount()).toBe(3); }); diff --git a/src/app/shared/modules/sai-editor/sai-editor.component.ts b/src/app/shared/modules/sai-editor/sai-editor.component.ts index 02cc22b68e..9d07bf3fdd 100644 --- a/src/app/shared/modules/sai-editor/sai-editor.component.ts +++ b/src/app/shared/modules/sai-editor/sai-editor.component.ts @@ -33,6 +33,8 @@ import { SAI_EVENT_PARAM4_TOOLTIPS, SAI_EVENT_PARAM5_NAMES, SAI_EVENT_PARAM5_TOOLTIPS, + SAI_EVENT_PARAM6_NAMES, + SAI_EVENT_PARAM6_TOOLTIPS, SAI_EVENT_TOOLTIPS, } from './constants/sai-event'; import { @@ -81,6 +83,7 @@ export class SaiEditorComponent extends MultiRowEditorComponent im readonly EVENT_PARAM3_NAMES = SAI_EVENT_PARAM3_NAMES; readonly EVENT_PARAM4_NAMES = SAI_EVENT_PARAM4_NAMES; readonly EVENT_PARAM5_NAMES = SAI_EVENT_PARAM5_NAMES; + readonly EVENT_PARAM6_NAMES = SAI_EVENT_PARAM6_NAMES; readonly ACTION_PARAM1_NAMES = SAI_ACTION_PARAM1_NAMES; readonly ACTION_PARAM2_NAMES = SAI_ACTION_PARAM2_NAMES; readonly ACTION_PARAM3_NAMES = SAI_ACTION_PARAM3_NAMES; @@ -100,6 +103,7 @@ export class SaiEditorComponent extends MultiRowEditorComponent im readonly EVENT_PARAM3_TOOLTIPS = SAI_EVENT_PARAM3_TOOLTIPS; readonly EVENT_PARAM4_TOOLTIPS = SAI_EVENT_PARAM4_TOOLTIPS; readonly EVENT_PARAM5_TOOLTIPS = SAI_EVENT_PARAM5_TOOLTIPS; + readonly EVENT_PARAM6_TOOLTIPS = SAI_EVENT_PARAM6_TOOLTIPS; readonly ACTION_PARAM1_TOOLTIPS = SAI_ACTION_PARAM1_TOOLTIPS; readonly ACTION_PARAM2_TOOLTIPS = SAI_ACTION_PARAM2_TOOLTIPS; readonly ACTION_PARAM3_TOOLTIPS = SAI_ACTION_PARAM3_TOOLTIPS; @@ -142,7 +146,10 @@ export class SaiEditorComponent extends MultiRowEditorComponent im } /* istanbul ignore next */ // because of: https://github.com/gotwarlost/istanbul/issues/690 - constructor(public editorService: SaiEditorService, protected handlerService: SaiHandlerService) { + constructor( + public editorService: SaiEditorService, + protected handlerService: SaiHandlerService, + ) { super(editorService, handlerService); } diff --git a/src/app/shared/modules/sai-editor/sai-editor.service.ts b/src/app/shared/modules/sai-editor/sai-editor.service.ts index 44b27426cc..3a867d5221 100644 --- a/src/app/shared/modules/sai-editor/sai-editor.service.ts +++ b/src/app/shared/modules/sai-editor/sai-editor.service.ts @@ -83,10 +83,12 @@ export class SaiEditorService extends MultiRowComplexKeyEditorService