Merge branch 'master' into merge-stack-refactor

src/components/App/DefaultState.tsx

@@ -4,7 +4,7 @@ import { defaultState as reviewEntriesState } from "../../goals/ReviewEntries/Re
 import { defaultProject } from "../../types/project";
 import { defaultState as loginState } from "../Login/LoginReducer";
 import { defaultState as goalTimelineState } from "../GoalTimeline/DefaultState";
-import { defaultState as goalSelectorState } from "../GoalTimeline/GoalSwitcher/GoalSelectorScroll/GoalSelectorReducer";
+import { defaultState as goalSelectorState } from "../GoalTimeline/GoalSelectorScroll/GoalSelectorReducer";
 import { defaultState as passwordResetState } from "../PasswordReset/reducer";
 import { defaultState as exportProjectState } from "../ProjectExport/ExportProjectReducer";
 import { defaultState as createProjectState } from "../ProjectScreen/CreateProject/CreateProjectReducer";

src/components/GoalTimeline/GoalSwitcher/GoalSelectorScroll/GoalSelectorReducer.tsx → src/components/GoalTimeline/GoalSelectorScroll/GoalSelectorReducer.tsx

@@ -1,10 +1,10 @@
+import { StoreAction, StoreActions } from "../../../rootActions";
+import { GoalSelectorState } from "../../../types/goals";
 import {
   GoalScrollAction,
-  SELECT_ACTION,
   MOUSE_ACTION,
+  SELECT_ACTION,
 } from "./GoalSelectorAction";
-import { GoalSelectorState } from "../../../../types/goals";
-import { StoreAction, StoreActions } from "../../../../rootActions";
 
 export const defaultState: GoalSelectorState = {
   selectedIndex: 0,

src/components/GoalTimeline/GoalSwitcher/GoalSelectorScroll/GoalSelectorScroll.tsx → src/components/GoalTimeline/GoalSelectorScroll/GoalSelectorScroll.tsx

@@ -1,15 +1,15 @@
-import React, { ReactElement } from "react";
-
 import Card from "@material-ui/core/Card";
 import { Button, CardContent, Typography } from "@material-ui/core";
-import { Goal, GoalName } from "../../../../types/goals";
+import React, { ReactElement } from "react";
 import {
   LocalizeContextProps,
-  withLocalize,
   Translate,
+  withLocalize,
 } from "react-localize-redux";
-import ContextMenu from "../../../ContextMenu/ContextMenu";
-import { styleAddendum } from "../../../../types/theme";
+
+import { Goal, GoalName } from "../../../types/goals";
+import { styleAddendum } from "../../../types/theme";
+import ContextMenu from "../../ContextMenu/ContextMenu";
 
 const CLICK_SENSITIVITY: number = 10;
 

src/components/GoalTimeline/GoalSwitcher/GoalSelectorScroll/index.tsx → src/components/GoalTimeline/GoalSelectorScroll/index.tsx

@@ -1,14 +1,14 @@
-import GoalSelectorScroll from "./GoalSelectorScroll";
+import { connect } from "react-redux";
+import { Dispatch } from "redux";
+
+import { StoreState } from "../../../types";
+import { GoalSelectorState } from "../../../types/goals";
 import {
   GoalScrollAction,
   scrollSelectorIndexAction,
   scrollSelectorMouseAction,
 } from "./GoalSelectorAction";
-
-import { connect } from "react-redux";
-import { StoreState } from "../../../../types";
-import { GoalSelectorState } from "../../../../types/goals";
-import { Dispatch } from "redux";
+import GoalSelectorScroll from "./GoalSelectorScroll";
 
 export function mapStateToProps(state: StoreState): GoalSelectorState {
   return {

src/components/GoalTimeline/GoalSwitcher/GoalSelectorScroll/tests/GoalSelectorAction.test.tsx → src/components/GoalTimeline/GoalSelectorScroll/tests/GoalSelectorAction.test.tsx

@@ -1,9 +1,9 @@
 import {
-  SELECT_ACTION,
   GoalScrollAction,
+  MOUSE_ACTION,
+  SELECT_ACTION,
   scrollSelectorIndexAction,
   scrollSelectorMouseAction,
-  MOUSE_ACTION,
 } from "../GoalSelectorAction";
 
 const VAL = 5;

src/components/GoalTimeline/GoalSwitcher/GoalSelectorScroll/tests/GoalSelectorReducer.test.tsx → src/components/GoalTimeline/GoalSelectorScroll/tests/GoalSelectorReducer.test.tsx

@@ -1,11 +1,11 @@
-import { goalSelectReducer, defaultState } from "../GoalSelectorReducer";
+import { StoreActions, StoreAction } from "../../../../rootActions";
+import { GoalSelectorState } from "../../../../types/goals";
 import {
-  SELECT_ACTION,
   GoalScrollAction,
   MOUSE_ACTION,
+  SELECT_ACTION,
 } from "../GoalSelectorAction";
-import { GoalSelectorState } from "../../../../../types/goals";
-import { StoreActions, StoreAction } from "../../../../../rootActions";
+import { defaultState, goalSelectReducer } from "../GoalSelectorReducer";
 
 const VAL = 5;
 const scrollAct: GoalScrollAction = {

src/components/GoalTimeline/GoalSwitcher/GoalSelectorScroll/tests/GoalSelectorScroll.test.tsx → src/components/GoalTimeline/GoalSelectorScroll/tests/GoalSelectorScroll.test.tsx

@@ -7,8 +7,8 @@ import renderer, {
 import configureMockStore from "redux-mock-store";
 import thunk from "redux-thunk";
 
-import { Goal, GoalName, GoalSelectorState } from "../../../../../types/goals";
-import { User } from "../../../../../types/user";
+import { Goal, GoalName, GoalSelectorState } from "../../../../types/goals";
+import { User } from "../../../../types/user";
 import GoalSelectorScroll from "../";
 import {
   GoalScrollAction,

src/components/GoalTimeline/GoalsActions.tsx

@@ -19,7 +19,7 @@ import { ValidateChars } from "../../goals/ValidateChars/ValidateChars";
 import { ValidateStrWords } from "../../goals/ValidateStrWords/ValidateStrWords";
 import history, { Path } from "../../history";
 import { StoreState } from "../../types";
-import { Goal, GoalType } from "../../types/goals";
+import { Goal, GoalType, maxNumSteps } from "../../types/goals";
 import { ActionWithPayload } from "../../types/mockAction";
 import { User } from "../../types/user";
 import { Edit } from "../../types/userEdit";
@@ -130,8 +130,8 @@ export function loadGoalData(goal: Goal) {
             usedIDs.push(...groupIds);
           }
 
-          // Stop the process once numSteps many groups found.
-          if (newGroups.length === goal.numSteps) {
+          // Stop the process once maxNumSteps many groups found.
+          if (newGroups.length === maxNumSteps(goal.goalType)) {
             break;
           }
         }
@@ -157,9 +157,7 @@ export function loadGoalData(goal: Goal) {
 export function updateStepData(goal: Goal): Goal {
   switch (goal.goalType) {
     case GoalType.MergeDups: {
-      let currentGoalData: MergeDupData = JSON.parse(
-        JSON.stringify(goal.data as MergeDupData)
-      );
+      const currentGoalData = goal.data as MergeDupData;
       goal.steps[goal.currentStep] = {
         words: currentGoalData.plannedWords[goal.currentStep],
       };

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

@@ -4,14 +4,18 @@ import thunk from "redux-thunk";
 import * as LocalStorage from "../../../backend/localStorage";
 import { CreateCharInv } from "../../../goals/CreateCharInv/CreateCharInv";
 import { HandleFlags } from "../../../goals/HandleFlags/HandleFlags";
-import { MergeDups, MergeDupData } from "../../../goals/MergeDupGoal/MergeDups";
 import {
-  MergeTreeActions,
+  MergeDupData,
+  MergeDups,
+  MergeStepData,
+} from "../../../goals/MergeDupGoal/MergeDups";
+import {
   MergeTreeAction,
+  MergeTreeActions,
 } from "../../../goals/MergeDupGoal/MergeDupStep/MergeDupStepActions";
 import { goalDataMock } from "../../../goals/MergeDupGoal/MergeDupStep/tests/MockMergeDupData";
 import { ReviewEntries } from "../../../goals/ReviewEntries/ReviewEntries";
-import { Goal } from "../../../types/goals";
+import { Goal, maxNumSteps } from "../../../types/goals";
 import { User } from "../../../types/user";
 import { UserEdit } from "../../../types/userEdit";
 import { defaultState as goalsDefaultState } from "../DefaultState";
@@ -198,7 +202,7 @@ describe("Test GoalsActions", () => {
 
   it("should dispatch UPDATE_GOAL and SET_DATA", async () => {
     let goalToUpdate: Goal = new MergeDups();
-    goalToUpdate.numSteps = 8;
+    goalToUpdate.numSteps = maxNumSteps(goalToUpdate.goalType);
     goalToUpdate.steps = [
       {
         words: [...goalDataMock.plannedWords[0]],
@@ -287,14 +291,16 @@ describe("Test GoalsActions", () => {
   });
 
   it("Should update the step data of a goal", () => {
-    const goal: MergeDups = new MergeDups();
+    const goal = new MergeDups();
     goal.data = goalDataMock;
     expect(goal.steps).toEqual([]);
     expect(goal.currentStep).toEqual(0);
 
-    const updatedGoal: MergeDups = actions.updateStepData(goal) as MergeDups;
+    const updatedGoal = actions.updateStepData(goal);
 
-    expect(updatedGoal.steps[0].words).toEqual(goal.data.plannedWords[0]);
+    expect((updatedGoal.steps[0] as MergeStepData).words).toEqual(
+      (goal.data as MergeDupData).plannedWords[0]
+    );
     expect(updatedGoal.currentStep).toEqual(0);
   });
 

src/goals/MergeDupGoal/MergeDups.tsx

@@ -15,6 +15,5 @@ export class MergeDups extends Goal {
     data: MergeDupData = { plannedWords: [[]] }
   ) {
     super(GoalType.MergeDups, GoalName.MergeDups, steps, data);
-    this.numSteps = 8;
   }
 }

src/rootReducer.tsx

@@ -2,7 +2,7 @@ import { localizeReducer } from "react-localize-redux";
 import { combineReducers, Reducer } from "redux";
 
 import { goalsReducer } from "./components/GoalTimeline/GoalsReducer";
-import { goalSelectReducer } from "./components/GoalTimeline/GoalSwitcher/GoalSelectorScroll/GoalSelectorReducer";
+import { goalSelectReducer } from "./components/GoalTimeline/GoalSelectorScroll/GoalSelectorReducer";
 import { loginReducer } from "./components/Login/LoginReducer";
 import { passwordResetReducer } from "./components/PasswordReset/reducer";
 import { projectReducer } from "./components/Project/ProjectReducer";

src/types/goals.tsx

@@ -75,6 +75,15 @@ export enum GoalName {
   ValidateStrWords = "validateStrWords",
 }
 
+export function maxNumSteps(type: GoalType) {
+  switch (type) {
+    case GoalType.MergeDups:
+      return 8;
+    default:
+      return 1;
+  }
+}
+
 export class Goal {
   goalType: GoalType;
   name: GoalName;