Skip to content

Commit

Permalink
fix(j-s): Filter Case Files by Police Case Number (#16422)
Browse files Browse the repository at this point in the history
* Fixes case files record filtering by police case number

* Improves type safety

---------

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
  • Loading branch information
gudjong and kodiakhq[bot] authored Oct 16, 2024
1 parent cc988c7 commit be38ab0
Showing 1 changed file with 15 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@ import {
PdfButton,
ProsecutorCaseInfo,
} from '@island.is/judicial-system-web/src/components'
import { CaseFileCategory } from '@island.is/judicial-system-web/src/graphql/schema'
import {
CaseFile as TCaseFile,
CaseFileCategory,
} from '@island.is/judicial-system-web/src/graphql/schema'

import { caseFile as m } from './CaseFile.strings'

Expand All @@ -25,12 +28,17 @@ const CaseFile = () => {
useContext(FormContext)

const caseFiles = useMemo(() => {
return (
workingCase.caseFiles?.filter(
(caseFile) => caseFile.category === CaseFileCategory.CASE_FILE_RECORD,
) ?? []
return new Map<string, TCaseFile[]>(
workingCase.policeCaseNumbers?.map((policeCaseNumber) => [
policeCaseNumber,
workingCase.caseFiles?.filter(
(caseFile) =>
caseFile.policeCaseNumber === policeCaseNumber &&
caseFile.category === CaseFileCategory.CASE_FILE_RECORD,
) ?? [],
]),
)
}, [workingCase.caseFiles])
}, [workingCase.caseFiles, workingCase.policeCaseNumbers])

const { formatMessage } = useIntl()
const [editCount, setEditCount] = useState<number>(0)
Expand Down Expand Up @@ -73,7 +81,7 @@ const CaseFile = () => {
caseId={workingCase.id}
policeCaseNumber={policeCaseNumber}
shouldStartExpanded={index === 0}
caseFiles={caseFiles}
caseFiles={caseFiles.get(policeCaseNumber) ?? []}
subtypes={workingCase.indictmentSubtypes}
crimeScenes={workingCase.crimeScenes}
setEditCount={setEditCount}
Expand Down

0 comments on commit be38ab0

Please sign in to comment.