File tree Expand file tree Collapse file tree 4 files changed +7
-9
lines changed Expand file tree Collapse file tree 4 files changed +7
-9
lines changed Original file line number Diff line number Diff line change @@ -88,10 +88,10 @@ class Channel implements Channel {
8888
8989 try {
9090 // TODO: better handle errors
91- await tutorialConfig ( { config : data . config } , onError )
91+ await tutorialConfig ( { config : data . config } )
9292 } catch ( error ) {
93- // TODO send failure messages back to client
94- // to show errors in the webview
93+ this . send ( { type : 'TUTORIAL_CONFIGURE_FAIL' , payload : { error : error . message } } )
94+ return
9595 }
9696
9797 // report back to the webview that setup is complete
Original file line number Diff line number Diff line change @@ -69,7 +69,6 @@ export interface MachineStateSchema {
6969 Setup : {
7070 states : {
7171 Startup : { }
72- Error : { }
7372 LoadStoredTutorial : { }
7473 Start : { }
7574 ValidateSetup : { }
Original file line number Diff line number Diff line change @@ -31,9 +31,6 @@ const Routes = () => {
3131 < Route path = "Setup.GitNotInstalled" >
3232 < GitInstalled send = { send } />
3333 </ Route >
34- < Route path = "Setup.Error" >
35- < LoadingPage text = "Error" context = { context } />
36- </ Route >
3734 < Route path = "Setup.SelectTutorial" >
3835 < SelectTutorialPage send = { send } context = { context } />
3936 </ Route >
Original file line number Diff line number Diff line change @@ -42,7 +42,6 @@ export const createMachine = (options: any) => {
4242 } ,
4343 } ,
4444 } ,
45- Error : { } ,
4645 LoadStoredTutorial : {
4746 onEntry : [ 'loadStoredTutorial' ] ,
4847 on : {
@@ -103,7 +102,10 @@ export const createMachine = (options: any) => {
103102 SetupNewTutorial : {
104103 onEntry : [ 'configureNewTutorial' ] ,
105104 on : {
106- GIT_REMOTE_FAILED : 'GitRemoteFailed' ,
105+ TUTORIAL_CONFIGURE_FAIL : {
106+ actions : [ 'setError' ] ,
107+ } ,
108+ TRY_AGAIN : 'SetupNewTutorial' ,
107109 TUTORIAL_CONFIGURED : 'StartNewTutorial' ,
108110 } ,
109111 } ,
You can’t perform that action at this time.
0 commit comments