replace stepNext guards with actions

Author: ShMcK

web-app/src/components/Router/index.tsx

@@ -8,7 +8,6 @@ import debuggerWrapper from '../Debugger/debuggerWrapper'
 import channel from '../../services/channel'
 import messageBusReceiver from '../../services/channel/receiver'
 import actions from '../../services/state/actions'
-import guards from '../../services/state/guards'
 
 
 interface Props {
@@ -24,7 +23,6 @@ interface CloneElementProps {
 const Router = ({ children }: Props): React.ReactElement<CloneElementProps>|null => {
 	const [state, send] = useMachine(machine, {
 		actions,
-		guards,
 		interpreterOptions: {
 			logger: console.log.bind('XSTATE:')
 		}

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

@@ -2,20 +2,50 @@ import {send} from 'xstate'
 // import {machine} from '../../extension'
 // import {cache} from '../../services/apollo'
 // import {editorDispatch} from '../../services/vscode'
-// import * as CR from 'typings'
-// import * as G from 'typings/graphql'
+import * as CR from 'typings'
+import * as G from 'typings/graphql'
 // import tutorialConfig from '../../services/apollo/queries/tutorialConfig'
 import editorActions from './editor'
 import contextActions from './context'
 
 export default {
-	newOrContinue: send((context): 'NEW' | 'CONTINUE' => {
+	newOrContinue: send((context: CR.MachineContext): 'NEW' | 'CONTINUE' => {
 		console.log('new or continue')
 
 		// TODO: verify that the user has an existing tutorial to continue
 		const hasExistingTutorial: boolean = false
 		return hasExistingTutorial ? 'CONTINUE' : 'NEW'
 	}),
+	stepNext: send((context: CR.MachineContext): CR.Action => {
+		const {tutorial, position, progress} = context
+		// TODO: protect against errors
+		const steps: G.Step[] = tutorial.version
+			.levels.find((l: G.Level) => l.id === position.levelId)
+			.stages.find((s: G.Stage) => s.id === position.stageId)
+			.steps
+
+		// TODO: verify not -1
+		const stepIndex = steps.findIndex((s: G.Step) => s.id === position.stepId)
+		const finalStep = stepIndex === steps.length - 1
+		const stepComplete = progress.steps[position.stepId]
+		// not final step, or final step but not complete
+		const hasNextStep = !finalStep || !stepComplete
+
+		if (hasNextStep) {
+			const nextStep = steps[stepIndex + 1]
+			return {
+				type: 'LOAD_NEXT_STEP',
+				payload: {
+					step: nextStep
+				}
+			}
+		} else {
+			return {
+				type: 'STAGE_COMPLETE'
+			}
+		}
+
+	}),
 	...editorActions,
 	...contextActions,
 }

web-app/src/services/state/guards/index.ts

@@ -138,19 +138,17 @@ export const machine = Machine<CR.MachineContext, CR.MachineStateSchema, CR.Mach
 								},
 							},
 							StepNext: {
-								after: {
-									0: [
-										{
-											target: 'Normal',
-											cond: 'hasNextStep',
-											actions: ['loadStep'],
-										},
-										{
-											target: 'StageComplete',
-											actions: ['updateStageProgress']
-										},
-									],
-								},
+								onEntry: ['stepNext'],
+								on: {
+									LOAD_NEXT_STEP: {
+										target: 'Normal',
+										actions: ['loadStep']
+									},
+									STAGE_COMPLETE: {
+										target: "StageComplete",
+										actions: ['updateStageProgress']
+									}
+								}
 							},
 							StageComplete: {
 								on: {