Skip to content
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

chore(j-s): remove the option to set a reviewer when a decision has been taken #17299

Merged
merged 2 commits into from
Dec 19, 2024
+42 −40
Merged

chore(j-s): remove the option to set a reviewer when a decision has been taken #17299

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8647a5c
chore(j-s): remove the option to set a reviewer when a decision has b…
thorhildurt Dec 19, 2024
25fbcfc
Merge branch 'main' into j-s/remove-prosecutor-update-option-when-rev…
kodiakhq[bot] Dec 19, 2024
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
82 changes: 42 additions & 40 deletions apps/judicial-system/web/src/routes/PublicProsecutor/Indictments/Overview/Overview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,48 +121,50 @@ export const Overview = () => {
<Box component="section" marginBottom={5}>
<IndictmentCaseFilesList workingCase={workingCase} />
</Box>
<Box marginBottom={5}>
<SectionHeading
title={fm(strings.reviewerTitle)}
description={
<Text variant="eyebrow">
{fm(strings.reviewerSubtitle, {
isFine:
workingCase.indictmentRulingDecision ===
CaseIndictmentRulingDecision.FINE,
indictmentAppealDeadline: formatDate(
workingCase.indictmentAppealDeadline,
),
appealDeadlineIsInThePast:
workingCase.indictmentVerdictAppealDeadlineExpired,
})}
</Text>
}
/>
<BlueBox>
<Select
name="reviewer"
label={fm(strings.reviewerLabel)}
placeholder={fm(strings.reviewerPlaceholder)}
value={
selectedIndictmentReviewer
? selectedIndictmentReviewer
: workingCase.indictmentReviewer
? {
label: workingCase.indictmentReviewer.name || '',
value: workingCase.indictmentReviewer.id,
}
: undefined
{!workingCase.indictmentReviewDecision && (
oddsson marked this conversation as resolved.
Show resolved Hide resolved
<Box marginBottom={5}>
<SectionHeading
title={fm(strings.reviewerTitle)}
description={
<Text variant="eyebrow">
{fm(strings.reviewerSubtitle, {
isFine:
workingCase.indictmentRulingDecision ===
CaseIndictmentRulingDecision.FINE,
indictmentAppealDeadline: formatDate(
workingCase.indictmentAppealDeadline,
),
appealDeadlineIsInThePast:
workingCase.indictmentVerdictAppealDeadlineExpired,
})}
</Text>
}
options={publicProsecutors}
onChange={(value) => {
setSelectedIndictmentReviewer(value as Option<string>)
}}
isDisabled={loading}
required
/>
</BlueBox>
</Box>
<BlueBox>
<Select
name="reviewer"
label={fm(strings.reviewerLabel)}
placeholder={fm(strings.reviewerPlaceholder)}
value={
selectedIndictmentReviewer
? selectedIndictmentReviewer
: workingCase.indictmentReviewer
? {
label: workingCase.indictmentReviewer.name || '',
value: workingCase.indictmentReviewer.id,
}
: undefined
}
options={publicProsecutors}
onChange={(value) => {
setSelectedIndictmentReviewer(value as Option<string>)
}}
isDisabled={loading}
required
/>
</BlueBox>
</Box>
)}
</FormContentContainer>
<FormContentContainer isFooter>
<FormFooter
Expand Down
Loading