Commit98498c5

committed

setup editor config on continue

1 parent19d819c commit98498c5Copy full SHA for 98498c5

File tree

+37

-6

lines changed

+37

-6

lines changed

Lines changed: 12 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,19 @@ import * as G from 'typings/graphql'`
`2`	`2`	`import*asvscodefrom'vscode'`
`3`	`3`	`import*asgitfrom'../services/git'`
`4`	`4`
`5`		`-consttutorialConfig=async(tutorial:G.Tutorial)=>{`
	`5`	`+interfaceTutorialConfigParams{`
	`6`	`+tutorial:G.Tutorial,`
	`7`	`+alreadyConfigured?:boolean`
	`8`	`+}`
	`9`	`+`
	`10`	`+consttutorialConfig=async({tutorial, alreadyConfigured}:TutorialConfigParams)=>{`
	`11`	`+if(!alreadyConfigured){`
	`12`	`+// setup git, add remote`
	`13`	`+awaitgit.initIfNotExists()`
`6`	`14`
`7`		`-//setup git, addremote`
`8`		`-awaitgit.initIfNotExists()`
`9`		`-awaitgit.setupRemote(tutorial.repo.uri)`
	`15`	`+//TODO: ifremote not already set`
	`16`	`+awaitgit.setupRemote(tutorial.repo.uri)`
	`17`	`+}`
`10`	`18`
`11`	`19`	`// TODO: allow multiple coding languages in a tutorial`
`12`	`20`	`constlanguage=tutorial.codingLanguage.toLowerCase()`

Lines changed: 13 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,19 @@ class Channel implements Channel {`
`70`	`70`	`case'EDITOR_TUTORIAL_CONFIG':`
`71`	`71`	`consttutorialData=action.payload.tutorial`
`72`	`72`	`this.context.setTutorial(this.workspaceState,tutorialData)`
`73`		`-tutorialConfig(tutorialData)`
	`73`	`+tutorialConfig({`
	`74`	`+tutorial:tutorialData`
	`75`	`+})`
	`76`	`+return`
	`77`	`+case'EDITOR_TUTORIAL_CONTINUE_CONFIG':`
	`78`	`+consttutorialContinue:G.Tutorial\|null=this.context.tutorial.get()`
	`79`	`+if(!tutorialContinue){`
	`80`	`+thrownewError('Invalid tutorial to continue')`
	`81`	`+}`
	`82`	`+tutorialConfig({`
	`83`	`+tutorial:tutorialContinue,`
	`84`	`+alreadyConfigured:true`
	`85`	`+})`
`74`	`86`	`return`
`75`	`87`	`case'EDITOR_SYNC_PROGRESS':`
`76`	`88`	`// sync client progress on server`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ export default {`
`11`	`11`	`type:'EDITOR_TUTORIAL_LOAD',`
`12`	`12`	`})`
`13`	`13`	`},`
	`14`	`+// TODO: syncProgress unused`
`14`	`15`	`syncProgress(context:CR.MachineContext){`
`15`	`16`	`// sync progress in editor local storage for persistence`
`16`	`17`	`channel.editorSend({`
`@@ -23,6 +24,7 @@ export default {`
`23`	`24`	`initializeTutorial(context:CR.MachineContext,event:CR.MachineEvent){`
`24`	`25`	`// setup test runner and git`
`25`	`26`	`const{tutorial}=event.data.payload`
	`27`	`+`
`26`	`28`	`if(!tutorial){`
`27`	`29`	`thrownewError('Invalid tutorial for tutorial config')`
`28`	`30`	`}`
`@@ -32,6 +34,11 @@ export default {`
`32`	`34`	`payload:{tutorial},`
`33`	`35`	`})`
`34`	`36`	`},`
	`37`	`+continueConfig(){`
	`38`	`+channel.editorSend({`
	`39`	`+type:'EDITOR_TUTORIAL_CONTINUE_CONFIG',`
	`40`	`+})`
	`41`	`+},`
`35`	`42`	`testStart(context:CR.MachineContext,event:CR.MachineEvent){`
`36`	`43`	`console.log('EDITOR: TEST_RUN')`
`37`	`44`	`const{stepId}=event.payload`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,10 @@ export const machine = Machine<CR.MachineContext, CR.MachineStateSchema, CR.Mach`
`50`	`50`	`},`
`51`	`51`	`ContinueTutorial:{`
`52`	`52`	`on:{`
`53`		`-TUTORIAL_START:'#tutorial-stage',`
	`53`	`+TUTORIAL_START:{`
	`54`	`+target:'#tutorial-stage',`
	`55`	`+actions:['continueConfig'],`
	`56`	`+},`
`54`	`57`	`TUTORIAL_SELECT:'SelectTutorial'`
`55`	`58`	`},`
`56`	`59`	`},`
`@@ -60,6 +63,7 @@ export const machine = Machine<CR.MachineContext, CR.MachineStateSchema, CR.Mach`
`60`	`63`	`id:'tutorial',`
`61`	`64`	`initial:'Initialize',`
`62`	`65`	`states:{`
	`66`	`+// TODO: move Initialize into New Tutorial setup`
`63`	`67`	`Initialize:{`
`64`	`68`	`invoke:{`
`65`	`69`	`id:'loadTutorial',`

Comments

(0)