Merge pull request #8 from ShMcK/fix/workflow

Fix/workflow

Author: ShMcK

src/editor/ReactWebView.ts

@@ -31,7 +31,7 @@ class ReactWebView {
         console.log('webview loaded')
     }
 
-    public async createOrShow(column: number): Promise<void> {
+    public createOrShow(column: number): void {
         // If we already have a panel, show it.
         // Otherwise, create a new panel.
         if (this.panel && this.panel.webview) {
@@ -40,7 +40,6 @@ class ReactWebView {
         } else {
             console.log('make new panel')
             this.panel = this.createWebviewPanel(column)
-
         }
     }
 

src/editor/commands/index.ts

@@ -43,6 +43,9 @@ export const createCommands = ({ context, machine, storage, git, position }: Cre
     // open React webview
     [COMMANDS.OPEN_WEBVIEW]: (column: number = vscode.ViewColumn.One) => {
         webview.createOrShow(column);
+        setTimeout(() => {
+            machine.send('WEBVIEW_INITIALIZED')
+        }, 2000)
     },
     // launch a new tutorial
     // NOTE: may be better to move into action as logic is primarily non-vscode

src/state/actions/index.ts

@@ -78,23 +78,31 @@ export default {
             console.log('ACTION: tutorialLoad.progress')
             return currentProgress
         },
-        position() {
+        position(context: any): CR.Position {
             console.log('ACTION: tutorialLoad.position')
             if (!currentTutorial) {
                 throw new Error('No Tutorial loaded')
             }
             const { data } = currentTutorial
-
-            const levelId = data.summary.levelList[0]
-            const stageId = data.levels[levelId].stageList[0]
-            const stepId = data.stages[stageId].stepList[0]
+            const levelId = data.summary.levelList.find((id: string) => !currentProgress.levels[id])
+            if (!levelId) {
+                throw new Error('No level found on position load')
+            }
+            const stageId = data.levels[levelId].stageList.find((id: string) => !currentProgress.stages[id])
+            if (!stageId) {
+                throw new Error('No stage found on position load')
+            }
+            const stepId = data.stages[stageId].stepList.find((id: string) => !currentProgress.steps[id])
+            if (!stepId) {
+                throw new Error('No step found on position load')
+            }
 
             const position = {
                 levelId,
                 stageId,
-                stepId,
+                stepId
             }
-
+            console.log('position', position)
             return position
         }
     }),
@@ -120,6 +128,7 @@ export default {
                     [context.position.stepId]: true,
                 }
             }
+            console.log('progress update', nextProgress)
             storage.setProgress(nextProgress)
             return nextProgress
         }
@@ -134,6 +143,7 @@ export default {
                     [context.position.stageId]: true,
                 }
             }
+            console.log('progress update', nextProgress)
             storage.setProgress(nextProgress)
             return nextProgress
         }
@@ -148,6 +158,7 @@ export default {
                     [context.position.levelId]: true,
                 }
             }
+            console.log('progress update', nextProgress)
             storage.setProgress(nextProgress)
             return nextProgress
 
@@ -160,20 +171,24 @@ export default {
                 ...context.progress,
                 complete: true,
             }
+            console.log('progress update', nextProgress)
             storage.setProgress(nextProgress)
             return nextProgress
         }
     }),
     stepLoadNext: assign({
-        position: (context: any) => {
+        position: (context: any): CR.Position => {
             const { data, position } = context
             const { stepList } = data.stages[position.stageId]
             const currentStepIndex = stepList.indexOf(position.stepId)
             const nextStepId = stepList[currentStepIndex + 1]
-            return {
+
+            const nextPosition = {
                 ...context.position,
                 stepId: nextStepId,
             }
+            console.log('position update', nextPosition)
+            return nextPosition
         }
     }),
     loadLevel() {

src/state/guards/index.ts

@@ -2,11 +2,14 @@ import * as CR from 'typings'
 
 export default {
     hasNextStep: (context: CR.MachineContext): boolean => {
-        const { data, position } = context
+        const { data, position, progress } = context
         const steps = data.stages[position.stageId].stepList
-        const hasNext = steps[steps.length - 1] !== position.stepId
-        console.log('GUARD: hasNextStep', hasNext)
-        return hasNext
+        // isn't final step yet
+        if (steps[steps.length - 1] !== position.stepId) {
+            return true
+        }
+        // final step is not yet complete
+        return !progress.steps[position.stepId]
     },
     hasNextStage: (context: CR.MachineContext): boolean => {
         const { data, position } = context

src/state/machine.ts

@@ -20,8 +20,8 @@ export const machine = Machine<
                 initial: 'Initial',
                 states: {
                     Initial: {
-                        after: {
-                            2000: 'Startup'
+                        on: {
+                            WEBVIEW_INITIALIZED: 'Startup'
                         }
                     },
                     Startup: {
@@ -50,7 +50,7 @@ export const machine = Machine<
                     ContinueTutorial: {
                         onEntry: ['tutorialContinue'],
                         on: {
-                            TUTORIAL_START: '#tutorial-load-next'
+                            TUTORIAL_START: '#tutorial-load-current'
                         }
                     },
                 }
@@ -66,6 +66,13 @@ export const machine = Machine<
                             0: 'Summary'
                         }
                     },
+                    LoadCurrent: {
+                        id: 'tutorial-load-current',
+                        // TODO: verify current is not complete
+                        after: {
+                            0: 'Stage'
+                        },
+                    },
                     LoadNext: {
                         id: 'tutorial-load-next',
                         onEntry: ['tutorialLoadNext'],
@@ -120,14 +127,9 @@ export const machine = Machine<
                             TestPass: {
                                 onEntry: ['testPass', 'stepComplete'],
                                 after: {
-                                    1000: {
-                                        target: 'StepNext',
-                                        cond: 'hasNextStep',
-                                    }
-                                },
-                                on: {
-                                    NEXT: 'StageComplete',
+                                    1000: 'StepNext',
                                 },
+
                             },
                             TestFail: {
                                 onEntry: ['testFail'],
@@ -138,8 +140,14 @@ export const machine = Machine<
                             StepNext: {
                                 onEntry: ['stepLoadNext'],
                                 after: {
-                                    0: 'Normal'
-                                }
+                                    0: [{
+                                        target: 'Normal',
+                                        cond: 'hasNextStep',
+                                        actions: ['stepLoadCommits']
+                                    }, {
+                                        target: 'StageComplete'
+                                    }]
+                                },
                             },
                             StageComplete: {
                                 onEntry: 'stageComplete',

typings/index.d.ts

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

web-app/src/containers/Tutorial/StagePage.tsx

@@ -25,7 +25,7 @@ const StagePage = (props: PageProps) => {
       ...data.steps[stepId],
       status: {
         // flag progressed steps as complete
-        complete: progress.steps[stepId] || false,
+        complete: progress.stages[stageId] || false,
         // set active step to active
         active: position.stepId === stepId,
       },