fix(j-s): Defender Case Info (#16024)

island-is · Sep 17, 2024 · e8480d9 · e8480d9
1 parent e77487b
commit e8480d9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/apps/judicial-system/backend/src/app/modules/case/limitedAccessCase.service.ts b/apps/judicial-system/backend/src/app/modules/case/limitedAccessCase.service.ts
@@ -216,6 +216,7 @@ export const include: Includeable[] = [
     required: false,
     where: { stringType: { [Op.in]: stringTypes } },
   },
+  { model: Case, as: 'mergeCase', attributes },
 ]
 
 export const order: OrderItem[] = [

diff --git a/apps/judicial-system/web/src/components/FormProvider/limitedAccessCase.graphql b/apps/judicial-system/web/src/components/FormProvider/limitedAccessCase.graphql
@@ -161,5 +161,9 @@ query LimitedAccessCase($input: CaseQueryInput!) {
       created
       eventType
     }
+    mergeCase {
+      id
+      courtCaseNumber
+    }
   }
 }
diff --git a/apps/judicial-system/web/src/components/TagCaseState/TagCaseState.strings.ts b/apps/judicial-system/web/src/components/TagCaseState/TagCaseState.strings.ts
@@ -73,9 +73,9 @@ export const strings = defineMessages({
     description: 'Notað sem merki þegar mál í stöðu "Dómtekið" í málalista',
   },
   completed: {
-    id: 'judicial.system.core:tag_case_state.completed',
+    id: 'judicial.system.core:tag_case_state.completed_v2',
     defaultMessage:
-      '{indictmentRulingDecision, select, RULING {Dómur} FINE {Viðurlagaákvörðun} DISMISSAL {Frávísun} CANCELLATION {Niðurfelling} other {Lokið}}',
+      '{indictmentRulingDecision, select, RULING {Dómur} FINE {Viðurlagaákvörðun} DISMISSAL {Frávísun} CANCELLATION {Niðurfelling} MERGE {Sameinað} other {Lokið}}',
     description: 'Notað sem merki þegar mál í stöðu "Dómþulur" í málalista',
   },
   recalled: {

diff --git a/apps/judicial-system/web/src/routes/Shared/IndictmentOverview/IndictmentOverview.tsx b/apps/judicial-system/web/src/routes/Shared/IndictmentOverview/IndictmentOverview.tsx
@@ -26,6 +26,7 @@ import {
   UserContext,
 } from '@island.is/judicial-system-web/src/components'
 import {
+  CaseIndictmentRulingDecision,
   CaseState,
   IndictmentDecision,
   UserRole,
@@ -110,8 +111,10 @@ const IndictmentOverview: FC = () => {
           {caseIsClosed ? (
             <InfoCardClosedIndictment
               displayAppealExpirationInfo={
-                user?.role === UserRole.DEFENDER ||
-                workingCase.indictmentReviewer?.id === user?.id
+                workingCase.indictmentRulingDecision ===
+                  CaseIndictmentRulingDecision.RULING &&
+                (user?.role === UserRole.DEFENDER ||
+                  workingCase.indictmentReviewer?.id === user?.id)
               }
             />
           ) : (