replace load-current with load-next

Author: ShMcK

src/state/guards/index.ts

@@ -5,7 +5,8 @@ export default {
     const { data, position, progress } = context
     const steps = data.stages[position.stageId].stepList
     // isn't final step yet
-    const hasNext = !!position.stepId && (steps[steps.length - 1] !== position.stepId) || !progress.stages[position.stageId]
+    const stageIncomplete = !progress.stages[position.stageId]
+    const hasNext = stageIncomplete && (!!position.stepId && (steps[steps.length - 1] !== position.stepId))
     console.log('GUARD: hasNextStep', hasNext)
     return hasNext
   },

src/state/machine.ts

@@ -47,7 +47,7 @@ export const machine = (dispatch: CR.EditorDispatch) =>
             ContinueTutorial: {
               onEntry: ['tutorialContinue'],
               on: {
-                TUTORIAL_START: '#tutorial-load-current',
+                TUTORIAL_START: '#tutorial-load-next',
               },
             },
           },
@@ -57,7 +57,7 @@ export const machine = (dispatch: CR.EditorDispatch) =>
           initial: 'Initialize',
           onEntry: ['tutorialSetup'],
           on: {
-            WEBVIEW_INITIALIZED: '#tutorial-load-current'
+            WEBVIEW_INITIALIZED: '#tutorial-load-next'
           },
           states: {
             Initialize: {
@@ -66,28 +66,24 @@ export const machine = (dispatch: CR.EditorDispatch) =>
                 0: 'Summary',
               },
             },
-            LoadCurrent: {
-              id: 'tutorial-load-current',
-              // TODO: verify current is not complete
-              after: {
-                0: 'Stage',
-              },
-            },
             LoadNext: {
               id: 'tutorial-load-next',
               after: {
-                0: [
-                  {
-                    target: 'Stage',
-                    cond: 'hasNextStage',
-                  },
-                  {
-                    target: 'Level',
-                    cond: 'hasNextLevel',
-                  },
-                  {
-                    target: '#completed-tutorial',
-                  },
+                0: [{
+                  target: 'Stage',
+                  cond: 'hasNextStep',
+                },
+                {
+                  target: 'Stage',
+                  cond: 'hasNextStage',
+                },
+                {
+                  target: 'Level',
+                  cond: 'hasNextLevel',
+                },
+                {
+                  target: '#completed-tutorial',
+                },
                 ],
               },
             },

typings/index.d.ts

@@ -148,7 +148,6 @@ export interface MachineStateSchema {
       states: {
         Initialize: {}
         Summary: {}
-        LoadCurrent: {}
         LoadNext: {}
         Level: {}
         Stage: {