Merge pull request #6 from InfinityTwo/grading-filterable-columns

I need to stop not switch branch

Author: InfinityTwo

src/commons/workspace/WorkspaceActions.ts

@@ -26,6 +26,7 @@ import {
   CLEAR_REPL_INPUT,
   CLEAR_REPL_OUTPUT,
   CLEAR_REPL_OUTPUT_LAST,
+  DECREMENT_REQUEST_COUNTER,
   DISABLE_TOKEN_COUNTER,
   EditorTabState,
   ENABLE_TOKEN_COUNTER,
@@ -35,6 +36,7 @@ import {
   EVAL_REPL,
   EVAL_TESTCASE,
   GradingColumnVisibility,
+  INCREMENT_REQUEST_COUNTER,
   MOVE_CURSOR,
   NAV_DECLARATION,
   PLAYGROUND_EXTERNAL_SELECT,
@@ -67,7 +69,6 @@ import {
   UPDATE_GRADING_COLUMN_VISIBILITY,
   UPDATE_HAS_UNSAVED_CHANGES,
   UPDATE_REPL_VALUE,
-  UPDATE_REQUEST_COUNTER,
   UPDATE_STEPSTOTAL,
   UPDATE_SUBLANGUAGE,
   UPDATE_SUBMISSIONS_TABLE_FILTERS,
@@ -396,10 +397,13 @@ export const setIsEditorReadonly = createAction(
   })
 );
 
-export const updateRequestCounter = createAction(
-  UPDATE_REQUEST_COUNTER,
-  (requestCount: number) => ({ payload: { requestCount } })
-);
+export const increaseRequestCounter = createAction(INCREMENT_REQUEST_COUNTER, () => ({
+  payload: {}
+}));
+
+export const decreaseRequestCounter = createAction(DECREMENT_REQUEST_COUNTER, () => ({
+  payload: {}
+}));
 
 export const updateSubmissionsTableFilters = createAction(
   UPDATE_SUBMISSIONS_TABLE_FILTERS,

src/commons/workspace/WorkspaceReducer.ts

@@ -47,12 +47,14 @@ import {
 import {
   ADD_EDITOR_TAB,
   CHANGE_EXTERNAL_LIBRARY,
+  DECREMENT_REQUEST_COUNTER,
   DISABLE_TOKEN_COUNTER,
   EditorTabState,
   ENABLE_TOKEN_COUNTER,
   END_CLEAR_CONTEXT,
   EVAL_EDITOR,
   EVAL_REPL,
+  INCREMENT_REQUEST_COUNTER,
   MOVE_CURSOR,
   REMOVE_EDITOR_TAB,
   REMOVE_EDITOR_TAB_FOR_FILE,
@@ -79,7 +81,6 @@ import {
   UPDATE_GRADING_COLUMN_VISIBILITY,
   UPDATE_HAS_UNSAVED_CHANGES,
   UPDATE_REPL_VALUE,
-  UPDATE_REQUEST_COUNTER,
   UPDATE_STEPSTOTAL,
   UPDATE_SUBLANGUAGE,
   UPDATE_SUBMISSIONS_TABLE_FILTERS,
@@ -659,12 +660,20 @@ const oldWorkspaceReducer: Reducer<WorkspaceManagerState> = (
           currentQuestion: action.payload.questionId
         }
       };
-    case UPDATE_REQUEST_COUNTER:
+    case INCREMENT_REQUEST_COUNTER:
       return {
         ...state,
         grading: {
           ...state.grading,
-          requestCounter: action.payload.requestCount
+          requestCounter: state.grading.requestCounter + 1
+        }
+      };
+    case DECREMENT_REQUEST_COUNTER:
+      return {
+        ...state,
+        grading: {
+          ...state.grading,
+          requestCounter: Math.max(0, state.grading.requestCounter - 1)
         }
       };
     case SET_FOLDER_MODE:

src/commons/workspace/WorkspaceTypes.ts

@@ -23,12 +23,14 @@ 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 DECREMENT_REQUEST_COUNTER = 'DECREMENT_REQUEST_COUNTER';
 export const EVAL_EDITOR = 'EVAL_EDITOR';
 export const EVAL_REPL = 'EVAL_REPL';
 export const PROMPT_AUTOCOMPLETE = 'PROMPT_AUTOCOMPLETE';
 export const EVAL_SILENT = 'EVAL_SILENT';
 export const EVAL_TESTCASE = 'EVAL_TESTCASE';
 export const EVAL_EDITOR_AND_TESTCASES = 'EVAL_EDITOR_AND_TESTCASES';
+export const INCREMENT_REQUEST_COUNTER = 'INCREMENT_REQUEST_COUNTER';
 export const MOVE_CURSOR = 'MOVE_CURSOR';
 export const NAV_DECLARATION = 'NAV_DECLARATION';
 export const PLAYGROUND_EXTERNAL_SELECT = 'PLAYGROUND_EXTERNAL_SELECT ';
@@ -40,7 +42,6 @@ export const TOGGLE_EDITOR_AUTORUN = 'TOGGLE_EDITOR_AUTORUN';
 export const TOGGLE_USING_SUBST = 'TOGGLE_USING_SUBST';
 export const TOGGLE_USING_CSE = 'TOGGLE_USING_CSE';
 export const TOGGLE_UPDATE_CSE = 'TOGGLE_UPDATE_CSE';
-export const UPDATE_REQUEST_COUNTER = 'UPDATE_REQUEST_COUNTER';
 export const UPDATE_SUBMISSIONS_TABLE_FILTERS = 'UPDATE_SUBMISSIONS_TABLE_FILTERS';
 export const UPDATE_GRADING_COLUMN_VISIBILITY = 'UPDATE_GRADING_COLUMN_VISIBILITY';
 export const UPDATE_CURRENT_ASSESSMENT_ID = 'UPDATE_CURRENT_ASSESSMENT_ID';

src/pages/academy/grading/Grading.tsx

@@ -10,7 +10,7 @@ import { fetchGradingOverviews } from 'src/commons/application/actions/SessionAc
 import { Role } from 'src/commons/application/ApplicationTypes';
 import SimpleDropdown from 'src/commons/SimpleDropdown';
 import { useSession, useTypedSelector } from 'src/commons/utils/Hooks';
-import { updateRequestCounter } from 'src/commons/workspace/WorkspaceActions';
+import { decreaseRequestCounter, increaseRequestCounter } from 'src/commons/workspace/WorkspaceActions';
 import { numberRegExp } from 'src/features/academy/AcademyTypes';
 import {
   exportGradingCSV,
@@ -55,8 +55,7 @@ const Grading: React.FC = () => {
 
   const updateGradingOverviewsCallback = useCallback(
     (page: number, filterParams: Object) => {
-      console.log("+1 parent");
-      dispatch(updateRequestCounter(requestCounter + 1));
+      dispatch(increaseRequestCounter());
       dispatch(
         fetchGradingOverviews(
           showAllGroups,
@@ -70,7 +69,12 @@ const Grading: React.FC = () => {
   );
 
   useEffect(() => {
-    dispatch(updateRequestCounter(Math.max(0, requestCounter - 1)));
+    console.log(requestCounter);
+  }, [requestCounter]);
+
+  useEffect(() => {
+    console.log("minus 11");
+    dispatch(decreaseRequestCounter());
   }, [gradingOverviews]);
 
   // If submissionId or questionId is defined but not numeric, redirect back to the Grading overviews page