Skip to content

Allow rescorings to same category again #467

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
zkdev merged 2 commits into from
Jun 17, 2026
+7 −14
Merged

Allow rescorings to same category again #467

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
974bd28
feat(rescorings): Allow rescorings to same category again
zkdev Jun 16, 2026
d07f9d5
fix(rescoring): Only validate to-be applied rescorings
zkdev Jun 16, 2026
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
21 changes: 7 additions & 14 deletions src/rescoring.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,13 +169,11 @@ const rescoringIdentity = (rescoring) => {
}


const rescoringNeedsComment = (rescoring) => {
const rescoringNeedsComment = (rescoring, isSelected = true) => {
return (
rescoring.matching_rules.includes(META_RESCORING_RULES.CUSTOM_RESCORING)
&& (
rescoring.severity !== rescoring.originalSeverityProposal
|| rescoring.due_date !== rescoring.originalDueDate
) && !rescoring.comment
&& !rescoring.comment
&& isSelected
)
}

Expand Down Expand Up @@ -2671,7 +2669,7 @@ const RescoringContentTableRow = ({
defaultValue={rescoring.comment}
onChange={(e) => delayRescoringUpdate({comment: e.target.value})}
onClick={(e) => e.stopPropagation()}
error={rescoringNeedsComment(rescoring)}
error={rescoringNeedsComment(rescoring, Boolean(selectedRescorings.find((r) => rescoringIdentity(r) === rescoringIdentity(rescoring))))}
size='small'
maxRows={4}
InputProps={{
Expand Down Expand Up @@ -3442,7 +3440,7 @@ const Rescore = ({
Apply Rescoring
</Button>

const customRescoringsWithoutComment = rescorings.filter(rescoringNeedsComment)
const customRescoringsWithoutComment = rescorings.filter(r => rescoringNeedsComment(r, true))
Comment thread
zkdev marked this conversation as resolved.

if (customRescoringsWithoutComment.length > 0) return <Tooltip
title={
Expand Down Expand Up @@ -3659,14 +3657,9 @@ const RescoringModal = ({
}, [setSprints, rescoringsForType])

const allowedRescorings = filteredRescorings?.filter((rescoring) => {
// only rescorings are allowed iff their severity has changed OR they allow a custom due date
// input and the due date has changed
// only rescorings are allowed iff they are selected and not filtered out
return (
selectedRescorings.find((r) => rescoringIdentity(r) === rescoringIdentity(rescoring))
&& (
rescoring.severity !== categoriseRescoringProposal({rescoring, findingCfg}).id
|| rescoring.due_date !== rescoring.originalDueDate
)
)
})
const filteredOutRescoringsLength = filteredRescorings ? selectedRescorings.length - allowedRescorings.length : 0
Expand Down Expand Up @@ -3863,7 +3856,7 @@ const RescoringModal = ({
filteredOutRescoringsLength > 0 && <Tooltip
title={
`${filteredOutRescoringsLength} ${pluralise('rescoring', filteredOutRescoringsLength, 'is', 'are')}
filtered out or the categorisation did not change`
filtered out`
}
>
<InfoOutlinedIcon sx={{ height: '1rem' }}/>
Expand Down
Loading