Make sidebarEntryFactory type safe

pixiebrix · Jul 6, 2024 · 876a1c2 · 876a1c2
1 parent 09b2a67
commit 876a1c2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/src/sidebar/activateMod/ActivateModPanel.test.tsx b/src/sidebar/activateMod/ActivateModPanel.test.tsx
@@ -162,7 +162,7 @@ function setupMocksAndRender(
   appApiMock.onGet().reply(200, []);
 
   const entry = sidebarEntryFactory("activateMods", {
-    modIds: [modDefinition.metadata.id],
+    mods: [{ modId: modDefinition.metadata.id, initialOptions: {} }],
     heading: "Activate Mod",
   });
 

diff --git a/src/store/sidebar/eventKeyUtils.test.ts b/src/store/sidebar/eventKeyUtils.test.ts
@@ -148,10 +148,10 @@ describe("eventKeyForEntry", () => {
     expect(eventKeyForEntry(value)).toBeNull();
   });
 
-  it("uses modId for activateRecipe", () => {
+  it("uses modId for activateMods", () => {
     const modId = validateRegistryId("@test/test-recipe");
     const entry = sidebarEntryFactory("activateMods", {
-      modComponentRef: modComponentRefFactory({ blueprintId: modId }),
+      mods: [{ modId, initialOptions: {} }],
     });
     // Main part is an object hash of the mod ids
     expect(eventKeyForEntry(entry)).toStartWith("activate-");

diff --git a/src/testUtils/factories/sidebarEntryFactories.ts b/src/testUtils/factories/sidebarEntryFactories.ts
@@ -73,27 +73,27 @@ const panelEntryFactory = define<PanelEntry>({
   heading: (n: number) => `Panel Test ${n}`,
   payload: null,
 });
-export function sidebarEntryFactory<T = PanelEntry>(
+export function sidebarEntryFactory(
   type: "panel",
-  override?: FactoryConfig<T>,
+  override?: FactoryConfig<PanelEntry>,
 ): PanelEntry;
-export function sidebarEntryFactory<T = TemporaryPanelEntry>(
+export function sidebarEntryFactory(
   type: "temporaryPanel",
-  override?: FactoryConfig<T>,
+  override?: FactoryConfig<TemporaryPanelEntry>,
 ): TemporaryPanelEntry;
-export function sidebarEntryFactory<T = FormPanelEntry>(
+export function sidebarEntryFactory(
   type: "form",
-  override?: FactoryConfig<T>,
+  override?: FactoryConfig<FormPanelEntry>,
 ): FormPanelEntry;
-export function sidebarEntryFactory<T = ModActivationPanelEntry>(
+export function sidebarEntryFactory(
   type: "activateMods",
-  override?: FactoryConfig<T>,
+  override?: FactoryConfig<ModActivationPanelEntry>,
 ): ModActivationPanelEntry;
-export function sidebarEntryFactory<T = StaticPanelEntry>(
+export function sidebarEntryFactory(
   type: "staticPanel",
-  override?: FactoryConfig<T>,
+  override?: FactoryConfig<StaticPanelEntry>,
 ): StaticPanelEntry;
-export function sidebarEntryFactory<T = SidebarEntry>(
+export function sidebarEntryFactory<T extends SidebarEntry = SidebarEntry>(
   type: EntryType,
   override?: FactoryConfig<T>,
 ): SidebarEntry {