continue progress

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

Author: ShMcK

src/channel/index.ts

@@ -204,7 +204,7 @@ class Channel implements Channel {
             alreadyConfigured: true,
           })
           // update the current stepId on startup
-          vscode.commands.executeCommand(COMMANDS.SET_CURRENT_STEP, action.payload)
+          vscode.commands.executeCommand(COMMANDS.SET_CURRENT_STEP, action.payload.stepId)
           return
         } catch (e) {
           const error = {
@@ -266,14 +266,14 @@ class Channel implements Channel {
         return
       // load step actions (git commits, commands, open files)
       case 'SETUP_ACTIONS':
-        await vscode.commands.executeCommand(COMMANDS.SET_CURRENT_STEP, action.payload)
-        setupActions(action.payload, this.send)
+        await vscode.commands.executeCommand(COMMANDS.SET_CURRENT_STEP, action.payload.stepId)
+        setupActions(action.payload.actions, this.send)
         return
       // load solution step actions (git commits, commands, open files)
       case 'SOLUTION_ACTIONS':
-        await solutionActions(action.payload, this.send)
+        await solutionActions(action.payload.actions, this.send)
         // run test following solution to update position
-        vscode.commands.executeCommand(COMMANDS.RUN_TEST, action.payload)
+        vscode.commands.executeCommand(COMMANDS.RUN_TEST, action.payload.stepId)
         return
 
       default:

src/editor/commands.ts

@@ -19,7 +19,7 @@ interface CreateCommandProps {
 export const createCommands = ({ extensionPath, workspaceState }: CreateCommandProps) => {
   // React panel webview
   let webview: any
-  let currentStepId = ''
+  let currentStepId: string | null = ''
   let testRunner: any
 
   return {
@@ -67,13 +67,13 @@ export const createCommands = ({ extensionPath, workspaceState }: CreateCommandP
         },
       })
     },
-    [COMMANDS.SET_CURRENT_STEP]: ({ stepId }: Payload) => {
+    [COMMANDS.SET_CURRENT_STEP]: (stepId: string | null) => {
       // set from last setup stepAction
       currentStepId = stepId
     },
-    [COMMANDS.RUN_TEST]: (current: Payload | undefined, onSuccess: () => void) => {
+    [COMMANDS.RUN_TEST]: (stepId: string | null | undefined, onSuccess: () => void) => {
       // use stepId from client, or last set stepId
-      const payload: Payload = { stepId: current && current.stepId.length ? current.stepId : currentStepId }
+      const payload: Payload = { stepId: stepId ?? null }
       testRunner(payload, onSuccess)
     },
   }

src/services/testRunner/index.ts

@@ -7,7 +7,7 @@ import { clearOutput, displayOutput } from './output'
 import { formatFailOutput } from './formatOutput'
 
 export interface Payload {
-  stepId: string
+  stepId: string | null
 }
 
 interface Callbacks {

web-app/src/services/logger/index.ts

@@ -1,6 +1,6 @@
 import { LOG, VERSION, NODE_ENV } from '../../environment'
 
-export type Log = string | object
+export type Log = string | object | null
 
 const logger = (...messages: Log[]): void => {
   if (!LOG) {

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

@@ -230,7 +230,7 @@ const contextActions: ActionFunctionMap<T.MachineContext, T.MachineEvent> = {
     error: (): any => null,
   }),
   // @ts-ignore
-  checkEmptySteps: send((context: T.MachineContext) => {
+  checkLevelCompleted: send((context: T.MachineContext) => {
     // no step id indicates no steps to complete
     return {
       type: context.position.stepId === null ? 'START_COMPLETED_LEVEL' : 'START_LEVEL',

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

@@ -1,6 +1,7 @@
 import * as CR from 'typings'
 import * as TT from 'typings/tutorial'
 import * as selectors from '../../selectors'
+import logger from 'services/logger'
 
 export default (editorSend: any) => ({
   startup(): void {
@@ -28,23 +29,28 @@ export default (editorSend: any) => ({
   },
   loadLevel(context: CR.MachineContext): void {
     const level: TT.Level = selectors.currentLevel(context)
+    logger('loadStep', level)
     if (level.setup) {
       // load step actions
       editorSend({
         type: 'SETUP_ACTIONS',
-        payload: level.setup,
+        payload: {
+          actions: level.setup,
+          stepId: level.steps.length ? level.steps[0].id : null,
+        },
       })
     }
   },
   loadStep(context: CR.MachineContext): void {
     const step: TT.Step | null = selectors.currentStep(context)
+    logger('loadStep', step)
     if (step && step.setup) {
       // load step actions
       editorSend({
         type: 'SETUP_ACTIONS',
         payload: {
+          actions: step.setup,
           stepId: step.id,
-          ...step.setup,
         },
       })
     }

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

@@ -157,7 +157,7 @@ export const createMachine = (options: any) => {
               initial: 'Load',
               states: {
                 Load: {
-                  onEntry: ['loadLevel', 'loadStep', 'checkEmptySteps'],
+                  onEntry: ['loadLevel', 'checkLevelCompleted'],
                   on: {
                     START_LEVEL: 'Normal',
                     START_COMPLETED_LEVEL: 'LevelComplete',