fix(j-s): cleanup

island-is · May 10, 2024 · 9fce80e · 9fce80e
1 parent b6581dd
commit 9fce80e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/apps/judicial-system/web/src/routes/Court/Indictments/Conclusion/Conclusion.tsx b/apps/judicial-system/web/src/routes/Court/Indictments/Conclusion/Conclusion.tsx
@@ -111,12 +111,12 @@ const Conclusion: React.FC = () => {
       } else if (selectedAction === 'COMPLETE') {
         handleCompletion()
       } else if (postponement?.postponedIndefinitely) {
-        const updateSuccss = await updateCase(workingCase.id, {
+        const updateSuccess = await updateCase(workingCase.id, {
           courtDate: null,
           postponedIndefinitelyExplanation: postponement.reason,
         })
 
-        if (!updateSuccss) {
+        if (!updateSuccess) {
           return
         }
       } else {

diff --git a/...cial-system/web/src/routes/PublicProsecutor/Indictments/ReviewDecision/ReviewDecision.tsx b/...cial-system/web/src/routes/PublicProsecutor/Indictments/ReviewDecision/ReviewDecision.tsx
@@ -7,7 +7,6 @@ import * as constants from '@island.is/judicial-system/consts'
 import { formatDate } from '@island.is/judicial-system/formatters'
 import {
   IndictmentCaseReviewDecision,
-  isCompletedCase,
   isPublicProsecutor,
 } from '@island.is/judicial-system/types'
 import {
@@ -16,17 +15,14 @@ import {
   SectionHeading,
   UserContext,
 } from '@island.is/judicial-system-web/src/components'
-import {
-  Case,
-  CaseState,
-} from '@island.is/judicial-system-web/src/graphql/schema'
 import { useCase } from '@island.is/judicial-system-web/src/utils/hooks'
 
 import { strings } from './ReviewDecision.strings'
 import * as styles from './ReviewDecision.css'
 
 interface Props {
-  workingCase: Case
+  caseId: string
+  indictmentAppealDeadline?: string
   modalVisible?: boolean
   setModalVisible: React.Dispatch<React.SetStateAction<boolean>>
   onSelect?: () => void
@@ -38,7 +34,13 @@ export const ReviewDecision: React.FC<Props> = (props) => {
   const { formatMessage: fm } = useIntl()
   const { updateCase } = useCase()
 
-  const { workingCase, modalVisible, setModalVisible, onSelect } = props
+  const {
+    caseId,
+    indictmentAppealDeadline,
+    modalVisible,
+    setModalVisible,
+    onSelect,
+  } = props
 
   const [indictmentReviewDecision, setIndictmentReviewDecision] = useState<
     IndictmentCaseReviewDecision | undefined
@@ -48,7 +50,7 @@ export const ReviewDecision: React.FC<Props> = (props) => {
     if (!indictmentReviewDecision) {
       return
     }
-    const updateSuccess = await updateCase(workingCase.id, {
+    const updateSuccess = await updateCase(caseId, {
       indictmentReviewDecision: indictmentReviewDecision,
     })
     if (updateSuccess) {
@@ -79,7 +81,7 @@ export const ReviewDecision: React.FC<Props> = (props) => {
           <Text variant="eyebrow">
             {fm(strings.subtitle, {
               indictmentAppealDeadline: formatDate(
-                workingCase.indictmentAppealDeadline,
+                indictmentAppealDeadline,
                 'P',
               ),
             })}

diff --git a/apps/judicial-system/web/src/routes/Shared/IndictmentOverview/IndictmentOverview.tsx b/apps/judicial-system/web/src/routes/Shared/IndictmentOverview/IndictmentOverview.tsx
@@ -106,7 +106,10 @@ const IndictmentOverview = () => {
         )}
         {shouldDisplayReviewDecision && (
           <ReviewDecision
-            workingCase={workingCase}
+            caseId={workingCase.id}
+            indictmentAppealDeadline={
+              workingCase.indictmentAppealDeadline ?? ''
+            }
             modalVisible={modalVisible}
             setModalVisible={setModalVisible}
             onSelect={() => setIsReviewDecisionSelected(true)}