Remove unecessary payload wrapper

pixiebrix · Jun 21, 2024 · c79ea3d · c79ea3d
1 parent d20f8b7
commit c79ea3d
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 39 deletions.
diff --git a/src/extensionConsole/pages/activateExtension/ActivateExtensionCard.tsx b/src/extensionConsole/pages/activateExtension/ActivateExtensionCard.tsx
@@ -93,9 +93,7 @@ const ActivateExtensionCard: React.FunctionComponent<{
     async (values: FormState, helpers: FormikProps<FormState>) => {
       try {
         dispatch(
-          actions.activateStandaloneModDefinition({
-            standaloneModDefinition: { ...extension, ...values },
-          }),
+          actions.activateStandaloneModDefinition({ ...extension, ...values }),
         );
         notify.success("Activated mod");
         dispatch(push("/mods"));

diff --git a/src/extensionConsole/pages/mods/hooks/useModsPageActions.test.tsx b/src/extensionConsole/pages/mods/hooks/useModsPageActions.test.tsx
@@ -437,14 +437,14 @@ describe("actions", () => {
       } = renderHook(() => useModsPageActions(modViewItem), {
         setupRedux(dispatch) {
           dispatch(
-            extensionActions.activateStandaloneModDefinition({
+            extensionActions.activateStandaloneModDefinition(
               standaloneModDefinition,
-            }),
+            ),
           );
           dispatch(
-            extensionActions.activateStandaloneModDefinition({
-              standaloneModDefinition: standaloneModDefinitionFactory(),
-            }),
+            extensionActions.activateStandaloneModDefinition(
+              standaloneModDefinitionFactory(),
+            ),
           );
         },
       });

diff --git a/src/extensionConsole/pages/mods/modals/convertToModModal/ConvertToModModal.test.tsx b/src/extensionConsole/pages/mods/modals/convertToModModal/ConvertToModModal.test.tsx
@@ -67,9 +67,9 @@ describe("it renders", () => {
       setupRedux(dispatch) {
         dispatch(authSlice.actions.setAuth(authStateFactory()));
         dispatch(
-          extensionsSlice.actions.activateStandaloneModDefinition({
+          extensionsSlice.actions.activateStandaloneModDefinition(
             standaloneModDefinition,
-          }),
+          ),
         );
         dispatch(
           modModalsSlice.actions.setShareContext({
@@ -90,9 +90,9 @@ describe("it renders", () => {
       setupRedux(dispatch) {
         dispatch(authSlice.actions.setAuth(anonAuth));
         dispatch(
-          extensionsSlice.actions.activateStandaloneModDefinition({
+          extensionsSlice.actions.activateStandaloneModDefinition(
             standaloneModDefinition,
-          }),
+          ),
         );
         dispatch(
           modModalsSlice.actions.setShareContext({
@@ -147,9 +147,9 @@ describe("it renders", () => {
           setupRedux(dispatch) {
             dispatch(authSlice.actions.setAuth(authStateFactory()));
             dispatch(
-              extensionsSlice.actions.activateStandaloneModDefinition({
+              extensionsSlice.actions.activateStandaloneModDefinition(
                 standaloneModDefinition,
-              }),
+              ),
             );
             dispatch(
               sharingAction({

diff --git a/src/extensionConsole/pages/mods/utils/useReinstall.test.ts b/src/extensionConsole/pages/mods/utils/useReinstall.test.ts
@@ -44,14 +44,14 @@ test("uninstalls mod components", async () => {
   } = renderHook(() => useReinstall(), {
     setupRedux(dispatch) {
       dispatch(
-        extensionActions.activateStandaloneModDefinition({
+        extensionActions.activateStandaloneModDefinition(
           standaloneModDefinition,
-        }),
+        ),
       );
       dispatch(
-        extensionActions.activateStandaloneModDefinition({
-          standaloneModDefinition: anotherStandaloneModDefinition,
-        }),
+        extensionActions.activateStandaloneModDefinition(
+          anotherStandaloneModDefinition,
+        ),
       );
     },
   });
@@ -85,9 +85,9 @@ test("dispatches install recipe action", async () => {
   } = renderHook(() => useReinstall(), {
     setupRedux(dispatch) {
       dispatch(
-        extensionActions.activateStandaloneModDefinition({
+        extensionActions.activateStandaloneModDefinition(
           standaloneModDefinition,
-        }),
+        ),
       );
     },
   });

diff --git a/src/store/checkAvailableInstalledExtensions.test.ts b/src/store/checkAvailableInstalledExtensions.test.ts
@@ -127,24 +127,14 @@ describe("checkAvailableInstalledExtensions", () => {
     });
 
     store.dispatch(
-      optionsActions.activateStandaloneModDefinition({
-        standaloneModDefinition: availableButton,
-      }),
+      optionsActions.activateStandaloneModDefinition(availableButton),
     );
     store.dispatch(
-      optionsActions.activateStandaloneModDefinition({
-        standaloneModDefinition: unavailableButton,
-      }),
+      optionsActions.activateStandaloneModDefinition(unavailableButton),
     );
+    store.dispatch(optionsActions.activateStandaloneModDefinition(availableQb));
     store.dispatch(
-      optionsActions.activateStandaloneModDefinition({
-        standaloneModDefinition: availableQb,
-      }),
-    );
-    store.dispatch(
-      optionsActions.activateStandaloneModDefinition({
-        standaloneModDefinition: unavailableQb,
-      }),
+      optionsActions.activateStandaloneModDefinition(unavailableQb),
     );
 
     await store.dispatch(actions.checkAvailableInstalledExtensions());

diff --git a/src/store/extensionsSlice.ts b/src/store/extensionsSlice.ts
@@ -82,11 +82,9 @@ const extensionsSlice = createSlice({
     activateStandaloneModDefinition(
       state,
       {
-        payload,
-      }: PayloadAction<{ standaloneModDefinition: StandaloneModDefinition }>,
+        payload: standaloneModDefinition,
+      }: PayloadAction<StandaloneModDefinition>,
     ) {
-      const { standaloneModDefinition } = payload;
-
       reportEvent(
         Events.MOD_COMPONENT_CLOUD_ACTIVATE,
         selectEventData(standaloneModDefinition),