fix send data to client

ShMcK · ShMcK · commit b35813094881 · 2019-08-25T16:10:06.000-07:00
diff --git a/src/extension.ts b/src/extension.ts
@@ -14,6 +14,10 @@ export const editor = new Editor({
 	setWorkspaceRoot,
 })
 
+// TODO: refactor tutorial & editor relationships
+// code here is a bit smelly
+tutorial.setClientDispatch(editor.dispatch)
+
 // activate run on vscode extension initialization
 export const activate = editor.activate
 
diff --git a/src/services/tutorial/index.ts b/src/services/tutorial/index.ts
@@ -9,6 +9,11 @@ interface TutorialConfig {
 	testRunner: G.EnumTestRunner
 }
 
+interface PositionProgress {
+	position: CR.Position
+	progress: CR.Progress
+}
+
 export interface TutorialModel {
 	repo: G.TutorialRepo
 	config: TutorialConfig
@@ -20,9 +25,10 @@ export interface TutorialModel {
 	level(levelId?: string): G.Level
 	stage(stageId?: string): G.Stage
 	step(stepId?: string): G.Step
-	updateProgress(): {position: CR.Position, progress: CR.Progress}
+	updateProgress(): PositionProgress
 	nextPosition(): CR.Position
 	hasExisting(): Promise<boolean>
+	setClientDispatch(editorDispatch: CR.EditorDispatch): void
 }
 
 class Tutorial implements TutorialModel {
@@ -31,9 +37,13 @@ class Tutorial implements TutorialModel {
 	public version: G.TutorialVersion
 	public position: CR.Position
 	public progress: CR.Progress
+	private clientDispatch: (props: PositionProgress) => void
 
 	constructor() {
 		// initialize types, will be assigned when tutorial is selected
+		this.clientDispatch = (props: PositionProgress) => {
+			throw new Error('Tutorial client dispatch yet initialized')
+		}
 		this.repo = {} as G.TutorialRepo
 		this.config = {} as TutorialConfig
 		this.version = {} as G.TutorialVersion
@@ -51,6 +61,10 @@ class Tutorial implements TutorialModel {
 
 	}
 
+	public setClientDispatch(editorDispatch: CR.EditorDispatch) {
+		this.clientDispatch = ({progress, position}: PositionProgress) => editorDispatch('SEND_DATA', {progress, position})
+	}
+
 	public init = (tutorial: G.Tutorial) => {
 		this.repo = tutorial.repo
 		this.config = {
@@ -73,6 +87,11 @@ class Tutorial implements TutorialModel {
 			complete: false,
 		}
 
+		this.clientDispatch({
+			position: this.position,
+			progress: this.progress
+		})
+
 		// set tutorial, position, progress locally
 		// TODO: base position off of progress
 		Promise.all([
diff --git a/src/state/index.ts b/src/state/index.ts
@@ -42,9 +42,7 @@ class StateMachine {
 			.onTransition(state => {
 				if (state.changed) {
 					console.log(`STATE: ${stateToString(state.value)}`)
-					dispatch('coderoad.send_state', {state: state.value, data: state.context})
-				} else {
-					dispatch('coderoad.send_data', {data: state.context})
+					dispatch('coderoad.send_state', {state: state.value})
 				}
 			})
 	}
@@ -58,8 +56,8 @@ class StateMachine {
 	public refresh() {
 		console.log('service refresh')
 		console.log(this.service.state)
-		const {value, context} = this.service.state
-		this.dispatch('coderoad.send_state', {state: value, data: context})
+		const {value} = this.service.state
+		this.dispatch('coderoad.send_state', {state: value})
 	}
 	public send(action: string | CR.Action) {
 		this.service.send(action)
diff --git a/web-app/src/App.tsx b/web-app/src/App.tsx
@@ -28,15 +28,14 @@ const App = () => {
 		const handleEvent = (event: ReceivedEvent): void => {
 			const message = event.data
 			// messages from core
-			const { progress, position } = message.payload.data
 	
 			if (message.type === 'SET_STATE') {
 				// SET_STATE - set state machine state
 				setState(message.payload.state)
-	
-				setStatus({ variables: { progress, position } })
+
 			} else if (message.type === 'SET_DATA') {
 				// SET_DATA - set state machine context
+				const { progress, position } = message.payload.data
 				setStatus({ variables: { progress, position } })
 			}
 		}
