Fix bug where turning off token counter would not work in repl

Author: jayjay19630

src/commons/assessmentWorkspace/AssessmentWorkspace.tsx

@@ -76,6 +76,7 @@ import {
   changeExecTime,
   changeSideContentHeight,
   clearReplOutput,
+  disableTokenCounter,
   enableTokenCounter,
   evalEditor,
   evalRepl,
@@ -152,7 +153,8 @@ const AssessmentWorkspace: React.FC<AssessmentWorkspaceProps> = props => {
     handleReplEval,
     handleSave,
     handleUpdateHasUnsavedChanges,
-    handleEnableTokenCounter
+    handleEnableTokenCounter,
+    handleDisableTokenCounter
   } = useMemo(() => {
     return {
       handleTestcaseEval: (id: number) => dispatch(evalTestcase(workspaceLocation, id)),
@@ -178,7 +180,9 @@ const AssessmentWorkspace: React.FC<AssessmentWorkspaceProps> = props => {
       handleUpdateHasUnsavedChanges: (hasUnsavedChanges: boolean) =>
         dispatch(updateHasUnsavedChanges(workspaceLocation, hasUnsavedChanges)),
       handleEnableTokenCounter: () =>
-        dispatch(enableTokenCounter(workspaceLocation))
+        dispatch(enableTokenCounter(workspaceLocation)),
+      handleDisableTokenCounter: () =>
+        dispatch(disableTokenCounter(workspaceLocation))
     };
   }, [dispatch]);
 
@@ -244,13 +248,15 @@ const AssessmentWorkspace: React.FC<AssessmentWorkspaceProps> = props => {
   });
 
   /**
-   * Handles toggling enabling token counter depending on assessment properties
+   * Handles toggling enabling and disabling token counter depending on assessment properties
    */
   useEffect(() => {
     if (props.assessmentConfiguration.hasTokenCounter) {
       handleEnableTokenCounter();
+    } else {
+      handleDisableTokenCounter();
     }
-  }, [props, handleEnableTokenCounter]);
+  }, [props, handleEnableTokenCounter, handleDisableTokenCounter]);
 
   /**
    * Handles toggling of relevant SideContentTabs when mobile breakpoint it hit

src/commons/workspace/WorkspaceActions.ts

@@ -28,6 +28,7 @@ import {
   CLEAR_REPL_INPUT,
   CLEAR_REPL_OUTPUT,
   CLEAR_REPL_OUTPUT_LAST,
+  DISABLE_TOKEN_COUNTER,
   EditorTabState,
   ENABLE_TOKEN_COUNTER,
   END_CLEAR_CONTEXT,
@@ -186,6 +187,9 @@ export const runAllTestcases = (workspaceLocation: WorkspaceLocation) =>
 export const enableTokenCounter = (workspaceLocation: WorkspaceLocation) => 
   action(ENABLE_TOKEN_COUNTER, { workspaceLocation });
 
+export const disableTokenCounter = (workspaceLocation: WorkspaceLocation) => 
+  action(DISABLE_TOKEN_COUNTER, { workspaceLocation });
+
 export const toggleFolderMode = (workspaceLocation: WorkspaceLocation) =>
   action(TOGGLE_FOLDER_MODE, { workspaceLocation });
 

src/commons/workspace/WorkspaceReducer.ts

@@ -45,6 +45,7 @@ import {
   CLEAR_REPL_INPUT,
   CLEAR_REPL_OUTPUT,
   CLEAR_REPL_OUTPUT_LAST,
+  DISABLE_TOKEN_COUNTER,
   EditorTabState,
   ENABLE_TOKEN_COUNTER,
   END_CLEAR_CONTEXT,
@@ -354,7 +355,15 @@ export const WorkspaceReducer: Reducer<WorkspaceManagerState> = (
           ...state[workspaceLocation],
           hasTokenCounter: true
         }
-      }
+      };
+    case DISABLE_TOKEN_COUNTER:
+      return {
+        ...state,
+        [workspaceLocation]: {
+          ...state[workspaceLocation],
+          hasTokenCounter: false
+        }
+      };  
     case EVAL_EDITOR:
       return {
         ...state,

src/commons/workspace/WorkspaceTypes.ts

@@ -23,6 +23,7 @@ export const CLEAR_REPL_OUTPUT = 'CLEAR_REPL_OUTPUT';
 export const CLEAR_REPL_OUTPUT_LAST = 'CLEAR_REPL_OUTPUT_LAST';
 export const END_CLEAR_CONTEXT = 'END_CLEAR_CONTEXT';
 export const ENABLE_TOKEN_COUNTER = 'ENABLE_TOKEN_COUNTER';
+export const DISABLE_TOKEN_COUNTER = 'DISABLE_TOKEN_COUNTER';
 export const EVAL_EDITOR = 'EVAL_EDITOR';
 export const EVAL_REPL = 'EVAL_REPL';
 export const PROMPT_AUTOCOMPLETE = 'PROMPT_AUTOCOMPLETE';