setup continue path

Author: ShMcK

src/editor/commands/index.ts

@@ -9,7 +9,6 @@ import tutorial from '../../state/context/tutorials/basic'
 
 const COMMANDS = {
     START: 'coderoad.start',
-    NEW_OR_CONTINUE: 'coderoad.new_or_continue',
     TUTORIAL_LAUNCH: 'coderoad.tutorial_launch',
     OPEN_WEBVIEW: 'coderoad.open_webview',
     SEND_STATE: 'coderoad.send_state',
@@ -45,23 +44,8 @@ export const createCommands = ({ context, machine, storage, git, position }: Cre
     [COMMANDS.OPEN_WEBVIEW]: (column: number = vscode.ViewColumn.One) => {
         webview.createOrShow(column);
     },
-    // launch with continue or new
-    [COMMANDS.NEW_OR_CONTINUE]: async () => {
-        // verify that the user has a tutorial & progress
-        // verify git is setup with a coderoad remote
-        const [tutorial, progress, hasGit, hasGitRemote] = await Promise.all([
-            storage.getTutorial(),
-            storage.getProgress(),
-            git.gitVersion(),
-            git.gitCheckRemoteExists(),
-        ])
-        const canContinue = !!(tutorial && progress && hasGit && hasGitRemote)
-        console.log('canContinue', canContinue)
-        // if a tutorial exists, 'CONTINUE'
-        // otherwise start from 'NEW'
-        machine.send(canContinue ? 'CONTINUE' : 'NEW')
-    },
     // launch a new tutorial
+    // NOTE: may be better to move into action as logic is primarily non-vscode
     [COMMANDS.TUTORIAL_LAUNCH]: async () => {
         console.log('launch tutorial')
 

src/state/actions/index.ts

@@ -1,6 +1,10 @@
 import { assign } from 'xstate'
+// NOTE: codesmell - importing machine
+import { machine } from '../../extension'
 import * as CR from 'typings'
 import * as vscode from 'vscode'
+import * as storage from '../../services/storage'
+import * as git from '../../services/git'
 
 let initialTutorial: CR.Tutorial | undefined
 let initialProgress: CR.Progress = {
@@ -15,8 +19,23 @@ export default {
         console.log('execute coderoad.open_webview')
         vscode.commands.executeCommand('coderoad.open_webview')
     },
-    newOrContinue() {
-        vscode.commands.executeCommand('coderoad.new_or_continue')
+    async newOrContinue() {
+        // verify that the user has a tutorial & progress
+        // verify git is setup with a coderoad remote
+        const [tutorial, progress, hasGit, hasGitRemote] = await Promise.all([
+            storage.getTutorial(),
+            storage.getProgress(),
+            git.gitVersion(),
+            git.gitCheckRemoteExists(),
+        ])
+        const canContinue = !!(tutorial && progress && hasGit && hasGitRemote)
+
+        if (canContinue) {
+            initialTutorial = tutorial
+            initialProgress = progress
+        }
+
+        machine.send(canContinue ? 'CONTINUE' : 'NEW')
     },
     tutorialLaunch() {
         vscode.commands.executeCommand('coderoad.tutorial_launch')

src/state/machine.ts

@@ -49,7 +49,7 @@ export const machine = Machine<
 
                     },
                     ContinueTutorial: {
-                        onEntry: 'tutorialContinue',
+                        onEntry: ['tutorialContinue'],
                         on: {
                             TUTORIAL_START: {
                                 target: 'Tutorial.LoadNext',

web-app/src/Routes.tsx

@@ -15,15 +15,15 @@ const Routes = ({ state }: Props) => {
     return (
       <div>
         <Cond state={state} path="SelectTutorial.Startup">
-          <div style={{ backgroundColor: 'red' }}>
+          <div>
             <h3>Starting...</h3>
           </div>
         </Cond>
         <Cond state={state} path="SelectTutorial.NewTutorial">
           <NewPage />
         </Cond>
         <Cond state={state} path="SelectTutorial.ContinueTutorial">
-          <ContinuePage />
+            <ContinuePage />
         </Cond>
         <Cond state={state} path="Tutorial">
           <TutorialPage />