From dc76c27ce576deb44f3aeb7de75ad1d2047cf79d Mon Sep 17 00:00:00 2001
From: Todd Schiller <todd.schiller@gmail.com>
Date: Sat, 21 Sep 2024 21:47:29 -0400
Subject: [PATCH] Remove some unrelated refactoring

---
 ...ponentDefinitionToActivatedModComponent.ts | 25 +++++++------------
 src/activation/wizardTypes.ts                 |  2 +-
 .../activateMod/ActivateModPage.test.tsx      |  3 +--
 .../pages/activateMod/ActivateModPage.tsx     |  2 --
 4 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/src/activation/mapModComponentDefinitionToActivatedModComponent.ts b/src/activation/mapModComponentDefinitionToActivatedModComponent.ts
index e2dde77a97..3cda9d3c1c 100644
--- a/src/activation/mapModComponentDefinitionToActivatedModComponent.ts
+++ b/src/activation/mapModComponentDefinitionToActivatedModComponent.ts
@@ -51,20 +51,6 @@ export type ActivateModComponentParam = {
   integrationDependencies: IntegrationDependency[];
 };
 
-function mapDeploymentToDeploymentMetadata(
-  deployment: Deployment,
-): NonNullable<ActivatedModComponent["_deployment"]> {
-  return {
-    id: deployment.id,
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- This should be defined in practice
-    timestamp: deployment.updated_at!,
-    active: deployment.active,
-    ...(deployment.organization
-      ? { organization: deployment.organization }
-      : { isPersonalDeployment: true }),
-  };
-}
-
 /**
  * Transform a given ModComponentDefinition into an ActivatedModComponent.
  *
@@ -105,8 +91,15 @@ export function mapModComponentDefinitionToActivatedModComponent<
   // here makes testing harder because we then have to account for the normalized value in assertions.
 
   if (deployment) {
-    activatedModComponent._deployment =
-      mapDeploymentToDeploymentMetadata(deployment);
+    activatedModComponent._deployment = {
+      id: deployment.id,
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- This should be defined in practice
+      timestamp: deployment.updated_at!,
+      active: deployment.active,
+      ...(deployment.organization
+        ? { organization: deployment.organization }
+        : { isPersonalDeployment: true }),
+    };
   }
 
   if (modComponentDefinition.services) {
diff --git a/src/activation/wizardTypes.ts b/src/activation/wizardTypes.ts
index d16d193004..27876b9789 100644
--- a/src/activation/wizardTypes.ts
+++ b/src/activation/wizardTypes.ts
@@ -28,7 +28,7 @@ export type WizardStep = {
   }>;
 };
 
-export type ActivationWizardValues = {
+export type WizardValues = {
   /**
    * Integration dependencies for the mod
    */
diff --git a/src/extensionConsole/pages/activateMod/ActivateModPage.test.tsx b/src/extensionConsole/pages/activateMod/ActivateModPage.test.tsx
index eb9823f4f6..c3317af7a4 100644
--- a/src/extensionConsole/pages/activateMod/ActivateModPage.test.tsx
+++ b/src/extensionConsole/pages/activateMod/ActivateModPage.test.tsx
@@ -20,7 +20,6 @@ import { render } from "@/extensionConsole/testHelpers";
 import { waitForEffect } from "@/testUtils/testHelpers";
 import { screen, waitFor } from "@testing-library/react";
 import registerDefaultWidgets from "@/components/fields/schemaFields/widgets/registerDefaultWidgets";
-import { type RegistryId } from "@/types/registryTypes";
 import userEvent from "@testing-library/user-event";
 import { MemoryRouter } from "react-router";
 import { type ModDefinition } from "@/types/modDefinitionTypes";
@@ -28,8 +27,8 @@ import { appApiMock, mockAllApiEndpoints } from "@/testUtils/appApiMock";
 import { validateRegistryId } from "@/types/helpers";
 import { type RetrieveRecipeResponse } from "@/types/contract";
 import {
-  modComponentDefinitionFactory,
   defaultModDefinitionFactory,
+  modComponentDefinitionFactory,
 } from "@/testUtils/factories/modDefinitionFactories";
 import { metadataFactory } from "@/testUtils/factories/metadataFactory";
 import useActivateMod, {
diff --git a/src/extensionConsole/pages/activateMod/ActivateModPage.tsx b/src/extensionConsole/pages/activateMod/ActivateModPage.tsx
index da25c1e517..d8d4987424 100644
--- a/src/extensionConsole/pages/activateMod/ActivateModPage.tsx
+++ b/src/extensionConsole/pages/activateMod/ActivateModPage.tsx
@@ -60,8 +60,6 @@ function useModNotFoundRedirectEffect(error: unknown): void {
 
 /**
  * Common page for activating a mod definition
- *
- * @param modDefinitionQuery The mod definition to activate
  */
 const ActivateModPage: React.FC = () => {
   const modId = useRegistryIdParam();