remove stages from files

Author: ShMcK

src/channel/state/Position.ts

@@ -3,7 +3,6 @@ import * as G from 'typings/graphql'
 
 const defaultValue: CR.Position = {
 	levelId: '',
-	stageId: '',
 	stepId: '',
 }
 
@@ -31,7 +30,7 @@ class Position {
 			return this.value
 		}
 
-		const {levels} = tutorial.version
+		const {levels} = tutorial.version.data
 
 		const lastLevelIndex: number | undefined = levels.findIndex((l: G.Level) => !progress.levels[l.id])
 		// TODO: consider all levels complete as progress.complete
@@ -40,15 +39,7 @@ class Position {
 		}
 		const currentLevel: G.Level = levels[lastLevelIndex]
 
-		const {stages} = currentLevel
-
-		const lastStageIndex: number | undefined = stages.findIndex((s: G.Stage) => !progress.stages[s.id])
-		if (lastStageIndex >= stages.length) {
-			throw new Error('Error setting progress stage')
-		}
-		const currentStage: G.Stage = stages[lastStageIndex]
-
-		const {steps} = currentStage
+		const {steps} = currentLevel
 
 		const lastStepIndex: number | undefined = steps.findIndex((s: G.Step) => !progress.steps[s.id])
 		if (lastStepIndex >= steps.length) {
@@ -60,7 +51,6 @@ class Position {
 
 		this.value = {
 			levelId: currentLevel.id,
-			stageId: currentStage.id,
 			stepId: currentStep.id,
 		}
 		return this.value

typings/context.d.ts

@@ -1,21 +1,18 @@
 import * as CR from './index'
 
-export interface Step extends Exclude<CR.TutorialStep, 'actions'> {
-  status: {
-    complete: boolean
-    active: boolean
-  }
+interface ProgressStatus {
+	active: boolean
+	complete: boolean
 }
 
-export interface ReceivedEvent {
-  data: CR.Action
+export interface Step extends Exclude<CR.TutorialStep, 'actions'> {
+	status: ProgressStatus
 }
 
-export interface StageStepStatus {
-  active: boolean
-  complete: boolean
+export interface ReceivedEvent {
+	data: CR.Action
 }
 
-export interface StageWithStatus extends CR.TutorialStage {
-  status: StageStepStatus
+export interface LevelWithStatus extends CR.TutorialLevel {
+	status: ProgressStatus
 }

typings/index.d.ts

@@ -3,17 +3,6 @@ import Storage from '../src/services/storage'
 import * as G from './graphql'
 
 export interface TutorialLevel {
-	stageList: string[]
-	content: {
-		title: string
-		text: string
-	}
-	actions?: {
-		setup: TutorialAction
-	}
-}
-
-export interface TutorialStage {
 	stepList: string[]
 	content: {
 		title: string
@@ -54,9 +43,6 @@ export interface TutorialData {
 	levels: {
 		[levelId: string]: TutorialLevel
 	}
-	stages: {
-		[stageId: string]: TutorialStage
-	}
 	steps: {
 		[stepId: string]: TutorialStep
 	}
@@ -90,9 +76,6 @@ export interface Progress {
 	levels: {
 		[levelId: string]: boolean
 	}
-	stages: {
-		[stageId: string]: boolean
-	}
 	steps: {
 		[stepId: string]: boolean
 	}
@@ -106,7 +89,6 @@ export interface StepProgress {
 // current tutorial position
 export interface Position {
 	levelId: string
-	stageId: string
 	stepId: string
 	complete?: boolean
 }
@@ -154,16 +136,15 @@ export interface MachineStateSchema {
 				Initialize: {}
 				Summary: {}
 				LoadNext: {}
-				Level: {}
-				Stage: {
+				Level: {
 					states: {
 						Load: {}
 						Normal: {}
 						TestRunning: {}
 						TestPass: {}
 						TestFail: {}
 						StepNext: {}
-						StageComplete: {}
+						LevelComplete: {}
 					}
 				}
 				Completed: {}

web-app/src/containers/Tutorial/LevelPage/index.tsx

@@ -28,7 +28,7 @@ const LevelSummaryPageContainer = (props: ContainerProps) => {
     throw new Error('Tutorial not found in LevelSummaryPageContainer')
   }
 
-  const level: G.Level | undefined = tutorial.version.levels.find((l: G.Level) => l.id === position.levelId)
+  const level: G.Level | undefined = tutorial.version.data.levels.find((l: G.Level) => l.id === position.levelId)
 
   if (!level) {
     throw new Error('Level not found in LevelSummaryPageContainer')

web-app/src/services/selectors/position.ts

@@ -5,17 +5,15 @@ import * as tutorial from './tutorial'
 
 export const defaultPosition = () => ({
 	levelId: '',
-	stageId: '',
 	stepId: ''
 })
 
 export const initialPosition = createSelector(
 	tutorial.currentVersion,
 	(version: G.TutorialVersion) => {
 		const position: CR.Position = {
-			levelId: version.levels[0].id,
-			stageId: version.levels[0].stages[0].id,
-			stepId: version.levels[0].stages[0].steps[0].id,
+			levelId: version.data.levels[0].id,
+			stepId: version.data.levels[0].steps[0].id,
 		}
 		return position
 	}

web-app/src/services/selectors/progress.ts

@@ -1,6 +1,5 @@
 export const defaultProgress = () => ({
 	levels: {},
-	stages: {},
 	steps: {},
 	complete: false
 })

web-app/src/services/selectors/tutorial.ts

@@ -23,7 +23,7 @@ export const currentLevel = (context: MachineContext): G.Level => createSelector
 	(version: G.TutorialVersion): G.Level => {
 		// merge in the updated position
 		// sent with the test to ensure consistency
-		const levels: G.Level[] = version.levels
+		const levels: G.Level[] = version.data.levels
 
 		const level: G.Level | undefined = levels.find((l: G.Level) => l.id === context.position.levelId)
 
@@ -33,22 +33,10 @@ export const currentLevel = (context: MachineContext): G.Level => createSelector
 		return level
 	})(context)
 
-export const currentStage = (context: MachineContext): G.Stage => createSelector(
-	currentLevel,
-	(level: G.Level): G.Stage => {
-		const stages: G.Stage[] = level.stages
-		const stage: G.Stage | undefined = stages.find((s: G.Stage) => s.id === context.position.stageId)
-		if (!stage) {
-			throw new Error('No Stage found')
-		}
-		return stage
-	}
-)(context)
-
 export const currentStep = (context: MachineContext): G.Step => createSelector(
-	currentStage,
-	(stage: G.Stage): G.Step => {
-		const steps: G.Step[] = stage.steps
+	currentLevel,
+	(level: G.Level): G.Step => {
+		const steps: G.Step[] = level.steps
 		const step: G.Step | undefined = steps.find((s: G.Step) => s.id === context.position.stepId)
 		if (!step) {
 			throw new Error('No Step found')

web-app/src/services/state/actions/context.ts

@@ -28,7 +28,7 @@ export default {
 			return event.payload.tutorial
 		},
 		progress: (): CR.Progress => {
-			return {levels: {}, stages: {}, steps: {}, complete: false}
+			return {levels: {}, steps: {}, complete: false}
 		}
 	}),
 	initTutorial: assign({
@@ -74,41 +74,20 @@ export default {
 		},
 	}),
 	// @ts-ignore
-	updateStagePosition: assign({
-		position: (context: CR.MachineContext): CR.Position => {
-			const {position} = context
-
-			const level: G.Level = selectors.currentLevel(context)
-			const stages: G.Stage[] = level.stages
-
-			const stageIndex = stages.findIndex((s: G.Stage) => s.id === position.stageId)
-			const stage: G.Stage = stages[stageIndex + 1]
-
-			const nextPosition: CR.Position = {
-				...position,
-				stageId: stage.id,
-				stepId: stage.steps[0].id,
-			}
-
-			return nextPosition
-		},
-	}),
-	// @ts-ignore
 	updateLevelPosition: assign({
 		position: (context: CR.MachineContext): CR.Position => {
 			const {position} = context
 			const version = selectors.currentVersion(context)
 			// merge in the updated position
 			// sent with the test to ensure consistency
-			const levels: G.Level[] = version.levels
+			const levels: G.Level[] = version.data.levels
 
 			const levelIndex = levels.findIndex((l: G.Level) => l.id === position.levelId)
 			const level: G.Level = levels[levelIndex + 1]
 
 			const nextPosition: CR.Position = {
 				levelId: level.id,
-				stageId: level.stages[0].id,
-				stepId: level.stages[0].steps[0].id,
+				stepId: level.steps[0].id,
 			}
 
 			return nextPosition
@@ -128,19 +107,6 @@ export default {
 		},
 	}),
 	// @ts-ignore
-	updateStageProgress: assign({
-		progress: (context: CR.MachineContext, event: CR.MachineEvent): CR.Progress => {
-			// update progress by tracking completed
-			const {progress, position} = context
-
-			const stageId: string = position.stageId
-
-			progress.stages[stageId] = true
-
-			return progress
-		},
-	}),
-	// @ts-ignore
 	updatePosition: assign({
 		position: (context: CR.MachineContext, event: CR.MachineEvent): CR.Progress => {
 			const {position} = event.payload
@@ -152,9 +118,8 @@ export default {
 
 		const version = selectors.currentVersion(context)
 		const level = selectors.currentLevel(context)
-		const stage = selectors.currentStage(context)
 
-		const steps: G.Step[] = stage.steps
+		const steps: G.Step[] = level.steps
 
 		const stepIndex = steps.findIndex((s: G.Step) => s.id === position.stepId)
 		const stepComplete = progress.steps[position.stepId]
@@ -168,39 +133,19 @@ export default {
 			return {type: 'NEXT_STEP', payload: {position: nextPosition}}
 		}
 
-		// has next stage?
-
-		const {stages} = level
-		const stageIndex = stages.findIndex((s: G.Stage) => s.id === position.stageId)
-		const finalStage = (stageIndex > -1 && stageIndex === stages.length - 1)
-		const hasNextStage = (!finalStage)
-
-		// NEXT STAGE
-		if (hasNextStage) {
-			const nextStage = stages[stageIndex + 1]
-			const nextPosition = {
-				levelId: position.levelId,
-				stageId: nextStage.id,
-				stepId: nextStage.steps[0].id,
-			}
-			return {type: 'NEXT_STAGE', payload: {position: nextPosition}}
-		}
-
 		// has next level?
 
-		const {levels} = version
+		const levels = context?.tutorial?.version.data.levels ?? []
 		const levelIndex = levels.findIndex((l: G.Level) => l.id === position.levelId)
 		const finalLevel = (levelIndex > -1 && levelIndex === levels.length - 1)
 		const hasNextLevel = (!finalLevel)
 
 		// NEXT LEVEL
 		if (hasNextLevel) {
 			const nextLevel = levels[levelIndex + 1]
-			const nextStage = nextLevel.stages[0]
 			const nextPosition = {
 				levelId: nextLevel.id,
-				stageId: nextStage.id,
-				stepId: nextStage.steps[0].id,
+				stepId: nextLevel.steps[0].id,
 			}
 			return {type: 'NEXT_LEVEL', payload: {position: nextPosition}}
 		}
@@ -211,9 +156,9 @@ export default {
 	stepNext: send((context: CR.MachineContext): CR.Action => {
 		const {position, progress} = context
 
-		const stage: G.Stage = selectors.currentStage(context)
+		const level: G.Level = selectors.currentLevel(context)
 
-		const {steps} = stage
+		const {steps} = level
 		// TODO: verify not -1
 		const stepIndex = steps.findIndex((s: G.Step) => s.id === position.stepId)
 		const finalStep = stepIndex === steps.length - 1

web-app/src/services/state/machine.ts

@@ -14,10 +14,9 @@ export const machine = Machine<CR.MachineContext, CR.MachineStateSchema, CR.Mach
 		context: {
 			env: {machineId: '', sessionId: '', token: ''},
 			tutorial: null,
-			position: {levelId: '', stageId: '', stepId: ''},
+			position: {levelId: '', stepId: ''},
 			progress: {
 				levels: {},
-				stages: {},
 				steps: {},
 				complete: false
 			}