setup editor config on continue

src/actions/tutorialConfig.ts

@@ -2,11 +2,19 @@ import * as G from 'typings/graphql'
 import * as vscode from 'vscode'
 import * as git from '../services/git'
 
-const tutorialConfig = async (tutorial: G.Tutorial) => {
+interface TutorialConfigParams {
+	tutorial: G.Tutorial,
+	alreadyConfigured?: boolean
+}
+
+const tutorialConfig = async ({tutorial, alreadyConfigured}: TutorialConfigParams) => {
+	if (!alreadyConfigured) {
+		// setup git, add remote
+		await git.initIfNotExists()
 
-	// setup git, add remote
-	await git.initIfNotExists()
-	await git.setupRemote(tutorial.repo.uri)
+		// TODO: if remote not already set
+		await git.setupRemote(tutorial.repo.uri)
+	}
 
 	// TODO: allow multiple coding languages in a tutorial
 	const language = tutorial.codingLanguage.toLowerCase()

src/channel/index.ts

@@ -70,7 +70,19 @@ class Channel implements Channel {
 			case 'EDITOR_TUTORIAL_CONFIG':
 				const tutorialData = action.payload.tutorial
 				this.context.setTutorial(this.workspaceState, tutorialData)
-				tutorialConfig(tutorialData)
+				tutorialConfig({
+					tutorial: tutorialData
+				})
+				return
+			case 'EDITOR_TUTORIAL_CONTINUE_CONFIG':
+				const tutorialContinue: G.Tutorial | null = this.context.tutorial.get()
+				if (!tutorialContinue) {
+					throw new Error('Invalid tutorial to continue')
+				}
+				tutorialConfig({
+					tutorial: tutorialContinue,
+					alreadyConfigured: true
+				})
 				return
 			case 'EDITOR_SYNC_PROGRESS':
 				// sync client progress on server

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

@@ -11,6 +11,7 @@ export default {
 			type: 'EDITOR_TUTORIAL_LOAD',
 		})
 	},
+	// TODO: syncProgress unused
 	syncProgress(context: CR.MachineContext) {
 		// sync progress in editor local storage for persistence
 		channel.editorSend({
@@ -23,6 +24,7 @@ export default {
 	initializeTutorial(context: CR.MachineContext, event: CR.MachineEvent) {
 		// setup test runner and git
 		const {tutorial} = event.data.payload
+
 		if (!tutorial) {
 			throw new Error('Invalid tutorial for tutorial config')
 		}
@@ -32,6 +34,11 @@ export default {
 			payload: {tutorial},
 		})
 	},
+	continueConfig() {
+		channel.editorSend({
+			type: 'EDITOR_TUTORIAL_CONTINUE_CONFIG',
+		})
+	},
 	testStart(context: CR.MachineContext, event: CR.MachineEvent) {
 		console.log('EDITOR: TEST_RUN')
 		const {stepId} = event.payload

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

@@ -50,7 +50,10 @@ export const machine = Machine<CR.MachineContext, CR.MachineStateSchema, CR.Mach
 					},
 					ContinueTutorial: {
 						on: {
-							TUTORIAL_START: '#tutorial-stage',
+							TUTORIAL_START: {
+								target: '#tutorial-stage',
+								actions: ['continueConfig'],
+							},
 							TUTORIAL_SELECT: 'SelectTutorial'
 						},
 					},
@@ -60,6 +63,7 @@ export const machine = Machine<CR.MachineContext, CR.MachineStateSchema, CR.Mach
 				id: 'tutorial',
 				initial: 'Initialize',
 				states: {
+					// TODO: move Initialize into New Tutorial setup
 					Initialize: {
 						invoke: {
 							id: 'loadTutorial',