fix(j-s): Indictment Post Processing (#15077)

* Fixes post processing of dismissed and cancelled indictments * Refactors code --------- Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
island-is · Jun 5, 2024 · eebb157 · eebb157
1 parent 19b919b
commit eebb157
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 27 deletions.
diff --git a/apps/judicial-system/web/src/routes/Court/Indictments/Completed/Completed.tsx b/apps/judicial-system/web/src/routes/Court/Indictments/Completed/Completed.tsx
@@ -83,6 +83,13 @@ const Completed: FC = () => {
     [workingCase.id],
   )
 
+  const isRulingOrFine =
+    workingCase.indictmentRulingDecision &&
+    [
+      CaseIndictmentRulingDecision.RULING,
+      CaseIndictmentRulingDecision.FINE,
+    ].includes(workingCase.indictmentRulingDecision)
+
   const stepIsValid = () =>
     workingCase.indictmentRulingDecision === CaseIndictmentRulingDecision.RULING
       ? workingCase.defendants?.every(
@@ -112,30 +119,32 @@ const Completed: FC = () => {
         <Box marginBottom={5} component="section">
           <IndictmentCaseFilesList workingCase={workingCase} />
         </Box>
-        <Box marginBottom={5} component="section">
-          <SectionHeading
-            title={formatMessage(strings.criminalRecordUpdateTitle)}
-          />
-          <InputFileUpload
-            fileList={uploadFiles.filter(
-              (file) =>
-                file.category === CaseFileCategory.CRIMINAL_RECORD_UPDATE,
-            )}
-            accept="application/pdf"
-            header={formatMessage(core.uploadBoxTitle)}
-            buttonLabel={formatMessage(core.uploadBoxButtonLabel)}
-            description={formatMessage(core.uploadBoxDescription, {
-              fileEndings: '.pdf',
-            })}
-            onChange={(files) =>
-              handleCriminalRecordUpdateUpload(
-                files,
-                CaseFileCategory.CRIMINAL_RECORD_UPDATE,
-              )
-            }
-            onRemove={(file) => handleRemoveFile(file)}
-          />
-        </Box>
+        {isRulingOrFine && (
+          <Box marginBottom={5} component="section">
+            <SectionHeading
+              title={formatMessage(strings.criminalRecordUpdateTitle)}
+            />
+            <InputFileUpload
+              fileList={uploadFiles.filter(
+                (file) =>
+                  file.category === CaseFileCategory.CRIMINAL_RECORD_UPDATE,
+              )}
+              accept="application/pdf"
+              header={formatMessage(core.uploadBoxTitle)}
+              buttonLabel={formatMessage(core.uploadBoxButtonLabel)}
+              description={formatMessage(core.uploadBoxDescription, {
+                fileEndings: '.pdf',
+              })}
+              onChange={(files) =>
+                handleCriminalRecordUpdateUpload(
+                  files,
+                  CaseFileCategory.CRIMINAL_RECORD_UPDATE,
+                )
+              }
+              onRemove={(file) => handleRemoveFile(file)}
+            />
+          </Box>
+        )}
         {workingCase.indictmentRulingDecision ===
           CaseIndictmentRulingDecision.RULING && (
           <Box marginBottom={10}>
@@ -239,6 +248,7 @@ const Completed: FC = () => {
       <FormContentContainer isFooter>
         <FormFooter
           previousUrl={constants.CASES_ROUTE}
+          hideNextButton={!isRulingOrFine}
           nextButtonText={formatMessage(strings.sendToPublicProsecutor)}
           nextIsDisabled={!stepIsValid()}
           onNextButtonClick={handleNextButtonClick}

diff --git a/apps/judicial-system/web/src/routes/Court/Indictments/Summary/Summary.strings.ts b/apps/judicial-system/web/src/routes/Court/Indictments/Summary/Summary.strings.ts
@@ -40,9 +40,8 @@ export const strings = defineMessages({
     description: 'Notaður sem titill á staðfestingarglugga um að mál sé lokið.',
   },
   completedCaseModalBody: {
-    id: 'judicial.system.core:indictments.summary.completed_case_modal_body',
-    defaultMessage:
-      'Gögn hafa verið send á ákæranda og verjanda hafi þeim verið hlaðið upp.',
+    id: 'judicial.system.core:indictments.summary.completed_case_modal_body_v2',
+    defaultMessage: 'Gögn hafa verið send ákæranda og verjanda.',
     description: 'Notaður sem texti í staðfestingarglugga um að mál sé lokið.',
   },
 })