Merge branch 'main' into feat/default-scopes

island-is · Oct 18, 2024 · a2ea02c · a2ea02c
2 parents 8e3a9d0 + 52288e6
commit a2ea02c
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 163 deletions.
diff --git a/apps/judicial-system/web/messages/InvestigationCases/Prosecutor/caseFiles.ts b/apps/judicial-system/web/messages/InvestigationCases/Prosecutor/caseFiles.ts
diff --git a/apps/judicial-system/web/messages/RestrictionCases/Prosecutor/caseFiles.ts b/apps/judicial-system/web/messages/RestrictionCases/Prosecutor/caseFiles.ts
diff --git a/apps/judicial-system/web/messages/index.ts b/apps/judicial-system/web/messages/index.ts
@@ -2,7 +2,6 @@ export * from './RestrictionCases/Prosecutor/accusedForm'
 export * from './RestrictionCases/Prosecutor/requestedHearingArrangementsForm'
 export * from './RestrictionCases/Prosecutor/reportForm'
 export * from './RestrictionCases/Prosecutor/demandsForm'
-export * from './RestrictionCases/Prosecutor/caseFiles'
 export * from './RestrictionCases/Prosecutor/overview'
 export * from './/RestrictionCases/Prosecutor/demandsForm'
 export * from './RestrictionCases/Court/courtRecordForm'
@@ -12,7 +11,6 @@ export * from './InvestigationCases/Prosecutor/defendantForm'
 export * from './InvestigationCases/Prosecutor/requestedHearingArrangements'
 export * from './InvestigationCases/Prosecutor/demandsForm'
 export * from './InvestigationCases/Prosecutor/reportForm'
-export * from './InvestigationCases/Prosecutor/caseFiles'
 export * from './InvestigationCases/Prosecutor/overview'
 export * from './InvestigationCases/Court/courtRecordForm'
 export * from './InvestigationCases/Court/confirmation'

diff --git a/...s/Prosecutor/components/CasesAwaitingConfirmationTable/CasesAwaitingConfirmationTable.tsx b/...s/Prosecutor/components/CasesAwaitingConfirmationTable/CasesAwaitingConfirmationTable.tsx
@@ -9,7 +9,10 @@ import {
   SectionHeading,
   TagCaseState,
 } from '@island.is/judicial-system-web/src/components'
-import { useContextMenu } from '@island.is/judicial-system-web/src/components/ContextMenu/ContextMenu'
+import {
+  ContextMenuItem,
+  useContextMenu,
+} from '@island.is/judicial-system-web/src/components/ContextMenu/ContextMenu'
 import { contextMenu } from '@island.is/judicial-system-web/src/components/ContextMenu/ContextMenu.strings'
 import {
   ColumnCaseType,
@@ -33,12 +36,19 @@ interface CasesAwaitingConfirmationTableProps {
   isFiltering: boolean
   cases: CaseListEntry[]
   onContextMenuDeleteClick: (id: string) => void
+  canDeleteCase: (caseToDelete: CaseListEntry) => boolean
 }
 
 const CasesAwaitingConfirmationTable: FC<
   CasesAwaitingConfirmationTableProps
 > = (props) => {
-  const { loading, isFiltering, cases, onContextMenuDeleteClick } = props
+  const {
+    loading,
+    isFiltering,
+    cases,
+    onContextMenuDeleteClick,
+    canDeleteCase,
+  } = props
   const { formatMessage } = useIntl()
 
   const { openCaseInNewTabMenuItem } = useContextMenu()
@@ -76,13 +86,17 @@ const CasesAwaitingConfirmationTable: FC<
               generateContextMenuItems={(row) => {
                 return [
                   openCaseInNewTabMenuItem(row.id),
-                  {
-                    title: formatMessage(contextMenu.deleteCase),
-                    onClick: () => {
-                      onContextMenuDeleteClick(row.id)
-                    },
-                    icon: 'trash',
-                  },
+                  ...(canDeleteCase(row)
+                    ? [
+                        {
+                          title: formatMessage(contextMenu.deleteCase),
+                          onClick: () => {
+                            onContextMenuDeleteClick(row.id)
+                          },
+                          icon: 'trash',
+                        } as ContextMenuItem,
+                      ]
+                    : []),
                 ]
               }}
               columns={[

diff --git a/apps/judicial-system/web/src/routes/Shared/Cases/ActiveCases.tsx b/apps/judicial-system/web/src/routes/Shared/Cases/ActiveCases.tsx
@@ -4,7 +4,10 @@ import { useIntl } from 'react-intl'
 import { capitalize } from '@island.is/judicial-system/formatters'
 import { core, tables } from '@island.is/judicial-system-web/messages'
 import { TagCaseState } from '@island.is/judicial-system-web/src/components'
-import { useContextMenu } from '@island.is/judicial-system-web/src/components/ContextMenu/ContextMenu'
+import {
+  ContextMenuItem,
+  useContextMenu,
+} from '@island.is/judicial-system-web/src/components/ContextMenu/ContextMenu'
 import { contextMenu } from '@island.is/judicial-system-web/src/components/ContextMenu/ContextMenu.strings'
 import {
   ColumnCaseType,
@@ -19,10 +22,11 @@ import { CaseListEntry } from '@island.is/judicial-system-web/src/graphql/schema
 interface Props {
   cases: CaseListEntry[]
   onContextMenuDeleteClick: (id: string) => void
+  canDeleteCase: (caseToDelete: CaseListEntry) => boolean
 }
 
 const ActiveCases: FC<Props> = (props) => {
-  const { cases, onContextMenuDeleteClick } = props
+  const { cases, onContextMenuDeleteClick, canDeleteCase } = props
   const { formatMessage } = useIntl()
   const { openCaseInNewTabMenuItem } = useContextMenu()
 
@@ -56,13 +60,17 @@ const ActiveCases: FC<Props> = (props) => {
       generateContextMenuItems={(row) => {
         return [
           openCaseInNewTabMenuItem(row.id),
-          {
-            title: formatMessage(contextMenu.deleteCase),
-            onClick: () => {
-              onContextMenuDeleteClick(row.id)
-            },
-            icon: 'trash',
-          },
+          ...(canDeleteCase(row)
+            ? [
+                {
+                  title: formatMessage(contextMenu.deleteCase),
+                  onClick: () => {
+                    onContextMenuDeleteClick(row.id)
+                  },
+                  icon: 'trash',
+                } as ContextMenuItem,
+              ]
+            : []),
         ]
       }}
       columns={[

diff --git a/apps/judicial-system/web/src/routes/Shared/Cases/Cases.tsx b/apps/judicial-system/web/src/routes/Shared/Cases/Cases.tsx
@@ -10,6 +10,7 @@ import {
   isIndictmentCase,
   isProsecutionUser,
   isPublicProsecutor,
+  isRestrictionCase,
 } from '@island.is/judicial-system/types'
 import {
   core,
@@ -213,15 +214,20 @@ export const Cases: FC = () => {
     pastCases,
   } = useFilter(allActiveCases, allPastCases, user)
 
+  const canDeleteCase = (caseToDelete: CaseListEntry) =>
+    (isRestrictionCase(caseToDelete.type) &&
+      (caseToDelete.state === CaseState.NEW ||
+        caseToDelete.state === CaseState.DRAFT ||
+        caseToDelete.state === CaseState.SUBMITTED ||
+        caseToDelete.state === CaseState.RECEIVED)) ||
+    (isIndictmentCase(caseToDelete.type) &&
+      (caseToDelete.state === CaseState.DRAFT ||
+        caseToDelete.state === CaseState.WAITING_FOR_CONFIRMATION))
+
   const deleteCase = async (caseToDelete: CaseListEntry) => {
-    if (
-      caseToDelete.state === CaseState.NEW ||
-      caseToDelete.state === CaseState.DRAFT ||
-      caseToDelete.state === CaseState.WAITING_FOR_CONFIRMATION ||
-      caseToDelete.state === CaseState.SUBMITTED ||
-      caseToDelete.state === CaseState.RECEIVED
-    ) {
+    if (canDeleteCase(caseToDelete)) {
       await transitionCase(caseToDelete.id, CaseTransition.DELETE)
+
       refetch()
     }
   }
@@ -236,6 +242,7 @@ export const Cases: FC = () => {
     }
 
     await deleteCase(caseToDelete)
+
     setVisibleModal(undefined)
   }
 
@@ -287,6 +294,7 @@ export const Cases: FC = () => {
                       isFiltering={isFiltering}
                       cases={casesAwaitingConfirmation}
                       onContextMenuDeleteClick={setVisibleModal}
+                      canDeleteCase={canDeleteCase}
                     />
                     {isPublicProsecutor(user) && (
                       <CasesAwaitingReview
@@ -302,6 +310,7 @@ export const Cases: FC = () => {
                     <ActiveCases
                       cases={activeCases}
                       onContextMenuDeleteClick={setVisibleModal}
+                      canDeleteCase={canDeleteCase}
                     />
                   ) : (
                     <div className={styles.infoContainer}>