chore(j-s): Fixes to ServiceRequirement NOT_REQUIRED

apps/judicial-system/api/src/app/modules/case/interceptors/case.transformer.ts

@@ -147,9 +147,10 @@ export const getIndictmentInfo = (
 
   const verdictInfo = defendants?.map<[boolean, Date | undefined]>(
     (defendant) => [
-      rulingDecision === CaseIndictmentRulingDecision.RULING &&
-        defendant.serviceRequirement !== ServiceRequirement.NOT_REQUIRED,
-      defendant.verdictViewDate
+      rulingDecision === CaseIndictmentRulingDecision.RULING,
+      defendant.serviceRequirement === ServiceRequirement.NOT_REQUIRED
+        ? new Date()
+        : defendant.verdictViewDate
         ? new Date(defendant.verdictViewDate)
         : undefined,
     ],

apps/judicial-system/backend/src/app/modules/case/filters/case.filter.ts

@@ -20,7 +20,6 @@ import {
   isRequestCase,
   isRestrictionCase,
   RequestSharedWithDefender,
-  ServiceRequirement,
   UserRole,
 } from '@island.is/judicial-system/types'
 
@@ -289,21 +288,19 @@ const canPrisonAdminUserAccessCase = (
     ) {
       return false
     }
+  }
 
-    // Check defendant verdict appeal deadline access
-    const verdictInfo = theCase.defendants?.map<[boolean, Date | undefined]>(
-      (defendant) => [
-        defendant.serviceRequirement !== ServiceRequirement.NOT_REQUIRED,
-        defendant.verdictViewDate,
-      ],
-    )
+  // Check defendant verdict appeal deadline access
+  const canAppealVerdict = true
+  const verdictInfo = (theCase.defendants || []).map<
+    [boolean, Date | undefined]
+  >((defendant) => [canAppealVerdict, defendant.verdictViewDate])
 
-    const [_, indictmentVerdictAppealDeadlineExpired] =
-      getIndictmentVerdictAppealDeadlineStatus(verdictInfo)
+  const [_, indictmentVerdictAppealDeadlineExpired] =
+    getIndictmentVerdictAppealDeadlineStatus(verdictInfo)
 
-    if (!indictmentVerdictAppealDeadlineExpired) {
-      return false
-    }
+  if (!indictmentVerdictAppealDeadlineExpired) {
+    return false
   }
 
   return true

apps/judicial-system/backend/src/app/modules/case/filters/cases.filter.ts

@@ -214,8 +214,7 @@ const getPrisonAdminUserCasesQueryFilter = (): WhereOptions => {
           [Op.notIn]: Sequelize.literal(`
             (SELECT case_id
               FROM defendant
-              WHERE service_requirement <> 'NOT_REQUIRED'
-              AND (verdict_view_date IS NULL OR verdict_view_date > NOW() - INTERVAL '28 days'))
+              WHERE (verdict_view_date IS NULL OR verdict_view_date > NOW() - INTERVAL '28 days'))
           `),
         },
       },

apps/judicial-system/backend/src/app/modules/case/filters/test/cases.filter.spec.ts

@@ -389,8 +389,7 @@ describe('getCasesQueryFilter', () => {
             [Op.notIn]: Sequelize.literal(`
             (SELECT case_id
               FROM defendant
-              WHERE service_requirement <> 'NOT_REQUIRED'
-              AND (verdict_view_date IS NULL OR verdict_view_date > NOW() - INTERVAL '28 days'))
+              WHERE (verdict_view_date IS NULL OR verdict_view_date > NOW() - INTERVAL '28 days'))
           `),
           },
         },

apps/judicial-system/backend/src/app/modules/subpoena/limitedAccessSubpoena.controller.ts

@@ -6,7 +6,6 @@ import {
   Header,
   Inject,
   Param,
-  Query,
   Res,
   UseGuards,
 } from '@nestjs/common'

apps/judicial-system/web/src/components/InfoCard/DefendantInfo/DefendantInfo.css.ts

@@ -8,7 +8,7 @@ const baseGridRow = style({
 })
 
 export const gridRow = styleVariants({
-  withButton: [baseGridRow, { gridTemplateColumns: '5fr 1fr' }],
+  withButton: [baseGridRow, { gridTemplateColumns: '5fr auto' }],
   withoutButton: [baseGridRow, { gridTemplateColumns: '1fr' }],
 })
 

apps/judicial-system/web/src/components/SectionHeading/SectionHeading.tsx

@@ -29,7 +29,11 @@ const SectionHeading: FC<Props> = ({
       {tooltip && ' '}
       {tooltip && <Box component="span">{tooltip}</Box>}
     </Text>
-    {description && <Text marginTop={1}>{description}</Text>}
+    {description && (
+      <Box component="span" marginTop={1}>
+        {description}
+      </Box>
+    )}
   </Box>
 )