Rename actions; Remove action wrapper

Author: jcobis

packages/compass-collection/src/components/collection-header/collection-header.tsx

@@ -23,9 +23,9 @@ import type { MockDataGeneratorStep } from '../mock-data-generator-modal/types';
 import { connect } from 'react-redux';
 import type { CollectionState } from '../../modules/collection-tab';
 import {
-  openMockDataGeneratorModal,
-  closeMockDataGeneratorModal,
-  setMockDataGeneratorStep,
+  mockDataGeneratorModalOpened,
+  mockDataGeneratorModalClosed,
+  mockDataGeneratorStepChanged,
 } from '../../modules/collection-tab';
 
 const collectionHeaderStyles = css({
@@ -215,9 +215,9 @@ type ConnectedCollectionHeaderProps = Omit<
 >;
 
 const ConnectedCollectionHeader = connect(mapStateToProps, {
-  onOpenMockDataModal: openMockDataGeneratorModal,
-  onCloseMockDataModal: closeMockDataGeneratorModal,
-  onSetMockDataGeneratorStep: setMockDataGeneratorStep,
+  onOpenMockDataModal: mockDataGeneratorModalOpened,
+  onCloseMockDataModal: mockDataGeneratorModalClosed,
+  onSetMockDataGeneratorStep: mockDataGeneratorStepChanged,
 })(CollectionHeader) as React.ComponentType<ConnectedCollectionHeaderProps>;
 
 export {

packages/compass-collection/src/modules/collection-tab.ts

@@ -40,26 +40,26 @@ export type CollectionState = {
 
 enum CollectionActions {
   CollectionMetadataFetched = 'compass-collection/CollectionMetadataFetched',
-  OpenMockDataGeneratorModal = 'compass-collection/OpenMockDataGeneratorModal',
-  CloseMockDataGeneratorModal = 'compass-collection/CloseMockDataGeneratorModal',
-  SetMockDataGeneratorStep = 'compass-collection/SetMockDataGeneratorStep',
+  MockDataGeneratorModalOpened = 'compass-collection/MockDataGeneratorModalOpened',
+  MockDataGeneratorModalClosed = 'compass-collection/MockDataGeneratorModalClosed',
+  MockDataGeneratorStepChanged = 'compass-collection/MockDataGeneratorStepChanged',
 }
 
 interface CollectionMetadataFetchedAction {
   type: CollectionActions.CollectionMetadataFetched;
   metadata: CollectionMetadata;
 }
 
-interface OpenMockDataGeneratorModalAction {
-  type: CollectionActions.OpenMockDataGeneratorModal;
+interface MockDataGeneratorModalOpenedAction {
+  type: CollectionActions.MockDataGeneratorModalOpened;
 }
 
-interface CloseMockDataGeneratorModalAction {
-  type: CollectionActions.CloseMockDataGeneratorModal;
+interface MockDataGeneratorModalClosedAction {
+  type: CollectionActions.MockDataGeneratorModalClosed;
 }
 
-interface SetMockDataGeneratorStepAction {
-  type: CollectionActions.SetMockDataGeneratorStep;
+interface MockDataGeneratorStepChangedAction {
+  type: CollectionActions.MockDataGeneratorStepChanged;
   step: MockDataGeneratorStep;
 }
 
@@ -89,9 +89,9 @@ const reducer: Reducer<CollectionState, Action> = (
   }
 
   if (
-    isAction<OpenMockDataGeneratorModalAction>(
+    isAction<MockDataGeneratorModalOpenedAction>(
       action,
-      CollectionActions.OpenMockDataGeneratorModal
+      CollectionActions.MockDataGeneratorModalOpened
     )
   ) {
     return {
@@ -105,9 +105,9 @@ const reducer: Reducer<CollectionState, Action> = (
   }
 
   if (
-    isAction<CloseMockDataGeneratorModalAction>(
+    isAction<MockDataGeneratorModalClosedAction>(
       action,
-      CollectionActions.CloseMockDataGeneratorModal
+      CollectionActions.MockDataGeneratorModalClosed
     )
   ) {
     return {
@@ -121,9 +121,9 @@ const reducer: Reducer<CollectionState, Action> = (
   }
 
   if (
-    isAction<SetMockDataGeneratorStepAction>(
+    isAction<MockDataGeneratorStepChangedAction>(
       action,
-      CollectionActions.SetMockDataGeneratorStep
+      CollectionActions.MockDataGeneratorStepChanged
     )
   ) {
     return {
@@ -144,20 +144,20 @@ export const collectionMetadataFetched = (
   return { type: CollectionActions.CollectionMetadataFetched, metadata };
 };
 
-export const openMockDataGeneratorModal =
-  (): OpenMockDataGeneratorModalAction => {
-    return { type: CollectionActions.OpenMockDataGeneratorModal };
+export const mockDataGeneratorModalOpened =
+  (): MockDataGeneratorModalOpenedAction => {
+    return { type: CollectionActions.MockDataGeneratorModalOpened };
   };
 
-export const closeMockDataGeneratorModal =
-  (): CloseMockDataGeneratorModalAction => {
-    return { type: CollectionActions.CloseMockDataGeneratorModal };
+export const mockDataGeneratorModalClosed =
+  (): MockDataGeneratorModalClosedAction => {
+    return { type: CollectionActions.MockDataGeneratorModalClosed };
   };
 
-export const setMockDataGeneratorStep = (
+export const mockDataGeneratorStepChanged = (
   step: MockDataGeneratorStep
-): SetMockDataGeneratorStepAction => {
-  return { type: CollectionActions.SetMockDataGeneratorStep, step };
+): MockDataGeneratorStepChangedAction => {
+  return { type: CollectionActions.MockDataGeneratorStepChanged, step };
 };
 
 export const selectTab = (

packages/compass-collection/src/stores/collection-tab.ts

@@ -5,11 +5,9 @@ import thunk from 'redux-thunk';
 import reducer, {
   selectTab,
   collectionMetadataFetched,
-  openMockDataGeneratorModal,
-  closeMockDataGeneratorModal,
-  setMockDataGeneratorStep,
 } from '../modules/collection-tab';
 import { MockDataGeneratorStep } from '../components/mock-data-generator-modal/types';
+
 import type { Collection } from '@mongodb-js/compass-app-stores/provider';
 import type { ActivateHelpers } from '@mongodb-js/compass-app-registry';
 import type { workspacesServiceLocator } from '@mongodb-js/compass-workspaces/provider';
@@ -56,11 +54,6 @@ export function activatePlugin(
 ): {
   store: ReturnType<typeof createStore>;
   deactivate: () => void;
-  actions: {
-    openMockDataGeneratorModal: () => void;
-    closeMockDataGeneratorModal: () => void;
-    setMockDataGeneratorStep: (step: MockDataGeneratorStep) => void;
-  };
 } {
   const {
     dataService,
@@ -143,13 +136,5 @@ export function activatePlugin(
   return {
     store,
     deactivate: cleanup,
-    actions: {
-      openMockDataGeneratorModal: () =>
-        store.dispatch(openMockDataGeneratorModal()),
-      closeMockDataGeneratorModal: () =>
-        store.dispatch(closeMockDataGeneratorModal()),
-      setMockDataGeneratorStep: (step: MockDataGeneratorStep) =>
-        store.dispatch(setMockDataGeneratorStep(step)),
-    },
   };
 }