Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb187d48

Browse files
authored
Merge pull requestcoderoad#37 from ShMcK/fix/git-async-setup-issue
resolve git async issue
2 parents71a1efa +1dfb9f8 commitb187d48

File tree

6 files changed

+37
-50
lines changed

6 files changed

+37
-50
lines changed

‎src/actions/tutorialConfig.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,17 @@ import * as git from '../services/git'
55
interfaceTutorialConfigParams{
66
tutorial:G.Tutorial,
77
alreadyConfigured?:boolean
8+
onComplete?():void
89
}
910

10-
consttutorialConfig=async({tutorial, alreadyConfigured}:TutorialConfigParams)=>{
11+
consttutorialConfig=async({tutorial, alreadyConfigured, onComplete}:TutorialConfigParams)=>{
1112
if(!alreadyConfigured){
1213
// setup git, add remote
1314
awaitgit.initIfNotExists()
1415

1516
// TODO: if remote not already set
1617
awaitgit.setupRemote(tutorial.repo.uri)
18+
if(onComplete){onComplete()}
1719
}
1820

1921
// TODO: allow multiple coding languages in a tutorial

‎src/channel/index.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@ class Channel implements Channel {
7474
consttutorialData=action.payload.tutorial
7575
this.context.setTutorial(this.workspaceState,tutorialData)
7676
tutorialConfig({
77-
tutorial:tutorialData
77+
tutorial:tutorialData,
78+
// must await async git setup or commit loading fails
79+
onComplete:()=>this.send({type:'TUTORIAL_CONFIGURED'})
7880
})
7981
return
8082
case'EDITOR_TUTORIAL_CONTINUE_CONFIG':

‎web-app/src/services/channel/index.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ class Channel {
4040
case'NEW_TUTORIAL':
4141
this.machineSend(action)
4242
return
43+
case'TUTORIAL_CONFIGURED':
44+
this.machineSend(action)
45+
return
4346
case'CONTINUE_TUTORIAL':
4447
this.machineSend(action)
4548
return

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

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import * as G from 'typings/graphql'
22
import*asCRfrom'typings'
33
import*asselectorsfrom'../../selectors'
44
importchannelfrom'../../channel'
5+
importclientfrom'../../apollo'
6+
importtutorialQueryfrom'../../apollo/queries/tutorial'
57

68
exportdefault{
79
loadStoredTutorial(){
@@ -23,16 +25,29 @@ export default {
2325
},
2426
initializeTutorial(context:CR.MachineContext,event:CR.MachineEvent){
2527
// setup test runner and git
26-
const{tutorial}=event.data.payload
27-
28-
if(!tutorial){
29-
thrownewError('Invalid tutorial for tutorial config')
28+
if(!context.tutorial){
29+
thrownewError('Tutorial not available to load')
3030
}
31-
console.log('EDITOR: TUTORIAL_CONFIG',tutorial)
32-
channel.editorSend({
33-
type:'EDITOR_TUTORIAL_CONFIG',
34-
payload:{tutorial},
31+
32+
client.query({
33+
query:tutorialQuery,
34+
variables:{
35+
tutorialId:context.tutorial.id,
36+
version:context.tutorial.version.version,
37+
}
38+
}).then((result)=>{
39+
if(!result||!result.data||!result.data.tutorial){
40+
returnPromise.reject('No tutorial returned from tutorial config query')
41+
}
42+
43+
channel.editorSend({
44+
type:'EDITOR_TUTORIAL_CONFIG',
45+
payload:{tutorial:result.data.tutorial},
46+
})
3547
})
48+
.catch((error:Error)=>{
49+
returnPromise.reject(`Failed to load tutorial config${error.message}`)
50+
})
3651
},
3752
continueConfig(){
3853
channel.editorSend({

‎web-app/src/services/state/actions/invoke.ts‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

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

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import{Machine,MachineOptions}from'xstate'
22
import*asCRfrom'typings'
33
importactionsfrom'./actions'
4-
import*asinvokefrom'./actions/invoke'
54

65
constoptions:MachineOptions<CR.MachineContext,CR.MachineEvent>={
76
//@ts-ignore
@@ -65,15 +64,11 @@ export const machine = Machine<CR.MachineContext, CR.MachineStateSchema, CR.Mach
6564
states:{
6665
// TODO: move Initialize into New Tutorial setup
6766
Initialize:{
68-
invoke:{
69-
id:'loadTutorial',
70-
src:invoke.loadTutorial,
71-
onDone:{
72-
target:'Summary',
73-
actions:['initializeTutorial']
74-
},
75-
onError:'Initialize'// TODO: handle load tutorial error
76-
},
67+
onEntry:['initializeTutorial'],
68+
on:{
69+
TUTORIAL_CONFIGURED:'Summary',
70+
// TUTORIAL_CONFIG_ERROR: 'Start' // TODO: should handle error
71+
}
7772
},
7873
LoadNext:{
7974
id:'tutorial-load-next',

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp