fix issues with stepNext

Signed-off-by: shmck <shawn.j.mckay@gmail.com>

Author: ShMcK

web-app/src/services/state/actions/context.ts

@@ -34,28 +34,7 @@ export const initPosition = assign({
 
 export const updateStepPosition = assign({
   position: (context: T.MachineContext, event: T.MachineEvent): any => {
-    const { position } = context
-    // merge in the updated position
-    // sent with the test to ensure consistency
-    const level: TT.Level = selectors.currentLevel(context)
-    const steps: TT.Step[] = level.steps
-
-    // final step now completed
-    if (steps[steps.length - 1].id === position.stepId) {
-      return { ...position, complete: true }
-    }
-
-    const stepIndex = steps.findIndex((s: TT.Step) => s.id === position.stepId)
-
-    const step: TT.Step = steps[stepIndex + 1]
-
-    const nextPosition: T.Position = {
-      ...position,
-      stepId: step.id,
-      complete: false,
-    }
-
-    return nextPosition
+    return event.payload.position
   },
 })
 

web-app/src/services/state/actions/utils/stepNext.test.ts

@@ -29,16 +29,6 @@ describe('stepNext', () => {
   it('should LOAD_NEXT_STEP when there is another step', () => {
     const position = { levelId: '1', stepId: '1.2', complete: false }
     const result = getStepNext(position, level)
-    expect(result).toEqual({
-      type: 'LOAD_NEXT_STEP',
-      payload: {
-        step: level.steps[1],
-      },
-    })
-  })
-  it('should LOAD_NEXT_STEP when there is another step but no more', () => {
-    const position = { levelId: '1', stepId: '1.3', complete: false }
-    const result = getStepNext(position, level)
     expect(result).toEqual({
       type: 'LOAD_NEXT_STEP',
       payload: {

web-app/src/services/state/actions/utils/stepNext.ts

@@ -1,17 +1,22 @@
 import * as T from 'typings'
 import * as TT from 'typings/tutorial'
+import logger from '../../../../services/logger'
 
 const getStepNext = (position: T.Position, level: TT.Level): T.Action => {
+  logger('getStepNext position', position)
   const { steps } = level
 
   if (steps.length) {
     const stepIndex = steps.findIndex((s: TT.Step) => s.id === position.stepId)
-    const nextStep = steps[stepIndex]
-    return {
-      type: 'LOAD_NEXT_STEP',
-      payload: {
-        step: nextStep,
-      },
+    const finalStepIndex = steps.length - 1
+    if (stepIndex < finalStepIndex) {
+      const nextStep = steps[stepIndex + 1]
+      return {
+        type: 'LOAD_NEXT_STEP',
+        payload: {
+          step: nextStep,
+        },
+      }
     }
   }
   return {