feat(j-s): Add new case decision for closing without ruling

island-is · Jan 21, 2025 · c103885 · c103885
1 parent 2b2a7e3
commit c103885
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 0 deletions.
diff --git a/apps/judicial-system/backend/migrations/20250121143923-update-case.js b/apps/judicial-system/backend/migrations/20250121143923-update-case.js
@@ -0,0 +1,29 @@
+'use strict'
+
+const replaceEnum = require('sequelize-replace-enum-postgres').default
+
+module.exports = {
+  up: async (queryInterface) => {
+    // Safely add the new enum value to the type without replacing the entire enum
+    await queryInterface.sequelize.query(`
+      ALTER TYPE enum_case_decision 
+      ADD VALUE IF NOT EXISTS 'COMPLETED_WITHOUT_RULING';
+    `)
+  },
+
+  down: (queryInterface) => {
+    return replaceEnum({
+      queryInterface,
+      tableName: 'case',
+      columnName: 'decision',
+      newValues: [
+        'ACCEPTING',
+        'REJECTING',
+        'ACCEPTING_ALTERNATIVE_TRAVEL_BAN',
+        'ACCEPTING_PARTIALLY',
+        'DISMISSING',
+      ],
+      enumName: 'enum_case_decision',
+    })
+  },
+}
diff --git a/apps/judicial-system/web/src/routes/Court/InvestigationCase/Ruling/Ruling.strings.ts b/apps/judicial-system/web/src/routes/Court/InvestigationCase/Ruling/Ruling.strings.ts
@@ -35,6 +35,20 @@ export const icRuling = {
           'Notaður sem skýritexti fyrir "greinargerð um málsatvik" innsláttarsvæðið á úrskurðar skrefi í rannsóknarheimildum.',
       },
     }),
+    completedWithoutRuling: defineMessages({
+      label: {
+        id: 'judicial.system.core:investigation_cases.ruling.completed_without_ruling.label',
+        defaultMessage: 'Ljúka máli án úrskurðar',
+        description:
+          'Notaður sem titill fyrir "Ljúka máli án úrskurðar" checkbox á úrskurðar skrefi í rannsóknarheimildum.',
+      },
+      tooltip: {
+        id: 'judicial.system.core:investigation_cases.ruling.completed_without_ruling.tooltip',
+        defaultMessage: 'Ljúka máli án úrskurðar.',
+        description:
+          'Notaður sem upplýsingatexti við "Ljúka mál án úrskurðar" titlinn á úrskurðar skrefi í rannsóknarheimildum.',
+      },
+    }),
     courtLegalArguments: defineMessages({
       title: {
         id: 'judicial.system.core:investigation_cases.ruling.court_legal_arguments.title',

diff --git a/apps/judicial-system/web/src/routes/Court/InvestigationCase/Ruling/Ruling.tsx b/apps/judicial-system/web/src/routes/Court/InvestigationCase/Ruling/Ruling.tsx
@@ -6,6 +6,7 @@ import {
   Accordion,
   AccordionItem,
   Box,
+  Checkbox,
   Input,
   Text,
   Tooltip,
@@ -138,6 +139,32 @@ const Ruling = () => {
             </AccordionItem>
           </Accordion>
         </Box>
+        <Box component="section" marginBottom={5}>
+          <Checkbox
+            name={formatMessage(m.sections.completedWithoutRuling.label)}
+            label={formatMessage(m.sections.completedWithoutRuling.label)}
+            checked={Boolean(
+              workingCase.decision === CaseDecision.COMPLETED_WITHOUT_RULING,
+            )}
+            onChange={({ target }) => {
+              setAndSendCaseToServer(
+                [
+                  {
+                    decision: target.checked
+                      ? CaseDecision.COMPLETED_WITHOUT_RULING
+                      : null,
+                    force: true,
+                  },
+                ],
+                workingCase,
+                setWorkingCase,
+              )
+            }}
+            tooltip={formatMessage(m.sections.completedWithoutRuling.tooltip)}
+            backgroundColor="blue"
+            large
+          />
+        </Box>
         <Box component="section" marginBottom={5}>
           <Box marginBottom={3}>
             <Text as="h3" variant="h3">

diff --git a/libs/judicial-system/types/src/lib/case.ts b/libs/judicial-system/types/src/lib/case.ts
@@ -215,6 +215,7 @@ export enum CaseDecision {
   ACCEPTING_ALTERNATIVE_TRAVEL_BAN = 'ACCEPTING_ALTERNATIVE_TRAVEL_BAN',
   ACCEPTING_PARTIALLY = 'ACCEPTING_PARTIALLY',
   DISMISSING = 'DISMISSING',
+  COMPLETED_WITHOUT_RULING = 'COMPLETED_WITHOUT_RULING',
 }
 
 export enum IndictmentDecision {