cleanup hasNext guards

Author: ShMcK

web-app/src/containers/Tutorial/LevelPage/index.tsx

@@ -1,11 +1,8 @@
 import * as React from 'react'
-import { useQuery } from '@apollo/react-hooks'
 import * as CR from 'typings'
 import * as G from 'typings/graphql'
 
-import ErrorView from '../../../components/Error'
 import Level from './Level'
-import queryLevel from './queryLevel'
 
 interface LevelProps {
   level: G.Level
@@ -30,23 +27,7 @@ interface ContainerProps {
 const LevelSummaryPageContainer = (props: ContainerProps) => {
 	const { tutorial, position, progress } = props.context
 
-  const { loading, error, data } = useQuery(queryLevel, {
-    variables: {
-      tutorialId: tutorial.id,
-      version: tutorial.version.version,
-      levelId: position.levelId,
-    },
-	})
-
-  if (loading) {
-    return <div>Loading Levels...</div>
-  }
-
-  if (error) {
-    return <ErrorView error={error} />
-  }
-
-	const { level } = data.tutorial.version
+	const level: G.Level = tutorial.version.levels.find((l: G.Level) => l.id === position.levelId)
 
 	level.stages.forEach((stage: G.Stage) => {
 		if (stage.id === position.stageId) {

web-app/src/containers/Tutorial/LevelPage/queryLevel.ts

@@ -1,11 +1,8 @@
 import * as React from 'react'
 import * as CR from 'typings'
 import * as G from 'typings/graphql'
-import { useQuery } from '@apollo/react-hooks'
 
-import ErrorView from '../../../components/Error'
 import Stage from './Stage'
-import queryStage from './queryStage'
 
 interface PageProps {
 	context: CR.MachineContext,
@@ -14,22 +11,8 @@ interface PageProps {
 
 const StageSummaryPageContainer = (props: PageProps) => {
 	const { tutorial, position, progress } = props.context
-  const { loading, error, data } = useQuery(queryStage, {
-    variables: {
-      tutorialId: tutorial.id,
-      version: tutorial.version.version,
-      stageId: position.stageId,
-    },
-  })
-  if (loading) {
-    return <div>Loading Stage...</div>
-  }
 
-  if (error) {
-    return <ErrorView error={error} />
-  }
-
-	const { stage } = data.tutorial.version
+	const stage: G.Stage = tutorial.version.levels.find((l: G.Level) => l.id === position.levelId).stages.find((s: G.Stage) => s.id === position.stageId)
 
   const onContinue = (): void => {
     props.send({
@@ -42,7 +25,7 @@ const StageSummaryPageContainer = (props: PageProps) => {
 
 	const onSave =(): void => {
 		props.send({
-			type: 'TEST_RUNNING',
+			type: 'TEST_RUN',
 			payload: {
 				stepId: position.stepId,
 			}

web-app/src/containers/Tutorial/StagePage/index.tsx

@@ -38,6 +38,10 @@ class Channel {
 				this.machineSend('TUTORIAL_LOADED')
 				console.log('send action to state machine')
 				return
+			case 'TEST_PASS':
+				this.machineSend(action)
+				console.log('test passed')
+				return
 			default:
 				console.warn(`Unknown received action ${action.type}`, action)
 		}

web-app/src/services/channel/index.ts

@@ -19,6 +19,14 @@ window.acquireVsCodeApi = () => ({
 					}
 					channel.receive(createReceiveEvent(receiveAction))
 				}, 1000)
+			case 'TEST_RUN':
+				return setTimeout(() => {
+					const receiveAction: Action = {
+						type: 'TEST_PASS',
+						payload: action.payload,
+					}
+					channel.receive(createReceiveEvent(receiveAction))
+				})
 			default:
 				console.warn(`${action.type} not found in post message mock`)
 		}

web-app/src/services/channel/mock.ts

@@ -27,10 +27,11 @@ export default {
 		},
 	}),
 	// @ts-ignore
-	testPass: assign({
+	updateStepProgress: assign({
 		progress: (context: CR.MachineContext, event: CR.MachineEvent): CR.Progress => {
 			// update progress by tracking completed
 			const currentProgress: CR.Progress = context.progress
+			console.log('progress update', event.payload)
 			const stepId = event.payload.stepId
 
 			currentProgress.steps[stepId] = true
@@ -44,9 +45,10 @@ export default {
 			const currentPosition: CR.Position = context.position
 			// merge in the updated position
 			// sent with the test to ensure consistency
+			console.log('should calculate next step')
+
 			return {
 				...currentPosition,
-				...event.payload.nextPosition,
 			}
 		},
 	})

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

@@ -15,7 +15,14 @@ export default {
 	testRunnerSetup(context: CR.MachineContext) {
 		console.log('test runner setup', context)
 	},
-	testStart() {
+	testStart(context: CR.MachineContext, event: CR.MachineEvent) {
 		console.log('test start')
+		const {stepId} = event.payload
+		channel.editorSend({
+			type: 'TEST_RUN',
+			payload: {
+				stepId,
+			}
+		})
 	}
 }

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

@@ -1,43 +1,30 @@
-// import * as CR from 'typings'
-// import {TutorialModel} from '../../services/tutorial'
-
-
-export default {}
+import * as G from 'typings/graphql'
+import * as CR from 'typings'
 
 // // TODO: refactor into a single calculation
-// export default (tutorialModel: TutorialModel) => ({
-// 	hasNextStep: (): boolean => {
-
-// 		const nextPosition: CR.Position = tutorialModel.nextPosition()
-
-// 		const sameStage = nextPosition.stageId === tutorialModel.position.stageId
-// 		const sameStep = nextPosition.stepId === tutorialModel.position.stepId
-
-// 		const hasNext: boolean = sameStage && sameStep
-
-// 		console.log('GUARD: hasNextStep', hasNext)
-// 		return hasNext
-// 	},
-// 	hasNextStage: (): boolean => {
-// 		const nextPosition: CR.Position = tutorialModel.nextPosition()
-
-// 		const sameLevel = nextPosition.levelId === tutorialModel.position.levelId
-// 		const sameStage = nextPosition.stageId === tutorialModel.position.stageId
-
-// 		const hasNext: boolean = sameLevel && sameStage
-
-// 		console.log('GUARD: hasNextStage', hasNext)
-// 		return hasNext
-// 	},
-// 	hasNextLevel: (): boolean => {
-// 		const nextPosition: CR.Position = tutorialModel.nextPosition()
-
-// 		const sameLevel = nextPosition.levelId === tutorialModel.position.levelId
-
-// 		const hasNext: boolean = sameLevel
-
-// 		// TODO: ensure this accounts for end
-// 		console.log('GUARD: hasNextLevel', hasNext)
-// 		return hasNext
-// 	},
-// })
+export default {
+	hasNextStep: (context: CR.MachineContext): boolean => {
+		const {tutorial, position} = 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
+		return !(steps.indexOf(position.stepId) === steps.length - 1)
+	},
+	hasNextStage: (context: CR.MachineContext): boolean => {
+		const {tutorial, position} = context
+		// TODO: protect against errors
+		const stages: G.Stage[] = tutorial.version.levels.find((l: G.Level) => l.id === position.levelId).stages
+
+		// TODO: verify not -1
+		return !(stages.indexOf(position.stageId) === stages.length - 1)
+	},
+	hasNextLevel: (context: CR.MachineContext): boolean => {
+		const {tutorial, position} = context
+		// TODO: protect against errors
+		const levels: G.Level[] = tutorial.version.levels
+
+		// TODO: verify not -1
+		return !(levels.indexOf(position.levelId) === levels.length - 1)
+	},
+}

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

@@ -110,7 +110,10 @@ export const machine = Machine<CR.MachineContext, CR.MachineStateSchema, CR.Mach
 						states: {
 							Normal: {
 								on: {
-									TEST_RUN: 'TestRunning',
+									TEST_RUN: {
+										target: 'TestRunning',
+										actions: 'testStart',
+									},
 									STEP_SOLUTION_LOAD: {
 										actions: ['callSolution'],
 									},
@@ -119,12 +122,14 @@ export const machine = Machine<CR.MachineContext, CR.MachineStateSchema, CR.Mach
 							TestRunning: {
 								onEntry: ['testStart'],
 								on: {
-									TEST_PASS: 'TestPass',
+									TEST_PASS: {
+										target: 'TestPass',
+										actions: ['updateStepProgress']
+									},
 									TEST_FAIL: 'TestFail',
 								},
 							},
 							TestPass: {
-								onEntry: ['testPass'],
 								onExit: ['stepLoadNext'],
 								after: {
 									1000: 'StepNext',