fix(j-s): Police case numbers input

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

@@ -39,6 +39,7 @@ import {
 } from '@island.is/judicial-system/formatters'
 import type { User } from '@island.is/judicial-system/types'
 import {
+  CaseOrigin,
   CaseState,
   CaseType,
   indictmentCases,
@@ -271,6 +272,15 @@ export class CaseController {
       )
     }
 
+    if (theCase.origin === CaseOrigin.LOKE && update.policeCaseNumbers) {
+      const mainPoliceCaseNumber = theCase.policeCaseNumbers[0]
+      if (!update.policeCaseNumbers.includes(mainPoliceCaseNumber)) {
+        throw new BadRequestException(
+          `Cannot remove main police case number ${mainPoliceCaseNumber}`,
+        )
+      }
+    }
+
     return this.caseService.update(theCase, update, user) as Promise<Case> // Never returns undefined
   }
 

apps/judicial-system/web/src/routes/Prosecutor/components/PoliceCaseNumbers/PoliceCaseNumbers.tsx

@@ -43,6 +43,32 @@ export const usePoliceCaseNumbers = (workingCase: Case) => {
   return { clientPoliceNumbers, setClientPoliceNumbers }
 }
 
+const validatePoliceCaseNumber = (
+  value: string | undefined,
+  existingNumbers: string[] | null | undefined,
+): { isValid: boolean; errorMessage?: string } => {
+  if (!value) {
+    return { isValid: false, errorMessage: 'Value is required' }
+  }
+
+  const baseValidation = validate([
+    [value, ['empty', 'police-casenumber-format']],
+  ])
+
+  if (!baseValidation.isValid) {
+    return baseValidation
+  }
+
+  if (existingNumbers?.includes(value)) {
+    return {
+      isValid: false,
+      errorMessage: 'This police case number already exists',
+    }
+  }
+
+  return { isValid: true }
+}
+
 export const PoliceCaseNumbers: FC<Props> = ({
   workingCase,
   setWorkingCase,
@@ -53,21 +79,21 @@ export const PoliceCaseNumbers: FC<Props> = ({
   const { setAndSendCaseToServer } = useCase()
   const { formatMessage } = useIntl()
   const isLOKECase = workingCase.origin === CaseOrigin.LOKE
-
   const [hasError, setHasError] = useState(false)
+
   const updatePoliceNumbers = useCallback(
     (newPoliceCaseNumbers: string[]) => {
       setClientPoliceNumbers(newPoliceCaseNumbers)
-      setAndSendCaseToServer(
-        [
-          {
-            policeCaseNumbers: newPoliceCaseNumbers,
-            force: true,
-          },
-        ],
-        workingCase,
-        setWorkingCase,
-      )
+      if (newPoliceCaseNumbers.length > 0) {
+        setAndSendCaseToServer(
+          [{ policeCaseNumbers: newPoliceCaseNumbers, force: true }],
+          workingCase,
+          setWorkingCase,
+        )
+        setHasError(false)
+      } else {
+        setHasError(true)
+      }
     },
     [
       workingCase,
@@ -79,29 +105,77 @@ export const PoliceCaseNumbers: FC<Props> = ({
 
   const onAdd = useCallback(
     (value: string) => {
-      if (validate([[value, ['empty', 'police-casenumber-format']]]).isValid) {
+      const validation = validatePoliceCaseNumber(
+        value,
+        clientPoliceNumbers ?? [],
+      )
+      if (validation.isValid) {
         updatePoliceNumbers([...(clientPoliceNumbers ?? []), value])
-        setHasError(false)
       }
     },
-    [clientPoliceNumbers, updatePoliceNumbers, setHasError],
+    [clientPoliceNumbers, updatePoliceNumbers],
   )
 
   const onRemove = useCallback(
     (value: string) => () => {
-      const newPoliceCaseNumbers = clientPoliceNumbers?.filter(
-        (number) => number !== value,
+      if (!clientPoliceNumbers) return
+
+      let firstOccurrenceSkipped = false
+
+      const newPoliceCaseNumbers = clientPoliceNumbers.filter(
+        (number, index) => {
+          if (isLOKECase && number === value && index === 0) {
+            if (!firstOccurrenceSkipped) {
+              firstOccurrenceSkipped = true // Skip the first occurrence
+              return true
+            }
+            return false // Remove all other instances
+          }
+          return number !== value // Remove in non-LOKE cases
+        },
       )
-      if (newPoliceCaseNumbers && newPoliceCaseNumbers.length > 0) {
-        updatePoliceNumbers(newPoliceCaseNumbers)
-      } else {
-        setHasError(true)
-      }
-      setClientPoliceNumbers(newPoliceCaseNumbers)
+
+      updatePoliceNumbers(newPoliceCaseNumbers)
     },
-    [clientPoliceNumbers, updatePoliceNumbers, setClientPoliceNumbers],
+    [clientPoliceNumbers, updatePoliceNumbers, isLOKECase],
   )
 
+  const renderPoliceCaseNumbersList = () => {
+    if (!clientPoliceNumbers?.length) {
+      return (
+        <Text color="dark400" dataTestId="noPoliceCaseNumbersAssignedMessage">
+          {formatMessage(m.noPoliceCaseNumbersAssignedMessage)}
+        </Text>
+      )
+    }
+
+    return (
+      <Box display="flex" flexWrap="wrap" data-testid="policeCaseNumbers-list">
+        {clientPoliceNumbers.map((policeCaseNumber, index) => (
+          <Box
+            key={`${policeCaseNumber}-${index}`}
+            paddingRight={1}
+            paddingBottom={1}
+          >
+            <Tag
+              variant="darkerBlue"
+              onClick={onRemove(policeCaseNumber)}
+              aria-label={`Eyða númeri ${policeCaseNumber}`}
+              disabled={isLOKECase && index === 0}
+            >
+              <Box display="flex" alignItems="center">
+                <Box paddingRight={'smallGutter'}>{policeCaseNumber}</Box>
+                {isLOKECase && index === 0 ? null : (
+                  <Icon icon="close" size="small" />
+                )}
+              </Box>
+            </Tag>
+          </Box>
+        ))}
+      </Box>
+    )
+  }
+
   return (
     <>
       <SectionHeading title={formatMessage(m.heading)} required />
@@ -118,9 +192,11 @@ export const PoliceCaseNumbers: FC<Props> = ({
         })}
         onAddValue={onAdd}
         buttonText={formatMessage(m.buttonText)}
-        isDisabled={(value) =>
-          !validate([[value, ['empty', 'police-casenumber-format']]]).isValid
-        }
+        isDisabled={(value) => {
+          if (!value) return true
+          return !validatePoliceCaseNumber(value, clientPoliceNumbers ?? [])
+            .isValid
+        }}
         onBlur={(event) => {
           setHasError(
             Boolean(
@@ -133,39 +209,7 @@ export const PoliceCaseNumbers: FC<Props> = ({
         hasError={hasError}
         errorMessage={validate([[undefined, ['empty']]]).errorMessage}
       >
-        {clientPoliceNumbers && clientPoliceNumbers.length === 0 ? (
-          <Text color="dark400" dataTestId="noPoliceCaseNumbersAssignedMessage">
-            {formatMessage(m.noPoliceCaseNumbersAssignedMessage)}
-          </Text>
-        ) : (
-          <Box
-            display="flex"
-            flexWrap="wrap"
-            data-testid="policeCaseNumbers-list"
-          >
-            {clientPoliceNumbers?.map((policeCaseNumber, index) => (
-              <Box
-                key={`${policeCaseNumber}-${index}`}
-                paddingRight={1}
-                paddingBottom={1}
-              >
-                <Tag
-                  variant="darkerBlue"
-                  onClick={onRemove(policeCaseNumber)}
-                  aria-label={`Eyða númeri ${policeCaseNumber}`}
-                  disabled={isLOKECase && index === 0}
-                >
-                  <Box display="flex" alignItems="center">
-                    <Box paddingRight={'smallGutter'}>{policeCaseNumber}</Box>
-                    {isLOKECase && index > 0 ? null : (
-                      <Icon icon="close" size="small" />
-                    )}
-                  </Box>
-                </Tag>
-              </Box>
-            ))}
-          </Box>
-        )}
+        {renderPoliceCaseNumbersList()}
       </MultipleValueList>
     </>
   )