fix up step progress

Author: ShMcK

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

@@ -12,7 +12,9 @@ interface PageProps {
 const StageSummaryPageContainer = (props: PageProps) => {
 	const { tutorial, position, progress } = props.context
 
-	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 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({
@@ -32,7 +34,7 @@ const StageSummaryPageContainer = (props: PageProps) => {
 		})
 	}
 
-	stage.steps.forEach((step: G.Step) => {
+	stage.steps.map((step: G.Step) => {
 		if (step.id === position.stepId) {
 			step.status = 'ACTIVE'
 		} else if (progress.steps[step.id]) {
@@ -46,3 +48,26 @@ const StageSummaryPageContainer = (props: PageProps) => {
 }
 
 export default StageSummaryPageContainer
+
+/*
+	const formattedStage = {
+		...stage,
+		steps: stage.steps.map((step: G.Step) => {
+		if (step.id === position.stepId) {
+			return {
+				...step,
+				status: 'ACTIVE'
+			}
+		} else if (progress.steps[step.id]) {
+			return {
+				...step,
+				status: 'COMPLETE'
+			}
+		} else {
+			return {
+				...step,
+				status: 'INCOMPLETE'
+			}
+		}
+	})
+	*/

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

@@ -42,13 +42,23 @@ export default {
 	// @ts-ignore
 	stepLoadNext: assign({
 		position: (context: CR.MachineContext, event: CR.MachineEvent): CR.Position => {
-			const currentPosition: CR.Position = context.position
+			const position: CR.Position = context.position
 			// merge in the updated position
 			// sent with the test to ensure consistency
-			console.log('should calculate next step')
+			const steps: G.Step[] = context.tutorial.version
+				.levels.find((l: G.Level) => l.id === position.levelId)
+				.stages.find((s: G.Stage) => s.id === position.stageId)
+				.steps
+
+			const stepIndex = steps.findIndex((s: G.Step) => s.id === position.stepId)
+			console.log('step index', stepIndex)
+			const step: G.Step = steps[stepIndex + 1]
+
+			console.log('step load next', step.id, position.stepId)
 
 			return {
-				...currentPosition,
+				...position,
+				stepId: step.id
 			}
 		},
 	})

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

@@ -6,25 +6,30 @@ 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
+		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)
+		return !(steps.findIndex((s: G.Step) => s.id === 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
+		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)
+		return !(stages.findIndex((s: G.Stage) => s.id === 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)
+		return !(levels.findIndex((l: G.Level) => l.id === position.levelId) === levels.length - 1)
 	},
 }