Skip to content

Refactor and fix group filter #3116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 23, 2025
Merged

Refactor and fix group filter #3116

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/pages/academy/grading/Grading.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import GradingSubmissionsTable from './subcomponents/GradingSubmissionsTable';
import GradingWorkspace from './subcomponents/GradingWorkspace';

const groupOptions = [
{ value: false, label: 'my groups' },
{ value: true, label: 'all groups' }
{ value: true, label: 'my groups' },
{ value: false, label: 'all groups' }
];

const showOptions = [
Expand All @@ -46,7 +46,7 @@ const Grading: React.FC = () => {
const params = useParams<{ submissionId: string; questionId: string }>();

const isAdmin = role === Role.Admin;
const [showAllGroups, setShowAllGroups] = useState(isAdmin || group === null);
const [showUserGroups, setShowUserGroups] = useState(!isAdmin && group !== null);

const [pageSize, setPageSize] = useState(10);
const [showAllSubmissions, setShowAllSubmissions] = useState(false);
Expand All @@ -71,23 +71,23 @@ const Grading: React.FC = () => {
dispatch(WorkspaceActions.increaseRequestCounter());
dispatch(
SessionActions.fetchGradingOverviews(
!showAllGroups,
showUserGroups,
unpublishedToBackendParams(showAllSubmissions),
paginationToBackendParams(page, pageSize),
filterParams,
allColsSortStates
)
);
},
[dispatch, showAllGroups, showAllSubmissions, pageSize, allColsSortStates]
[dispatch, showUserGroups, showAllSubmissions, pageSize, allColsSortStates]
);

useEffect(() => {
if (refreshQueried) {
dispatch(WorkspaceActions.increaseRequestCounter());
dispatch(
SessionActions.fetchGradingOverviews(
showAllGroups,
showUserGroups,
unpublishedToBackendParams(showAllSubmissions),
paginationToBackendParams(refreshQueryData.page, pageSize),
refreshQueryData.filterParams,
Expand All @@ -98,7 +98,7 @@ const Grading: React.FC = () => {
}
}, [
dispatch,
showAllGroups,
showUserGroups,
showAllSubmissions,
pageSize,
allColsSortStates,
Expand Down Expand Up @@ -152,7 +152,7 @@ const Grading: React.FC = () => {
<ContentDisplay
loadContentDispatch={() => {
if (!hasLoadedBefore) {
dispatch(SessionActions.fetchGradingOverviews(showAllGroups));
dispatch(SessionActions.fetchGradingOverviews(showUserGroups));
}
}}
display={
Expand Down Expand Up @@ -196,8 +196,8 @@ const Grading: React.FC = () => {
<GradingText>submissions from</GradingText>
<SimpleDropdown
options={groupOptions}
selectedValue={showAllGroups}
onClick={setShowAllGroups}
selectedValue={showUserGroups}
onClick={setShowUserGroups}
popoverProps={{ position: Position.BOTTOM }}
buttonProps={{ minimal: true, rightIcon: 'caret-down' }}
/>
Expand Down