Skip to content

Commit 2dcb5b4

Browse files
ShMcKShMcK
committed
cleanup senders
1 parent 81c3f05 commit 2dcb5b4

File tree

7 files changed

+74
-63
lines changed

7 files changed

+74
-63
lines changed

‎web-app/src/App.tsx

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,13 @@
11
import * as React from 'react'
22
import { ApolloProvider } from '@apollo/react-hooks'
3-
import * as CR from 'typings'
43

54
import client from './services/apollo'
6-
import currentTutorial from './services/current'
75
import Routes from './Routes'
8-
9-
interface ReceivedEvent {
10-
data: CR.Action
11-
}
6+
import messageBusReceiver from './services/channel/receiver'
127

138
const App = () => {
14-
159
// event bus listener
16-
React.useEffect(() => {
17-
// update state based on response from editor
18-
const handleEvent = (event: ReceivedEvent): void => {
19-
const message = event.data
20-
// messages from core
21-
22-
if (message.type === 'SET_DATA') {
23-
// SET_DATA - set state machine context
24-
console.log('SET_DATA updated')
25-
const { progress, position } = message.payload
26-
if (process.env.REACT_APP_DEBUG) {
27-
console.log(`Position: ${position.levelId}/${position.stageId}/${position.stepId}`)
28-
// setDebuggerInfo({ progress, position })
29-
}
30-
console.log('set currentTutorial')
31-
currentTutorial.set({ position, progress })
32-
33-
}
34-
}
35-
36-
const listener = 'message'
37-
window.addEventListener(listener, handleEvent)
38-
return () => {
39-
window.removeEventListener(listener, handleEvent)
40-
}
41-
}, [])
10+
React.useEffect(messageBusReceiver, [])
4211

4312
return (
4413
<ApolloProvider client={client}>

‎web-app/src/Routes.tsx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from 'react'
2-
import { editorDispatch } from './services/vscode'
2+
// import { editorDispatch } from './services/vscode'
33

44
import Router from './components/Router'
55
import LoadingPage from './containers/LoadingPage'
@@ -19,6 +19,8 @@ const styles = {
1919
},
2020
}
2121

22+
const tempSend = (action: any) => console.log('sent')
23+
2224
const Routes = () => {
2325
const [dimensions, setDimensions] = React.useState({
2426
width: window.innerWidth - 20,
@@ -46,7 +48,7 @@ const Routes = () => {
4648
<LoadingPage text="Launching..." />
4749
</Route>
4850
<Route path="Start.NewTutorial.SelectTutorial">
49-
<NewPage />
51+
<NewPage send={tempSend}/>
5052
</Route>
5153
<Route path="Start.NewTutorial.InitializeTutorial">
5254
<LoadingPage text="Launching Tutorial..." />
@@ -61,13 +63,13 @@ const Routes = () => {
6163
<LoadingPage text="Loading..." />
6264
</Route>
6365
<Route path="Tutorial.Summary">
64-
<SummaryPage send={editorDispatch} />
66+
<SummaryPage send={tempSend}/>
6567
</Route>
6668
<Route path="Tutorial.Level">
67-
<LevelSummaryPage send={editorDispatch} />
69+
<LevelSummaryPage send={tempSend} />
6870
</Route>
6971
<Route path="Tutorial.Stage">
70-
<StageSummaryPage send={editorDispatch} />
72+
<StageSummaryPage send={tempSend} />
7173
</Route>
7274
<Route path="Tutorial.Completed">
7375
<CompletedPage />

‎web-app/src/containers/New/index.tsx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export const NewPage = (props: Props) => (
2323
const Loading = () => <LoadingPage text="Loading tutorials" />
2424

2525
interface ContainerProps {
26-
send?(action: CR.Action): void
26+
send(action: CR.Action): void
2727
}
2828

2929
const NewPageContainer = (props: ContainerProps) => {
@@ -36,14 +36,10 @@ const NewPageContainer = (props: ContainerProps) => {
3636
if (error) {
3737
return <ErrorView error={error} />
3838
}
39-
40-
// TODO: cleanup React.cloneElement props issue
41-
const sendFallback = (action: CR.Action) => console.log('Cannot send')
42-
const send = props.send || sendFallback
4339

4440
return (
4541
<React.Suspense fallback={Loading}>
46-
<NewPage onNew={send} tutorialList={data.tutorials} />
42+
<NewPage onNew={props.send} tutorialList={data.tutorials} />
4743
</React.Suspense>
4844
)
4945
}

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

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
import {Action} from 'typings'
2+
3+
declare var acquireVsCodeApi: any
4+
5+
// @ts-ignore
6+
if (!window.acquireVsCodeApi) {
7+
require('./mock')
8+
}
9+
10+
const channel = acquireVsCodeApi()
11+
12+
13+
// Send to Editor
14+
export const send = (action: Action) => {
15+
return channel.postMessage(action)
16+
}
17+
18+
interface ReceivedEvent {
19+
data: Action
20+
}
21+
22+
// Receive from Editor
23+
export const receive = (event: ReceivedEvent): void => {
24+
25+
const message = event.data
26+
console.log('message', message)
27+
// messages from core
28+
29+
// if (message.type === 'SET_DATA') {
30+
// // SET_DATA - set state machine context
31+
// console.log('SET_DATA updated')
32+
// const {progress, position} = message.payload
33+
// if (process.env.REACT_APP_DEBUG) {
34+
// console.log(`Position: ${position.levelId}/${position.stageId}/${position.stepId}`)
35+
// // setDebuggerInfo({ progress, position })
36+
// }
37+
// console.log('set currentTutorial')
38+
// // currentTutorial.set({position, progress})
39+
40+
// }
41+
}
42+

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import {receive} from './index'
2+
3+
// mock vscode from client side development
4+
// @ts-ignore
5+
window.acquireVsCodeApi = () => ({
6+
postMessage(event: string) {
7+
console.log('postMessage', event)
8+
}
9+
})

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import {receive} from './index'
2+
3+
const messageBusReceiver = () => {
4+
// update state based on response from editor
5+
const listener = 'message'
6+
window.addEventListener(listener, receive)
7+
return () => {
8+
window.removeEventListener(listener, receive)
9+
}
10+
}
11+
12+
export default messageBusReceiver

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

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

0 commit comments

Comments
 (0)