cleanup

pixiebrix · Sep 13, 2024 · 5598eca · 5598eca
1 parent 61432f3
commit 5598eca
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 50 deletions.
diff --git a/src/pageEditor/hooks/useAddNewModComponent.ts b/src/pageEditor/hooks/useAddNewModComponent.ts
@@ -34,17 +34,16 @@ import {
   inspectedTab,
 } from "@/pageEditor/context/connection";
 import { getExampleBrickPipeline } from "@/pageEditor/panes/insert/exampleStarterBrickConfigs";
-import {
-  type StarterBrickType,
-  StarterBrickTypes,
-} from "@/types/starterBrickTypes";
+import { StarterBrickTypes } from "@/types/starterBrickTypes";
 import { openSidePanel } from "@/utils/sidePanelUtils";
 import { useInsertPane } from "@/pageEditor/panes/insert/InsertPane";
 import { type ModMetadata } from "@/types/modComponentTypes";
-import { adapter } from "@/pageEditor/starterBricks/adapter";
 import { getUnsavedModMetadataForFormState } from "@/pageEditor/utils";
+import { type ModComponentFormStateAdapter } from "@/pageEditor/starterBricks/modComponentFormStateAdapter";
 
-export type AddNewModComponent = (starterBrickType: StarterBrickType) => void;
+export type AddNewModComponent = (
+  adapter: ModComponentFormStateAdapter,
+) => void;
 
 function useAddNewModComponent(modMetadata?: ModMetadata): AddNewModComponent {
   const dispatch = useDispatch();
@@ -58,12 +57,11 @@ function useAddNewModComponent(modMetadata?: ModMetadata): AddNewModComponent {
   );
 
   const getInitialModComponentFormState = useCallback(
-    async (
-      starterBrickType: StarterBrickType,
-    ): Promise<ModComponentFormState> => {
-      const { selectNativeElement, fromNativeElement } =
-        adapter(starterBrickType);
-
+    async ({
+      starterBrickType,
+      selectNativeElement,
+      fromNativeElement,
+    }: ModComponentFormStateAdapter): Promise<ModComponentFormState> => {
       let element = null;
       if (selectNativeElement) {
         setInsertingStarterBrickType(starterBrickType);
@@ -91,17 +89,16 @@ function useAddNewModComponent(modMetadata?: ModMetadata): AddNewModComponent {
   );
 
   return useCallback(
-    async (starterBrickType: StarterBrickType) => {
-      const { label, flag, asDraftModComponent } = adapter(starterBrickType);
+    async (adapter: ModComponentFormStateAdapter) => {
+      const { starterBrickType, label, flag, asDraftModComponent } = adapter;
 
       if (flag && flagOff(flag)) {
         dispatch(actions.betaError());
         return;
       }
 
       try {
-        const initialFormState =
-          await getInitialModComponentFormState(starterBrickType);
+        const initialFormState = await getInitialModComponentFormState(adapter);
 
         dispatch(actions.addModComponentFormState(initialFormState));
         dispatch(actions.checkActiveModComponentAvailability());

diff --git a/src/pageEditor/modListingPanel/ModListItem.test.tsx b/src/pageEditor/modListingPanel/ModListItem.test.tsx
@@ -38,14 +38,7 @@ describe("ModListItem", () => {
     render(
       <Accordion defaultActiveKey={modMetadata.id}>
         <ListGroup>
-          <ModListItem
-            modMetadata={modMetadata}
-            onSave={jest.fn()}
-            isSaving={false}
-            onReset={jest.fn()}
-            onDeactivate={jest.fn()}
-            onClone={jest.fn()}
-          >
+          <ModListItem modMetadata={modMetadata}>
             <div>test children</div>
           </ModListItem>
         </ListGroup>
@@ -70,14 +63,7 @@ describe("ModListItem", () => {
     render(
       <Accordion>
         <ListGroup>
-          <ModListItem
-            modMetadata={modMetadata}
-            onSave={jest.fn()}
-            isSaving={false}
-            onReset={jest.fn()}
-            onDeactivate={jest.fn()}
-            onClone={jest.fn()}
-          >
+          <ModListItem modMetadata={modMetadata}>
             <div>test children</div>
           </ModListItem>
         </ListGroup>
@@ -111,14 +97,7 @@ describe("ModListItem", () => {
     render(
       <Accordion defaultActiveKey={modMetadata.id}>
         <ListGroup>
-          <ModListItem
-            modMetadata={modMetadata}
-            onSave={jest.fn()}
-            isSaving={false}
-            onReset={jest.fn()}
-            onDeactivate={jest.fn()}
-            onClone={jest.fn()}
-          >
+          <ModListItem modMetadata={modMetadata}>
             <div>test children</div>
           </ModListItem>
         </ListGroup>

diff --git a/src/pageEditor/modListingPanel/actionMenus/ModActionMenu.tsx b/src/pageEditor/modListingPanel/actionMenus/ModActionMenu.tsx
@@ -70,9 +70,9 @@ const ModActionMenu: React.FC<{ modMetadata: ModMetadata }> = ({
   const addStarterBrickSubMenu = useMemo(
     () =>
       modComponentFormStateAdapters.map((adapter) => ({
-        title: adapter.label,
+        title: adapter.flag ? `${adapter.label} (Beta)` : adapter.label,
         action() {
-          addNewModComponent(adapter.starterBrickType);
+          addNewModComponent(adapter);
         },
         icon: <FontAwesomeIcon icon={adapter.icon} fixedWidth />,
       })),

diff --git a/src/pageEditor/modals/Modals.tsx b/src/pageEditor/modals/Modals.tsx
@@ -17,17 +17,13 @@
 
 import AddBrickModal from "@/pageEditor/modals/addBrickModal/AddBrickModal";
 import React from "react";
-import AddToModModal from "@/pageEditor/modListingPanel/modals/AddToModModal";
 import CreateModModal from "@/pageEditor/modListingPanel/modals/CreateModModal";
 import MoveFromModModal from "@/pageEditor/modListingPanel/modals/MoveFromModModal";
-import SaveAsNewModModal from "@/pageEditor/modListingPanel/modals/SaveAsNewModModal";
 import SaveDataIntegrityErrorModal from "@/pageEditor/panes/save/SaveDataIntegrityErrorModal";
 
 const Modals: React.FunctionComponent = () => (
   <>
-    <AddToModModal />
     <MoveFromModModal />
-    <SaveAsNewModModal />
     <CreateModModal />
     <AddBrickModal />
     <SaveDataIntegrityErrorModal />

diff --git a/src/pageEditor/store/editor/editorSlice.test.ts b/src/pageEditor/store/editor/editorSlice.test.ts
@@ -16,8 +16,8 @@
  */
 
 import {
-  editorSlice,
   actions,
+  editorSlice,
   initialState,
   persistEditorConfig,
 } from "@/pageEditor/store/editor/editorSlice";
@@ -49,6 +49,7 @@ import { migrations } from "@/store/editorMigrations";
 import { modMetadataFactory } from "@/testUtils/factories/modComponentFactories";
 import { setActiveModId } from "./editorSliceHelpers";
 import { castDraft } from "immer";
+import { type ModComponentsRootState } from "@/store/modComponents/modComponentTypes";
 
 function getTabState(
   state: EditorState,
@@ -222,11 +223,14 @@ describe("Add/Remove Bricks", () => {
     ).toBeArrayOfSize(initialIntegrationDependencies.length);
   });
 
-  test("Can clone a mod compoenent", async () => {
+  test("Can clone a mod component", async () => {
     const dispatch = jest.fn();
-    const getState: () => EditorRootState = () => ({ editor });
+    const getState: () => EditorRootState & ModComponentsRootState = () => ({
+      editor,
+      options: { activatedModComponents: [] },
+    });
 
-    await actions.cloneActiveModComponent()(dispatch, getState, undefined);
+    await actions.duplicateActiveModComponent()(dispatch, getState, undefined);
 
     // Dispatch call args (actions) should be:
     //  1. thunk pending