Commit3983bda

committed

fix issue when continue history is unusable

Signed-off-by: shmck <shawn.j.mckay@gmail.com>

1 parent99a6f70 commit3983bdaCopy full SHA for 3983bda

File tree

-6

lines changed

-6

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import*asTfrom'typings'`
`2`	`2`	`import*asTTfrom'typings/tutorial'`
`3`	`3`
`4`		`-constgetProgress=(levels:TT.Level[]=[],position:T.Position):number=>{`
	`4`	`+constgetProgress=(levels:TT.Level[]=[],position:T.Position):number\|null=>{`
`5`	`5`	`letprogress=0`
`6`	`6`	`letisLevelComplete=false`
`7`	`7`	`if(levels&&levels.length){`
`@@ -10,7 +10,9 @@ const getProgress = (levels: TT.Level[] = [], position: T.Position): number => {`
`10`	`10`	`constcurrentLevel:TT.Level\|undefined=levels.find(findLevel)`
`11`	`11`	`letcurrentLevelIndex:number=levels.findIndex(findLevel)`
`12`	`12`	`if(!currentLevel){`
`13`		`-thrownewError('Invalid level')`
	`13`	`+// something went wrong, just return null`
	`14`	`+console.error('Invalid level match between levels & position')`
	`15`	`+returnnull`
`14`	`16`	`}`
`15`	`17`	`// check if the level is complete`
`16`	`18`	`if(position.stepId&&currentLevel.steps&&currentLevel.steps.length){`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ interface Props {`
`97`	`97`	`onContinue():void`
`98`	`98`	`onNew():void`
`99`	`99`	`tutorial:TT.Tutorial\|null`
`100`		`-progress:number`
	`100`	`+progress:number\|null`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`exportconstStartPage=(props:Props)=>(`
`@@ -118,12 +118,12 @@ export const StartPage = (props: Props) => (`
`118`	`118`	`Start New Tutorial`
`119`	`119`	`</Button>`
`120`	`120`	`</div>`
`121`		`-{props.tutorial&&(`
	`121`	`+{!!props.tutorial&&props.progress!==null&&(`
`122`	`122`	`<divcss={styles.buttonContainer}>`
`123`	`123`	`<buttononClick={props.onContinue}css={styles.buttonLarge}>`
`124`	`124`	`Continue Tutorial`
`125`	`125`	`<divcss={styles.continueTitle}>"{props.tutorial.summary.title}"</div>`
`126`		`-<Progressstyle={{marginLeft:'1rem'}}percent={props.progress}hasBordersize="large"/>`
	`126`	`+<Progressstyle={{marginLeft:'1rem'}}percent={props.progress\|\|0}hasBordersize="large"/>`
`127`	`127`	`</button>`
`128`	`128`	`</div>`
`129`	`129`	`)}`
`@@ -142,7 +142,7 @@ interface ContainerProps {`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`constStartPageContainer=({ context, send}:ContainerProps)=>{`
`145`		`-constprogress:number=getProgress(context?.tutorial?.levels,context.position)`
	`145`	`+constprogress=getProgress(context?.tutorial?.levels,context.position)`
`146`	`146`	`return(`
`147`	`147`	`<StartPage`
`148`	`148`	`onContinue={()=>send({type:'CONTINUE_TUTORIAL'})}`

Comments

(0)