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.

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

fix(j-s): Render sent to prison admin files for FMST #17264

Merged
merged 3 commits into from
Dec 17, 2024

Conversation

unakb
Copy link
Member

@unakb unakb commented Dec 16, 2024

Laga að FMST sjái uploadað skjal

What

Display prison admin case files to prison admin

Why

They need to see the files

Checklist:

  • I have performed a self-review of my own code
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • Formatting passes locally with my changes
  • I have rebased against main before asking for a review

Summary by CodeRabbit

  • New Features

    • Introduced a new case file category for prison admin users: "Sent to Prison Admin."
    • Added a section in the Indictment Overview to display files categorized as "Sent to Prison Admin."
    • Expanded localization support with a new title for documents sent to prison administration.
  • Bug Fixes

    • Enhanced access control for prison admin users to include the new case file category.
  • Tests

    • Updated test cases to verify access rights for the new case file category for prison admin users.

@unakb unakb requested a review from a team as a code owner December 16, 2024 21:48
Copy link
Contributor

coderabbitai bot commented Dec 16, 2024

Warning

There were issues while running some tools. Please review the errors and either fix the tool’s configuration or disable the tool if it’s a critical failure.

🔧 eslint

If the error stems from missing dependencies, add them to the package.json file. For unrecoverable errors (e.g., due to private dependencies), disable the tool in the CodeRabbit configuration.

warning [email protected]: This version is no longer supported. Please see https://eslint.org/version-support for other options.
warning eslint > @humanwhocodes/[email protected]: Use @eslint/config-array instead
warning eslint > @humanwhocodes/config-array > @humanwhocodes/[email protected]: Use @eslint/object-schema instead
warning eslint > file-entry-cache > flat-cache > [email protected]: Rimraf versions prior to v4 are no longer supported
warning eslint > file-entry-cache > flat-cache > rimraf > [email protected]: Glob versions prior to v9 are no longer supported
warning eslint > file-entry-cache > flat-cache > rimraf > glob > [email protected]: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.
warning jest > @jest/core > jest-config > [email protected]: Glob versions prior to v9 are no longer supported
warning jest > @jest/core > jest-runtime > [email protected]: Glob versions prior to v9 are no longer supported
warning jest > @jest/core > @jest/reporters > [email protected]: Glob versions prior to v9 are no longer supported
warning jest > @jest/core > @jest/transform > babel-plugin-istanbul > test-exclude > [email protected]: Glob versions prior to v9 are no longer supported
warning storybook > @storybook/cli > puppeteer-core > [email protected]: Rimraf versions prior to v4 are no longer supported
warning storybook > @storybook/cli > puppeteer-core > rimraf > [email protected]: Glob versions prior to v9 are no longer supported
warning storybook > @storybook/cli > tempy > del > [email protected]: Rimraf versions prior to v4 are no longer supported
warning storybook > @storybook/cli > jscodeshift > temp > [email protected]: Rimraf versions prior to v4 are no longer supported
warning storybook > @storybook/cli > jscodeshift > temp > rimraf > [email protected]: Glob versions prior to v9 are no longer supported
warning storybook > @storybook/cli > jscodeshift > @babel/[email protected]: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-properties instead.
warning storybook > @storybook/cli > jscodeshift > @babel/[email protected]: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-nullish-coalescing-operator instead.
warning storybook > @storybook/cli > jscodeshift > @babel/[email protected]: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-optional-chaining instead.
warning react-native > @react-native/codegen > [email protected]: Glob versions prior to v9 are no longer supported
warning react-native > @react-native/community-cli-plugin > [email protected]: The querystring API is considered Legacy. new code should use the URLSearchParams API instead.
warning react-native > @react-native/community-cli-plugin > @react-native/dev-middleware > @rnx-kit/chromium-edge-launcher > [email protected]: Rimraf versions prior to v4 are no longer supported
warning react-native > @react-native/community-cli-plugin > @react-native/metro-babel-transformer > @react-native/babel-preset > @babel/[email protected]: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-properties instead.
warning react-native > @react-native/community-cli-plugin > @react-native/metro-babel-transformer > @react-native/babel-preset > @babel/[email protected]: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-optional-chaining instead.
warning react-native > @react-native/community-cli-plugin > @react-native/metro-babel-transformer > @react-native/babel-preset > @babel/[email protected]: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-nullish-coalescing-operator instead.
warning react-native > @react-native/community-cli-plugin > @react-native/metro-babel-transformer > @react-native/babel-preset > @babel/[email protected]: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-numeric-separator instead.
warning react-native > @react-native/community-cli-plugin > @react-native/metro-babel-transformer > @react-native/babel-preset > @babel/[email protected]: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-object-rest-spread instead.
warning react-native > @react-native/community-cli-plugin > @react-native/metro-babel-transformer > @react-native/babel-preset > @babel/[email protected]: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-optional-catch-binding instead.
warning react-native > @react-native/community-cli-plugin > @react-native/metro-babel-transformer > @react-native/babel-preset > @babel/[email protected]: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-async-generator-functions instead.
warning react-native > @react-native/community-cli-plugin > @react-native/metro-babel-transformer > @react-native/babel-preset > @babel/[email protected]: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-logical-assignment-operators instead.
warning next-auth > [email protected]: The querystring API is considered Legacy. new code should use the URLSearchParams API instead.
warning next-auth > [email protected]: this version is no longer supported
warning next-auth > @next-auth/typeorm-legacy-adapter > typeorm > [email protected]: Glob versions prior to v9 are no longer supported
warning @nx/next > @nx/webpack > stylus > [email protected]: Glob versions prior to v9 are no longer supported
warning @nx/next > @nx/webpack > webpack-dev-server > [email protected]: Rimraf versions prior to v4 are no longer supported
warning @nx/next > @nx/webpack > fork-ts-checker-webpack-plugin > [email protected]: this will be v4
warning @nx/next > @nx/webpack > webpack-dev-server > webpack-dev-middleware > [email protected]: this will be v4
warning workspace-aggregator-c4a69452-7df2-4754-88d4-a93f4bd150ab > [email protected]: This version is no longer supported. Please see https://eslint.org/version-support for other options.

Walkthrough

This pull request introduces a new case file category SENT_TO_PRISON_ADMIN_FILE across multiple components of the judicial system application. The changes span backend services, file access guards, web interface components, and localization strings. The modifications enable handling and displaying files specifically sent to prison administration, expanding the system's file management capabilities for prison-related workflows.

Changes

File Change Summary
apps/judicial-system/backend/src/app/modules/case/limitedAccessCase.service.ts Added CaseFileCategory.SENT_TO_PRISON_ADMIN_FILE to include array for case files
apps/judicial-system/backend/src/app/modules/file/guards/caseFileCategory.ts Updated prisonAdminCaseFileCategories to include new case file category
apps/judicial-system/backend/src/app/modules/file/guards/test/limitedAccessViewCaseFileGuard.spec.ts Added test cases for new case file category access
apps/judicial-system/web/src/routes/Prison/IndictmentOverview/IndictmentOverview.strings.ts Added new localization string sentToPrisonAdminFileTitle
apps/judicial-system/web/src/routes/Prison/IndictmentOverview/IndictmentOverview.tsx Implemented rendering for prison admin files

Possibly related PRs

Suggested labels

automerge

Suggested reviewers

  • gudjong

Tip

CodeRabbit's docstrings feature is now available as part of our Early Access Program! Simply use the command @coderabbitai generate docstrings to have CodeRabbit automatically generate docstrings for your pull request. We would love to hear your feedback on Discord.


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link

codecov bot commented Dec 16, 2024

Codecov Report

Attention: Patch coverage is 0% with 4 lines in your changes missing coverage. Please review.

Project coverage is 35.73%. Comparing base (c3e8a9e) to head (21f4e6c).
Report is 1 commits behind head on main.

Files with missing lines Patch % Lines
...s/Prison/IndictmentOverview/IndictmentOverview.tsx 0.00% 4 Missing ⚠️
Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main   #17264      +/-   ##
==========================================
+ Coverage   35.72%   35.73%   +0.01%     
==========================================
  Files        6939     6941       +2     
  Lines      148368   148401      +33     
  Branches    42325    42334       +9     
==========================================
+ Hits        53009    53037      +28     
- Misses      95359    95364       +5     
Flag Coverage Δ
judicial-system-backend 55.90% <ø> (+0.07%) ⬆️
judicial-system-web 27.88% <0.00%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
.../src/app/modules/case/limitedAccessCase.service.ts 72.56% <ø> (ø)
...nd/src/app/modules/file/guards/caseFileCategory.ts 95.74% <ø> (ø)
...n/IndictmentOverview/IndictmentOverview.strings.ts 0.00% <ø> (ø)
...s/Prison/IndictmentOverview/IndictmentOverview.tsx 0.00% <0.00%> (ø)

... and 6 files with indirect coverage changes


Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c3e8a9e...21f4e6c. Read the comment docs.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

📜 Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between d30a093 and 9fab6a8.

📒 Files selected for processing (5)
  • apps/judicial-system/backend/src/app/modules/case/limitedAccessCase.service.ts (1 hunks)
  • apps/judicial-system/backend/src/app/modules/file/guards/caseFileCategory.ts (1 hunks)
  • apps/judicial-system/backend/src/app/modules/file/guards/test/limitedAccessViewCaseFileGuard.spec.ts (1 hunks)
  • apps/judicial-system/web/src/routes/Prison/IndictmentOverview/IndictmentOverview.strings.ts (1 hunks)
  • apps/judicial-system/web/src/routes/Prison/IndictmentOverview/IndictmentOverview.tsx (2 hunks)
🧰 Additional context used
📓 Path-based instructions (5)
apps/judicial-system/backend/src/app/modules/case/limitedAccessCase.service.ts (1)

Pattern apps/**/*: "Confirm that the code adheres to the following:

  • NextJS best practices, including file structure, API routes, and static generation methods.
  • Efficient state management and server-side rendering techniques.
  • Optimal use of TypeScript for component and utility type safety."
apps/judicial-system/web/src/routes/Prison/IndictmentOverview/IndictmentOverview.strings.ts (1)

Pattern apps/**/*: "Confirm that the code adheres to the following:

  • NextJS best practices, including file structure, API routes, and static generation methods.
  • Efficient state management and server-side rendering techniques.
  • Optimal use of TypeScript for component and utility type safety."
apps/judicial-system/backend/src/app/modules/file/guards/test/limitedAccessViewCaseFileGuard.spec.ts (1)

Pattern apps/**/*: "Confirm that the code adheres to the following:

  • NextJS best practices, including file structure, API routes, and static generation methods.
  • Efficient state management and server-side rendering techniques.
  • Optimal use of TypeScript for component and utility type safety."
apps/judicial-system/web/src/routes/Prison/IndictmentOverview/IndictmentOverview.tsx (1)

Pattern apps/**/*: "Confirm that the code adheres to the following:

  • NextJS best practices, including file structure, API routes, and static generation methods.
  • Efficient state management and server-side rendering techniques.
  • Optimal use of TypeScript for component and utility type safety."
apps/judicial-system/backend/src/app/modules/file/guards/caseFileCategory.ts (1)

Pattern apps/**/*: "Confirm that the code adheres to the following:

  • NextJS best practices, including file structure, API routes, and static generation methods.
  • Efficient state management and server-side rendering techniques.
  • Optimal use of TypeScript for component and utility type safety."
📓 Learnings (1)
apps/judicial-system/backend/src/app/modules/file/guards/caseFileCategory.ts (1)
Learnt from: oddsson
PR: island-is/island.is#16138
File: apps/judicial-system/backend/src/app/modules/file/guards/caseFileCategory.ts:74-87
Timestamp: 2024-11-12T15:15:26.274Z
Learning: User prefers to keep similar conditional statements separate rather than combining them into a single conditional with logical operators.
🔇 Additional comments (6)
apps/judicial-system/web/src/routes/Prison/IndictmentOverview/IndictmentOverview.strings.ts (1)

61-65: LGTM! The new localization string follows established patterns.

The new string entry for prison admin files maintains consistency with existing localization patterns and provides clear context through its description.

apps/judicial-system/backend/src/app/modules/file/guards/caseFileCategory.ts (1)

47-47: LGTM! Access control is properly implemented.

The new file category is correctly added to prisonAdminCaseFileCategories, maintaining the existing security model where access is granted only to prison admin users for completed cases.

Let's verify the access control implementation:

✅ Verification successful

Access control implementation is properly verified

The verification confirms that:

  • SENT_TO_PRISON_ADMIN_FILE is correctly added to prisonAdminCaseFileCategories array
  • Access control is enforced through the guard system that checks file categories against user roles
  • The implementation maintains consistency with other prison admin file categories (APPEAL_RULING, RULING)
  • The category is properly used in both frontend components and backend guards
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify that SENT_TO_PRISON_ADMIN_FILE is only accessible by prison admin users

# Search for all usages of SENT_TO_PRISON_ADMIN_FILE to ensure proper access control
rg -A 5 "SENT_TO_PRISON_ADMIN_FILE"

# Search for any test cases validating the access control
rg -A 10 "describe.*prison.*admin.*file"

Length of output: 5996


Script:

#!/bin/bash
# Let's verify the access control implementation more thoroughly

# Check the guard implementation in caseFileCategory.ts
ast-grep --pattern 'const prisonAdminCaseFileCategories = [$$$]'

# Check test cases for prison admin file access
ast-grep --pattern 'describe($$$prison admin$$$, () => {
  $$$
})'

# Check the implementation of the createDefendantCaseFile guard
ast-grep --pattern 'class CreateDefendantCaseFileGuard {
  $$$
}'

Length of output: 752


Script:

#!/bin/bash
# Let's check how the prison admin file categories are used in the guards

# Check the implementation of access control logic
ast-grep --pattern 'function canPrisonUserViewCaseFile($_) {
  $$$
}'

# Check for any validation in the limited access guard
ast-grep --pattern 'class LimitedAccessViewCaseFileGuard {
  $$$
}'

# Look for usage of prisonAdminCaseFileCategories in the code
rg -A 5 "prisonAdminCaseFileCategories.includes"

Length of output: 784

apps/judicial-system/web/src/routes/Prison/IndictmentOverview/IndictmentOverview.tsx (1)

102-112: LGTM! Clean implementation of the prison admin files section.

The UI implementation follows the established patterns in the codebase:

  • Consistent with other file sections
  • Proper use of island-ui components
  • Correct implementation of internationalization
apps/judicial-system/backend/src/app/modules/file/guards/test/limitedAccessViewCaseFileGuard.spec.ts (1)

437-437: LGTM: Comprehensive test coverage for new prison admin file category.

The addition of SENT_TO_PRISON_ADMIN_FILE to the allowed categories for prison admin users is well-tested:

  • Verifies prison admin access to the new category
  • Includes negative test cases
  • Maintains consistency with existing test patterns
apps/judicial-system/backend/src/app/modules/case/limitedAccessCase.service.ts (2)

237-237: LGTM: Addition of prison admin file category

The addition of SENT_TO_PRISON_ADMIN_FILE to the allowed case file categories aligns with the PR objective of enabling prison admin file visibility.


237-237: Verify prison admin file handling

Please ensure that:

  1. Appropriate access controls are in place for this new file category
  2. Consider if these files should be included in the zip file generation (currently filtered by defenderCaseFileCategoriesForRequestCases)

Let's verify the access controls and related configurations:

✅ Verification successful

Based on the search results, I can now generate the final response:

Access controls and configurations are properly implemented for prison admin files

The verification shows that:

  1. Access controls are properly implemented:

    • Prison admin file category is defined in the guards (caseFileCategory.ts)
    • Access is restricted through createDefendantCaseFile.guard.ts
    • Proper role checks are in place for prison admin users
  2. File handling is correctly configured:

    • Files are properly categorized with SENT_TO_PRISON_ADMIN_FILE
    • Notifications are set up for prison admin file operations
    • Prison admin files are handled separately from defender case files
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Check access controls and configurations for prison admin files

# Check for access guard configurations
echo "Checking access guard configurations..."
rg -A 5 "SENT_TO_PRISON_ADMIN_FILE" --type ts

# Check for prison admin role definitions and permissions
echo "Checking role definitions..."
rg -A 5 "PRISON_ADMIN|prisonAdmin" --type ts

# Check defender case file categories configuration
echo "Checking defender case file categories..."
ast-grep --pattern 'defenderCaseFileCategoriesForRequestCases = [
  $$$
]'

Length of output: 53920

@datadog-island-is
Copy link

datadog-island-is bot commented Dec 16, 2024

Datadog Report

All test runs 2091269 🔗

2 Total Test Services: 0 Failed, 2 Passed
➡️ Test Sessions change in coverage: 2 no change

Test Services
Service Name Failed Known Flaky New Flaky Passed Skipped Total Time Code Coverage Change Test Service View
judicial-system-backend 0 0 0 21363 0 22m 42.24s 1 no change Link
judicial-system-web 0 0 0 332 0 1m 16.16s 1 no change Link

Copy link
Member

@thorhildurt thorhildurt left a comment

Choose a reason for hiding this comment

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

Changes look good to me!

@thorhildurt thorhildurt added the automerge Merge this PR as soon as all checks pass label Dec 17, 2024
@kodiakhq kodiakhq bot merged commit b7c9767 into main Dec 17, 2024
40 checks passed
@kodiakhq kodiakhq bot deleted the j-s/prison-admin-file-display branch December 17, 2024 10:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this PR as soon as all checks pass
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants