add GetRootState function type, and refactor modules/User/actions & preferences

Author: clairep94

client/modules/IDE/actions/preferences.ts

@@ -6,7 +6,6 @@ import type {
   UpdatePreferencesDispatch,
   SetPreferencesTabValue,
   SetFontSizeValue,
-  GetRootState,
   SetLineNumbersValue,
   SetAutocloseBracketsQuotesValue,
   SetAutocompleteHinterValue,
@@ -20,6 +19,7 @@ import type {
   SetLanguageValue,
   SetThemeValue
 } from './preferences.types';
+import type { GetRootState } from '../../../reducers';
 
 function updatePreferences(
   formParams: UpdatePreferencesRequestBody,

client/modules/IDE/actions/preferences.types.ts

@@ -1,6 +1,6 @@
 import * as ActionTypes from '../../../constants';
 import type { PreferencesState } from '../reducers/preferences';
-import type { RootState } from '../../../reducers';
+import type { GetRootState } from '../../../reducers';
 
 // Value Definitions:
 export type SetPreferencesTabValue = PreferencesState['tabIndex'];
@@ -112,5 +112,3 @@ export type PreferencesThunk = (
   dispatch: UpdatePreferencesDispatch,
   getState: GetRootState
 ) => void;
-
-export type GetRootState = () => RootState;

client/modules/User/actions.ts

@@ -23,7 +23,7 @@ import type {
   UserPreferences,
   VerifyEmailQuery
 } from '../../../common/types';
-import { RootState } from '../../reducers';
+import type { GetRootState, RootState } from '../../reducers';
 
 export function authError(error: Error) {
   return {
@@ -76,7 +76,7 @@ export function validateAndLoginUser(formProps: {
 }) {
   return (
     dispatch: ThunkDispatch<RootState, unknown, AnyAction>,
-    getState: () => RootState
+    getState: GetRootState
   ) => {
     const state = getState();
     const { previousPath } = state.ide;
@@ -115,7 +115,7 @@ export function validateAndLoginUser(formProps: {
  *   - Create a new user
  */
 export function validateAndSignUpUser(formValues: CreateUserRequestBody) {
-  return (dispatch: Dispatch, getState: () => RootState) => {
+  return (dispatch: Dispatch, getState: GetRootState) => {
     const state = getState();
     const { previousPath } = state.ide;
     return new Promise<void | PublicUserOrError>((resolve) => {
@@ -161,7 +161,7 @@ export function getUser() {
 }
 
 export function validateSession() {
-  return async (dispatch: Dispatch, getState: () => RootState) => {
+  return async (dispatch: Dispatch, getState: GetRootState) => {
     try {
       const response = await apiClient.get('/session');
       const state = getState();

client/reducers.ts

@@ -34,5 +34,8 @@ const rootReducer = combineReducers({
 // Type for entire redux state
 export type RootState = ReturnType<typeof rootReducer>;
 
+// Type for functions that get root state
+export type GetRootState = () => RootState;
+
 // eslint-disable-next-line import/no-default-export
 export default rootReducer;