Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -695,6 +695,12 @@ export default function HelpRequestForm() {
);
}

// Compute hasErrors, ignoring empty root object left by React Hook Form
const hasErrors = Object.keys(errors).some(
(key) =>
key !== "root" || (key === "root" && Object.keys((errors as Record<string, unknown>).root || {}).length > 0)
);

return (
<form onSubmit={onSubmit} aria-label="New Help Request Form">
<Toaster />
Expand Down Expand Up @@ -1229,7 +1235,7 @@ export default function HelpRequestForm() {
<Button
type="submit"
loading={isSubmitting || isSubmittingGuard}
disabled={isSubmitting || isSubmittingGuard || Object.keys(errors).length > 0}
disabled={isSubmitting || isSubmittingGuard || hasErrors}
mt={4}
>
Submit Request
Expand Down
18 changes: 16 additions & 2 deletions lib/test-insights/RegradeSubmissionsDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,11 @@ export function RegradeSubmissionsDialog({

// Handle regrade action
const handleRegrade = useCallback(async () => {
// Early guard to prevent duplicate calls
if (isRegrading) {
return;
}

if (errorGroup.affected_submission_ids.length === 0) {
toaster.error({
title: "Error",
Expand Down Expand Up @@ -254,7 +259,16 @@ export function RegradeSubmissionsDialog({
} finally {
setIsRegrading(false);
}
}, [errorGroup.affected_submission_ids, courseId, manualSha, selectedCommit, autoPromote, supabase, onClose]);
}, [
errorGroup.affected_submission_ids,
courseId,
manualSha,
selectedCommit,
autoPromote,
supabase,
onClose,
isRegrading
]);

return (
<Dialog.Root open={isOpen} onOpenChange={({ open }) => !open && onClose()} size="xl">
Expand Down Expand Up @@ -453,7 +467,7 @@ export function RegradeSubmissionsDialog({
colorPalette="green"
onClick={handleRegrade}
loading={isRegrading}
disabled={errorGroup.affected_submission_ids.length === 0}
disabled={isRegrading || errorGroup.affected_submission_ids.length === 0}
>
<Icon as={FaPlay} mr={2} />
Regrade {errorGroup.affected_submission_ids.length} Submissions
Expand Down
Loading