Commitccd088b

committed

fix loading tutorial position

1 parent13a4499 commitccd088bCopy full SHA for ccd088b

File tree

+13

-26

lines changed

+13

-26

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,11 @@ class Context {`
`17`	`17`	`this.position=newPosition()`
`18`	`18`	`this.progress=newProgress()`
`19`	`19`	`}`
`20`		`-setTutorial(workspaceState:vscode.Memento,tutorial:G.Tutorial){`
	`20`	`+publicsetTutorial=async(workspaceState:vscode.Memento,tutorial:G.Tutorial):Promise<{progress:CR.Progress,position:CR.Position}>=>{`
`21`	`21`	`this.tutorial.set(tutorial)`
`22`		`-this.progress.setTutorial(workspaceState,tutorial)`
	`22`	`+constprogress:CR.Progress=awaitthis.progress.setTutorial(workspaceState,tutorial)`
	`23`	`+constposition:CR.Position=this.position.setPositionFromProgress(tutorial,progress)`
	`24`	`+return{progress, position}`
`23`	`25`	`}`
`24`	`26`	`}`
`25`	`27`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -49,16 +49,14 @@ class Channel implements Channel {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`// set tutorial`
`52`		`-constprogress:CR.Progress=awaitthis.context.progress.setTutorial(this.workspaceState,tutorial)`
	`52`	`+const{position,progress}=awaitthis.context.setTutorial(this.workspaceState,tutorial)`
`53`	`53`
`54`	`54`	`if(progress.complete){`
`55`	`55`	`// tutorial is already complete`
`56`	`56`	`this.send({type:'NEW_TUTORIAL'})`
`57`	`57`	`return`
`58`	`58`	`}`
`59`	`59`
`60`		`-constposition=this.context.position.get()`
`61`		`-`
`62`	`60`	`// communicate to client the tutorial & stepProgress state`
`63`	`61`	`this.send({type:'CONTINUE_TUTORIAL',payload:{tutorial, progress, position}})`
`64`	`62`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,23 +30,23 @@ class Position {`
`30`	`30`
`31`	`31`	`constlastLevelIndex:number\|undefined=levels.findIndex((l:G.Level)=>progress.levels[l.id])`
`32`	`32`	`// TODO: consider all levels complete as progress.complete`
`33`		`-if(lastLevelIndex<0&&lastLevelIndex<levels.length){`
	`33`	`+if(lastLevelIndex>=levels.length){`
`34`	`34`	`thrownewError('Error setting progress level')`
`35`	`35`	`}`
`36`	`36`	`constcurrentLevel:G.Level=levels[lastLevelIndex+1]`
`37`	`37`
`38`	`38`	`const{stages}=currentLevel`
`39`	`39`
`40`	`40`	`constlastStageIndex:number\|undefined=stages.findIndex((s:G.Stage)=>progress.stages[s.id])`
`41`		`-if(lastStageIndex<0&&lastStageIndex<stages.length){`
	`41`	`+if(lastStageIndex>=stages.length){`
`42`	`42`	`thrownewError('Error setting progress stage')`
`43`	`43`	`}`
`44`	`44`	`constcurrentStage:G.Stage=stages[lastStageIndex+1]`
`45`	`45`
`46`	`46`	`const{steps}=currentStage`
`47`	`47`
`48`	`48`	`constlastStepIndex:number\|undefined=steps.findIndex((s:G.Step)=>progress.steps[s.id])`
`49`		`-if(lastStepIndex<0&&lastStepIndex<steps.length){`
	`49`	`+if(lastStepIndex>=steps.length){`
`50`	`50`	`thrownewError('Error setting progress step')`
`51`	`51`	`}`
`52`	`52`	`constcurrentStep:G.Step=steps[lastStepIndex+1]`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import * as vscode from 'vscode'`
`4`	`4`
`5`	`5`	`importStoragefrom'../../services/storage'`
`6`	`6`
`7`		`-constdefaultValue={`
	`7`	`+constdefaultValue:CR.Progress={`
`8`	`8`	`levels:{},`
`9`	`9`	`stages:{},`
`10`	`10`	`steps:{},`
`@@ -24,7 +24,7 @@ class Progress {`
`24`	`24`	`storage:workspaceState,`
`25`	`25`	`defaultValue,`
`26`	`26`	`})// set value from storage`
`27`		`-this.value=awaitthis.storage.get()`
	`27`	`+this.value=awaitthis.storage.get()\|\|defaultValue`
`28`	`28`	`returnthis.value`
`29`	`29`	`}`
`30`	`30`	`publicget=()=>{`

Lines changed: 3 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`import*asReactfrom'react'`
`2`	`2`	`import*asCRfrom'typings'`
`3`	`3`	`import*asGfrom'typings/graphql'`
	`4`	`+import*asselectorsfrom'../../../services/selectors'`
`4`	`5`
`5`	`6`	`importStagefrom'./Stage'`
`6`	`7`
`@@ -10,23 +11,9 @@ interface PageProps {`
`10`	`11`	`}`
`11`	`12`
`12`	`13`	`constStageSummaryPageContainer=(props:PageProps)=>{`
`13`		`-const{tutorial,position, progress}=props.context`
	`14`	`+const{ position, progress}=props.context`
`14`	`15`
`15`		`-if(!tutorial){`
`16`		`-thrownewError('Tutorial not found in StageSummaryPageContainer')`
`17`		`-}`
`18`		`-`
`19`		`-constlevel:G.Level\|undefined=tutorial.version.levels.find((l:G.Level)=>l.id===position.levelId)`
`20`		`-`
`21`		`-if(!level){`
`22`		`-thrownewError('Level not found in StageSummaryPageContainer')`
`23`		`-}`
`24`		`-`
`25`		`-conststage:G.Stage\|undefined=level.stages.find((s:G.Stage)=>s.id===position.stageId)`
`26`		`-`
`27`		`-if(!stage){`
`28`		`-thrownewError('Stage not found in StageSummaryPageContainer')`
`29`		`-}`
	`16`	`+conststage:G.Stage=selectors.currentStage(props.context)`
`30`	`17`
`31`	`18`	`constonContinue=():void=>{`
`32`	`19`	`props.send({`

Comments

(0)