Fixes generated pdf view for prosecutors

island-is · Oct 29, 2024 · c6ab3ee · c6ab3ee
1 parent b86cd04
commit c6ab3ee
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 23 deletions.
diff --git a/apps/judicial-system/web/src/routes/Court/Indictments/Overview/Overview.tsx b/apps/judicial-system/web/src/routes/Court/Indictments/Overview/Overview.tsx
@@ -132,11 +132,9 @@ const IndictmentOverview = () => {
             ))}
           </Accordion>
         )}
-        {workingCase.caseFiles && (
-          <Box component="section" marginBottom={10}>
-            <IndictmentCaseFilesList workingCase={workingCase} />
-          </Box>
-        )}
+        <Box component="section" marginBottom={10}>
+          <IndictmentCaseFilesList workingCase={workingCase} />
+        </Box>
         {workingCase.defendants && (
           <Box component="section" marginBottom={5}>
             {

diff --git a/apps/judicial-system/web/src/routes/PublicProsecutor/Indictments/Overview/Overview.tsx b/apps/judicial-system/web/src/routes/PublicProsecutor/Indictments/Overview/Overview.tsx
@@ -165,11 +165,9 @@ export const Overview = () => {
             <IndictmentsLawsBrokenAccordionItem workingCase={workingCase} />
           </Box>
         )} */}
-        {workingCase.caseFiles && (
-          <Box component="section" marginBottom={5}>
-            <IndictmentCaseFilesList workingCase={workingCase} />
-          </Box>
-        )}
+        <Box component="section" marginBottom={5}>
+          <IndictmentCaseFilesList workingCase={workingCase} />
+        </Box>
         <Box marginBottom={5}>
           <SectionHeading
             title={fm(strings.reviewerTitle)}

diff --git a/apps/judicial-system/web/src/routes/Shared/IndictmentOverview/IndictmentOverview.tsx b/apps/judicial-system/web/src/routes/Shared/IndictmentOverview/IndictmentOverview.tsx
@@ -8,6 +8,7 @@ import { normalizeAndFormatNationalId } from '@island.is/judicial-system/formatt
 import {
   isCompletedCase,
   isDefenceUser,
+  isProsecutionUser,
 } from '@island.is/judicial-system/types'
 import { titles } from '@island.is/judicial-system-web/messages'
 import {
@@ -68,7 +69,8 @@ const IndictmentOverview: FC = () => {
     ) &&
     workingCase.indictmentDecision !==
       IndictmentDecision.POSTPONING_UNTIL_VERDICT
-  const shouldDisplayGeneratedPDFs =
+  const shouldDisplayGeneratedPdfFiles =
+    isProsecutionUser(user) ||
     workingCase.defendants?.some(
       (defendant) =>
         defendant.isDefenderChoiceConfirmed &&
@@ -171,25 +173,23 @@ const IndictmentOverview: FC = () => {
                     <ConnectedCaseFilesAccordionItem
                       connectedCaseParentId={workingCase.id}
                       connectedCase={mergedCase}
-                      displayGeneratedPDFs={shouldDisplayGeneratedPDFs}
+                      displayGeneratedPDFs={shouldDisplayGeneratedPdfFiles}
                     />
                   </Box>
                 ))}
               </Accordion>
             )}
           </Box>
         )}
-        {workingCase.caseFiles && ( // TODO: Find a more accurate condition, there may be generated PDFs to display even if there are no uploaded files to display
-          <Box
-            component="section"
-            marginBottom={shouldDisplayReviewDecision || canAddFiles ? 5 : 10}
-          >
-            <IndictmentCaseFilesList
-              workingCase={workingCase}
-              displayGeneratedPDFs={shouldDisplayGeneratedPDFs}
-            />
-          </Box>
-        )}
+        <Box
+          component="section"
+          marginBottom={shouldDisplayReviewDecision || canAddFiles ? 5 : 10}
+        >
+          <IndictmentCaseFilesList
+            workingCase={workingCase}
+            displayGeneratedPDFs={shouldDisplayGeneratedPdfFiles}
+          />
+        </Box>
         {canAddFiles && (
           <Box display="flex" justifyContent="flexEnd" marginBottom={10}>
             <Button