Hotfix "Stop" button (#262)

* Remove EVAL_EDITOR and EVAL_REPL reducers

These run before the saga

* Add isRunning property to IWorkspaceState

* Modify EVAL reducer cases

to set isRunning to true or false.

* Modify containers to use isRunning from workspace

* Format reducer

Author: remo5000

src/containers/PlaygroundContainer.ts

@@ -27,7 +27,7 @@ const mapStateToProps: MapStateToProps<IStateProps, {}, IState> = state => ({
   activeTab: state.workspaces.playground.sideContentActiveTab,
   editorWidth: state.workspaces.playground.editorWidth,
   editorValue: state.workspaces.playground.editorValue!,
-  isRunning: state.workspaces.playground.context.runtime.isRunning,
+  isRunning: state.workspaces.playground.isRunning,
   output: state.workspaces.playground.output,
   queryString: state.playground.queryString,
   replValue: state.workspaces.playground.replValue,

src/containers/academy/grading/GradingWorkspaceContainer.ts

@@ -40,7 +40,7 @@ const mapStateToProps: MapStateToProps<StateProps, OwnProps, IState> = (state, p
     editorWidth: state.workspaces.grading.editorWidth,
     grading: state.session.gradings.get(props.submissionId),
     hasUnsavedChanges: state.workspaces.grading.hasUnsavedChanges,
-    isRunning: state.workspaces.grading.context.runtime.isRunning,
+    isRunning: state.workspaces.grading.isRunning,
     output: state.workspaces.grading.output,
     replValue: state.workspaces.grading.replValue,
     sideContentHeight: state.workspaces.grading.sideContentHeight,

src/containers/assessment/AssessmentWorkspaceContainer.ts

@@ -39,7 +39,7 @@ const mapStateToProps: MapStateToProps<StateProps, OwnProps, IState> = (state, p
     editorValue: state.workspaces.assessment.editorValue,
     editorWidth: state.workspaces.assessment.editorWidth,
     hasUnsavedChanges: state.workspaces.assessment.hasUnsavedChanges,
-    isRunning: state.workspaces.assessment.context.runtime.isRunning,
+    isRunning: state.workspaces.assessment.isRunning,
     output: state.workspaces.assessment.output,
     replValue: state.workspaces.assessment.replValue,
     sideContentHeight: state.workspaces.assessment.sideContentHeight,

src/reducers/states.ts

@@ -60,6 +60,7 @@ export interface IWorkspaceState {
   readonly context: Context
   readonly editorValue: string | null
   readonly editorWidth: string
+  readonly isRunning: boolean
   readonly output: InterpreterOutput[]
   readonly replHistory: ReplHistory
   readonly replValue: string
@@ -197,7 +198,8 @@ export const createDefaultWorkspace = (location: WorkspaceLocation): IWorkspaceS
   replValue: '',
   sideContentActiveTab: 0,
   externalSymbols: [],
-  globals: []
+  globals: [],
+  isRunning: false
 })
 
 export const defaultComments = 'Comments **here**. Use `markdown` if you ~~are cool~~ want!'

src/reducers/workspaces.ts

@@ -261,19 +261,19 @@ export const reducer: Reducer<IWorkspaceManagerState> = (
         playground: playgroundWorkspace
       }
     case EVAL_EDITOR:
-      // Forces re-render of workspace on editor eval
       return {
         ...state,
         [location]: {
-          ...state[location]
+          ...state[location],
+          isRunning: true
         }
       }
     case EVAL_REPL:
-      // Forces re-render of workspace on editor eval
       return {
         ...state,
         [location]: {
-          ...state[location]
+          ...state[location],
+          isRunning: true
         }
       }
     case EVAL_INTERPRETER_SUCCESS:
@@ -295,7 +295,8 @@ export const reducer: Reducer<IWorkspaceManagerState> = (
         ...state,
         [location]: {
           ...state[location],
-          output: newOutput
+          output: newOutput,
+          isRunning: false
         }
       }
     case EVAL_INTERPRETER_ERROR:
@@ -317,7 +318,8 @@ export const reducer: Reducer<IWorkspaceManagerState> = (
         ...state,
         [location]: {
           ...state[location],
-          output: newOutput
+          output: newOutput,
+          isRunning: false
         }
       }
     /**
@@ -337,10 +339,7 @@ export const reducer: Reducer<IWorkspaceManagerState> = (
         ...state,
         [location]: {
           ...state[location],
-          context: {
-            ...state[location].context,
-            isRunning: false
-          }
+          isRunning: false
         }
       }
     /**