Segregate Playground and Assessment Workspaces

.gitignore

@@ -9,6 +9,7 @@
 # production
 /build
 src/styles/*.css
+/.env
 
 # deployment
 terraform*

src/actions/actionTypes.ts

@@ -8,27 +8,31 @@ export interface IAction extends ReduxAction {
 export const SAVE_CANVAS = 'SAVE_CANVAS'
 
 /** Playground */
+export const CHANGE_QUERY_STRING = 'CHANGE_QUERY_STRING'
+export const GENERATE_LZ_STRING = 'GENERATE_LZ_STRING'
+
+/** Interpreter */
+export const HANDLE_CONSOLE_LOG = 'HANDLE_CONSOLE_LOG'
+export const EVAL_INTERPRETER_SUCCESS = 'EVAL_INTERPRETER_SUCCESS'
+export const EVAL_INTERPRETER_ERROR = 'EVAL_INTERPRETER_ERROR'
+export const INTERRUPT_EXECUTION = 'INTERRUPT_EXECUTION'
+
+/** Workspace */
 export const CHANGE_ACTIVE_TAB = 'CHANGE_ACTIVE_TAB'
 export const CHANGE_CHAPTER = 'CHANGE_CHAPTER'
 export const CHANGE_EDITOR_WIDTH = 'CHANGE_EDITOR_WIDTH'
-export const CHANGE_QUERY_STRING = 'CHANGE_QUERY_STRING'
 export const CHANGE_SIDE_CONTENT_HEIGHT = 'CHANGE_SIDE_CONTENT_HEIGHT'
 export const CHAPTER_SELECT = 'CHAPTER_SELECT'
 export const CLEAR_REPL_INPUT = 'CLEAR_REPL_INPUT'
 export const CLEAR_REPL_OUTPUT = 'CLEAR_REPL_OUTPUT'
 export const CLEAR_CONTEXT = 'CLEAR_CONTEXT'
 export const EVAL_EDITOR = 'EVAL_EDITOR'
 export const EVAL_REPL = 'EVAL_REPL'
-export const GENERATE_LZ_STRING = 'GENERATE_LZ_STRING'
 export const UPDATE_EDITOR_VALUE = 'UPDATE_EDITOR_VALUE'
 export const UPDATE_REPL_VALUE = 'UPDATE_REPL_VALUE'
 export const SEND_REPL_INPUT_TO_OUTPUT = 'SEND_REPL_INPUT_TO_OUTPUT'
-
-/** Interpreter */
-export const HANDLE_CONSOLE_LOG = 'HANDLE_CONSOLE_LOG'
-export const EVAL_INTERPRETER_SUCCESS = 'EVAL_INTERPRETER_SUCCESS'
-export const EVAL_INTERPRETER_ERROR = 'EVAL_INTERPRETER_ERROR'
-export const INTERRUPT_EXECUTION = 'INTERRUPT_EXECUTION'
+export const RESET_ASSESSMENT_WORKSPACE = 'RESET_ASSESSMENT_WORKSPACE'
+export const UPDATE_CURRENT_ASSESSMENT_ID = 'UPDATE_CURRENT_ASSESSMENT_ID'
 
 /** Session */
 export const CHANGE_TOKEN = 'CHANGE_TOKEN'

src/actions/index.ts

@@ -2,3 +2,4 @@ export * from './game'
 export * from './interpreter'
 export * from './playground'
 export * from './session'
+export * from './workspaces'

src/actions/interpreter.ts

@@ -1,21 +1,31 @@
 import { SourceError, Value } from '../slang/types'
 import * as actionTypes from './actionTypes'
+import { WorkspaceLocation } from './workspaces'
 
-export const handleConsoleLog = (log: string) => ({
+// TODO fix this immediately after location
+// is implemented completely
+export const handleConsoleLog = (
+  logString: string,
+  workspaceLocation: WorkspaceLocation = 'assessment'
+) => ({
   type: actionTypes.HANDLE_CONSOLE_LOG,
-  payload: log
+  payload: { logString, workspaceLocation }
 })
 
-export const evalInterpreterSuccess = (value: Value) => ({
+export const evalInterpreterSuccess = (value: Value, workspaceLocation: WorkspaceLocation) => ({
   type: actionTypes.EVAL_INTERPRETER_SUCCESS,
-  payload: { type: 'result', value }
+  payload: { type: 'result', value, workspaceLocation }
 })
 
-export const evalInterpreterError = (errors: SourceError[]) => ({
+export const evalInterpreterError = (
+  errors: SourceError[],
+  workspaceLocation: WorkspaceLocation
+) => ({
   type: actionTypes.EVAL_INTERPRETER_ERROR,
-  payload: { type: 'errors', errors }
+  payload: { type: 'errors', errors, workspaceLocation }
 })
 
-export const handleInterruptExecution = () => ({
-  type: actionTypes.INTERRUPT_EXECUTION
+export const handleInterruptExecution = (workspaceLocation: WorkspaceLocation) => ({
+  type: actionTypes.INTERRUPT_EXECUTION,
+  payload: { workspaceLocation }
 })

src/actions/playground.ts

@@ -1,74 +1,5 @@
-import { ActionCreator } from 'redux'
 import * as actionTypes from './actionTypes'
 
-export const changeActiveTab: ActionCreator<actionTypes.IAction> = (activeTab: number) => ({
-  type: actionTypes.CHANGE_ACTIVE_TAB,
-  payload: activeTab
-})
-
-export const changeChapter: ActionCreator<actionTypes.IAction> = (newChapter: number) => ({
-  type: actionTypes.CHANGE_CHAPTER,
-  payload: newChapter
-})
-
-export const changeEditorWidth: ActionCreator<actionTypes.IAction> = (widthChange: string) => ({
-  type: actionTypes.CHANGE_EDITOR_WIDTH,
-  payload: widthChange
-})
-
-export const changeQueryString: ActionCreator<actionTypes.IAction> = (queryString: string) => ({
-  type: actionTypes.CHANGE_QUERY_STRING,
-  payload: queryString
-})
-
-export const changeSideContentHeight: ActionCreator<actionTypes.IAction> = (height: number) => ({
-  type: actionTypes.CHANGE_SIDE_CONTENT_HEIGHT,
-  payload: height
-})
-
-export const chapterSelect: ActionCreator<actionTypes.IAction> = (chapter, changeEvent) => ({
-  type: actionTypes.CHAPTER_SELECT,
-  payload: chapter.chapter
-})
-
-export const clearContext = () => ({
-  type: actionTypes.CLEAR_CONTEXT
-})
-
-export const clearReplInput = () => ({
-  type: actionTypes.CLEAR_REPL_INPUT
-})
-
-export const clearReplOutput = () => ({
-  type: actionTypes.CLEAR_REPL_OUTPUT
-})
-
-export const evalEditor = () => ({
-  type: actionTypes.EVAL_EDITOR
-})
-
-export const evalRepl = () => ({
-  type: actionTypes.EVAL_REPL
-})
-
 export const generateLzString = () => ({
   type: actionTypes.GENERATE_LZ_STRING
 })
-
-export const updateEditorValue: ActionCreator<actionTypes.IAction> = (newEditorValue: string) => ({
-  type: actionTypes.UPDATE_EDITOR_VALUE,
-  payload: newEditorValue
-})
-
-export const updateReplValue: ActionCreator<actionTypes.IAction> = (newReplValue: string) => ({
-  type: actionTypes.UPDATE_REPL_VALUE,
-  payload: newReplValue
-})
-
-export const sendReplInputToOutput: ActionCreator<actionTypes.IAction> = (newOutput: string) => ({
-  type: actionTypes.SEND_REPL_INPUT_TO_OUTPUT,
-  payload: {
-    type: 'code',
-    value: newOutput
-  }
-})

src/actions/workspaces.ts

@@ -0,0 +1,135 @@
+import { ActionCreator } from 'redux'
+import * as actionTypes from './actionTypes'
+
+/**
+ * Used to differenciate between the sources of actions, as
+ * two workspaces can work at the same time. To generalise this
+ * or add more instances of `Workspace`s, one can add a string,
+ * and call the actions with the respective string (taken
+ * from the below enum).
+ *
+ * Note that the names must correspond with the name of the
+ * object in IWorkspaceManagerState.
+ */
+export enum WorkspaceLocations {
+  assessment,
+  playground
+}
+export type WorkspaceLocation = keyof typeof WorkspaceLocations
+
+export const changeActiveTab: ActionCreator<actionTypes.IAction> = (
+  activeTab: number,
+  workspaceLocation: WorkspaceLocation
+) => ({
+  type: actionTypes.CHANGE_ACTIVE_TAB,
+  payload: { activeTab, workspaceLocation }
+})
+
+export const changeChapter: ActionCreator<actionTypes.IAction> = (
+  newChapter: number,
+  workspaceLocation: WorkspaceLocation
+) => ({
+  type: actionTypes.CHANGE_CHAPTER,
+  payload: { newChapter, workspaceLocation }
+})
+
+export const changeEditorWidth: ActionCreator<actionTypes.IAction> = (
+  widthChange: string,
+  workspaceLocation: WorkspaceLocation
+) => ({
+  type: actionTypes.CHANGE_EDITOR_WIDTH,
+  payload: { widthChange, workspaceLocation }
+})
+
+export const changeQueryString: ActionCreator<actionTypes.IAction> = (
+  queryString: string,
+  workspaceLocation: WorkspaceLocation
+) => ({
+  type: actionTypes.CHANGE_QUERY_STRING,
+  payload: { queryString, workspaceLocation }
+})
+
+export const changeSideContentHeight: ActionCreator<actionTypes.IAction> = (
+  height: number,
+  workspaceLocation: WorkspaceLocation
+) => ({
+  type: actionTypes.CHANGE_SIDE_CONTENT_HEIGHT,
+  payload: { height, workspaceLocation }
+})
+
+export const chapterSelect: ActionCreator<actionTypes.IAction> = (
+  chapter,
+  changeEvent,
+  workspaceLocation: WorkspaceLocation
+) => ({
+  type: actionTypes.CHAPTER_SELECT,
+  payload: {
+    chapter: chapter.chapter,
+    workspaceLocation
+  }
+})
+
+export const clearContext = (workspaceLocation: WorkspaceLocation) => ({
+  type: actionTypes.CLEAR_CONTEXT,
+  payload: { workspaceLocation }
+})
+
+export const clearReplInput = (workspaceLocation: WorkspaceLocation) => ({
+  type: actionTypes.CLEAR_REPL_INPUT,
+  payload: { workspaceLocation }
+})
+
+export const clearReplOutput = (workspaceLocation: WorkspaceLocation) => ({
+  type: actionTypes.CLEAR_REPL_OUTPUT,
+  payload: { workspaceLocation }
+})
+
+export const evalEditor = (workspaceLocation: WorkspaceLocation) => ({
+  type: actionTypes.EVAL_EDITOR,
+  payload: { workspaceLocation }
+})
+
+export const evalRepl = (workspaceLocation: WorkspaceLocation) => ({
+  type: actionTypes.EVAL_REPL,
+  payload: { workspaceLocation }
+})
+
+export const updateEditorValue: ActionCreator<actionTypes.IAction> = (
+  newEditorValue: string,
+  workspaceLocation: WorkspaceLocation
+) => ({
+  type: actionTypes.UPDATE_EDITOR_VALUE,
+  payload: { newEditorValue, workspaceLocation }
+})
+
+export const updateReplValue: ActionCreator<actionTypes.IAction> = (
+  newReplValue: string,
+  workspaceLocation: WorkspaceLocation
+) => ({
+  type: actionTypes.UPDATE_REPL_VALUE,
+  payload: { newReplValue, workspaceLocation }
+})
+
+export const sendReplInputToOutput: ActionCreator<actionTypes.IAction> = (
+  newOutput: string,
+  workspaceLocation: WorkspaceLocation
+) => ({
+  type: actionTypes.SEND_REPL_INPUT_TO_OUTPUT,
+  payload: {
+    type: 'code',
+    workspaceLocation,
+    value: newOutput
+  }
+})
+
+export const resetAssessmentWorkspace = () => ({
+  type: actionTypes.RESET_ASSESSMENT_WORKSPACE
+})
+
+export const updateCurrentAssessmentId = (assessmentId: number, questionId: number) => ({
+  type: actionTypes.UPDATE_CURRENT_ASSESSMENT_ID,
+  payload: {
+    assessmentId,
+    questionId
+  }
+})