ShaunSHamilton
diff --git a/‎typings/index.d.ts
Lines changed: 1 addition & 1 deletion b/‎typings/index.d.ts
Lines changed: 1 addition & 1 deletion
diff --git a/‎web-app/src/App.tsx
Lines changed: 4 additions & 1 deletion b/‎web-app/src/App.tsx
Lines changed: 4 additions & 1 deletion
diff --git a/‎web-app/src/Routes.tsx
Lines changed: 34 additions & 36 deletions b/‎web-app/src/Routes.tsx
Lines changed: 34 additions & 36 deletions
diff --git a/‎web-app/src/components/Router/Route.tsx
Lines changed: 0 additions & 8 deletions b/‎web-app/src/components/Router/Route.tsx
Lines changed: 0 additions & 8 deletions
diff --git a/‎web-app/src/components/Router/index.tsx
Lines changed: 41 additions & 74 deletions b/‎web-app/src/components/Router/index.tsx
Lines changed: 41 additions & 74 deletions
diff --git a/‎web-app/src/containers/Tutorial/ContentMenu.tsx renamed to ‎web-app/src/containers/Tutorial/components/ContentMenu.tsx
Lines changed: 1 addition & 1 deletion b/‎web-app/src/containers/Tutorial/ContentMenu.tsx renamed to ‎web-app/src/containers/Tutorial/components/ContentMenu.tsx
Lines changed: 1 addition & 1 deletion
diff --git a/‎web-app/src/containers/Tutorial/components/Hints.tsx
Lines changed: 7 additions & 5 deletions b/‎web-app/src/containers/Tutorial/components/Hints.tsx
Lines changed: 7 additions & 5 deletions
@@ -76,7 +76,6 @@ export interface MachineStateSchema {
     }
     Tutorial: {
       states: {
-        LoadNext: {}
         Level: {
           states: {
             Load: {}
@@ -86,6 +85,7 @@ export interface MachineStateSchema {
             TestFail: {}
             StepNext: {}
             LevelComplete: {}
+            LoadNext: {}
           }
         }
         Completed: {}
 
@@ -2,12 +2,15 @@ import * as React from 'react'
 import { ConfigProvider } from '@alifd/next'
 import enUS from '@alifd/next/lib/locale/en-us'
 import ErrorBoundary from './components/ErrorBoundary'
+import Workspace from './components/Workspace'
 import Routes from './Routes'
 
 const App = () => (
   <ConfigProvider locale={enUS}>
     <ErrorBoundary>
-      <Routes />
+      <Workspace>
+        <Routes />
+      </Workspace>
     </ErrorBoundary>
   </ConfigProvider>
 )
 
@@ -1,54 +1,52 @@
 import * as React from 'react'
-import useRouter from './components/Router'
-import Workspace from './components/Workspace'
+import useStateMachine from './services/state/useStateMachine'
+import { Router, Route } from './components/Router'
 import ErrorView from './components/Error'
 import LoadingPage from './containers/Loading'
 import StartPage from './containers/Start'
 import SelectTutorialPage from './containers/SelectTutorial'
 import CompletedPage from './containers/Tutorial/CompletedPage'
 import TutorialPage from './containers/Tutorial'
 
+/*
+ * NOTE: due to a lack of URLs and a dependency on xstate
+ * we have to implement a custom router here
+ */
 const Routes = () => {
-  const { context, send, Router, Route } = useRouter()
+  const { context, route, send } = useStateMachine()
 
   // TODO: handle only full page errors
   if (context.error) {
-    return (
-      <Workspace>
-        <ErrorView send={send} error={context.error} />
-      </Workspace>
-    )
+    return <ErrorView send={send} error={context.error} />
   }
 
   return (
-    <Workspace>
-      <Router>
-        {/* Setup */}
-        <Route path={['Setup.Startup', 'Setup.ValidateSetup']}>
-          <LoadingPage text="Launching..." processes={context.processes} />
-        </Route>
-        <Route path="Setup.Start">
-          <StartPage send={send} context={context} />
-        </Route>
-        <Route path="Setup.SelectTutorial">
-          <SelectTutorialPage send={send} context={context} />
-        </Route>
-        <Route path={['Setup.SetupNewTutorial', 'Setup.StartTutorial']}>
-          <LoadingPage text="Configuring tutorial..." />
-        </Route>
-        {/* Tutorial */}
-        <Route path={['Tutorial.LoadNext', 'Tutorial.Level.Load']}>
-          <LoadingPage text="Loading Level..." processes={context.processes} />
-        </Route>
-        <Route path="Tutorial.Level">
-          <TutorialPage send={send} context={context} />
-        </Route>
-        {/* Completed */}
-        <Route path="Tutorial.Completed">
-          <CompletedPage context={context} />
-        </Route>
-      </Router>
-    </Workspace>
+    <Router route={route}>
+      {/* Setup */}
+      <Route paths={{ Setup: { Startup: true, ValidateSetup: true } }}>
+        <LoadingPage text="Launching..." processes={context.processes} />
+      </Route>
+      <Route paths={{ Setup: { Start: true } }}>
+        <StartPage send={send} context={context} />
+      </Route>
+      <Route paths={{ Setup: { SelectTutorial: true } }}>
+        <SelectTutorialPage send={send} context={context} />
+      </Route>
+      <Route paths={{ Setup: { SetupNewTutorial: true, StartTutorial: true } }}>
+        <LoadingPage text="Configuring tutorial..." />
+      </Route>
+      {/* Tutorial */}
+      <Route paths={{ Tutorial: { Level: { Load: true } } }}>
+        <LoadingPage text="Loading Level..." processes={context.processes} />
+      </Route>
+      <Route paths={{ Tutorial: { Level: true } }}>
+        <TutorialPage send={send} context={context} />
+      </Route>
+      {/* Completed */}
+      <Route paths={{ Tutorial: { Completed: true } }}>
+        <CompletedPage context={context} />
+      </Route>
+    </Router>
   )
 }
 
 
@@ -1,87 +1,54 @@
 import * as React from 'react'
-import * as T from 'typings'
-import { createMachine } from '../../services/state/machine'
-import { useMachine } from '../../services/xstate-react'
-import Route from './Route'
 import onError from '../../services/sentry/onError'
-import logger from '../../services/logger'
 
-interface Output {
-  context: T.MachineContext
-  send: (action: any) => void
-  Router: any
-  Route: any
+interface RouterProps {
+  children: React.ReactChildren | React.ReactChildren[]
+  route: string
 }
 
-declare let acquireVsCodeApi: any
-
-const editor = acquireVsCodeApi()
-const editorSend = (action: T.Action) => {
-  logger(`TO EXT: "${action.type}"`)
-  return editor.postMessage(action)
-}
-
-// router finds first state match of <Route path='' />
-const useRouter = (): Output => {
-  const [state, send] = useMachine<T.MachineContext, any>(createMachine({ editorSend }))
-
-  const sendWithLog = (action: T.Action): void => {
-    logger(`SEND: ${action.type}`, action)
-    send(action)
-  }
-
-  logger(`STATE: ${JSON.stringify(state.value)}`)
-
-  // event bus listener
-  React.useEffect(() => {
-    const listener = 'message'
-    // propograte channel event to state machine
-    const handler = (event: any) => {
-      // NOTE: must call event.data, cannot destructure. VSCode acts odd
-      const action = event.data
-      // ignore browser events from plugins
-      if (action.source) {
-        return
+// check if a route string (eg. 'a.b.c')
+// matches a paths object ({ a: { b: { c: true }}})
+const matches = (route: string, paths: object): boolean => {
+  const keys: string[] = route.split('.')
+  let current: any = paths || {}
+  // if the key throws, there is no match
+  for (const key of keys) {
+    const next = current[key]
+    if (next) {
+      // exit early if property value is true
+      if (next === true) {
+        return true
       }
-      sendWithLog(action)
-    }
-    window.addEventListener(listener, handler)
-    return () => {
-      window.removeEventListener(listener, handler)
+      current = next
+      continue
+    } else {
+      return false
     }
-  }, [])
+  }
+  return true
+}
 
-  const Router = ({ children }: any) => {
-    const childArray = React.Children.toArray(children)
-    for (const child of childArray) {
-      // match path
-      // @ts-ignore
-      const { path } = child.props
-      let pathMatch
-      if (typeof path === 'string') {
-        pathMatch = state.matches(path)
-      } else if (Array.isArray(path)) {
-        pathMatch = path.some((p) => state.matches(p))
-      } else {
-        throw new Error(`Invalid route path ${JSON.stringify(path)}`)
-      }
-      if (pathMatch) {
-        // @ts-ignore
-        return child.props.children
-      }
+export const Router = ({ children, route }: RouterProps) => {
+  // @ts-ignore may accept string as well as element
+  const childArray: React.ReactElement[] = React.Children.toArray(children)
+  for (const child of childArray) {
+    // match path
+    const { paths } = child.props
+    let pathMatch = matches(route, paths)
+
+    if (pathMatch) {
+      return child.props.children
     }
-    const message = `No Route matches for ${JSON.stringify(state)}`
-    onError(new Error(message))
-    console.warn(message)
-    return null
   }
+  const message = `No Route matches for "${JSON.stringify(route)}"`
+  onError(new Error(message))
+  console.warn(message)
+  return null
+}
 
-  return {
-    context: state.context,
-    send: sendWithLog,
-    Router,
-    Route,
-  }
+interface RouteProps {
+  children: any
+  paths: object
 }
 
-export default useRouter
+export const Route = ({ children }: RouteProps) => children
@@ -2,7 +2,7 @@ import * as React from 'react'
 import * as T from 'typings'
 import * as TT from 'typings/tutorial'
 import { Menu } from '@alifd/next'
-import Icon from '../../components/Icon'
+import Icon from '../../../components/Icon'
 
 interface Props {
   tutorial: TT.Tutorial
 
@@ -19,22 +19,24 @@ const styles = {
 
 interface Props {
   hints: string[]
+  hintIndex: number
+  setHintIndex(value: number): void
 }
 
 const Hints = (props: Props) => {
-  const [hintIndex, setHintIndex] = React.useState(-1)
-  const isFinalHint = props.hints.length - 1 === hintIndex
+  const isFinalHint = props.hints.length - 1 === props.hintIndex
   const nextHint = () => {
-    if (!isFinalHint) {
-      setHintIndex((currentHintIndex) => currentHintIndex + 1)
+    if (isFinalHint) {
+      return
     }
+    props.setHintIndex(props.hintIndex + 1)
   }
   return (
     <div style={styles.hints}>
       <div style={styles.hintList}>
         {/* only show revealed hints */}
         {props.hints.map((h, i) => {
-          return i <= hintIndex ? (
+          return i <= props.hintIndex ? (
             <div key={i} style={styles.hint}>
               <Markdown>{h}</Markdown>
             </div>