add empty workspace check

ShMcK · ShMcK · commit 5858c933e967 · 2020-03-21T16:35:02.000-07:00
diff --git a/src/channel/index.ts b/src/channel/index.ts
@@ -8,6 +8,7 @@ import tutorialConfig from '../actions/tutorialConfig'
 import { COMMANDS } from '../editor/commands'
 import logger from '../services/logger'
 import Context from './context'
+import { openWorkspace, checkWorkspaceEmpty } from '../services/workspace'
 
 interface Channel {
   receive(action: T.Action): Promise<void>
@@ -108,6 +109,15 @@ class Channel implements Channel {
         // update the current stepId on startup
         vscode.commands.executeCommand(COMMANDS.SET_CURRENT_STEP, action.payload)
         return
+      case 'EDITOR_CHECK_WORKSPACE':
+        const isEmptyWorkspace = await checkWorkspaceEmpty(this.workspaceRoot.uri.path)
+        if (isEmptyWorkspace) {
+          this.send({ type: 'IS_EMPTY_WORKSPACE' })
+        } else {
+          openWorkspace()
+          this.send({ type: 'REQUEST_WORKSPACE' })
+        }
+        return
       // load step actions (git commits, commands, open files)
       case 'SETUP_ACTIONS':
         await vscode.commands.executeCommand(COMMANDS.SET_CURRENT_STEP, action.payload)
diff --git a/src/services/testRunner/index.ts b/src/services/testRunner/index.ts
@@ -1,5 +1,5 @@
-import node from '../../services/node'
-import logger from '../../services/logger'
+import node from '../node'
+import logger from '../logger'
 import parser from './parser'
 import { debounce, throttle } from './throttle'
 import onError from '../sentry/onError'
diff --git a/src/services/workspace/index.ts b/src/services/workspace/index.ts
@@ -0,0 +1,16 @@
+import * as vscode from 'vscode'
+import * as fs from 'fs'
+
+export const openWorkspace = () => {
+  vscode.commands.executeCommand('vscode.openFolder')
+}
+
+export const checkWorkspaceEmpty = async (dirname: string) => {
+  let files
+  try {
+    files = await fs.promises.readdir(dirname)
+  } catch (error) {
+    throw new Error('Failed to check workspace')
+  }
+  return files.length === 0
+}
diff --git a/typings/index.d.ts b/typings/index.d.ts
@@ -73,6 +73,8 @@ export interface MachineStateSchema {
         Error: {}
         LoadStoredTutorial: {}
         Start: {}
+        CheckEmptyWorkspace: {}
+        RequestEmptyWorkspace: {}
         SelectTutorial: {}
         LoadTutorialSummary: {}
         Summary: {}
diff --git a/web-app/src/Routes.tsx b/web-app/src/Routes.tsx
@@ -14,7 +14,15 @@ const Routes = () => {
     <Workspace>
       <Router>
         {/* Setup */}
-        <Route path={['Setup.Startup', 'Setup.Authenticate', 'Setup.LoadStoredTutorial']}>
+        <Route
+          path={[
+            'Setup.Startup',
+            'Setup.Authenticate',
+            'Setup.LoadStoredTutorial',
+            'Setup.CheckEmptyWorkspace',
+            'Setup.RequestEmptyWorkspace',
+          ]}
+        >
           <LoadingPage text="Launching..." context={context} />
         </Route>
         <Route path="Setup.Start">
diff --git a/web-app/src/services/state/actions/editor.ts b/web-app/src/services/state/actions/editor.ts
@@ -70,4 +70,13 @@ export default (editorSend: any) => ({
   clearStorage(): void {
     editorSend({ type: 'TUTORIAL_CLEAR' })
   },
+  checkEmptyWorkspace() {
+    editorSend({
+      type: 'EDITOR_CHECK_WORKSPACE',
+    })
+  },
+  requestEmptyWorkspace() {
+    // TODO
+    console.log('request empty workspace')
+  },
 })
diff --git a/web-app/src/services/state/machine.ts b/web-app/src/services/state/machine.ts
@@ -68,13 +68,26 @@ export const createMachine = (options: any) => {
             },
             Start: {
               on: {
-                NEW_TUTORIAL: 'SelectTutorial',
+                NEW_TUTORIAL: 'CheckEmptyWorkspace',
                 CONTINUE_TUTORIAL: {
                   target: '#tutorial-level',
                   actions: ['continueConfig'],
                 },
               },
             },
+            CheckEmptyWorkspace: {
+              onEntry: ['checkEmptyWorkspace'],
+              on: {
+                REQUEST_WORKSPACE: 'RequestEmptyWorkspace',
+                IS_EMPTY_WORKSPACE: 'SelectTutorial',
+              },
+            },
+            RequestEmptyWorkspace: {
+              onEntry: ['requestWorkspaceSelection'],
+              on: {
+                WORKSPACE_LOADED: 'CheckEmptyWorkspace',
+              },
+            },
             SelectTutorial: {
               onEntry: ['clearStorage'],
               id: 'select-new-tutorial',
