From ead03df617c3415222f80b1e411b135bbe9d32e4 Mon Sep 17 00:00:00 2001 From: Exitare Date: Sat, 21 Dec 2024 08:18:51 -0800 Subject: [PATCH] Convert editorService from public to protected (#3212) --- .../creature-equip-template.component.ts | 2 +- .../creature-loot-template.component.ts | 2 +- .../creature-onkill-reputation.component.ts | 2 +- .../creature-questitem/creature-questitem.component.ts | 2 +- .../creature-spawn-addon.component.ts | 2 +- .../src/creature-spawn/creature-spawn.component.ts | 2 +- .../creature-template-addon.component.ts | 2 +- .../creature-template-model.component.ts | 2 +- .../creature-template-movement.component.ts | 2 +- .../creature-template-resistance.component.ts | 2 +- .../creature-template-spell.component.ts | 2 +- .../src/creature-template/creature-template.component.ts | 2 +- .../creature/src/creature-text/creature-text.component.ts | 2 +- .../creature/src/npc-trainer/npc-trainer.component.ts | 2 +- .../creature/src/npc-vendor/npc-vendor.component.ts | 2 +- .../pickpocketing-loot-template.component.ts | 2 +- .../skinning-loot-template.component.ts | 2 +- .../gameobject-loot-template.component.ts | 2 +- .../gameobject-questitem.component.ts | 2 +- .../gameobject-spawn-addon.component.ts | 2 +- .../src/gameobject-spawn/gameobject-spawn.component.ts | 2 +- .../gameobject-template-addon.component.ts | 2 +- .../gameobject-template/gameobject-template.component.ts | 2 +- .../gossip-menu-option/gossip-menu-option.component.ts | 2 +- .../gossip/src/gossip-menu/gossip-menu.component.ts | 2 +- .../item-enchantment-template.component.ts | 2 +- .../item-loot-template/item-loot-template.component.ts | 2 +- .../item/src/item-template/item-template.component.ts | 2 +- .../milling-loot-template.component.ts | 2 +- .../prospecting-loot-template.component.ts | 2 +- .../src/fishing-loot/fishing-loot-template.component.ts | 2 +- .../src/mail-loot/mail-loot-template.component.ts | 2 +- .../reference-loot/reference-loot-template.component.ts | 2 +- .../src/spell-loot/spell-loot-template.component.ts | 2 +- .../creature-questender/creature-questender.component.ts | 2 +- .../creature-queststarter.component.ts | 2 +- .../gameobject-questender.component.ts | 2 +- .../gameobject-queststarter.component.ts | 2 +- .../quest-offer-reward/quest-offer-reward.component.ts | 2 +- .../quest-request-items/quest-request-items.component.ts | 2 +- .../quest-template-addon.component.ts | 2 +- .../quest/src/quest-template/quest-template.component.ts | 2 +- libs/features/spell/src/spell-dbc/spell-dbc.component.ts | 2 +- .../texts/src/broadcast-text/broadcast-text.component.ts | 2 +- libs/features/texts/src/npc-text/npc-text.component.ts | 2 +- libs/features/texts/src/page-text/page-text.component.ts | 2 +- .../src/components/editors/editor.component.ts | 2 +- .../editors/loot-template/loot-template-id.component.ts | 2 +- .../src/components/editors/multi-row-editor.component.ts | 2 +- .../src/components/editors/select.component.ts | 8 ++++---- .../src/components/editors/single-row-editor.component.ts | 2 +- libs/shared/sai-editor/src/sai-editor.component.ts | 2 +- 52 files changed, 55 insertions(+), 55 deletions(-) diff --git a/libs/features/creature/src/creature-equip-template/creature-equip-template.component.ts b/libs/features/creature/src/creature-equip-template/creature-equip-template.component.ts index d5b5d604f38..b3a5a1b8d40 100644 --- a/libs/features/creature/src/creature-equip-template/creature-equip-template.component.ts +++ b/libs/features/creature/src/creature-equip-template/creature-equip-template.component.ts @@ -27,6 +27,6 @@ import { TooltipModule } from 'ngx-bootstrap/tooltip'; ], }) export class CreatureEquipTemplateComponent extends SingleRowEditorComponent { - override readonly editorService = inject(CreatureEquipTemplateService); + protected override readonly editorService = inject(CreatureEquipTemplateService); readonly handlerService = inject(CreatureHandlerService); } diff --git a/libs/features/creature/src/creature-loot-template/creature-loot-template.component.ts b/libs/features/creature/src/creature-loot-template/creature-loot-template.component.ts index 66c6dbc1fc7..b2203998fd6 100644 --- a/libs/features/creature/src/creature-loot-template/creature-loot-template.component.ts +++ b/libs/features/creature/src/creature-loot-template/creature-loot-template.component.ts @@ -14,6 +14,6 @@ import { CreatureLootTemplateService } from './creature-loot-template.service'; imports: [TopBarComponent, LootEditorComponent], }) export class CreatureLootTemplateComponent extends LootTemplateIdComponent { - override readonly editorService = inject(CreatureLootTemplateService); + protected override readonly editorService = inject(CreatureLootTemplateService); readonly handlerService = inject(CreatureHandlerService); } diff --git a/libs/features/creature/src/creature-onkill-reputation/creature-onkill-reputation.component.ts b/libs/features/creature/src/creature-onkill-reputation/creature-onkill-reputation.component.ts index 8b543a8c142..ade7df9f79f 100644 --- a/libs/features/creature/src/creature-onkill-reputation/creature-onkill-reputation.component.ts +++ b/libs/features/creature/src/creature-onkill-reputation/creature-onkill-reputation.component.ts @@ -36,6 +36,6 @@ import { CreatureOnkillReputationService } from './creature-onkill-reputation.se export class CreatureOnkillReputationComponent extends SingleRowEditorComponent { readonly FACTION_RANK = FACTION_RANK; - override readonly editorService = inject(CreatureOnkillReputationService); + protected override readonly editorService = inject(CreatureOnkillReputationService); readonly handlerService = inject(CreatureHandlerService); } diff --git a/libs/features/creature/src/creature-questitem/creature-questitem.component.ts b/libs/features/creature/src/creature-questitem/creature-questitem.component.ts index 7dcc7d44566..94b0f9cfacf 100644 --- a/libs/features/creature/src/creature-questitem/creature-questitem.component.ts +++ b/libs/features/creature/src/creature-questitem/creature-questitem.component.ts @@ -30,6 +30,6 @@ import { CreatureQuestitemService } from './creature-questitem.service'; ], }) export class CreatureQuestitemComponent extends MultiRowEditorComponent { - override readonly editorService = inject(CreatureQuestitemService); + protected override readonly editorService = inject(CreatureQuestitemService); readonly handlerService = inject(CreatureHandlerService); } diff --git a/libs/features/creature/src/creature-spawn-addon/creature-spawn-addon.component.ts b/libs/features/creature/src/creature-spawn-addon/creature-spawn-addon.component.ts index f60647bcd46..b19a8260e69 100644 --- a/libs/features/creature/src/creature-spawn-addon/creature-spawn-addon.component.ts +++ b/libs/features/creature/src/creature-spawn-addon/creature-spawn-addon.component.ts @@ -33,6 +33,6 @@ export class CreatureSpawnAddonComponent extends MultiRowEditorComponent { - override readonly editorService = inject(CreatureTemplateModelService); + protected override readonly editorService = inject(CreatureTemplateModelService); readonly handlerService = inject(CreatureHandlerService); protected readonly NPC_VIEWER_TYPE = VIEWER_TYPE.NPC; 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 ded595cda03..bf6670b20d3 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 @@ -20,6 +20,6 @@ export class CreatureTemplateMovementComponent extends SingleRowEditorComponent< return this.WIKI_BASE_URL + CREATURE_TEMPLATE_MOVEMENT_TABLE; } - override readonly editorService = inject(CreatureTemplateMovementService); + protected override readonly editorService = inject(CreatureTemplateMovementService); readonly handlerService = inject(CreatureHandlerService); } diff --git a/libs/features/creature/src/creature-template-resistance/creature-template-resistance.component.ts b/libs/features/creature/src/creature-template-resistance/creature-template-resistance.component.ts index e3b5bfabfd1..aa53fc09500 100644 --- a/libs/features/creature/src/creature-template-resistance/creature-template-resistance.component.ts +++ b/libs/features/creature/src/creature-template-resistance/creature-template-resistance.component.ts @@ -39,6 +39,6 @@ export class CreatureTemplateResistanceComponent extends MultiRowEditorComponent protected readonly CREATURE_TEMPLATE_RESISTANCE_SCHOOL = CREATURE_TEMPLATE_RESISTANCE_SCHOOL; - override readonly editorService = inject(CreatureTemplateResistanceService); + protected override readonly editorService = inject(CreatureTemplateResistanceService); readonly handlerService = inject(CreatureHandlerService); } 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 746fb4c355f..2c5da4fa0f3 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 @@ -38,7 +38,7 @@ export class CreatureTemplateSpellComponent extends MultiRowEditorComponent protected readonly TEXT_RANGE = TEXT_RANGE; protected readonly EMOTE = EMOTE; - public override readonly editorService = inject(CreatureTextService); + protected override readonly editorService = inject(CreatureTextService); protected override readonly handlerService = inject(CreatureHandlerService); } 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 25a20c60f59..8cc8f4ed03c 100644 --- a/libs/features/creature/src/npc-trainer/npc-trainer.component.ts +++ b/libs/features/creature/src/npc-trainer/npc-trainer.component.ts @@ -34,7 +34,7 @@ import { NpcTrainerService } from './npc-trainer.service'; ], }) export class NpcTrainerComponent extends MultiRowEditorComponent { - override readonly editorService = inject(NpcTrainerService); + protected override readonly editorService = inject(NpcTrainerService); readonly handlerService = inject(CreatureHandlerService); readonly sqliteQueryService = inject(SqliteQueryService); } 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 321684220cd..b4f651bd44b 100644 --- a/libs/features/creature/src/npc-vendor/npc-vendor.component.ts +++ b/libs/features/creature/src/npc-vendor/npc-vendor.component.ts @@ -33,6 +33,6 @@ import { NpcVendorService } from './npc-vendor.service'; ], }) export class NpcVendorComponent extends MultiRowEditorComponent { - override readonly editorService = inject(NpcVendorService); + protected override readonly editorService = inject(NpcVendorService); readonly handlerService = inject(CreatureHandlerService); } diff --git a/libs/features/creature/src/pickpocketing-loot-template/pickpocketing-loot-template.component.ts b/libs/features/creature/src/pickpocketing-loot-template/pickpocketing-loot-template.component.ts index 0f4294d175c..dd360ad8f14 100644 --- a/libs/features/creature/src/pickpocketing-loot-template/pickpocketing-loot-template.component.ts +++ b/libs/features/creature/src/pickpocketing-loot-template/pickpocketing-loot-template.component.ts @@ -14,6 +14,6 @@ import { TopBarComponent } from '@keira/shared/base-editor-components'; imports: [TopBarComponent, LootEditorComponent], }) export class PickpocketingLootTemplateComponent extends LootTemplateIdComponent { - override readonly editorService = inject(PickpocketingLootTemplateService); + protected override readonly editorService = inject(PickpocketingLootTemplateService); readonly handlerService = inject(CreatureHandlerService); } diff --git a/libs/features/creature/src/skinning-loot-template/skinning-loot-template.component.ts b/libs/features/creature/src/skinning-loot-template/skinning-loot-template.component.ts index 9fd598ebb40..c4e5efc2d73 100644 --- a/libs/features/creature/src/skinning-loot-template/skinning-loot-template.component.ts +++ b/libs/features/creature/src/skinning-loot-template/skinning-loot-template.component.ts @@ -14,6 +14,6 @@ import { TopBarComponent } from '@keira/shared/base-editor-components'; imports: [TopBarComponent, LootEditorComponent], }) export class SkinningLootTemplateComponent extends LootTemplateIdComponent { - override readonly editorService = inject(SkinningLootTemplateService); + protected override readonly editorService = inject(SkinningLootTemplateService); readonly handlerService = inject(CreatureHandlerService); } 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 b63c15997f7..6151769f389 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 @@ -35,7 +35,7 @@ export class GameobjectLootTemplateComponent extends LootTemplateIdComponent { - override readonly editorService = inject(GameobjectQuestitemService); + protected override readonly editorService = inject(GameobjectQuestitemService); readonly handlerService = inject(GameobjectHandlerService); } 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 8147e17f8aa..f45b3ac7c8e 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 @@ -29,6 +29,6 @@ import { GameobjectSpawnAddonService } from './gameobject-spawn-addon.service'; export class GameobjectSpawnAddonComponent extends MultiRowEditorComponent { readonly INVISIBILITY_TYPE = INVISIBILITY_TYPE; - override readonly editorService = inject(GameobjectSpawnAddonService); + protected override readonly editorService = inject(GameobjectSpawnAddonService); readonly handlerService = inject(GameobjectHandlerService); } 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 a976bb78257..c0c54f5ebf3 100644 --- a/libs/features/gameobject/src/gameobject-spawn/gameobject-spawn.component.ts +++ b/libs/features/gameobject/src/gameobject-spawn/gameobject-spawn.component.ts @@ -34,6 +34,6 @@ export class GameobjectSpawnComponent extends MultiRowEditorComponent { readonly GAMEOBJECT_FLAGS = GAMEOBJECT_FLAGS; - override readonly editorService = inject(GameobjectTemplateAddonService); + protected override readonly editorService = inject(GameobjectTemplateAddonService); readonly handlerService = inject(GameobjectHandlerService); } diff --git a/libs/features/gameobject/src/gameobject-template/gameobject-template.component.ts b/libs/features/gameobject/src/gameobject-template/gameobject-template.component.ts index 4199b9b199d..4f83212c769 100644 --- a/libs/features/gameobject/src/gameobject-template/gameobject-template.component.ts +++ b/libs/features/gameobject/src/gameobject-template/gameobject-template.component.ts @@ -36,7 +36,7 @@ export class GameobjectTemplateComponent extends SingleRowEditorComponent { - override readonly editorService = inject(GossipMenuService); + protected override readonly editorService = inject(GossipMenuService); readonly handlerService = inject(GossipHandlerService); readonly queryService = inject(MysqlQueryService); } diff --git a/libs/features/item/src/item-enchantment/item-enchantment-template.component.ts b/libs/features/item/src/item-enchantment/item-enchantment-template.component.ts index 618c3730e8d..e05de5b4e03 100644 --- a/libs/features/item/src/item-enchantment/item-enchantment-template.component.ts +++ b/libs/features/item/src/item-enchantment/item-enchantment-template.component.ts @@ -25,6 +25,6 @@ import { TranslateModule } from '@ngx-translate/core'; ], }) export class ItemEnchantmentTemplateComponent extends MultiRowEditorComponent { - override readonly editorService = inject(ItemEnchantmentTemplateService); + protected override readonly editorService = inject(ItemEnchantmentTemplateService); readonly handlerService = inject(ItemHandlerService); } 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 4393df2a2e3..d80e4c51d31 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 @@ -14,6 +14,6 @@ import { ItemLootTemplateService } from './item-loot-template.service'; imports: [TopBarComponent, LootEditorComponent], }) export class ItemLootTemplateComponent extends LootTemplateComponent { - override readonly editorService = inject(ItemLootTemplateService); + protected override readonly editorService = inject(ItemLootTemplateService); readonly handlerService = inject(ItemHandlerService); } diff --git a/libs/features/item/src/item-template/item-template.component.ts b/libs/features/item/src/item-template/item-template.component.ts index 0e5ca9f923f..c9e32a97314 100644 --- a/libs/features/item/src/item-template/item-template.component.ts +++ b/libs/features/item/src/item-template/item-template.component.ts @@ -80,7 +80,7 @@ import { ItemTemplateService } from './item-template.service'; ], }) export class ItemTemplateComponent extends SingleRowEditorComponent implements OnInit { - override readonly editorService = inject(ItemTemplateService); + protected override readonly editorService = inject(ItemTemplateService); readonly handlerService = inject(ItemHandlerService); private readonly itemPreviewService = inject(ItemPreviewService); private readonly sanitizer = inject(DomSanitizer); diff --git a/libs/features/item/src/milling-loot-template/milling-loot-template.component.ts b/libs/features/item/src/milling-loot-template/milling-loot-template.component.ts index 23bccebcb5f..c868a920311 100644 --- a/libs/features/item/src/milling-loot-template/milling-loot-template.component.ts +++ b/libs/features/item/src/milling-loot-template/milling-loot-template.component.ts @@ -14,6 +14,6 @@ import { TopBarComponent } from '@keira/shared/base-editor-components'; imports: [TopBarComponent, LootEditorComponent], }) export class MillingLootTemplateComponent extends LootTemplateComponent { - override readonly editorService = inject(MillingLootTemplateService); + protected override readonly editorService = inject(MillingLootTemplateService); readonly handlerService = inject(ItemHandlerService); } diff --git a/libs/features/item/src/prospecting-loot-template/prospecting-loot-template.component.ts b/libs/features/item/src/prospecting-loot-template/prospecting-loot-template.component.ts index 0d79a5da7f6..7756d3a8924 100644 --- a/libs/features/item/src/prospecting-loot-template/prospecting-loot-template.component.ts +++ b/libs/features/item/src/prospecting-loot-template/prospecting-loot-template.component.ts @@ -14,6 +14,6 @@ import { TopBarComponent } from '@keira/shared/base-editor-components'; imports: [TopBarComponent, LootEditorComponent], }) export class ProspectingLootTemplateComponent extends LootTemplateComponent { - override readonly editorService = inject(ProspectingLootTemplateService); + protected override readonly editorService = inject(ProspectingLootTemplateService); readonly handlerService = inject(ItemHandlerService); } diff --git a/libs/features/other-loots/src/fishing-loot/fishing-loot-template.component.ts b/libs/features/other-loots/src/fishing-loot/fishing-loot-template.component.ts index 95e77800872..b9e478a48d5 100644 --- a/libs/features/other-loots/src/fishing-loot/fishing-loot-template.component.ts +++ b/libs/features/other-loots/src/fishing-loot/fishing-loot-template.component.ts @@ -15,6 +15,6 @@ import { TopBarComponent } from '@keira/shared/base-editor-components'; imports: [TopBarComponent, TranslateModule, LootEditorComponent], }) export class FishingLootTemplateComponent extends LootTemplateComponent { - override readonly editorService = inject(FishingLootTemplateService); + protected override readonly editorService = inject(FishingLootTemplateService); readonly handlerService = inject(FishingLootHandlerService); } diff --git a/libs/features/other-loots/src/mail-loot/mail-loot-template.component.ts b/libs/features/other-loots/src/mail-loot/mail-loot-template.component.ts index bef5c41b67b..1c61e181e21 100644 --- a/libs/features/other-loots/src/mail-loot/mail-loot-template.component.ts +++ b/libs/features/other-loots/src/mail-loot/mail-loot-template.component.ts @@ -15,6 +15,6 @@ import { TopBarComponent } from '@keira/shared/base-editor-components'; imports: [TopBarComponent, TranslateModule, LootEditorComponent], }) export class MailLootTemplateComponent extends LootTemplateComponent { - override readonly editorService = inject(MailLootTemplateService); + protected override readonly editorService = inject(MailLootTemplateService); readonly handlerService = inject(MailLootHandlerService); } diff --git a/libs/features/other-loots/src/reference-loot/reference-loot-template.component.ts b/libs/features/other-loots/src/reference-loot/reference-loot-template.component.ts index 0386cefb92a..c88d946844e 100644 --- a/libs/features/other-loots/src/reference-loot/reference-loot-template.component.ts +++ b/libs/features/other-loots/src/reference-loot/reference-loot-template.component.ts @@ -15,6 +15,6 @@ import { TopBarComponent } from '@keira/shared/base-editor-components'; imports: [TopBarComponent, TranslateModule, LootEditorComponent], }) export class ReferenceLootTemplateComponent extends LootTemplateComponent { - override readonly editorService = inject(ReferenceLootTemplateService); + protected override readonly editorService = inject(ReferenceLootTemplateService); readonly handlerService = inject(ReferenceLootHandlerService); } diff --git a/libs/features/other-loots/src/spell-loot/spell-loot-template.component.ts b/libs/features/other-loots/src/spell-loot/spell-loot-template.component.ts index a7464d532df..865ed7e975c 100644 --- a/libs/features/other-loots/src/spell-loot/spell-loot-template.component.ts +++ b/libs/features/other-loots/src/spell-loot/spell-loot-template.component.ts @@ -15,6 +15,6 @@ import { LootEditorComponent } from '@keira/shared/loot-editor'; imports: [TopBarComponent, TranslateModule, LootEditorComponent], }) export class SpellLootTemplateComponent extends LootTemplateComponent { - override readonly editorService = inject(SpellLootTemplateService); + protected override readonly editorService = inject(SpellLootTemplateService); readonly handlerService = inject(SpellLootHandlerService); } diff --git a/libs/features/quest/src/creature-questender/creature-questender.component.ts b/libs/features/quest/src/creature-questender/creature-questender.component.ts index 520854738ee..447b0f9970b 100644 --- a/libs/features/quest/src/creature-questender/creature-questender.component.ts +++ b/libs/features/quest/src/creature-questender/creature-questender.component.ts @@ -34,7 +34,7 @@ import { CreatureQuestenderService } from './creature-questender.service'; ], }) export class CreatureQuestenderComponent extends MultiRowEditorComponent { - override readonly editorService = inject(CreatureQuestenderService); + protected override readonly editorService = inject(CreatureQuestenderService); readonly handlerService = inject(QuestHandlerService); readonly questPreviewService = inject(QuestPreviewService); } diff --git a/libs/features/quest/src/creature-queststarter/creature-queststarter.component.ts b/libs/features/quest/src/creature-queststarter/creature-queststarter.component.ts index 2ec236d3b4a..6ab8c73b8d8 100644 --- a/libs/features/quest/src/creature-queststarter/creature-queststarter.component.ts +++ b/libs/features/quest/src/creature-queststarter/creature-queststarter.component.ts @@ -34,7 +34,7 @@ import { CreatureQueststarterService } from './creature-queststarter.service'; ], }) export class CreatureQueststarterComponent extends MultiRowEditorComponent { - override readonly editorService = inject(CreatureQueststarterService); + protected override readonly editorService = inject(CreatureQueststarterService); readonly handlerService = inject(QuestHandlerService); readonly questPreviewService = inject(QuestPreviewService); } diff --git a/libs/features/quest/src/gameobject-questender/gameobject-questender.component.ts b/libs/features/quest/src/gameobject-questender/gameobject-questender.component.ts index 3d51b518f92..375307dce3b 100644 --- a/libs/features/quest/src/gameobject-questender/gameobject-questender.component.ts +++ b/libs/features/quest/src/gameobject-questender/gameobject-questender.component.ts @@ -34,7 +34,7 @@ import { GameobjectQuestenderService } from './gameobject-questender.service'; ], }) export class GameobjectQuestenderComponent extends MultiRowEditorComponent { - override readonly editorService = inject(GameobjectQuestenderService); + protected override readonly editorService = inject(GameobjectQuestenderService); readonly handlerService = inject(QuestHandlerService); readonly questPreviewService = inject(QuestPreviewService); } diff --git a/libs/features/quest/src/gameobject-queststarter/gameobject-queststarter.component.ts b/libs/features/quest/src/gameobject-queststarter/gameobject-queststarter.component.ts index a574381a404..0afc908ae44 100644 --- a/libs/features/quest/src/gameobject-queststarter/gameobject-queststarter.component.ts +++ b/libs/features/quest/src/gameobject-queststarter/gameobject-queststarter.component.ts @@ -34,7 +34,7 @@ import { GameobjectQueststarterService } from './gameobject-queststarter.service ], }) export class GameobjectQueststarterComponent extends MultiRowEditorComponent { - override readonly editorService = inject(GameobjectQueststarterService); + protected override readonly editorService = inject(GameobjectQueststarterService); readonly handlerService = inject(QuestHandlerService); readonly questPreviewService = inject(QuestPreviewService); } diff --git a/libs/features/quest/src/quest-offer-reward/quest-offer-reward.component.ts b/libs/features/quest/src/quest-offer-reward/quest-offer-reward.component.ts index 36a8faa74ff..6c3be08ec44 100644 --- a/libs/features/quest/src/quest-offer-reward/quest-offer-reward.component.ts +++ b/libs/features/quest/src/quest-offer-reward/quest-offer-reward.component.ts @@ -31,7 +31,7 @@ import { QuestOfferRewardService } from './quest-offer-reward.service'; export class QuestOfferRewardComponent extends SingleRowEditorComponent { readonly EMOTE = EMOTE; - override readonly editorService = inject(QuestOfferRewardService); + protected override readonly editorService = inject(QuestOfferRewardService); readonly handlerService = inject(QuestHandlerService); readonly questPreviewService = inject(QuestPreviewService); } diff --git a/libs/features/quest/src/quest-request-items/quest-request-items.component.ts b/libs/features/quest/src/quest-request-items/quest-request-items.component.ts index 81ecdb40f0b..cc2670638c0 100644 --- a/libs/features/quest/src/quest-request-items/quest-request-items.component.ts +++ b/libs/features/quest/src/quest-request-items/quest-request-items.component.ts @@ -29,7 +29,7 @@ import { QuestRequestItemsService } from './quest-request-items.service'; ], }) export class QuestRequestItemsComponent extends SingleRowEditorComponent { - override readonly editorService = inject(QuestRequestItemsService); + protected override readonly editorService = inject(QuestRequestItemsService); readonly handlerService = inject(QuestHandlerService); readonly questPreviewService = inject(QuestPreviewService); diff --git a/libs/features/quest/src/quest-template-addon/quest-template-addon.component.ts b/libs/features/quest/src/quest-template-addon/quest-template-addon.component.ts index edfe47ae7a9..52323da936d 100644 --- a/libs/features/quest/src/quest-template-addon/quest-template-addon.component.ts +++ b/libs/features/quest/src/quest-template-addon/quest-template-addon.component.ts @@ -39,7 +39,7 @@ import { QuestTemplateAddonService } from './quest-template-addon.service'; ], }) export class QuestTemplateAddonComponent extends SingleRowEditorComponent { - override readonly editorService = inject(QuestTemplateAddonService); + protected override readonly editorService = inject(QuestTemplateAddonService); readonly handlerService = inject(QuestHandlerService); readonly questPreviewService = inject(QuestPreviewService); diff --git a/libs/features/quest/src/quest-template/quest-template.component.ts b/libs/features/quest/src/quest-template/quest-template.component.ts index a959c370a0c..23ef2f9e25a 100644 --- a/libs/features/quest/src/quest-template/quest-template.component.ts +++ b/libs/features/quest/src/quest-template/quest-template.component.ts @@ -42,7 +42,7 @@ import { QuestTemplateService } from './quest-template.service'; ], }) export class QuestTemplateComponent extends SingleRowEditorComponent { - override readonly editorService = inject(QuestTemplateService); + protected override readonly editorService = inject(QuestTemplateService); readonly handlerService = inject(QuestHandlerService); readonly questPreviewService = inject(QuestPreviewService); diff --git a/libs/features/spell/src/spell-dbc/spell-dbc.component.ts b/libs/features/spell/src/spell-dbc/spell-dbc.component.ts index 18aafef2a6c..49ae3a1a2e7 100644 --- a/libs/features/spell/src/spell-dbc/spell-dbc.component.ts +++ b/libs/features/spell/src/spell-dbc/spell-dbc.component.ts @@ -36,6 +36,6 @@ import { QueryOutputComponent, TopBarComponent } from '@keira/shared/base-editor ], }) export class SpellDbcComponent extends SingleRowEditorComponent { - override readonly editorService = inject(SpellDbcService); + protected override readonly editorService = inject(SpellDbcService); readonly handlerService = inject(SpellHandlerService); } diff --git a/libs/features/texts/src/broadcast-text/broadcast-text.component.ts b/libs/features/texts/src/broadcast-text/broadcast-text.component.ts index 13af8c886ee..65951c8b40f 100644 --- a/libs/features/texts/src/broadcast-text/broadcast-text.component.ts +++ b/libs/features/texts/src/broadcast-text/broadcast-text.component.ts @@ -26,7 +26,7 @@ import { BroadcastTextService } from './broadcast-text.service'; ], }) export class BroadcastTextComponent extends SingleRowEditorComponent { - override readonly editorService = inject(BroadcastTextService); + protected override readonly editorService = inject(BroadcastTextService); protected override readonly handlerService = inject(BroadcastTextHandlerService); protected readonly EMOTE = EMOTE; diff --git a/libs/features/texts/src/npc-text/npc-text.component.ts b/libs/features/texts/src/npc-text/npc-text.component.ts index 2c01a5f2e6f..119363b9af6 100644 --- a/libs/features/texts/src/npc-text/npc-text.component.ts +++ b/libs/features/texts/src/npc-text/npc-text.component.ts @@ -26,6 +26,6 @@ import { NpcTextFieldsGroupComponent } from './npc-text-fields-group.component'; ], }) export class NpcTextComponent extends SingleRowEditorComponent { - override readonly editorService = inject(NpcTextService); + protected override readonly editorService = inject(NpcTextService); protected override readonly handlerService = inject(NpcTextHandlerService); } diff --git a/libs/features/texts/src/page-text/page-text.component.ts b/libs/features/texts/src/page-text/page-text.component.ts index d8fbd2378dc..c616ca7afe9 100644 --- a/libs/features/texts/src/page-text/page-text.component.ts +++ b/libs/features/texts/src/page-text/page-text.component.ts @@ -24,6 +24,6 @@ import { PageText } from '@keira/shared/acore-world-model'; ], }) export class PageTextComponent extends SingleRowEditorComponent { - override readonly editorService = inject(PageTextService); + protected override readonly editorService = inject(PageTextService); protected override readonly handlerService = inject(PageTextHandlerService); } diff --git a/libs/shared/base-abstract-classes/src/components/editors/editor.component.ts b/libs/shared/base-abstract-classes/src/components/editors/editor.component.ts index 7bdc3024e65..08c6f8603b3 100644 --- a/libs/shared/base-abstract-classes/src/components/editors/editor.component.ts +++ b/libs/shared/base-abstract-classes/src/components/editors/editor.component.ts @@ -11,7 +11,7 @@ import { HandlerService } from '../../service/handlers/handler.service'; template: '', }) export abstract class EditorComponent extends SubscriptionHandler implements OnInit { - public abstract readonly editorService: EditorService; + protected abstract readonly editorService: EditorService; protected abstract readonly handlerService: HandlerService; readonly WIKI_BASE_URL = WIKI_BASE_URL; diff --git a/libs/shared/base-abstract-classes/src/components/editors/loot-template/loot-template-id.component.ts b/libs/shared/base-abstract-classes/src/components/editors/loot-template/loot-template-id.component.ts index ceee1cf4e53..434ae0bd2c9 100644 --- a/libs/shared/base-abstract-classes/src/components/editors/loot-template/loot-template-id.component.ts +++ b/libs/shared/base-abstract-classes/src/components/editors/loot-template/loot-template-id.component.ts @@ -13,7 +13,7 @@ import { LootTemplateComponent } from './loot-template.component'; template: '', }) export abstract class LootTemplateIdComponent extends LootTemplateComponent implements OnInit { - public abstract override editorService: LootEditorIdService; + protected abstract override editorService: LootEditorIdService; protected abstract override handlerService: HandlerService; protected _lootId!: number; diff --git a/libs/shared/base-abstract-classes/src/components/editors/multi-row-editor.component.ts b/libs/shared/base-abstract-classes/src/components/editors/multi-row-editor.component.ts index 022edccf476..cd7d4494152 100644 --- a/libs/shared/base-abstract-classes/src/components/editors/multi-row-editor.component.ts +++ b/libs/shared/base-abstract-classes/src/components/editors/multi-row-editor.component.ts @@ -10,7 +10,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; template: '', }) export abstract class MultiRowEditorComponent extends EditorComponent { - public abstract override readonly editorService: MultiRowEditorService; + protected abstract override readonly editorService: MultiRowEditorService; protected abstract override readonly handlerService: HandlerService; readonly DTCFG = DTCFG; diff --git a/libs/shared/base-abstract-classes/src/components/editors/select.component.ts b/libs/shared/base-abstract-classes/src/components/editors/select.component.ts index 4b0d6d6548c..2c071811f49 100644 --- a/libs/shared/base-abstract-classes/src/components/editors/select.component.ts +++ b/libs/shared/base-abstract-classes/src/components/editors/select.component.ts @@ -7,10 +7,10 @@ import { HandlerService } from '../../service/handlers/handler.service'; import { DTCFG } from '@keira/shared/config'; export abstract class SelectComponent { - abstract readonly entityTable: string; - abstract readonly entityIdField: string; - abstract readonly customStartingId: number; - abstract readonly selectService: SelectService; + protected abstract readonly entityTable: string; + protected abstract readonly entityIdField: string; + protected abstract readonly customStartingId: number; + protected abstract readonly selectService: SelectService; abstract readonly handlerService: HandlerService; readonly queryService = inject(MysqlQueryService); diff --git a/libs/shared/base-abstract-classes/src/components/editors/single-row-editor.component.ts b/libs/shared/base-abstract-classes/src/components/editors/single-row-editor.component.ts index 587c3de944b..df51814c55e 100644 --- a/libs/shared/base-abstract-classes/src/components/editors/single-row-editor.component.ts +++ b/libs/shared/base-abstract-classes/src/components/editors/single-row-editor.component.ts @@ -9,6 +9,6 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; template: '', }) export abstract class SingleRowEditorComponent extends EditorComponent { - public abstract override readonly editorService: SingleRowEditorService; + protected abstract override readonly editorService: SingleRowEditorService; protected abstract override readonly handlerService: HandlerService; } diff --git a/libs/shared/sai-editor/src/sai-editor.component.ts b/libs/shared/sai-editor/src/sai-editor.component.ts index 91e97d0b3b3..0afb1af28c8 100644 --- a/libs/shared/sai-editor/src/sai-editor.component.ts +++ b/libs/shared/sai-editor/src/sai-editor.component.ts @@ -87,7 +87,7 @@ import { EditorButtonsComponent, QueryOutputComponent } from '@keira/shared/base ], }) export class SaiEditorComponent extends MultiRowEditorComponent implements OnInit { - override readonly editorService = inject(SaiEditorService); + public override readonly editorService = inject(SaiEditorService); protected override readonly handlerService = inject(SaiHandlerService); readonly EVENT_PHASE_MASK = EVENT_PHASE_MASK;