Sep 28, 2019 · Sep 28, 2019
diff --git a/src/actions/tutorialConfig.ts b/src/actions/tutorialConfig.ts
 interface TutorialConfigParams {
 tutorial: G.Tutorial,
 alreadyConfigured?: boolean
 onComplete?(): void
 }

 const tutorialConfig = async ({tutorial, alreadyConfigured}: TutorialConfigParams) => {
 const tutorialConfig = async ({tutorial, alreadyConfigured, onComplete}: TutorialConfigParams) => {
 if (!alreadyConfigured) {
 // setup git, add remote
 await git.initIfNotExists()

 // TODO: if remote not already set
 await git.setupRemote(tutorial.repo.uri)
 if (onComplete) {onComplete()}
 }

 // TODO: allow multiple coding languages in a tutorial
diff --git a/src/channel/index.ts b/src/channel/index.ts
 const tutorialData = action.payload.tutorial
 this.context.setTutorial(this.workspaceState, tutorialData)
 tutorialConfig({
 tutorial: tutorialData
 tutorial: tutorialData,
 // must await async git setup or commit loading fails
 onComplete: () => this.send({type: 'TUTORIAL_CONFIGURED'})
 })
 return
 case 'EDITOR_TUTORIAL_CONTINUE_CONFIG':
diff --git a/web-app/src/services/channel/index.ts b/web-app/src/services/channel/index.ts
 case 'NEW_TUTORIAL':
 this.machineSend(action)
 return
 case 'TUTORIAL_CONFIGURED':
 this.machineSend(action)
 return
 case 'CONTINUE_TUTORIAL':
 this.machineSend(action)
 return
diff --git a/web-app/src/services/state/actions/editor.ts b/web-app/src/services/state/actions/editor.ts
 import * as CR from 'typings'
 import * as selectors from '../../selectors'
 import channel from '../../channel'
 import client from '../../apollo'
 import tutorialQuery from '../../apollo/queries/tutorial'

 export default {
 loadStoredTutorial() {
 },
 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')
 if (!context.tutorial) {
 throw new Error('Tutorial not available to load')
 }
 console.log('EDITOR: TUTORIAL_CONFIG', tutorial)
 channel.editorSend({
 type: 'EDITOR_TUTORIAL_CONFIG',
 payload: {tutorial},

 client.query({
 query: tutorialQuery,
 variables: {
 tutorialId: context.tutorial.id,
 version: context.tutorial.version.version,
 }
 }).then((result) => {
 if (!result || !result.data || !result.data.tutorial) {
 return Promise.reject('No tutorial returned from tutorial config query')
 }

 channel.editorSend({
 type: 'EDITOR_TUTORIAL_CONFIG',
 payload: {tutorial: result.data.tutorial},
 })
 })
 .catch((error: Error) => {
 return Promise.reject(`Failed to load tutorial config ${error.message}`)
 })
 },
 continueConfig() {
 channel.editorSend({
diff --git a/web-app/src/services/state/actions/invoke.ts b/web-app/src/services/state/actions/invoke.ts
diff --git a/web-app/src/services/state/machine.ts b/web-app/src/services/state/machine.ts
 import {Machine, MachineOptions} from 'xstate'
 import * as CR from 'typings'
 import actions from './actions'
 import * as invoke from './actions/invoke'

 const options: MachineOptions<CR.MachineContext, CR.MachineEvent> = {
 // @ts-ignore
 states: {
 // TODO: move Initialize into New Tutorial setup
 Initialize: {
 invoke: {
 id: 'loadTutorial',
 src: invoke.loadTutorial,
 onDone: {
 target: 'Summary',
 actions: ['initializeTutorial']
 },
 onError: 'Initialize' // TODO: handle load tutorial error
 },
 onEntry: ['initializeTutorial'],
 on: {
 TUTORIAL_CONFIGURED: 'Summary',
 // TUTORIAL_CONFIG_ERROR: 'Start' // TODO: should handle error
 }
 },
 LoadNext: {
 id: 'tutorial-load-next',
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,15 +5,17 @@ import * as git from '../services/git'
		interface TutorialConfigParams {
		tutorial: G.Tutorial,
		alreadyConfigured?: boolean
		onComplete?(): void
		}

		const tutorialConfig = async ({tutorial, alreadyConfigured}: TutorialConfigParams) => {
		const tutorialConfig = async ({tutorial, alreadyConfigured, onComplete}: TutorialConfigParams) => {
		if (!alreadyConfigured) {
		// setup git, add remote
		await git.initIfNotExists()

		// TODO: if remote not already set
		await git.setupRemote(tutorial.repo.uri)
		if (onComplete) {onComplete()}
		}

		// TODO: allow multiple coding languages in a tutorial
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -74,7 +74,9 @@ class Channel implements Channel {
		const tutorialData = action.payload.tutorial
		this.context.setTutorial(this.workspaceState, tutorialData)
		tutorialConfig({
		tutorial: tutorialData
		tutorial: tutorialData,
		// must await async git setup or commit loading fails
		onComplete: () => this.send({type: 'TUTORIAL_CONFIGURED'})
		})
		return
		case 'EDITOR_TUTORIAL_CONTINUE_CONFIG':
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -40,6 +40,9 @@ class Channel {
		case 'NEW_TUTORIAL':
		this.machineSend(action)
		return
		case 'TUTORIAL_CONFIGURED':
		this.machineSend(action)
		return
		case 'CONTINUE_TUTORIAL':
		this.machineSend(action)
		return
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,6 +2,8 @@ import * as G from 'typings/graphql'
		import * as CR from 'typings'
		import * as selectors from '../../selectors'
		import channel from '../../channel'
		import client from '../../apollo'
		import tutorialQuery from '../../apollo/queries/tutorial'

		export default {
		loadStoredTutorial() {
Expand All		@@ -23,16 +25,29 @@ 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')
		if (!context.tutorial) {
		throw new Error('Tutorial not available to load')
		}
		console.log('EDITOR: TUTORIAL_CONFIG', tutorial)
		channel.editorSend({
		type: 'EDITOR_TUTORIAL_CONFIG',
		payload: {tutorial},

		client.query({
		query: tutorialQuery,
		variables: {
		tutorialId: context.tutorial.id,
		version: context.tutorial.version.version,
		}
		}).then((result) => {
		if (!result \|\| !result.data \|\| !result.data.tutorial) {
		return Promise.reject('No tutorial returned from tutorial config query')
		}

		channel.editorSend({
		type: 'EDITOR_TUTORIAL_CONFIG',
		payload: {tutorial: result.data.tutorial},
		})
		})
		.catch((error: Error) => {
		return Promise.reject(`Failed to load tutorial config ${error.message}`)
		})
		},
		continueConfig() {
		channel.editorSend({
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,7 +1,6 @@
		import {Machine, MachineOptions} from 'xstate'
		import * as CR from 'typings'
		import actions from './actions'
		import * as invoke from './actions/invoke'

		const options: MachineOptions<CR.MachineContext, CR.MachineEvent> = {
		// @ts-ignore
Expand DownExpand Up		@@ -65,15 +64,11 @@ export const machine = Machine<CR.MachineContext, CR.MachineStateSchema, CR.Mach
		states: {
		// TODO: move Initialize into New Tutorial setup
		Initialize: {
		invoke: {
		id: 'loadTutorial',
		src: invoke.loadTutorial,
		onDone: {
		target: 'Summary',
		actions: ['initializeTutorial']
		},
		onError: 'Initialize' // TODO: handle load tutorial error
		},
		onEntry: ['initializeTutorial'],
		on: {
		TUTORIAL_CONFIGURED: 'Summary',
		// TUTORIAL_CONFIG_ERROR: 'Start' // TODO: should handle error
		}
		},
		LoadNext: {
		id: 'tutorial-load-next',
Expand Down