fix loading tutorial position

Author: ShMcK

src/channel/context.ts

@@ -17,9 +17,11 @@ class Context {
 		this.position = new Position()
 		this.progress = new Progress()
 	}
-	setTutorial(workspaceState: vscode.Memento, tutorial: G.Tutorial) {
+	public setTutorial = async (workspaceState: vscode.Memento, tutorial: G.Tutorial): Promise<{progress: CR.Progress, position: CR.Position}> => {
 		this.tutorial.set(tutorial)
-		this.progress.setTutorial(workspaceState, tutorial)
+		const progress: CR.Progress = await this.progress.setTutorial(workspaceState, tutorial)
+		const position: CR.Position = this.position.setPositionFromProgress(tutorial, progress)
+		return {progress, position}
 	}
 }
 

src/channel/index.ts

@@ -49,16 +49,14 @@ class Channel implements Channel {
 				}
 
 				// set tutorial 
-				const progress: CR.Progress = await this.context.progress.setTutorial(this.workspaceState, tutorial)
+				const {position, progress} = await this.context.setTutorial(this.workspaceState, tutorial)
 
 				if (progress.complete) {
 					// tutorial is already complete
 					this.send({type: 'NEW_TUTORIAL'})
 					return
 				}
 
-				const position = this.context.position.get()
-
 				// communicate to client the tutorial & stepProgress state
 				this.send({type: 'CONTINUE_TUTORIAL', payload: {tutorial, progress, position}})
 

src/channel/state/Position.ts

@@ -30,23 +30,23 @@ class Position {
 
 		const lastLevelIndex: number | undefined = levels.findIndex((l: G.Level) => progress.levels[l.id])
 		// TODO: consider all levels complete as progress.complete
-		if (lastLevelIndex < 0 && lastLevelIndex < levels.length) {
+		if (lastLevelIndex >= levels.length) {
 			throw new Error('Error setting progress level')
 		}
 		const currentLevel: G.Level = levels[lastLevelIndex + 1]
 
 		const {stages} = currentLevel
 
 		const lastStageIndex: number | undefined = stages.findIndex((s: G.Stage) => progress.stages[s.id])
-		if (lastStageIndex < 0 && lastStageIndex < stages.length) {
+		if (lastStageIndex >= stages.length) {
 			throw new Error('Error setting progress stage')
 		}
 		const currentStage: G.Stage = stages[lastStageIndex + 1]
 
 		const {steps} = currentStage
 
 		const lastStepIndex: number | undefined = steps.findIndex((s: G.Step) => progress.steps[s.id])
-		if (lastStepIndex < 0 && lastStepIndex < steps.length) {
+		if (lastStepIndex >= steps.length) {
 			throw new Error('Error setting progress step')
 		}
 		const currentStep: G.Step = steps[lastStepIndex + 1]

src/channel/state/Progress.ts

@@ -4,7 +4,7 @@ import * as vscode from 'vscode'
 
 import Storage from '../../services/storage'
 
-const defaultValue = {
+const defaultValue: CR.Progress = {
 	levels: {},
 	stages: {},
 	steps: {},
@@ -24,7 +24,7 @@ class Progress {
 			storage: workspaceState,
 			defaultValue,
 		})// set value from storage
-		this.value = await this.storage.get()
+		this.value = await this.storage.get() || defaultValue
 		return this.value
 	}
 	public get = () => {

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

@@ -1,6 +1,7 @@
 import * as React from 'react'
 import * as CR from 'typings'
 import * as G from 'typings/graphql'
+import * as selectors from '../../../services/selectors'
 
 import Stage from './Stage'
 
@@ -10,23 +11,9 @@ interface PageProps {
 }
 
 const StageSummaryPageContainer = (props: PageProps) => {
-  const { tutorial, position, progress } = props.context
+  const { position, progress } = props.context
 
-  if (!tutorial) {
-    throw new Error('Tutorial not found in StageSummaryPageContainer')
-  }
-
-  const level: G.Level | undefined = tutorial.version.levels.find((l: G.Level) => l.id === position.levelId)
-
-  if (!level) {
-    throw new Error('Level not found in StageSummaryPageContainer')
-  }
-
-  const stage: G.Stage | undefined = level.stages.find((s: G.Stage) => s.id === position.stageId)
-
-  if (!stage) {
-    throw new Error('Stage not found in StageSummaryPageContainer')
-  }
+  const stage: G.Stage = selectors.currentStage(props.context)
 
   const onContinue = (): void => {
     props.send({