fix bug with continue loading init commits

ShMcK · ShMcK · commit 4044c7f8229e · 2020-08-08T16:16:09.000-07:00
Signed-off-by: shmck &lt;shawn.j.mckay@gmail.com&gt;
diff --git a/src/actions/onStartup.ts b/src/actions/onStartup.ts
@@ -33,9 +33,9 @@ const onStartup = async (context: Context): Promise<void> => {
     // continue from tutorial from local storage
     const tutorial: TT.Tutorial | null = context.tutorial.get()
 
-    // no stored tutorial, must start new tutorial
+    // NEW: no stored tutorial, must start new tutorial
     if (!tutorial || !tutorial.id) {
-      if (TUTORIAL_URL) {
+      if (!!TUTORIAL_URL) {
         // NEW_FROM_URL
         try {
           const tutorialRes = await fetch(TUTORIAL_URL)
@@ -47,7 +47,7 @@ const onStartup = async (context: Context): Promise<void> => {
           console.log(`Failed to load tutorial from url ${TUTORIAL_URL} with error "${e.message}"`)
         }
       }
-      // NEW
+      // NEW from start click
       send({ type: 'START_NEW_TUTORIAL', payload: { env } })
       return
     }
diff --git a/src/actions/onTutorialConfigContinue.ts b/src/actions/onTutorialConfigContinue.ts
@@ -4,19 +4,21 @@ import * as TT from 'typings/tutorial'
 import Context from '../services/context/context'
 import tutorialConfig from './utils/tutorialConfig'
 import { COMMANDS, send } from '../commands'
+import logger from '../services/logger'
 
 const onTutorialConfigContinue = async (action: T.Action, context: Context): Promise<void> => {
+  logger('onTutorialConfigContinue', action)
   try {
-    const tutorialContinue: TT.Tutorial | null = context.tutorial.get()
-    if (!tutorialContinue) {
+    const tutorialToContinue: TT.Tutorial | null = context.tutorial.get()
+    if (!tutorialToContinue) {
       throw new Error('Invalid tutorial to continue')
     }
+    // update the current stepId on startup
+    vscode.commands.executeCommand(COMMANDS.SET_CURRENT_POSITION, action.payload.position)
     await tutorialConfig({
-      data: tutorialContinue,
+      data: tutorialToContinue,
       alreadyConfigured: true,
     })
-    // update the current stepId on startup
-    vscode.commands.executeCommand(COMMANDS.SET_CURRENT_POSITION, action.payload.position)
   } catch (e) {
     const error = {
       type: 'UnknownError',
diff --git a/src/actions/utils/tutorialConfig.ts b/src/actions/utils/tutorialConfig.ts
@@ -52,7 +52,7 @@ const tutorialConfig = async ({ data, alreadyConfigured }: TutorialConfigParams)
     }
   }
 
-  await vscode.commands.executeCommand(COMMANDS.CONFIG_TEST_RUNNER, data)
+  await vscode.commands.executeCommand(COMMANDS.CONFIG_TEST_RUNNER, { data, alreadyConfigured })
 
   if (!DISABLE_RUN_ON_SAVE) {
     // verify if file test should run based on document saved
diff --git a/src/commands.ts b/src/commands.ts
@@ -59,10 +59,18 @@ export const createCommands = ({ extensionPath, workspaceState }: CreateCommandP
         sendToClient = webview.send
       }
     },
-    [COMMANDS.CONFIG_TEST_RUNNER]: async (data: TT.Tutorial) => {
-      const setupActions = data.config.setup
-      if (setupActions) {
-        hooks.onInit(setupActions)
+    [COMMANDS.CONFIG_TEST_RUNNER]: async ({
+      data,
+      alreadyConfigured,
+    }: {
+      data: TT.Tutorial
+      alreadyConfigured: boolean
+    }) => {
+      if (!alreadyConfigured) {
+        const setupActions = data.config.setup
+        if (setupActions) {
+          hooks.onInit(setupActions)
+        }
       }
       testRunner = createTestRunner(data, {
         onSuccess: (position: T.Position) => {
diff --git a/src/extension.ts b/src/extension.ts
@@ -2,7 +2,9 @@ import * as vscode from 'vscode'
 import { createCommands } from './commands'
 import * as telemetry from './services/telemetry'
 
-let onDeactivate = () => {}
+let onDeactivate = () => {
+  /* placeholder for unsubscribing fn */
+}
 
 // activate run on vscode extension initialization
 export const activate = (vscodeExt: vscode.ExtensionContext): void => {
diff --git a/web-app/src/services/state/actions/context.ts b/web-app/src/services/state/actions/context.ts
@@ -15,16 +15,14 @@ export const setStart = assign({
   },
 })
 
-export const loadContinuedTutorial = assign((context: T.MachineContext, event: T.MachineEvent): any => {
-  return {
-    env: {
-      ...context.env,
-      ...event.payload.env,
-    },
-    tutorial: event.payload.tutorial,
-    position: event.payload.position,
-  }
-})
+export const loadContinuedTutorial = assign((context: T.MachineContext, event: T.MachineEvent): any => ({
+  env: {
+    ...context.env,
+    ...event.payload.env,
+  },
+  tutorial: event.payload.tutorial,
+  position: event.payload.position,
+}))
 
 export const initPosition = assign({
   position: (context: T.MachineContext, event: T.MachineEvent): any => {
