cleanup

ShMcK · ShMcK · commit 9153eccde507 · 2020-04-12T21:45:21.000-07:00
Signed-off-by: shmck &lt;shawn.j.mckay@gmail.com&gt;
diff --git a/src/channel/index.ts b/src/channel/index.ts
@@ -91,15 +91,14 @@ class Channel implements Channel {
           }
           // communicate to client the tutorial & stepProgress state
           this.send({ type: 'LOAD_STORED_TUTORIAL', payload: { env, tutorial, progress, position } })
-
-          return
         } catch (e) {
           const error = {
             type: 'UnknownError',
             message: `Location: Editor startup\n\n${e.message}`,
           }
           this.send({ type: 'EDITOR_STARTUP_FAILED', payload: { error } })
         }
+        return
 
       // clear tutorial local storage
       case 'TUTORIAL_CLEAR':
@@ -184,14 +183,14 @@ class Channel implements Channel {
 
           // report back to the webview that setup is complete
           this.send({ type: 'TUTORIAL_CONFIGURED' })
-          return
         } catch (e) {
           const error = {
             type: 'UnknownError',
             message: `Location: EditorTutorialConfig.\n\n ${e.message}`,
           }
           this.send({ type: 'TUTORIAL_CONFIGURE_FAIL', payload: { error } })
         }
+        return
       case 'EDITOR_TUTORIAL_CONTINUE_CONFIG':
         try {
           const tutorialContinue: TT.Tutorial | null = this.context.tutorial.get()
@@ -205,14 +204,14 @@ class Channel implements Channel {
           })
           // update the current stepId on startup
           vscode.commands.executeCommand(COMMANDS.SET_CURRENT_STEP, action.payload.stepId)
-          return
         } catch (e) {
           const error = {
             type: 'UnknownError',
             message: `Location: Editor tutorial continue config.\n\n ${e.message}`,
           }
           this.send({ type: 'CONTINUE_FAILED', payload: { error } })
         }
+        return
       case 'EDITOR_VALIDATE_SETUP':
         try {
           // check workspace is selected
@@ -253,14 +252,14 @@ class Channel implements Channel {
             return
           }
           this.send({ type: 'SETUP_VALIDATED' })
-          return
         } catch (e) {
           const error = {
             type: 'UknownError',
             message: e.message,
           }
           this.send({ type: 'VALIDATE_SETUP_FAILED', payload: { error } })
         }
+        return
       case 'EDITOR_REQUEST_WORKSPACE':
         openWorkspace()
         return
diff --git a/src/services/logger/index.ts b/src/services/logger/index.ts
@@ -1,6 +1,6 @@
 import { LOG } from '../../environment'
 
-export type Log = string | object
+export type Log = string | object | null
 
 const logger = (...messages: Log[]): void => {
   if (!LOG) {
diff --git a/web-app/src/containers/Tutorial/Level/index.tsx b/web-app/src/containers/Tutorial/Level/index.tsx
@@ -91,8 +91,6 @@ const Level = ({ level, onContinue, onLoadSolution, processes, testStatus }: Pro
     currentStep = level.steps.length
   }
 
-  console.log(`currentStep: ${currentStep}`)
-
   const pageBottomRef = React.useRef(null)
 
   const scrollToBottom = () => {
diff --git a/web-app/src/services/state/actions/context.ts b/web-app/src/services/state/actions/context.ts
@@ -3,6 +3,7 @@ import * as TT from 'typings/tutorial'
 import { assign, send, ActionFunctionMap } from 'xstate'
 import * as selectors from '../../selectors'
 import onError from '../../../services/sentry/onError'
+import logger from 'services/logger'
 
 const contextActions: ActionFunctionMap<T.MachineContext, T.MachineEvent> = {
   // @ts-ignore
@@ -100,6 +101,8 @@ const contextActions: ActionFunctionMap<T.MachineContext, T.MachineEvent> = {
 
       progress.levels[levelId] = true
 
+      logger('PROGRESS', progress)
+
       return progress
     },
   }),
diff --git a/web-app/src/services/state/machine.ts b/web-app/src/services/state/machine.ts
@@ -160,7 +160,10 @@ export const createMachine = (options: any) => {
                   onEntry: ['loadLevel', 'checkLevelCompleted'],
                   on: {
                     START_LEVEL: 'Normal',
-                    START_COMPLETED_LEVEL: 'LevelComplete',
+                    START_COMPLETED_LEVEL: {
+                      target: 'LevelComplete',
+                      actions: ['updateLevelProgress'],
+                    },
                   },
                 },
                 Normal: {

Original file line number	Diff line number	Diff line change
`@@ -91,8 +91,6 @@ const Level = ({ level, onContinue, onLoadSolution, processes, testStatus }: Pro`
`91`	`91`	`currentStep = level.steps.length`
`92`	`92`	`}`
`93`	`93`
`94`		- console.log(`currentStep: ${currentStep}`)
`95`		`-`
`96`	`94`	`const pageBottomRef = React.useRef(null)`
`97`	`95`
`98`	`96`	`const scrollToBottom = () => {`