invoke initialize tutorial

Author: ShMcK

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

@@ -1,18 +1,6 @@
 import * as CR from 'typings'
 import * as G from 'typings/graphql'
-import client from '../../apollo'
-import tutorialQuery from '../../apollo/queries/tutorial'
 import * as selectors from '../../selectors'
-import onError from '../../../services/sentry/onError'
-
-interface TutorialData {
-  tutorial: G.Tutorial
-}
-
-interface TutorialDataVariables {
-  tutorialId: string
-  // version: string
-}
 
 export default (editorSend: any) => ({
   loadEnv(): void {
@@ -27,40 +15,6 @@ export default (editorSend: any) => ({
       type: 'EDITOR_TUTORIAL_LOAD',
     })
   },
-  initializeTutorial(context: CR.MachineContext, event: CR.MachineEvent) {
-    // setup test runner and git
-    if (!context.tutorial) {
-      const error = new Error('Tutorial not available to load')
-      onError(error)
-      throw error
-    }
-
-    client
-      .query<TutorialData, TutorialDataVariables>({
-        query: tutorialQuery,
-        variables: {
-          tutorialId: context.tutorial.id,
-          // version: context.tutorial.version.version, // TODO: reimplement version
-        },
-      })
-      .then(result => {
-        if (!result || !result.data || !result.data.tutorial) {
-          const message = 'No tutorial returned from tutorial config query'
-          onError(new Error(message))
-          return Promise.reject(message)
-        }
-
-        editorSend({
-          type: 'EDITOR_TUTORIAL_CONFIG',
-          payload: { tutorial: result.data.tutorial },
-        })
-      })
-      .catch((error: Error) => {
-        const message = `Failed to load tutorial config ${error.message}`
-        onError(new Error(message))
-        return Promise.reject(message)
-      })
-  },
   continueConfig(context: CR.MachineContext) {
     editorSend({
       type: 'EDITOR_TUTORIAL_CONTINUE_CONFIG',

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

@@ -54,11 +54,7 @@ export const createMachine = (options: any) => {
                 onError: {
                   target: 'Error',
                   actions: assign({
-                    error: (context, event) => {
-                      console.log('ERROR')
-                      console.log(JSON.stringify(event))
-                      return event.data
-                    },
+                    error: (context, event) => event.data,
                   }),
                 },
               },
@@ -118,10 +114,20 @@ export const createMachine = (options: any) => {
           states: {
             // TODO move Initialize into New Tutorial setup
             Initialize: {
-              onEntry: ['initializeTutorial'],
-              on: {
-                TUTORIAL_CONFIGURED: 'Summary',
-                // TUTORIAL_CONFIG_ERROR: 'Start' // TODO should handle error
+              invoke: {
+                src: services.initialize,
+                onDone: {
+                  target: 'Summary',
+                  actions: assign({
+                    tutorial: (context, event) => event.data,
+                  }),
+                },
+                onError: {
+                  target: 'Summary',
+                  actions: assign({
+                    error: (context, event) => event.data,
+                  }),
+                },
               },
             },
             Summary: {

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

@@ -29,7 +29,7 @@ export async function authenticate(context: CR.MachineContext): Promise<any> {
       },
     })
     .catch(error => {
-      // onError(error)
+      onError(error)
       console.log('ERROR: Authentication failed')
       console.log(error.message)
       // let message
@@ -53,7 +53,7 @@ export async function authenticate(context: CR.MachineContext): Promise<any> {
   if (!result || !result.data) {
     const error = new Error('Authentication request responded with no data')
     console.log(error)
-    // onError(error)
+    onError(error)
     return
   }
   const { token } = result.data.editorLogin

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

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

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

@@ -0,0 +1,43 @@
+import * as CR from 'typings'
+import * as G from 'typings/graphql'
+import client from '../../apollo'
+import tutorialQuery from '../../apollo/queries/tutorial'
+import onError from '../../../services/sentry/onError'
+
+interface TutorialData {
+  tutorial: G.Tutorial
+}
+
+interface TutorialDataVariables {
+  tutorialId: string
+  // version: string
+}
+
+export async function initialize(context: CR.MachineContext): Promise<any> {
+  // setup test runner and git
+  if (!context.tutorial) {
+    const error = new Error('Tutorial not available to load')
+    onError(error)
+    throw error
+  }
+
+  try {
+    const result = await client.query<TutorialData, TutorialDataVariables>({
+      query: tutorialQuery,
+      variables: {
+        tutorialId: context.tutorial.id,
+        // version: context.tutorial.version.version, // TODO: reimplement version
+      },
+    })
+    if (!result || !result.data || !result.data.tutorial) {
+      const message = 'No tutorial returned from tutorial config query'
+      onError(new Error(message))
+      return Promise.reject(message)
+    }
+    return Promise.resolve(result.data.tutorial)
+  } catch (error) {
+    const message: CR.ErrorMessage = { title: 'Failed to load tutorial config', description: error.message }
+    onError(error)
+    return Promise.reject(message)
+  }
+}