move summary & configure into SelectTutorial (broken)

Author: ShMcK

typings/index.d.ts

@@ -66,18 +66,19 @@ export interface SelectTutorialMachineStateSchema {
     Authenticate: {}
     NewOrContinue: {}
     SelectTutorial: {}
+    Summary: {}
+    Configure: {}
+    Launch: {}
     ContinueTutorial: {}
   }
 }
 
 export interface PlayTutorialMachineStateSchema {
   states: {
-    Initialize: {}
-    Summary: {}
     LoadNext: {}
     Level: {
       states: {
-        Load: {}
+        Loading: {}
         Normal: {}
         TestRunning: {}
         TestPass: {}

web-app/src/services/state/playTutorial/actions/context.ts

@@ -5,12 +5,6 @@ import * as selectors from '../../../selectors'
 import onError from '../../../sentry/onError'
 
 export default {
-  initTutorial: assign({
-    // loads complete tutorial
-    tutorial: (context: CR.PlayMachineContext, event: CR.MachineEvent): any => {
-      return event.payload.tutorial
-    },
-  }),
   // @ts-ignore
   initPosition: assign({
     position: (context: CR.PlayMachineContext, event: CR.MachineEvent): CR.Position => {
@@ -174,19 +168,6 @@ export default {
       }
     },
   ),
-  reset: assign({
-    tutorial() {
-      return null
-    },
-    progress(): CR.Progress {
-      const progress: CR.Progress = selectors.defaultProgress()
-      return progress
-    },
-    position(): CR.Position {
-      const position: CR.Position = selectors.defaultPosition()
-      return position
-    },
-  }),
   // @ts-ignore
   setError: assign({
     error: (context: CR.PlayMachineContext, event: CR.MachineEvent): string | null => {

web-app/src/services/state/playTutorial/actions/editor.ts

@@ -16,7 +16,7 @@ interface TutorialDataVariables {
 }
 
 export default {
-  initializeTutorial(context: CR.PlayMachineContext, event: CR.MachineEvent) {
+  configureTutorial(context: CR.PlayMachineContext, event: CR.MachineEvent) {
     // setup test runner and git
     if (!context.tutorial) {
       const error = new Error('Tutorial not available to load')

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

@@ -3,8 +3,11 @@ import { Machine, MachineOptions } from 'xstate'
 import actions from './actions'
 
 const options: MachineOptions<CR.PlayMachineContext, CR.MachineEvent> = {
-  // @ts-ignore
+  activities: {},
   actions,
+  guards: {},
+  services: {},
+  delays: {},
 }
 
 export const playTutorialMachine = Machine<CR.PlayMachineContext, CR.PlayTutorialMachineStateSchema, CR.MachineEvent>(
@@ -22,7 +25,8 @@ export const playTutorialMachine = Machine<CR.PlayMachineContext, CR.PlayTutoria
       processes: [],
     },
     id: 'tutorial',
-    initial: 'Initialize',
+    initial: 'Level',
+    onEntry: ['initPosition', 'initTutorial'],
     on: {
       // track commands
       COMMAND_START: {
@@ -39,22 +43,6 @@ export const playTutorialMachine = Machine<CR.PlayMachineContext, CR.PlayTutoria
       },
     },
     states: {
-      // TODO move Initialize into New Tutorial setup
-      Initialize: {
-        onEntry: ['initializeTutorial'],
-        on: {
-          TUTORIAL_CONFIGURED: 'Summary',
-          // TUTORIAL_CONFIG_ERROR: 'Start' // TODO should handle error
-        },
-      },
-      Summary: {
-        on: {
-          LOAD_TUTORIAL: {
-            target: 'Level',
-            actions: ['initPosition', 'initTutorial'],
-          },
-        },
-      },
       LoadNext: {
         id: 'tutorial-load-next',
         onEntry: ['loadNext'],
@@ -64,16 +52,17 @@ export const playTutorialMachine = Machine<CR.PlayMachineContext, CR.PlayTutoria
             actions: ['updatePosition'],
           },
           NEXT_LEVEL: {
-            target: 'Level', // TODO should return to levels summary page
+            target: 'Level',
             actions: ['updatePosition'],
           },
           COMPLETED: '#completed-tutorial',
         },
       },
       Level: {
-        initial: 'Load',
+        id: 'level',
+        initial: 'Loading',
         states: {
-          Load: {
+          Loading: {
             onEntry: ['loadLevel', 'loadStep'],
             after: {
               0: 'Normal',
@@ -143,7 +132,6 @@ export const playTutorialMachine = Machine<CR.PlayMachineContext, CR.PlayTutoria
         on: {
           SELECT_TUTORIAL: {
             type: 'final',
-            actions: ['reset'],
           },
         },
       },

web-app/src/services/state/selectTutorial/actions/context.ts

@@ -32,6 +32,12 @@ export default {
       return { levels: {}, steps: {}, complete: false }
     },
   }),
+  initTutorial: assign({
+    // loads complete tutorial
+    tutorial: (context: CR.PlayMachineContext, event: CR.MachineEvent): any => {
+      return event.payload.tutorial
+    },
+  }),
   // @ts-ignore
   setError: assign({
     error: (context: CR.MachineContext, event: CR.MachineEvent): string | null => {

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

@@ -3,8 +3,11 @@ import { Machine, MachineOptions } from 'xstate'
 import actions from './actions'
 
 const options: MachineOptions<CR.MachineContext, CR.MachineEvent> = {
-  // @ts-ignore
+  activities: {},
   actions,
+  guards: {},
+  services: {},
+  delays: {},
 }
 
 export const selectTutorialMachine = Machine<CR.MachineContext, CR.SelectTutorialMachineStateSchema, CR.MachineEvent>(
@@ -42,12 +45,31 @@ export const selectTutorialMachine = Machine<CR.MachineContext, CR.SelectTutoria
         },
       },
       SelectTutorial: {
-        onEntry: ['clearStorage'],
-        id: 'start-new-tutorial',
         on: {
-          TUTORIAL_START: {
+          SELECTED: 'Summary',
+        },
+      },
+      Summary: {
+        on: {
+          BACK: 'SelectTutorial',
+          LOAD_TUTORIAL: {
+            target: 'Configure',
+            actions: ['newTutorial', 'initTutorial'],
+          },
+        },
+      },
+      Configure: {
+        onEntry: ['clearStorage, configureTutorial'],
+        on: {
+          TUTORIAL_CONFIGURED: 'Launch',
+          // TUTORIAL_CONFIG_ERROR: 'Start' // TODO should handle error
+        },
+      },
+      Launch: {
+        // awaits tutorial configuration
+        on: {
+          LOAD_TUTORIAL: {
             type: 'final',
-            actions: ['newTutorial'],
           },
         },
       },