Commite152719

committed

fix continue progress

1 parent54545e4 commite152719Copy full SHA for e152719

File tree

+21

-12

lines changed

+21

-12

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -144,12 +144,12 @@ class Channel implements Channel {`
`144`	`144`	`constactionType:string=typeofaction==='string' ?action :action.type`
`145`	`145`	`switch(actionType){`
`146`	`146`	`case'TEST_PASS':`
`147`		`-// update local storage stepProgress`
`148`		`-constprogress=this.context.progress.setStepComplete(action.payload.stepId)`
`149`	`147`	`consttutorial=this.context.tutorial.get()`
`150`	`148`	`if(!tutorial){`
`151`	`149`	`thrownewError('Error with current tutorial')`
`152`	`150`	`}`
	`151`	`+// update local storage stepProgress`
	`152`	`+constprogress=this.context.progress.setStepComplete(tutorial.version.data,action.payload.stepId)`
`153`	`153`	`this.context.position.setPositionFromProgress(tutorial,progress)`
`154`	`154`	`saveCommit()`
`155`	`155`	`}`

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,17 +33,16 @@ class Position {`
`33`	`33`	`thrownewError('Error setting position from progress')`
`34`	`34`	`}`
`35`	`35`
	`36`	`+// get level`
`36`	`37`	`const{ levels}=tutorial.version.data`
`37`		`-`
`38`	`38`	`constlastLevelIndex:number\|undefined=levels.findIndex((l:G.Level)=>!progress.levels[l.id])`
`39`		`-`
`40`	`39`	`if(lastLevelIndex>=levels.length){`
`41`	`40`	`thrownewError('Error setting progress level')`
`42`	`41`	`}`
`43`		`-constcurrentLevel:G.Level=levels[lastLevelIndex]`
`44`	`42`
	`43`	`+// get step`
	`44`	`+constcurrentLevel:G.Level=levels[lastLevelIndex]`
`45`	`45`	`const{ steps}=currentLevel`
`46`		`-`
`47`	`46`	`constlastStepIndex:number\|undefined=steps.findIndex((s:G.Step)=>!progress.steps[s.id])`
`48`	`47`	`if(lastStepIndex>=steps.length){`
`49`	`48`	`thrownewError('Error setting progress step')`

Lines changed: 16 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,11 +39,25 @@ class Progress {`
`39`	`39`	`publicreset=()=>{`
`40`	`40`	`this.set(defaultValue)`
`41`	`41`	`}`
`42`		`-publicsetStepComplete=(stepId:string):CR.Progress=>{`
	`42`	`+publicsetStepComplete=(tutorialData:G.TutorialData,stepId:string):CR.Progress=>{`
`43`	`43`	`constnext=this.value`
	`44`	`+// mark step complete`
`44`	`45`	`next.steps[stepId]=true`
`45`	`46`
`46`		`-// TODO validate if progress is complete for a level or tutorial`
	`47`	`+constcurrentLevel=tutorialData.levels.find(l=>l.steps.find(s=>s.id===stepId))`
	`48`	`+if(!currentLevel){`
	`49`	+thrownewError(`setStepComplete level not found for stepId${stepId}`)
	`50`	`+}`
	`51`	`+`
	`52`	`+if(currentLevel.steps[currentLevel.steps.length-1]){`
	`53`	`+// final step for level is complete`
	`54`	`+next.levels[currentLevel.id]=true`
	`55`	`+`
	`56`	`+if(tutorialData.levels[tutorialData.levels.length-1].id===currentLevel.id){`
	`57`	`+//final level complete so tutorial is complete`
	`58`	`+next.complete=true`
	`59`	`+}`
	`60`	`+}`
`47`	`61`
`48`	`62`	`returnthis.set(next)`
`49`	`63`	`}`

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`import*asTfrom'typings'`
`2`	`2`	`import*asvscodefrom'vscode'`
`3`		`-importnotifyfrom'../services/notify'`
`4`	`3`	`importcreateTestRunner,{Payload}from'../services/testRunner'`
`5`	`4`	`importcreateWebViewfrom'../webview'`
`6`	`5`
`@@ -27,9 +26,6 @@ export const createCommands = ({ extensionPath, workspaceState, workspaceRoot }:`
`27`	`26`	`return{`
`28`	`27`	`// initialize`
`29`	`28`	`[COMMANDS.START]:async()=>{`
`30`		`-// TODO replace with a prompt to open a workspace`
`31`		`-// await isEmptyWorkspace()`
`32`		`-`
`33`	`29`	`letwebviewState:'INITIALIZING'\|'RESTARTING'`
`34`	`30`	`if(!webview){`
`35`	`31`	`webviewState='INITIALIZING'`

Comments

(0)