Skip to content

Revert invalid group greying in Set Quiz modal #1118

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
Sep 11, 2024
Merged

Revert invalid group greying in Set Quiz modal #1118

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
11 changes: 2 additions & 9 deletions src/app/components/elements/modals/QuizSettingModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export function QuizSettingModal({quiz, dueDate: initialDueDate, scheduledStartD
});
}

const isAssignmentSetToThisGroup = (group: Item<number>, assignment?: QuizAssignmentDTO) => assignment ? (assignment.quizId === quiz.id && assignment.groupId === group.value && (assignment.dueDate ? assignment.dueDate.valueOf() < Date.now() : true)) : false;
const isAssignmentSetToThisGroup = (group: Item<number>, assignment?: QuizAssignmentDTO) => assignment ? (assignment.quizId === quiz.id && assignment.groupId === group.value && (assignment.dueDate ? assignment.dueDate.valueOf() > Date.now() : true)) : false;
const alreadyAssignedToAGroup = selectedGroups.some(group => quizAssignments?.some(assignment => isAssignmentSetToThisGroup(group, assignment)));

const groupInvalid = validated.has('group') && selectedGroups.length === 0 || alreadyAssignedToAGroup;
Expand All @@ -105,10 +105,7 @@ export function QuizSettingModal({quiz, dueDate: initialDueDate, scheduledStartD
query={groupsQuery}
defaultErrorTitle={"Error fetching groups"}
thenRender={groups => {
function appGroupToItem(g: AppGroup): Item<number> {return {label: g.groupName as string, value: g.id as number}; }
function quizToAssignment(g: AppGroup): QuizAssignmentDTO | undefined { return quizAssignments?.find(assignment => assignment.quizId === quiz.id && assignment.groupId === g.id); }

const groupOptions = groups.map((g: AppGroup) => ({...appGroupToItem(g), isDisabled: isAssignmentSetToThisGroup(appGroupToItem(g), quizToAssignment(g))}));
const groupOptions = groups.map((g: AppGroup) => {return {label: g.groupName as string, value: g.id as number}; });

return <StyledSelect isMulti placeholder="Select groups"
options={groupOptions}
Expand All @@ -121,10 +118,6 @@ export function QuizSettingModal({quiz, dueDate: initialDueDate, scheduledStartD
isSearchable
menuPortalTarget={document.body}
styles={{
option: (base, selectProps) => ({
...base,
backgroundColor: selectProps.isFocused && selectProps.isDisabled ? 'transparent' : base.backgroundColor
}),
control: (styles) => ({...styles, ...(groupInvalid ? {borderColor: '#dc3545'} : {})}),
menuPortal: base => ({...base, zIndex: 9999}),
}}
Expand Down