chore(j-s): adding new client logic for offenses

apps/judicial-system/api/infra/judicial-system-api.ts

@@ -46,9 +46,9 @@ export const serviceSetup = (services: {
         prod: 'master',
       },
       HIDDEN_FEATURES: {
-        dev: '',
-        staging: '',
-        prod: '',
+        dev: 'OFFENSE_ENDPOINTS',
+        staging: 'OFFENSE_ENDPOINTS',
+        prod: 'OFFENSE_ENDPOINTS',
       },
     })
     .secrets({

apps/judicial-system/web/src/routes/Prosecutor/Indictments/Defendant/Defendant.tsx

@@ -9,11 +9,13 @@ import * as constants from '@island.is/judicial-system/consts'
 import {
   CrimeScene,
   CrimeSceneMap,
+  Feature,
   IndictmentSubtype,
   IndictmentSubtypeMap,
 } from '@island.is/judicial-system/types'
 import { core, errors, titles } from '@island.is/judicial-system-web/messages'
 import {
+  FeatureContext,
   FormContentContainer,
   FormContext,
   FormFooter,
@@ -38,7 +40,7 @@ import { isDefendantStepValidIndictments } from '@island.is/judicial-system-web/
 
 import { DefendantInfo } from '../../components'
 import { getIndictmentIntroductionAutofill } from '../Indictment/Indictment'
-import { getIncidentDescription } from '../Indictment/IndictmentCount'
+import { getIncidentDescription } from '../Indictment/lib/getIncidentDescription'
 import { LokeNumberList } from './LokeNumberList/LokeNumberList'
 import { PoliceCaseInfo } from './PoliceCaseInfo/PoliceCaseInfo'
 import { usePoliceCaseInfoQuery } from './policeCaseInfo.generated'
@@ -102,6 +104,9 @@ const getPoliceCasesForUpdate = (
   )
 
 const Defendant = () => {
+  const { features } = useContext(FeatureContext)
+  const isOffenseEndpointEnabled = features.includes(Feature.OFFENSE_ENDPOINTS)
+
   const { workingCase, setWorkingCase, isLoadingWorkingCase, caseNotFound } =
     useContext(FormContext)
   const { formatMessage } = useIntl()
@@ -297,12 +302,13 @@ const Defendant = () => {
             ...indictmentCount,
             indictmentCountSubtypes: subtypes?.[policeCaseNumber],
           }
-          const incidentDescription = getIncidentDescription(
-            updatedIndictmentCount,
+          const incidentDescription = getIncidentDescription({
+            indictmentCount: updatedIndictmentCount,
             formatMessage,
             crimeScene,
-            subtypes,
-          )
+            subtypesRecord: subtypes,
+            isOffenseEndpointEnabled,
+          })
 
           updateIndictmentCount(workingCase.id, indictmentCount.id, {
             incidentDescription,

apps/judicial-system/web/src/routes/Prosecutor/Indictments/Indictment/Indictment.tsx

@@ -7,9 +7,11 @@ import router from 'next/router'
 import { Box, Button, Checkbox, Input } from '@island.is/island-ui/core'
 import * as constants from '@island.is/judicial-system/consts'
 import { formatNationalId } from '@island.is/judicial-system/formatters'
+import { Feature } from '@island.is/judicial-system/types'
 import { titles } from '@island.is/judicial-system-web/messages'
 import {
   BlueBox,
+  FeatureContext,
   FormContentContainer,
   FormContext,
   FormFooter,
@@ -26,6 +28,7 @@ import {
   IndictmentCountOffense,
   Institution,
   Maybe,
+  Offense,
   PoliceCaseInfo,
 } from '@island.is/judicial-system-web/src/graphql/schema'
 import { TempIndictmentCount as TIndictmentCount } from '@island.is/judicial-system-web/src/types'
@@ -78,13 +81,17 @@ export const getIndictmentIntroductionAutofill = (
 }
 
 const Indictment = () => {
+  const { features } = useContext(FeatureContext)
+  const isOffenseEndpointEnabled = features.includes(Feature.OFFENSE_ENDPOINTS)
+
   const {
     workingCase,
     setWorkingCase,
     isLoadingWorkingCase,
     caseNotFound,
     isCaseUpToDate,
   } = useContext(FormContext)
+
   const { formatMessage } = useIntl()
   const { updateCase, setAndSendCaseToServer } = useCase()
   const {
@@ -129,16 +136,25 @@ const Indictment = () => {
       // If the case has:
       // at least one count with the offense driving under the influence of alcohol, illegal drugs or prescription drugs
       // then by default the prosecutor requests a suspension of the driver's licence.
-      const requestDriversLicenseSuspension = indictmentCounts?.some((count) =>
-        count.deprecatedOffenses?.some((offense) =>
-          [
-            IndictmentCountOffense.DRUNK_DRIVING,
-            IndictmentCountOffense.ILLEGAL_DRUGS_DRIVING,
-            IndictmentCountOffense.PRESCRIPTION_DRUGS_DRIVING,
-          ].includes(offense),
-        ),
-      )
-
+      const requestDriversLicenseSuspension = isOffenseEndpointEnabled
+        ? indictmentCounts?.some((count) => {
+            return count.offenses?.some((o) =>
+              [
+                IndictmentCountOffense.DRUNK_DRIVING,
+                IndictmentCountOffense.ILLEGAL_DRUGS_DRIVING,
+                IndictmentCountOffense.PRESCRIPTION_DRUGS_DRIVING,
+              ].includes(o.offense),
+            )
+          })
+        : indictmentCounts?.some((count) =>
+            count.deprecatedOffenses?.some((offense) =>
+              [
+                IndictmentCountOffense.DRUNK_DRIVING,
+                IndictmentCountOffense.ILLEGAL_DRUGS_DRIVING,
+                IndictmentCountOffense.PRESCRIPTION_DRUGS_DRIVING,
+              ].includes(offense),
+            ),
+          )
       if (
         requestDriversLicenseSuspension !==
         workingCase.requestDriversLicenseSuspension
@@ -158,7 +174,13 @@ const Indictment = () => {
         )
       }
     },
-    [formatMessage, setAndSendCaseToServer, setWorkingCase, workingCase],
+    [
+      isOffenseEndpointEnabled,
+      formatMessage,
+      setAndSendCaseToServer,
+      setWorkingCase,
+      workingCase,
+    ],
   )
 
   const handleCreateIndictmentCount = useCallback(async () => {
@@ -191,6 +213,7 @@ const Indictment = () => {
     async (
       indictmentCountId: string,
       updatedIndictmentCount: UpdateIndictmentCount,
+      updatedOffenses?: Offense[],
     ) => {
       if (
         updatedIndictmentCount.policeCaseNumber &&
@@ -218,14 +241,17 @@ const Indictment = () => {
 
       setDriversLicenseSuspensionRequest(
         workingCase.indictmentCounts?.map((count) =>
-          count.id === indictmentCountId ? returnedIndictmentCount : count,
+          count.id === indictmentCountId
+            ? { ...returnedIndictmentCount, offenses: updatedOffenses }
+            : count,
         ),
       )
 
       updateIndictmentCountState(
         indictmentCountId,
         returnedIndictmentCount,
         setWorkingCase,
+        updatedOffenses,
       )
     },
     [