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): Don't show UI updates underneath a modal #15922

Merged
merged 2 commits into from
Sep 12, 2024

Conversation

oddsson
Copy link
Member

@oddsson oddsson commented Sep 9, 2024

Don't show UI updates underneath a modal

Asana

What

When a case is set to WAITING_FOR_CONFIRMATION state, there are a number of things that change on the confirmation page for prosecutors. For users who can confirm indictments, we show the fields to do so, and for others, we change the next button text to from "Send" to "Resend". Today, this happens immediately when the state change occurs, which can be confusing. This PR changes that, so that no UI update is shown until you open the case again.

Screenshots / Gifs

Pay attention to what happens underneath the modal

BEFORE

Screen.Recording.2024-09-09.at.13.58.28.mov

AFTER

Screen.Recording.2024-09-09.at.13.48.28.mov

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

    • Enhanced logic for determining the state of indictments, allowing for a broader interpretation of new indictments based on modal state.
    • Refined criteria for user permissions to send indictments to court, emphasizing modal conditions.
  • Improvements

    • Simplified layout logic for the Box component, improving readability and reducing complexity.

@oddsson oddsson requested a review from a team as a code owner September 9, 2024 13:59
Copy link
Contributor

coderabbitai bot commented Sep 9, 2024

Walkthrough

The changes in this pull request modify the logic for determining the state of indictments and user permissions in the Overview.tsx file. The conditions for identifying new indictments and user capabilities to send indictments to court have been updated to include checks related to the modal state. Additionally, the logic for setting the marginBottom property in the layout has been simplified to enhance readability.

Changes

File Change Summary
apps/judicial-system/web/src/routes/Prosecutor/Indictments/Overview/Overview.tsx Updated logic for isIndictmentNew and userCanSendIndictmentToCourt to include modal checks; simplified marginBottom logic.

Possibly related PRs

Suggested labels

automerge


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>.
    • 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 generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @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 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
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: 0

Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL

Commits

Files that changed from the base of the PR and between d1fbbda and d07681a.

Files selected for processing (1)
  • apps/judicial-system/web/src/routes/Prosecutor/Indictments/Overview/Overview.tsx (3 hunks)
Additional context used
Path-based instructions (1)
apps/judicial-system/web/src/routes/Prosecutor/Indictments/Overview/Overview.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."
Learnings (2)
Common learnings
Learnt from: unakb
PR: island-is/island.is#15378
File: apps/judicial-system/web/src/routes/Court/Indictments/Summary/Summary.tsx:86-100
Timestamp: 2024-06-27T14:37:07.823Z
Learning: User unakb prefers explicit case handling in switch statements for key functionalities like `getRulingDecisionTagColor` to ensure clarity and avoid assumptions that a case was overlooked.
Learnt from: gudjong
PR: island-is/island.is#15421
File: apps/judicial-system/web/src/routes/Prosecutor/Indictments/Processing/Processing.tsx:55-61
Timestamp: 2024-07-03T15:43:13.884Z
Learning: The `updateCase` method in the `apps/judicial-system/web/src/routes/Prosecutor/Indictments/Processing/Processing.tsx` file has its own error handling, and additional error handling in the `initialize` function is not necessary.
Learnt from: oddsson
PR: island-is/island.is#14673
File: apps/judicial-system/web/src/routes/PublicProsecutor/Tables/CasesForReview.tsx:79-79
Timestamp: 2024-05-06T23:16:04.892Z
Learning: The implementation of `mapIndictmentCaseStateToTagVariant` in `TagCaseState.tsx`, which maps only `CaseState.ACCEPTED` to a specific tag and defaults others to an "unknown" status, is intentional as per the application's requirements.
apps/judicial-system/web/src/routes/Prosecutor/Indictments/Overview/Overview.tsx (3)
Learnt from: unakb
PR: island-is/island.is#15378
File: apps/judicial-system/web/src/routes/Court/Indictments/Summary/Summary.tsx:86-100
Timestamp: 2024-06-27T14:37:07.823Z
Learning: User unakb prefers explicit case handling in switch statements for key functionalities like `getRulingDecisionTagColor` to ensure clarity and avoid assumptions that a case was overlooked.
Learnt from: gudjong
PR: island-is/island.is#15421
File: apps/judicial-system/web/src/routes/Prosecutor/Indictments/Processing/Processing.tsx:55-61
Timestamp: 2024-07-03T15:43:13.884Z
Learning: The `updateCase` method in the `apps/judicial-system/web/src/routes/Prosecutor/Indictments/Processing/Processing.tsx` file has its own error handling, and additional error handling in the `initialize` function is not necessary.
Learnt from: oddsson
PR: island-is/island.is#14673
File: apps/judicial-system/web/src/routes/PublicProsecutor/Tables/CasesForReview.tsx:79-79
Timestamp: 2024-05-06T23:16:04.892Z
Learning: The implementation of `mapIndictmentCaseStateToTagVariant` in `TagCaseState.tsx`, which maps only `CaseState.ACCEPTED` to a specific tag and defaults others to an "unknown" status, is intentional as per the application's requirements.
Additional comments not posted (3)
apps/judicial-system/web/src/routes/Prosecutor/Indictments/Overview/Overview.tsx (3)

64-65: Approved: Updated condition for isIndictmentNew.

The modification to include modal !== 'noModal' in the condition for isIndictmentNew aligns well with the PR's objective to enhance user experience by managing UI updates more effectively when modals are active.


74-76: Approved: Refined condition for userCanSendIndictmentToCourt.

The addition of modal === 'noModal' to the condition ensures that the action to send an indictment to court is only available when no modal is active, which is a prudent enhancement to prevent user errors and confusion during critical actions.


218-218: Approved: Simplified marginBottom logic.

The new logic for determining the marginBottom property, which now depends on whether documents can be added or an indictment can be sent to court, simplifies the previous more complex conditions. This change improves readability and maintainability of the layout configuration.

@datadog-island-is
Copy link

Datadog Report

Branch report: j-s/damage-claim-upload
Commit report: 79092b7
Test service: judicial-system-web

✅ 0 Failed, 338 Passed, 0 Skipped, 1m 7.04s Total Time
➡️ Test Sessions change in coverage: 1 no change

Copy link

codecov bot commented Sep 9, 2024

Codecov Report

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

Project coverage is 36.79%. Comparing base (d298945) to head (e9c17ca).
Report is 2 commits behind head on main.

Files with missing lines Patch % Lines
...outes/Prosecutor/Indictments/Overview/Overview.tsx 0.00% 5 Missing ⚠️
Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main   #15922      +/-   ##
==========================================
- Coverage   36.86%   36.79%   -0.07%     
==========================================
  Files        6715     6693      -22     
  Lines      137631   136842     -789     
  Branches    39132    38910     -222     
==========================================
- Hits        50732    50356     -376     
+ Misses      86899    86486     -413     
Flag Coverage Δ
judicial-system-backend 55.81% <ø> (-0.08%) ⬇️
judicial-system-web 28.71% <0.00%> (+<0.01%) ⬆️

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

Files with missing lines Coverage Δ
...outes/Prosecutor/Indictments/Overview/Overview.tsx 0.00% <0.00%> (ø)

... and 125 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 8cce1bb...e9c17ca. Read the comment docs.

@oddsson oddsson added the deprecated:automerge (Disabled) Merge this PR as soon as all checks pass label Sep 12, 2024
@kodiakhq kodiakhq bot merged commit b5778d2 into main Sep 12, 2024
33 checks passed
@kodiakhq kodiakhq bot deleted the j-s/damage-claim-upload branch September 12, 2024 11:52
jonnigs pushed a commit that referenced this pull request Sep 12, 2024
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
@coderabbitai coderabbitai bot mentioned this pull request Oct 3, 2024
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
deprecated:automerge (Disabled) Merge this PR as soon as all checks pass
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants