From cce4547162955a3ecdad7c9ea2042967fd332f45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0j=C3=B3n=20Gu=C3=B0j=C3=B3nsson?= Date: Mon, 28 Oct 2024 14:32:56 +0000 Subject: [PATCH 1/3] fix(j-s): Investigation Case Deletion (#16570) Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> --- apps/judicial-system/web/src/routes/Shared/Cases/Cases.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/judicial-system/web/src/routes/Shared/Cases/Cases.tsx b/apps/judicial-system/web/src/routes/Shared/Cases/Cases.tsx index f2c6480de7f0..a2c1ecb6e872 100644 --- a/apps/judicial-system/web/src/routes/Shared/Cases/Cases.tsx +++ b/apps/judicial-system/web/src/routes/Shared/Cases/Cases.tsx @@ -10,7 +10,7 @@ import { isIndictmentCase, isProsecutionUser, isPublicProsecutor, - isRestrictionCase, + isRequestCase, } from '@island.is/judicial-system/types' import { core, @@ -215,7 +215,7 @@ export const Cases: FC = () => { } = useFilter(allActiveCases, allPastCases, user) const canDeleteCase = (caseToDelete: CaseListEntry) => - (isRestrictionCase(caseToDelete.type) && + (isRequestCase(caseToDelete.type) && (caseToDelete.state === CaseState.NEW || caseToDelete.state === CaseState.DRAFT || caseToDelete.state === CaseState.SUBMITTED || From 972b865982114152a95b95224f36bb8f4edf18c7 Mon Sep 17 00:00:00 2001 From: unakb Date: Mon, 28 Oct 2024 14:45:07 +0000 Subject: [PATCH 2/3] fix(j-s): Remove required criminal record upload in indictments (#16563) Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> --- .../routes/Prosecutor/Indictments/CaseFiles/CaseFiles.tsx | 6 ------ apps/judicial-system/web/src/utils/validate.ts | 5 +---- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/CaseFiles/CaseFiles.tsx b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/CaseFiles/CaseFiles.tsx index badca4970f3e..0417695836be 100644 --- a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/CaseFiles/CaseFiles.tsx +++ b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/CaseFiles/CaseFiles.tsx @@ -49,11 +49,6 @@ const CaseFiles = () => { file.category === CaseFileCategory.INDICTMENT && file.status === 'done', )) && - uploadFiles.some( - (file) => - file.category === CaseFileCategory.CRIMINAL_RECORD && - file.status === 'done', - ) && allFilesDoneOrError const handleNavigationTo = useCallback( (destination: string) => router.push(`${destination}/${workingCase.id}`), @@ -107,7 +102,6 @@ const CaseFiles = () => { { return Boolean( - (isTrafficViolationCase(workingCase) || + isTrafficViolationCase(workingCase) || workingCase.caseFiles?.some( (file) => file.category === CaseFileCategory.INDICTMENT, - )) && - workingCase.caseFiles?.some( - (file) => file.category === CaseFileCategory.CRIMINAL_RECORD, ), ) } From bc3e0d43876db8aaed280c266a892be053eef542 Mon Sep 17 00:00:00 2001 From: unakb Date: Mon, 28 Oct 2024 14:50:59 +0000 Subject: [PATCH 3/3] chore(j-s): Update advocate confirmed strings (#16573) Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> --- .../Advocates/Advocates.strings.ts | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/apps/judicial-system/web/src/routes/Court/Indictments/Advocates/Advocates.strings.ts b/apps/judicial-system/web/src/routes/Court/Indictments/Advocates/Advocates.strings.ts index 0ee84e48c080..6ff81c57ed5a 100644 --- a/apps/judicial-system/web/src/routes/Court/Indictments/Advocates/Advocates.strings.ts +++ b/apps/judicial-system/web/src/routes/Court/Indictments/Advocates/Advocates.strings.ts @@ -25,15 +25,17 @@ export const strings = defineMessages({ description: 'Notaður sem texti fyrir takka þegar ákærðu óska ekki eftir verjanda í dómaraflæði í ákærum. ', }, + confirmDefenderChoice: { - id: 'judicial.system.core:court_indictments.advocates.confirm_defender_choice', - defaultMessage: 'Staðfesta val á verjanda', + id: 'judicial.system.core:court_indictments.advocates.confirm_defender_choice_v1', + defaultMessage: 'Staðfesta val', + description: 'Notaður sem texti fyrir takka til að staðfesta val á verjanda í dómaraflæði í ákærum.', }, changeDefenderChoice: { - id: 'judicial.system.core:court_indictments.advocates.change_defender_choice', - defaultMessage: 'Breyta vali á verjanda', + id: 'judicial.system.core:court_indictments.advocates.change_defender_choice_v1', + defaultMessage: 'Breyta vali', description: 'Notaður sem texti fyrir takka til að breyta vali á verjanda í dómaraflæði í ákærum.', }, @@ -113,7 +115,6 @@ export const strings = defineMessages({ description: 'Notaður sem texti þegar ákærði hefur valið verjanda í dómaraflæði í ákærum.', }, - confirmDefenderChoiceModalTitle: { id: 'judicial.system.core:court_indictments.advocates.confirm_defender_choice_modal_title', defaultMessage: @@ -122,9 +123,9 @@ export const strings = defineMessages({ 'Notaður sem titill á staðfesta eða breyta val á verjanda modal í dómaraflæði í ákærum.', }, confirmDefenderChoiceModalText: { - id: 'judicial.system.core:court_indictments.advocates.confirm_defender_choice_modal_text', + id: 'judicial.system.core:court_indictments.advocates.confirm_defender_choice_modal_text_v1', defaultMessage: - 'Valinn verjandi, {defenderName}, mun fá aðgang að máli í Réttarvörslugátt. ', + 'Valinn verjandi, {defenderName}, mun fá aðgang að málinu í Réttarvörslugátt. ', description: 'Notaður sem texti í staðfesta val á verjanda modal í dómaraflæði í ákærum.', }, @@ -135,9 +136,9 @@ export const strings = defineMessages({ 'Notaður sem texti í staðfesta val á verjanda modal í dómaraflæði í ákærum.', }, confirmDefenderDelayModalText: { - id: 'judicial.system.core:court_indictments.advocates.confirm_defender_delay_modal_text', + id: 'judicial.system.core:court_indictments.advocates.confirm_defender_delay_modal_text_v1', defaultMessage: - 'Ákærð fær frest fram að þingfestingu til þess að tilnefna verjanda.', + 'Ákærði fær frest fram að þingfestingu til að tilnefna verjanda.', description: 'Notaður sem texti í staðfesta val á verjanda modal í dómaraflæði í ákærum.', }, @@ -147,7 +148,6 @@ export const strings = defineMessages({ description: 'Notaður sem texti í breyta vali á verjanda modal í dómaraflæði í ákærum.', }, - confirmSpokespersonModalTitle: { id: 'judicial.system.core:court_indictments.advocates.confirm_spokesperson_modal_title', defaultMessage: @@ -163,8 +163,8 @@ export const strings = defineMessages({ 'Notaður sem texti í staðfesta val á lögmanni eða réttargæslumanni modal í dómaraflæði í ákærum.', }, confirmModalPrimaryButtonText: { - id: 'judicial.system.core:court_indictments.advocates.modal_primary_button_text', - defaultMessage: 'Staðfesta', + id: 'judicial.system.core:court_indictments.advocates.modal_primary_button_text_v1', + defaultMessage: 'Staðfesta val', description: 'Notaður sem texti á takka til að staðfesta val á lögmanni eða réttargæslumanni í dómaraflæði í ákærum.', },