continue progress

ShMcK · ShMcK · commit a7f15271be73 · 2020-04-18T09:49:27.000-07:00
Signed-off-by: shmck &lt;shawn.j.mckay@gmail.com&gt;
diff --git a/src/actions/setupActions.ts b/src/actions/setupActions.ts
@@ -6,12 +6,6 @@ import openFiles from './utils/openFiles'
 import runCommands from './utils/runCommands'
 import onError from '../services/sentry/onError'
 
-async function wait(ms: number) {
-  return new Promise((resolve) => {
-    setTimeout(resolve, ms)
-  })
-}
-
 interface SetupActions {
   actions: TT.StepActions
   send: (action: T.Action) => void // send messages to client
@@ -35,8 +29,6 @@ export const setupActions = async ({ actions, send, path }: SetupActions): Promi
   // 3. start file watchers
   loadWatchers(watchers || [])
 
-  await wait(1000)
-
   // 4. run command
   await runCommands({ commands: commands || [], send, path }).catch(onError)
 }
diff --git a/src/channel/index.ts b/src/channel/index.ts
@@ -284,12 +284,12 @@ 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({ actions: action.payload, send: this.send })
+        await vscode.commands.executeCommand(COMMANDS.SET_CURRENT_STEP, action.payload.stepId)
+        setupActions({ actions: action.payload.actions, send: this.send })
         return
       // load solution step actions (git commits, commands, open files)
       case 'SOLUTION_ACTIONS':
-        await solutionActions({ actions: action.payload, send: this.send })
+        await solutionActions({ actions: action.payload.actions, send: this.send })
         // run test following solution to update position
         vscode.commands.executeCommand(COMMANDS.RUN_TEST, action.payload.stepId)
         return
@@ -326,13 +326,16 @@ class Channel implements Channel {
 
     switch (actionType) {
       case 'TEST_PASS':
+        logger(`TEST PASS ${action.payload.stepId}`)
         const tutorial = this.context.tutorial.get()
         if (!tutorial) {
           throw new Error('ERROR: Tutorial not found in test run')
         }
         // update local storage stepProgress
-        const progress = this.context.progress.setStepComplete(tutorial, action.payload.stepId)
-        this.context.position.setPositionFromProgress(tutorial, progress)
+        if (action.payload.stepId) {
+          const progress = this.context.progress.setStepComplete(tutorial, action.payload.stepId)
+          this.context.position.setPositionFromProgress(tutorial, progress)
+        }
         saveCommit()
     }
 
diff --git a/web-app/src/services/state/actions/editor.ts b/web-app/src/services/state/actions/editor.ts
@@ -29,14 +29,25 @@ export default (editorSend: any) => ({
   },
   loadLevel(context: CR.MachineContext): void {
     const level: TT.Level = selectors.currentLevel(context)
-    logger('loadStep', level)
+    logger('loadLevel', level)
     if (level.setup) {
       // load step actions
       editorSend({
         type: 'SETUP_ACTIONS',
         payload: {
           actions: level.setup,
-          stepId: level.steps.length ? level.steps[0].id : null,
+        },
+      })
+    }
+    // ensure level step is loaded before first step
+    const firstStep = selectors.currentStep(context)
+    logger('loadFirstStep', firstStep)
+    if (firstStep) {
+      editorSend({
+        type: 'SETUP_ACTIONS',
+        payload: {
+          actions: firstStep.setup,
+          stepId: firstStep.id,
         },
       })
     }
