Clean up goal redux to match other redux

src/components/App/DefaultState.ts

@@ -1,4 +1,4 @@
-import { defaultState as goalTimelineState } from "components/GoalTimeline/DefaultState";
+import { defaultState as goalsState } from "components/GoalTimeline/Redux/GoalReduxTypes";
 import { defaultState as loginState } from "components/Login/Redux/LoginReduxTypes";
 import { defaultState as currentProjectState } from "components/Project/ProjectReduxTypes";
 import { defaultState as exportProjectState } from "components/ProjectExport/Redux/ExportProjectReduxTypes";
@@ -23,7 +23,7 @@ export const defaultState = {
   pronunciationsState: { ...pronunciationsState },
 
   //goal timeline and current goal
-  goalsState: { ...goalTimelineState },
+  goalsState: { ...goalsState },
 
   //merge duplicates goal and review deferred duplicates goal
   mergeDuplicateGoal: { ...mergeDuplicateGoal },

src/components/GoalTimeline/Redux/GoalReducer.ts

@@ -1,6 +1,6 @@
 import { createSlice } from "@reduxjs/toolkit";
 
-import { defaultState } from "components/GoalTimeline/DefaultState";
+import { defaultState } from "components/GoalTimeline/Redux/GoalReduxTypes";
 import {
   MergeDupsData,
   MergesCompleted,

src/components/GoalTimeline/DefaultState.ts → src/components/GoalTimeline/Redux/GoalReduxTypes.ts

@@ -1,4 +1,13 @@
-import { Goal, GoalsState, GoalType } from "types/goals";
+import { Goal, GoalType } from "types/goals";
+
+// The representation of goals in the redux store
+export interface GoalsState {
+  allGoalTypes: GoalType[];
+  currentGoal: Goal;
+  goalTypeSuggestions: GoalType[];
+  history: Goal[];
+  previousGoalType: GoalType;
+}
 
 // GoalType.ReviewDeferredDups is also implemented,
 // but is conditionally available
@@ -15,12 +24,3 @@ export const defaultState: GoalsState = {
   history: [],
   previousGoalType: GoalType.Default,
 };
-
-export function emptyGoalState(): GoalsState {
-  return {
-    ...defaultState,
-    allGoalTypes: [],
-    currentGoal: { ...new Goal(), guid: expect.any(String) },
-    goalTypeSuggestions: [],
-  };
-}

src/components/GoalTimeline/tests/index.test.tsx

@@ -7,8 +7,11 @@ import "tests/reactI18nextMock";
 
 import { Permission } from "api/models";
 import GoalTimeline, { createSuggestionData } from "components/GoalTimeline";
-import { defaultState } from "components/GoalTimeline/DefaultState";
-import { Goal, GoalType, GoalsState } from "types/goals";
+import {
+  type GoalsState,
+  defaultState,
+} from "components/GoalTimeline/Redux/GoalReduxTypes";
+import { Goal, GoalType } from "types/goals";
 import { goalTypeToGoal } from "utilities/goalUtilities";
 
 jest.mock("backend", () => ({

src/types/goals.ts

@@ -1,17 +1,17 @@
 import { v4 } from "uuid";
 
-import { User } from "api/models";
+import { type User } from "api/models";
 import {
-  CharInvChanges,
-  CharInvData,
-  CharInvStepData,
+  type CharInvChanges,
+  type CharInvData,
+  type CharInvStepData,
 } from "goals/CharacterInventory/CharacterInventoryTypes";
 import {
-  MergeDupsData,
-  MergeStepData,
-  MergesCompleted,
+  type MergeDupsData,
+  type MergeStepData,
+  type MergesCompleted,
 } from "goals/MergeDuplicates/MergeDupsTypes";
-import { EntriesEdited } from "goals/ReviewEntries/ReviewEntriesTypes";
+import { type EntriesEdited } from "goals/ReviewEntries/ReviewEntriesTypes";
 import { newUser } from "types/user";
 
 export type GoalData = CharInvData | MergeDupsData;
@@ -23,15 +23,6 @@ export interface GoalProps {
   goal?: Goal;
 }
 
-// The representation of goals in the redux store
-export interface GoalsState {
-  allGoalTypes: GoalType[];
-  currentGoal: Goal;
-  goalTypeSuggestions: GoalType[];
-  history: Goal[];
-  previousGoalType: GoalType;
-}
-
 // The enum value is a permanent id for UserEdits and should not be changed.
 export enum GoalType {
   Default = -1,

src/types/index.ts

@@ -1,3 +1,4 @@
+import { GoalsState } from "components/GoalTimeline/Redux/GoalReduxTypes";
 import { LoginState } from "components/Login/Redux/LoginReduxTypes";
 import { CurrentProjectState } from "components/Project/ProjectReduxTypes";
 import { ExportProjectState } from "components/ProjectExport/Redux/ExportProjectReduxTypes";
@@ -7,7 +8,6 @@ import { CharacterInventoryState } from "goals/CharacterInventory/Redux/Characte
 import { MergeTreeState } from "goals/MergeDuplicates/Redux/MergeDupsReduxTypes";
 import { ReviewEntriesState } from "goals/ReviewEntries/Redux/ReviewEntriesReduxTypes";
 import { AnalyticsState } from "types/Redux/analyticsReduxTypes";
-import { GoalsState } from "types/goals";
 
 //root store structure
 export interface StoreState {