refactor(ui): Consolidate UI code

Author: oliversalzburg

source/ui/BonfireSettingsUi.ts

@@ -1,5 +1,4 @@
 import { coalesceArray, isNil } from "@oliversalzburg/js-utils/data/nil.js";
-import { redirectErrorsToConsole } from "@oliversalzburg/js-utils/errors/console.js";
 import type { SupportedLocale } from "../Engine.js";
 import type { KittenScientists } from "../KittenScientists.js";
 import { BonfireSettings } from "../settings/BonfireSettings.js";
@@ -38,7 +37,7 @@ export class BonfireSettingsUi extends SettingsPanel<BonfireSettings, SettingTri
           this.refreshUi();
           options?.onUnCheck?.(isBatchProcess);
         },
-        onRefresh: item => {
+        onRefresh: () => {
           const element = this.settingItem;
           element.triggerButton.inactive = !settings.enabled || settings.trigger < 0;
           element.triggerButton.ineffective =
@@ -57,16 +56,16 @@ export class BonfireSettingsUi extends SettingsPanel<BonfireSettings, SettingTri
             !settings.turnOnSteamworks.enabled &&
             !settings.upgradeBuildings.enabled;
         },
-        onRefreshTrigger: item => {
+        onRefreshTrigger: () => {
           const element = this.settingItem;
           element.triggerButton.element[0].title = host.engine.i18n("ui.trigger.section", [
             settings.trigger < 0
               ? host.engine.i18n("ui.trigger.section.inactive")
               : host.renderPercentage(settings.trigger, locale.selected, true),
           ]);
         },
-        onSetTrigger: () => {
-          Dialog.prompt(
+        onSetTrigger: async () => {
+          const value = await Dialog.prompt(
             host,
             host.engine.i18n("ui.trigger.prompt.percentage"),
             host.engine.i18n("ui.trigger.section.prompt", [
@@ -77,23 +76,18 @@ export class BonfireSettingsUi extends SettingsPanel<BonfireSettings, SettingTri
             ]),
             settings.trigger !== -1 ? host.renderPercentage(settings.trigger) : "",
             host.engine.i18n("ui.trigger.section.promptExplainer"),
-          )
-            .then(value => {
-              if (value === undefined) {
-                return;
-              }
+          );
 
-              if (value === "" || value.startsWith("-")) {
-                settings.trigger = -1;
-                return;
-              }
+          if (value === undefined) {
+            return;
+          }
 
-              settings.trigger = host.parsePercentage(value);
-            })
-            .then(() => {
-              this.refreshUi();
-            })
-            .catch(redirectErrorsToConsole(console));
+          if (value === "" || value.startsWith("-")) {
+            settings.trigger = -1;
+            return;
+          }
+
+          settings.trigger = host.parsePercentage(value);
         },
       }),
     );

source/ui/BuildSectionTools.ts

@@ -9,16 +9,14 @@ import {
 } from "./components/SettingMaxTriggerListItem.js";
 
 export const BuildSectionTools = {
-  getBuildOption: <
-    TOptions extends SettingMaxTriggerListItemOptions = SettingMaxTriggerListItemOptions,
-  >(
+  getBuildOption: (
     host: KittenScientists,
     option: SettingTriggerMax,
     locale: SettingOptions<SupportedLocale>,
     sectionSetting: SettingTrigger,
     label: string,
     sectionLabel: string,
-    options?: Partial<TOptions>,
+    options?: Partial<SettingMaxTriggerListItemOptions>,
   ) => {
     const onSetMax = () => {
       Dialog.prompt(

source/ui/BuildingUpgradeSettingsUi.ts

@@ -34,7 +34,7 @@ export class BuildingUpgradeSettingsUi extends SettingsPanel<BuildingUpgradeSett
           this.refreshUi();
           options?.onUnCheck?.(isBatchProcess);
         },
-        onRefresh: _item => {
+        onRefresh: () => {
           this.expando.ineffective =
             sectionSetting.enabled &&
             settings.enabled &&

source/ui/EmbassySettingsUi.ts

@@ -14,7 +14,7 @@ import { SettingTriggerListItem } from "./components/SettingTriggerListItem.js";
 import { SettingsList } from "./components/SettingsList.js";
 import { SettingsPanel } from "./components/SettingsPanel.js";
 
-export class EmbassySettingsUi extends SettingsPanel<EmbassySettings> {
+export class EmbassySettingsUi extends SettingsPanel<EmbassySettings, SettingTriggerListItem> {
   constructor(
     host: KittenScientists,
     settings: EmbassySettings,
@@ -37,9 +37,8 @@ export class EmbassySettingsUi extends SettingsPanel<EmbassySettings> {
           this.refreshUi();
           options?.onUnCheck?.(isBatchProcess);
         },
-        onRefresh: item => {
-          (item as SettingTriggerListItem).triggerButton.inactive =
-            !settings.enabled || settings.trigger === -1;
+        onRefresh: () => {
+          this.settingItem.triggerButton.inactive = !settings.enabled || settings.trigger === -1;
 
           this.expando.ineffective =
             sectionSetting.enabled &&

source/ui/InternalsUi.ts

@@ -16,7 +16,6 @@ import stylesSettingListItem from "./components/SettingListItem.module.css";
 import { SettingsList } from "./components/SettingsList.js";
 import { SettingsPanel } from "./components/SettingsPanel.js";
 import { TextButton } from "./components/TextButton.js";
-import type { UiComponent } from "./components/UiComponent.js";
 
 export class InternalsUi extends SettingsPanel<EngineSettings> {
   constructor(
@@ -68,7 +67,7 @@ export class InternalsUi extends SettingsPanel<EngineSettings> {
                         })
                         .catch(redirectErrorsToConsole(console));
                     },
-                    onRefresh: (subject: UiComponent) => {
+                    onRefresh: () => {
                       (subject as TextButton).element.text(
                         host.engine.i18n("ui.internals.interval", [settings.interval]),
                       );

source/ui/MissionSettingsUi.ts

@@ -37,7 +37,7 @@ export class MissionSettingsUi extends SettingsPanel<MissionSettings> {
           this.refreshUi();
           options?.onUnCheck?.(isBatchProcess);
         },
-        onRefresh: _item => {
+        onRefresh: () => {
           this.expando.ineffective =
             sectionSetting.enabled &&
             settings.enabled &&

source/ui/PolicySettingsUi.ts

@@ -35,7 +35,7 @@ export class PolicySettingsUi extends SettingsPanel<PolicySettings> {
           this.refreshUi();
           options?.onUnCheck?.(isBatchProcess);
         },
-        onRefresh: _item => {
+        onRefresh: () => {
           this.expando.ineffective =
             sectionSetting.enabled &&
             settings.enabled &&

source/ui/ReligionSettingsUi.ts

@@ -18,7 +18,7 @@ import { SettingTriggerListItem } from "./components/SettingTriggerListItem.js";
 import { SettingsList } from "./components/SettingsList.js";
 import { SettingsPanel } from "./components/SettingsPanel.js";
 
-export class ReligionSettingsUi extends SettingsPanel<ReligionSettings> {
+export class ReligionSettingsUi extends SettingsPanel<ReligionSettings, SettingTriggerListItem> {
   private readonly _unicornBuildings: Map<
     ZigguratUpgrade | "unicornPasture",
     SettingMaxTriggerListItem
@@ -29,7 +29,7 @@ export class ReligionSettingsUi extends SettingsPanel<ReligionSettings> {
     host: KittenScientists,
     settings: ReligionSettings,
     locale: SettingOptions<SupportedLocale>,
-    options?: Partial<PanelOptions & SettingListItemOptions>,
+    options?: PanelOptions & SettingListItemOptions,
   ) {
     const label = host.engine.i18n("ui.faith");
     super(
@@ -46,9 +46,8 @@ export class ReligionSettingsUi extends SettingsPanel<ReligionSettings> {
           this.refreshUi();
           options?.onUnCheck?.(isBatchProcess);
         },
-        onRefresh: item => {
-          (item as SettingTriggerListItem).triggerButton.inactive =
-            !settings.enabled || settings.trigger === -1;
+        onRefresh: () => {
+          this.settingItem.triggerButton.inactive = !settings.enabled || settings.trigger === -1;
         },
         onRefreshTrigger: item => {
           item.triggerButton.element[0].title = host.engine.i18n("ui.trigger.section", [
@@ -244,8 +243,8 @@ export class ReligionSettingsUi extends SettingsPanel<ReligionSettings> {
               onUnCheck: () => {
                 host.engine.imessage("status.sub.disable", [label]);
               },
-              onRefresh: element => {
-                (element as SettingTriggerListItem).triggerButton.inactive =
+              onRefresh: () => {
+                this.settingItem.triggerButton.inactive =
                   !this.setting[item].enabled || this.setting[item].trigger === -1;
               },
               onSetTrigger: () => {

source/ui/ScienceSettingsUi.ts

@@ -38,7 +38,7 @@ export class ScienceSettingsUi extends SettingsPanel<ScienceSettings> {
           this.refreshUi();
           options?.onUnCheck?.(isBatchProcess);
         },
-        onRefresh: _item => {
+        onRefresh: () => {
           this.expando.ineffective =
             settings.enabled &&
             !settings.policies.enabled &&

source/ui/SpaceSettingsUi.ts

@@ -14,7 +14,7 @@ import { SettingTriggerListItem } from "./components/SettingTriggerListItem.js";
 import { SettingsList } from "./components/SettingsList.js";
 import { SettingsPanel } from "./components/SettingsPanel.js";
 
-export class SpaceSettingsUi extends SettingsPanel<SpaceSettings> {
+export class SpaceSettingsUi extends SettingsPanel<SpaceSettings, SettingTriggerListItem> {
   private readonly _missionsUi: MissionSettingsUi;
 
   constructor(
@@ -38,9 +38,8 @@ export class SpaceSettingsUi extends SettingsPanel<SpaceSettings> {
           this.refreshUi();
           options?.onUnCheck?.(isBatchProcess);
         },
-        onRefresh: item => {
-          (item as SettingTriggerListItem).triggerButton.inactive =
-            !settings.enabled || settings.trigger === -1;
+        onRefresh: () => {
+          this.settingItem.triggerButton.inactive = !settings.enabled || settings.trigger === -1;
         },
         onRefreshTrigger: item => {
           item.triggerButton.element[0].title = host.engine.i18n("ui.trigger.section", [