Commitaad32f3

committed

fix issues with stepNext

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

1 parentbd96f17 commitaad32f3Copy full SHA for aad32f3

File tree

+12

-38

lines changed

web-app/src/services/state/actions
- context.ts
- utils
  - stepNext.test.ts
  - stepNext.ts

+12

-38

lines changed

Lines changed: 1 addition & 22 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,28 +34,7 @@ export const initPosition = assign({`
`34`	`34`
`35`	`35`	`exportconstupdateStepPosition=assign({`
`36`	`36`	`position:(context:T.MachineContext,event:T.MachineEvent):any=>{`
`37`		`-const{ position}=context`
`38`		`-// merge in the updated position`
`39`		`-// sent with the test to ensure consistency`
`40`		`-constlevel:TT.Level=selectors.currentLevel(context)`
`41`		`-conststeps:TT.Step[]=level.steps`
`42`		`-`
`43`		`-// final step now completed`
`44`		`-if(steps[steps.length-1].id===position.stepId){`
`45`		`-return{ ...position,complete:true}`
`46`		`-}`
`47`		`-`
`48`		`-conststepIndex=steps.findIndex((s:TT.Step)=>s.id===position.stepId)`
`49`		`-`
`50`		`-conststep:TT.Step=steps[stepIndex+1]`
`51`		`-`
`52`		`-constnextPosition:T.Position={`
`53`		`- ...position,`
`54`		`-stepId:step.id,`
`55`		`-complete:false,`
`56`		`-}`
`57`		`-`
`58`		`-returnnextPosition`
	`37`	`+returnevent.payload.position`
`59`	`38`	`},`
`60`	`39`	`})`
`61`	`40`

Lines changed: 0 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,16 +29,6 @@ describe('stepNext', () => {`
`29`	`29`	`it('should LOAD_NEXT_STEP when there is another step',()=>{`
`30`	`30`	`constposition={levelId:'1',stepId:'1.2',complete:false}`
`31`	`31`	`constresult=getStepNext(position,level)`
`32`		`-expect(result).toEqual({`
`33`		`-type:'LOAD_NEXT_STEP',`
`34`		`-payload:{`
`35`		`-step:level.steps[1],`
`36`		`-},`
`37`		`-})`
`38`		`-})`
`39`		`-it('should LOAD_NEXT_STEP when there is another step but no more',()=>{`
`40`		`-constposition={levelId:'1',stepId:'1.3',complete:false}`
`41`		`-constresult=getStepNext(position,level)`
`42`	`32`	`expect(result).toEqual({`
`43`	`33`	`type:'LOAD_NEXT_STEP',`
`44`	`34`	`payload:{`

Lines changed: 11 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,17 +1,22 @@`
`1`	`1`	`import*asTfrom'typings'`
`2`	`2`	`import*asTTfrom'typings/tutorial'`
	`3`	`+importloggerfrom'../../../../services/logger'`
`3`	`4`
`4`	`5`	`constgetStepNext=(position:T.Position,level:TT.Level):T.Action=>{`
	`6`	`+logger('getStepNext position',position)`
`5`	`7`	`const{ steps}=level`
`6`	`8`
`7`	`9`	`if(steps.length){`
`8`	`10`	`conststepIndex=steps.findIndex((s:TT.Step)=>s.id===position.stepId)`
`9`		`-constnextStep=steps[stepIndex]`
`10`		`-return{`
`11`		`-type:'LOAD_NEXT_STEP',`
`12`		`-payload:{`
`13`		`-step:nextStep,`
`14`		`-},`
	`11`	`+constfinalStepIndex=steps.length-1`
	`12`	`+if(stepIndex<finalStepIndex){`
	`13`	`+constnextStep=steps[stepIndex+1]`
	`14`	`+return{`
	`15`	`+type:'LOAD_NEXT_STEP',`
	`16`	`+payload:{`
	`17`	`+step:nextStep,`
	`18`	`+},`
	`19`	`+}`
`15`	`20`	`}`
`16`	`21`	`}`
`17`	`22`	`return{`

Comments

(0)