move init & summary into start

Author: ShMcK

typings/index.d.ts

@@ -66,15 +66,14 @@ export interface MachineStateSchema {
         Error: {}
         NewOrContinue: {}
         SelectTutorial: {}
+        LoadTutorial: {}
+        Summary: {}
         ContinueTutorial: {}
       }
     }
     Tutorial: {
       states: {
-        Initialize: {}
-        Summary: {}
         LoadNext: {}
-        Error: {}
         Level: {
           states: {
             Load: {}

web-app/src/Routes.tsx

@@ -11,13 +11,15 @@ import LevelSummaryPage from './containers/Tutorial/LevelPage'
 
 const Routes = () => {
   const { context, send, Router, Route } = useRouter()
-  // TODO refactor for typescript to understand send & context passed into React.cloneElement's
   return (
     <Workspace>
       <Router>
         <Route path={['Start.Startup', 'Start.Authenticate', 'Start.NewOrContinue']}>
           <LoadingPage text="Launching..." context={context} />
         </Route>
+        <Route path="Start.Initialize">
+          <LoadingPage text="Initializing..." context={context} />
+        </Route>
         <Route path={'Start.Error'}>
           <div>Something went wrong wrong</div>
         </Route>
@@ -27,17 +29,11 @@ const Routes = () => {
         <Route path="Start.ContinueTutorial">
           <ContinuePage send={send} context={context} />
         </Route>
-        <Route path={'Tutorial.Error'}>
-          <div>Something went wrong wrong</div>
-        </Route>
-        <Route path="Tutorial.Initialize">
-          <LoadingPage text="Initializing..." context={context} />
+        <Route path="Start.Summary">
+          <OverviewPage send={send} context={context} />
         </Route>
         <Route path="Tutorial.LoadNext">
-          <LoadingPage text="Loading..." context={context} />
-        </Route>
-        <Route path="Tutorial.Summary">
-          <OverviewPage send={send} context={context} />
+          <LoadingPage text="Loading Level..." context={context} />
         </Route>
         <Route path="Tutorial.Level">
           <LevelSummaryPage send={send} context={context} />

web-app/src/components/Router/index.tsx

@@ -39,6 +39,7 @@ const useRouter = () => {
     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') {

web-app/src/services/state/machine.ts

@@ -67,21 +67,46 @@ export const createMachine = (options: any) => {
                   target: 'ContinueTutorial',
                   actions: ['continueTutorial'],
                 },
-                NEW_TUTORIAL: {
-                  target: 'SelectTutorial',
-                },
+                NEW_TUTORIAL: 'SelectTutorial',
               },
             },
             SelectTutorial: {
               onEntry: ['clearStorage'],
               id: 'start-new-tutorial',
               on: {
                 TUTORIAL_START: {
-                  target: '#tutorial',
+                  target: 'LoadTutorial',
                   actions: ['newTutorial'],
                 },
               },
             },
+            // TODO move Initialize into New Tutorial setup
+            LoadTutorial: {
+              invoke: {
+                src: services.loadTutorial,
+                onDone: {
+                  target: 'Summary',
+                  actions: assign({
+                    tutorial: (context, event) => event.data,
+                  }),
+                },
+                onError: {
+                  target: 'Error',
+                  actions: assign({
+                    error: (context, event) => event.data,
+                  }),
+                },
+              },
+            },
+            Summary: {
+              on: {
+                BACK: 'SelectTutorial',
+                LOAD_TUTORIAL: {
+                  target: '#tutorial',
+                  actions: ['initPosition', 'initTutorial'],
+                },
+              },
+            },
             ContinueTutorial: {
               on: {
                 TUTORIAL_START: {
@@ -95,7 +120,7 @@ export const createMachine = (options: any) => {
         },
         Tutorial: {
           id: 'tutorial',
-          initial: 'Initialize',
+          initial: 'LoadNext',
           on: {
             // track commands
             COMMAND_START: {
@@ -112,33 +137,6 @@ export const createMachine = (options: any) => {
             },
           },
           states: {
-            // TODO move Initialize into New Tutorial setup
-            Initialize: {
-              invoke: {
-                src: services.initialize,
-                onDone: {
-                  target: 'Summary',
-                  actions: assign({
-                    tutorial: (context, event) => event.data,
-                  }),
-                },
-                onError: {
-                  target: 'Error',
-                  actions: assign({
-                    error: (context, event) => event.data,
-                  }),
-                },
-              },
-            },
-            Error: {},
-            Summary: {
-              on: {
-                LOAD_TUTORIAL: {
-                  target: 'Level',
-                  actions: ['initPosition', 'initTutorial'],
-                },
-              },
-            },
             LoadNext: {
               id: 'tutorial-load-next',
               onEntry: ['loadNext'],

web-app/src/services/state/services/index.ts

@@ -1,2 +1,2 @@
 export { authenticate } from './authenticate'
-export { initialize } from './initialize'
+export { loadTutorial } from './loadTutorial'

web-app/src/services/state/services/initialize.ts renamed to web-app/src/services/state/services/loadTutorial.ts

@@ -13,7 +13,7 @@ interface TutorialDataVariables {
   // version: string
 }
 
-export async function initialize(context: CR.MachineContext): Promise<any> {
+export async function loadTutorial(context: CR.MachineContext): Promise<any> {
   // setup test runner and git
   if (!context.tutorial) {
     const error = new Error('Tutorial not available to load')