renaming

pixiebrix · Jun 20, 2024 · a17b380 · a17b380
1 parent e451b05
commit a17b380
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/src/background/removeExtensionForEveryTab.ts b/src/background/removeExtensionForEveryTab.ts
@@ -18,7 +18,7 @@
 import {
   removeInstalledExtension,
   removeSidebars,
-  clearDraftElements,
+  clearDraftModComponents,
 } from "@/contentScript/messenger/api";
 import { forEachTab } from "@/utils/extensionUtils";
 import { type UUID } from "@/types/stringTypes";
@@ -34,7 +34,7 @@ export async function removeExtensionForEveryTab(
   await forEachTab(async ({ tabId }) => {
     const allFrames = { tabId, frameId: "allFrames" } as const;
     removeInstalledExtension(allFrames, extensionId);
-    clearDraftElements(allFrames, { uuid: extensionId });
+    clearDraftModComponents(allFrames, { uuid: extensionId });
     await removeSidebars({ tabId }, [extensionId]);
   });
   await uninstallContextMenu({ extensionId });

diff --git a/src/contentScript/messenger/api.ts b/src/contentScript/messenger/api.ts
@@ -103,6 +103,8 @@ export const getInstalledExtensionPoints = getMethod(
 );
 export const resetTab = getNotifier("RESET_TAB");
 export const toggleQuickBar = getMethod("TOGGLE_QUICK_BAR");
-export const clearDraftElements = getNotifier("CLEAR_DRAFT_ELEMENTS");
+export const clearDraftModComponents = getNotifier(
+  "CLEAR_DRAFT_MOD_COMPONENTS",
+);
 export const updateDraftElement = getNotifier("UPDATE_DRAFT_ELEMENT");
 export const checkAvailable = getMethod("CHECK_AVAILABLE");
diff --git a/src/contentScript/messenger/registration.ts b/src/contentScript/messenger/registration.ts
@@ -125,7 +125,7 @@ declare global {
     INSTALLED_EXTENSION_POINTS: typeof getActiveExtensionPoints;
     ENSURE_EXTENSION_POINTS_INSTALLED: typeof ensureInstalled;
     RESET_TAB: typeof resetTab;
-    CLEAR_DRAFT_ELEMENTS: typeof clearDraftModComponents;
+    CLEAR_DRAFT_MOD_COMPONENTS: typeof clearDraftModComponents;
     UPDATE_DRAFT_ELEMENT: typeof updateDraftModComponent;
   }
 }
@@ -179,7 +179,7 @@ export default function registerMessenger(): void {
     INSTALLED_EXTENSION_POINTS: getActiveExtensionPoints,
     ENSURE_EXTENSION_POINTS_INSTALLED: ensureInstalled,
     RESET_TAB: resetTab,
-    CLEAR_DRAFT_ELEMENTS: clearDraftModComponents,
+    CLEAR_DRAFT_MOD_COMPONENTS: clearDraftModComponents,
     UPDATE_DRAFT_ELEMENT: updateDraftModComponent,
   });
 }
diff --git a/src/pageEditor/hooks/useRemoveModComponentFromStorage.test.ts b/src/pageEditor/hooks/useRemoveModComponentFromStorage.test.ts
@@ -20,7 +20,7 @@ import { removeExtensionsFromAllTabs } from "@/store/uninstallUtils";
 import { useRemoveModComponentFromStorage } from "./useRemoveModComponentFromStorage";
 import { actions as editorActions } from "@/pageEditor/slices/editorSlice";
 import { actions as extensionsActions } from "@/store/extensionsSlice";
-import { clearDraftElements } from "@/contentScript/messenger/api";
+import { clearDraftModComponents } from "@/contentScript/messenger/api";
 
 import { uuidSequence } from "@/testUtils/factories/stringFactories";
 
@@ -52,7 +52,7 @@ test("useRemoveModComponentFromStorage", async () => {
   expect(dispatch).toHaveBeenCalledWith(
     extensionsActions.removeExtension({ extensionId }),
   );
-  expect(clearDraftElements).toHaveBeenCalledWith(expect.any(Object), {
+  expect(clearDraftModComponents).toHaveBeenCalledWith(expect.any(Object), {
     uuid: extensionId,
   });
   expect(removeExtensionsFromAllTabs).toHaveBeenCalledWith([extensionId]);

diff --git a/src/pageEditor/hooks/useRemoveModComponentFromStorage.tsx b/src/pageEditor/hooks/useRemoveModComponentFromStorage.tsx
@@ -28,7 +28,7 @@ import { Events } from "@/telemetry/events";
 import notify from "@/utils/notify";
 import { actions as editorActions } from "@/pageEditor/slices/editorSlice";
 import { actions as extensionsActions } from "@/store/extensionsSlice";
-import { clearDraftElements } from "@/contentScript/messenger/api";
+import { clearDraftModComponents } from "@/contentScript/messenger/api";
 import { removeExtensionsFromAllTabs } from "@/store/uninstallUtils";
 import { allFramesInInspectedTab } from "@/pageEditor/context/connection";
 
@@ -107,7 +107,7 @@ export function useRemoveModComponentFromStorage(): (
 
         // Remove from the host page
         try {
-          clearDraftElements(allFramesInInspectedTab, {
+          clearDraftModComponents(allFramesInInspectedTab, {
             uuid: extensionId,
           });
         } catch (error) {