Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(j-s): Allow defenders to filter cases by court date #17232

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+10 −3
Open

feat(j-s): Allow defenders to filter cases by court date #17232

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
830a673
feat(j-s): Allow filtering of defender cases by court date
unakb Dec 12, 2024
f009f43
Merge branch 'main' into j-s/defender-filter-court-date
unakb Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions apps/judicial-system/web/src/routes/Defender/Cases/components/DefenderCasesTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ export const DefenderCasesTable: FC<Props> = ({
) {
return entry.defendants[0].name ?? ''
}
if (column === 'courtDate') {
return entry.courtDate
}
Comment on lines +60 to +62
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Consider improving the courtDate handling logic

The current implementation has a few potential issues:

  1. The raw courtDate is returned without any formatting, which might be inconsistent with other date displays in the table.
  2. The fallback to entry.created seems incorrect for columns other than 'courtDate' and 'defendants'.

Consider applying this improvement:

    if (column === 'courtDate') {
-     return entry.courtDate
+     return entry.courtDate ?? null
    }
-   return entry.created
+   return entry[column] ?? null

Committable suggestion skipped: line range outside the PR's diff.

return entry.created
}
const { sortedData, requestSort, getClassNamesFor, isActiveColumn } = useSort(
Expand Down Expand Up @@ -129,9 +132,13 @@ export const DefenderCasesTable: FC<Props> = ({
</th>
) : (
<th>
<Text fontWeight="regular">
{formatMessage(tables.hearingArrangementDate)}
</Text>
<SortButton
title={formatMessage(tables.hearingArrangementDate)}
onClick={() => requestSort('courtDate')}
sortAsc={getClassNamesFor('courtDate') === 'ascending'}
sortDes={getClassNamesFor('courtDate') === 'descending'}
isActive={isActiveColumn('courtDate')}
/>
</th>
)}
<th></th>
Expand Down
Loading