ensure clearing of old progress on new

src/channel/context.ts

@@ -23,6 +23,11 @@ class Context {
 		const position: CR.Position = this.position.setPositionFromProgress(tutorial, progress)
 		return {progress, position}
 	}
+	public reset = () => {
+		this.tutorial.reset()
+		this.progress.reset()
+		this.position.reset()
+	}
 }
 
 export default Context

src/channel/index.ts

@@ -64,7 +64,7 @@ class Channel implements Channel {
 			// clear tutorial local storage
 			case 'TUTORIAL_CLEAR':
 				// clear current progress/position/tutorial
-				this.context = new Context(this.workspaceState)
+				this.context.reset()
 				return
 			// configure test runner, language, git
 			case 'EDITOR_TUTORIAL_CONFIG':

src/channel/state/Position.ts

@@ -1,22 +1,27 @@
 import * as CR from 'typings'
 import * as G from 'typings/graphql'
 
+const defaultValue: CR.Position = {
+	levelId: '',
+	stageId: '',
+	stepId: '',
+}
+
 // position
 class Position {
 	private value: CR.Position
 	constructor() {
-		this.value = {
-			levelId: '',
-			stageId: '',
-			stepId: '',
-		}
+		this.value = defaultValue
 	}
 	public get = () => {
 		return this.value
 	}
 	public set = (value: CR.Position) => {
 		this.value = value
 	}
+	public reset = () => {
+		this.value = defaultValue
+	}
 	// calculate the current position based on the saved progress
 	public setPositionFromProgress = (tutorial: G.Tutorial, progress: CR.Progress): CR.Position => {
 

src/channel/state/Progress.ts

@@ -32,11 +32,15 @@ class Progress {
 	}
 	public set = (value: CR.Progress) => {
 		this.value = value
-		if (this.storage) {
-			this.storage.set(value)
+		if (!this.storage) {
+			throw new Error('Tutorial storage not found')
 		}
+		this.storage.set(value)
 		return this.value
 	}
+	public reset = () => {
+		this.set(defaultValue)
+	}
 	public setStepComplete = (stepId: string): CR.Progress => {
 		const next = this.value
 		next.steps[stepId] = true

src/channel/state/Tutorial.ts

@@ -19,11 +19,13 @@ class Tutorial {
 			this.value = value
 		})
 	}
-	public get = () => {
-		return this.value
-	}
-	public set = (value: G.Tutorial) => {
+	public get = () => this.value
+	public set = (value: G.Tutorial | null) => {
 		this.value = value
+		this.storage.set(value)
+	}
+	public reset = () => {
+		this.set(null)
 	}
 }
 

src/editor/ReactWebView.ts

@@ -31,7 +31,6 @@ class ReactWebView {
 	private channel: Channel
 
 	public constructor({extensionPath, workspaceState}: ReactWebViewProps) {
-		console.log(`extPath ${extensionPath}`)
 		this.extensionPath = extensionPath
 
 		// Create and show a new webview panel
@@ -73,7 +72,7 @@ class ReactWebView {
 		this.channel = new Channel({
 			workspaceState,
 			postMessage: (action: Action): Thenable<boolean> => {
-				console.log(`postMessage ${JSON.stringify(action)}`)
+				// console.log(`postMessage ${JSON.stringify(action)}`)
 				return this.panel.webview.postMessage(action)
 			}
 		})

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

@@ -75,7 +75,7 @@ export default {
 			})
 		}
 	},
-	clearStorage() {
+	clearStorage(): void {
 		channel.editorSend({type: 'TUTORIAL_CLEAR'})
 	}
 }

web-app/src/services/state/machine.ts

@@ -35,11 +35,11 @@ export const machine = Machine<CR.MachineContext, CR.MachineStateSchema, CR.Mach
 							},
 							NEW_TUTORIAL: {
 								target: 'SelectTutorial',
-								actions: ['clearStorage']
 							}
 						},
 					},
 					SelectTutorial: {
+						onEntry: ['clearStorage'],
 						id: 'start-new-tutorial',
 						on: {
 							TUTORIAL_START: {