Skip to content

Commit 5a4eb0d

Browse files
authored
Merge pull request #6 from InfinityTwo/grading-filterable-columns
I need to stop not switch branch
2 parents 30014c8 + 63932c6 commit 5a4eb0d

File tree

6 files changed

+239
-148
lines changed

6 files changed

+239
-148
lines changed

src/commons/workspace/WorkspaceActions.ts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import {
2626
CLEAR_REPL_INPUT,
2727
CLEAR_REPL_OUTPUT,
2828
CLEAR_REPL_OUTPUT_LAST,
29+
DECREMENT_REQUEST_COUNTER,
2930
DISABLE_TOKEN_COUNTER,
3031
EditorTabState,
3132
ENABLE_TOKEN_COUNTER,
@@ -35,6 +36,7 @@ import {
3536
EVAL_REPL,
3637
EVAL_TESTCASE,
3738
GradingColumnVisibility,
39+
INCREMENT_REQUEST_COUNTER,
3840
MOVE_CURSOR,
3941
NAV_DECLARATION,
4042
PLAYGROUND_EXTERNAL_SELECT,
@@ -67,7 +69,6 @@ import {
6769
UPDATE_GRADING_COLUMN_VISIBILITY,
6870
UPDATE_HAS_UNSAVED_CHANGES,
6971
UPDATE_REPL_VALUE,
70-
UPDATE_REQUEST_COUNTER,
7172
UPDATE_STEPSTOTAL,
7273
UPDATE_SUBLANGUAGE,
7374
UPDATE_SUBMISSIONS_TABLE_FILTERS,
@@ -396,10 +397,13 @@ export const setIsEditorReadonly = createAction(
396397
})
397398
);
398399

399-
export const updateRequestCounter = createAction(
400-
UPDATE_REQUEST_COUNTER,
401-
(requestCount: number) => ({ payload: { requestCount } })
402-
);
400+
export const increaseRequestCounter = createAction(INCREMENT_REQUEST_COUNTER, () => ({
401+
payload: {}
402+
}));
403+
404+
export const decreaseRequestCounter = createAction(DECREMENT_REQUEST_COUNTER, () => ({
405+
payload: {}
406+
}));
403407

404408
export const updateSubmissionsTableFilters = createAction(
405409
UPDATE_SUBMISSIONS_TABLE_FILTERS,

src/commons/workspace/WorkspaceReducer.ts

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,14 @@ import {
4747
import {
4848
ADD_EDITOR_TAB,
4949
CHANGE_EXTERNAL_LIBRARY,
50+
DECREMENT_REQUEST_COUNTER,
5051
DISABLE_TOKEN_COUNTER,
5152
EditorTabState,
5253
ENABLE_TOKEN_COUNTER,
5354
END_CLEAR_CONTEXT,
5455
EVAL_EDITOR,
5556
EVAL_REPL,
57+
INCREMENT_REQUEST_COUNTER,
5658
MOVE_CURSOR,
5759
REMOVE_EDITOR_TAB,
5860
REMOVE_EDITOR_TAB_FOR_FILE,
@@ -79,7 +81,6 @@ import {
7981
UPDATE_GRADING_COLUMN_VISIBILITY,
8082
UPDATE_HAS_UNSAVED_CHANGES,
8183
UPDATE_REPL_VALUE,
82-
UPDATE_REQUEST_COUNTER,
8384
UPDATE_STEPSTOTAL,
8485
UPDATE_SUBLANGUAGE,
8586
UPDATE_SUBMISSIONS_TABLE_FILTERS,
@@ -659,12 +660,20 @@ const oldWorkspaceReducer: Reducer<WorkspaceManagerState> = (
659660
currentQuestion: action.payload.questionId
660661
}
661662
};
662-
case UPDATE_REQUEST_COUNTER:
663+
case INCREMENT_REQUEST_COUNTER:
663664
return {
664665
...state,
665666
grading: {
666667
...state.grading,
667-
requestCounter: action.payload.requestCount
668+
requestCounter: state.grading.requestCounter + 1
669+
}
670+
};
671+
case DECREMENT_REQUEST_COUNTER:
672+
return {
673+
...state,
674+
grading: {
675+
...state.grading,
676+
requestCounter: Math.max(0, state.grading.requestCounter - 1)
668677
}
669678
};
670679
case SET_FOLDER_MODE:

src/commons/workspace/WorkspaceTypes.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,14 @@ export const CLEAR_REPL_OUTPUT_LAST = 'CLEAR_REPL_OUTPUT_LAST';
2323
export const END_CLEAR_CONTEXT = 'END_CLEAR_CONTEXT';
2424
export const ENABLE_TOKEN_COUNTER = 'ENABLE_TOKEN_COUNTER';
2525
export const DISABLE_TOKEN_COUNTER = 'DISABLE_TOKEN_COUNTER';
26+
export const DECREMENT_REQUEST_COUNTER = 'DECREMENT_REQUEST_COUNTER';
2627
export const EVAL_EDITOR = 'EVAL_EDITOR';
2728
export const EVAL_REPL = 'EVAL_REPL';
2829
export const PROMPT_AUTOCOMPLETE = 'PROMPT_AUTOCOMPLETE';
2930
export const EVAL_SILENT = 'EVAL_SILENT';
3031
export const EVAL_TESTCASE = 'EVAL_TESTCASE';
3132
export const EVAL_EDITOR_AND_TESTCASES = 'EVAL_EDITOR_AND_TESTCASES';
33+
export const INCREMENT_REQUEST_COUNTER = 'INCREMENT_REQUEST_COUNTER';
3234
export const MOVE_CURSOR = 'MOVE_CURSOR';
3335
export const NAV_DECLARATION = 'NAV_DECLARATION';
3436
export const PLAYGROUND_EXTERNAL_SELECT = 'PLAYGROUND_EXTERNAL_SELECT ';
@@ -40,7 +42,6 @@ export const TOGGLE_EDITOR_AUTORUN = 'TOGGLE_EDITOR_AUTORUN';
4042
export const TOGGLE_USING_SUBST = 'TOGGLE_USING_SUBST';
4143
export const TOGGLE_USING_CSE = 'TOGGLE_USING_CSE';
4244
export const TOGGLE_UPDATE_CSE = 'TOGGLE_UPDATE_CSE';
43-
export const UPDATE_REQUEST_COUNTER = 'UPDATE_REQUEST_COUNTER';
4445
export const UPDATE_SUBMISSIONS_TABLE_FILTERS = 'UPDATE_SUBMISSIONS_TABLE_FILTERS';
4546
export const UPDATE_GRADING_COLUMN_VISIBILITY = 'UPDATE_GRADING_COLUMN_VISIBILITY';
4647
export const UPDATE_CURRENT_ASSESSMENT_ID = 'UPDATE_CURRENT_ASSESSMENT_ID';

src/pages/academy/grading/Grading.tsx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { fetchGradingOverviews } from 'src/commons/application/actions/SessionAc
1010
import { Role } from 'src/commons/application/ApplicationTypes';
1111
import SimpleDropdown from 'src/commons/SimpleDropdown';
1212
import { useSession, useTypedSelector } from 'src/commons/utils/Hooks';
13-
import { updateRequestCounter } from 'src/commons/workspace/WorkspaceActions';
13+
import { decreaseRequestCounter, increaseRequestCounter } from 'src/commons/workspace/WorkspaceActions';
1414
import { numberRegExp } from 'src/features/academy/AcademyTypes';
1515
import {
1616
exportGradingCSV,
@@ -55,8 +55,7 @@ const Grading: React.FC = () => {
5555

5656
const updateGradingOverviewsCallback = useCallback(
5757
(page: number, filterParams: Object) => {
58-
console.log("+1 parent");
59-
dispatch(updateRequestCounter(requestCounter + 1));
58+
dispatch(increaseRequestCounter());
6059
dispatch(
6160
fetchGradingOverviews(
6261
showAllGroups,
@@ -70,7 +69,12 @@ const Grading: React.FC = () => {
7069
);
7170

7271
useEffect(() => {
73-
dispatch(updateRequestCounter(Math.max(0, requestCounter - 1)));
72+
console.log(requestCounter);
73+
}, [requestCounter]);
74+
75+
useEffect(() => {
76+
console.log("minus 11");
77+
dispatch(decreaseRequestCounter());
7478
}, [gradingOverviews]);
7579

7680
// If submissionId or questionId is defined but not numeric, redirect back to the Grading overviews page

0 commit comments

Comments
 (0)