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): Fix flashing ui #16952

Merged
merged 6 commits into from
Nov 27, 2024
Merged

fix(j-s): Fix flashing ui #16952

merged 6 commits into from
Nov 27, 2024

Conversation

oddsson
Copy link
Member

@oddsson oddsson commented Nov 20, 2024

Fix flashing ui

Asana

What

When court users are selecting the indictment decision and continue from that page, if postponedIndefinetly is selected, the "Select new court date" input box would flash for a second. This pr fixes that.

Screenshots / Gifs

Before

Screen.Recording.2024-11-20.at.11.09.09.mov

After

Screen.Recording.2024-11-20.at.11.07.01.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 handling of indictment decisions with improved state management for SCHEDULING actions.
    • Updated navigation logic for REDISTRIBUTING decisions, resetting the judgeId as needed.
  • Bug Fixes

    • Refined control flow to prevent unnecessary state updates for various indictment decisions.
  • Improvements

    • Improved clarity and responsiveness of the component based on the current state of the working case.

@oddsson oddsson requested a review from a team as a code owner November 20, 2024 11:09
Copy link
Contributor

coderabbitai bot commented Nov 20, 2024

Walkthrough

The changes in this pull request focus on the Conclusion component within the Conclusion.tsx file. The modifications enhance the handling of IndictmentDecision states, introducing a new useEffect hook to set selectedAction based on the workingCase.indictmentDecision. The control flow has been refined to prevent unnecessary state updates, and the handleNavigationTo function has been updated to handle the IndictmentDecision.REDISTRIBUTING. The validation logic remains largely unchanged but continues to ensure accurate checks for each decision type.

Changes

File Path Change Summary
apps/judicial-system/web/src/routes/Court/Indictments/Conclusion/Conclusion.tsx - Introduced a new useEffect to set selectedAction to SCHEDULING based on workingCase.indictmentDecision.
- Adjusted existing useEffect to remove redundant assignments for SCHEDULING and refined control flow for state updates.
- Updated handleNavigationTo to reset judgeId for IndictmentDecision.REDISTRIBUTING.
- Validation logic in stepIsValid remains largely unchanged but continues to check conditions for each decision type.

Possibly related PRs

Suggested labels

automerge, high priority

Suggested reviewers

  • unakb

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 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 Nov 20, 2024

Codecov Report

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

Project coverage is 35.83%. Comparing base (cac3c4e) to head (45c8053).
Report is 1 commits behind head on main.

Files with missing lines Patch % Lines
...routes/Court/Indictments/Conclusion/Conclusion.tsx 0.00% 6 Missing ⚠️
Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main   #16952      +/-   ##
==========================================
+ Coverage   35.68%   35.83%   +0.15%     
==========================================
  Files        6937     6931       -6     
  Lines      147043   147225     +182     
  Branches    41819    42159     +340     
==========================================
+ Hits        52477    52764     +287     
+ Misses      94566    94461     -105     
Flag Coverage Δ
air-discount-scheme-web 0.00% <ø> (ø)
api 3.34% <ø> (ø)
application-api-files 62.14% <ø> (ø)
application-core 70.60% <ø> (-0.24%) ⬇️
application-system-api 38.73% <ø> (-0.02%) ⬇️
application-template-api-modules 27.78% <ø> (-0.02%) ⬇️
application-templates-accident-notification 28.97% <ø> (ø)
application-templates-car-recycling 3.12% <ø> (ø)
application-templates-criminal-record 25.86% <ø> (ø)
application-templates-driving-license 18.18% <ø> (ø)
application-templates-estate 13.75% <ø> (ø)
application-templates-example-payment 24.80% <ø> (ø)
application-templates-financial-aid 15.80% <ø> (ø)
application-templates-general-petition 23.09% <ø> (ø)
application-templates-inheritance-report 6.58% <ø> (ø)
application-templates-marriage-conditions 15.12% <ø> (ø)
application-templates-mortgage-certificate 43.27% <ø> (ø)
application-templates-parental-leave 29.93% <ø> (ø)
application-types 6.51% <ø> (ø)
application-ui-components 1.27% <ø> (ø)
application-ui-shell 21.44% <ø> (ø)
auth-react 24.40% <ø> (ø)
clients-charge-fjs-v2 24.11% <ø> (ø)
clients-regulations 42.40% <ø> (ø)
contentful-apps 4.74% <ø> (ø)
financial-aid-backend 51.30% <ø> (ø)
financial-aid-shared 17.81% <ø> (ø)
island-ui-core 30.94% <ø> (ø)
judicial-system-web 28.12% <0.00%> (-0.01%) ⬇️
portals-admin-regulations-admin 1.80% <ø> (ø)
portals-core 18.38% <ø> (ø)
regulations 16.78% <ø> (ø)
shared-components 29.13% <ø> (ø)
shared-form-fields 33.88% <ø> (ø)
web 2.45% <ø> (ø)

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

Files with missing lines Coverage Δ
...routes/Court/Indictments/Conclusion/Conclusion.tsx 0.00% <0.00%> (ø)

... and 61 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 cac3c4e...45c8053. Read the comment docs.

@datadog-island-is
Copy link

datadog-island-is bot commented Nov 20, 2024

Datadog Report

All test runs 72ae73d 🔗

35 Total Test Services: 0 Failed, 32 Passed
🔻 Test Sessions change in coverage: 2 decreased, 158 no change

Test Services
This report shows up to 10 services
Service Name Failed Known Flaky New Flaky Passed Skipped Total Time Code Coverage Change Test Service View
air-discount-scheme-web 0 0 0 2 0 7.67s 1 no change Link
api 0 0 0 4 0 3.06s 1 no change Link
application-api-files 0 0 0 2 0 4.5s 1 no change Link
application-core 0 0 0 97 0 17.93s 1 decreased (-0.1%) Link
application-system-api 0 0 0 40 0 2m 38.02s 1 no change Link
application-template-api-modules 0 0 0 118 0 2m 41.38s 1 decreased (-0.01%) Link
application-templates-accident-notification 0 0 0 148 0 21.34s 1 no change Link
application-templates-criminal-record 0 0 0 2 0 9.91s 1 no change Link
application-templates-driving-license 0 0 0 13 0 17.27s 1 no change Link
application-templates-example-payment 0 0 0 2 0 11.82s 1 no change Link

🔻 Code Coverage Decreases vs Default Branch (2)

  • application-core - jest 78.35% (-0.1%) - Details
  • application-template-api-modules - jest 30.16% (-0.01%) - Details

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

🧹 Outside diff range and nitpick comments (2)
apps/judicial-system/web/src/routes/Court/Indictments/Conclusion/Conclusion.tsx (2)

Line range hint 234-280: Consider refactoring validation logic for better maintainability.

The nested switch statements make the validation logic complex and harder to maintain. Consider extracting the validation logic for each decision type into separate functions.

+ const isCompletingDecisionValid = (decision: CaseIndictmentRulingDecision): boolean => {
+   switch (decision) {
+     case CaseIndictmentRulingDecision.RULING:
+     case CaseIndictmentRulingDecision.DISMISSAL:
+       return hasRequiredFiles([CaseFileCategory.COURT_RECORD, CaseFileCategory.RULING])
+     case CaseIndictmentRulingDecision.CANCELLATION:
+     case CaseIndictmentRulingDecision.FINE:
+       return hasRequiredFiles([CaseFileCategory.COURT_RECORD])
+     case CaseIndictmentRulingDecision.MERGE:
+       return hasRequiredFiles([CaseFileCategory.COURT_RECORD]) && Boolean(workingCase.mergeCase?.id)
+     default:
+       return false
+   }
+ }
+
+ const hasRequiredFiles = (categories: CaseFileCategory[]): boolean => {
+   return categories.every(category =>
+     uploadFiles.some(file => file.category === category && file.status === 'done')
+   )
+ }

  const stepIsValid = () => {
    if (!allFilesDoneOrError) {
      return false
    }

    switch (selectedAction) {
      case IndictmentDecision.POSTPONING:
        return Boolean(postponementReason)
      case IndictmentDecision.SCHEDULING:
        return Boolean(selectedCourtSessionType && courtDate?.date)
      case IndictmentDecision.COMPLETING:
-       switch (selectedDecision) {
-         case CaseIndictmentRulingDecision.RULING:
-         // ... existing switch cases
-       }
+       return selectedDecision ? isCompletingDecisionValid(selectedDecision) : false
      case IndictmentDecision.POSTPONING_UNTIL_VERDICT:
      case IndictmentDecision.REDISTRIBUTING:
        return true
      default:
        return false
    }
  }

Line range hint 142-186: Enhance type safety in navigation handling.

Consider adding explicit return type and exhaustive type checking to improve type safety and maintainability.

- const handleNavigationTo = useCallback(
+ const handleNavigationTo = useCallback(
+   async (destination: keyof stepValidationsType): Promise<void> => {
    // ... existing implementation
+   const assertNever = (x: never): never => {
+     throw new Error(`Unexpected decision type: ${x}`)
+   }
+   switch (selectedAction) {
      // ... existing cases
+     default:
+       assertNever(selectedAction)
    }
  },
  // ... dependencies
)
📜 Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 5832eb7 and f5d9830.

📒 Files selected for processing (1)
  • apps/judicial-system/web/src/routes/Court/Indictments/Conclusion/Conclusion.tsx (1 hunks)
🧰 Additional context used
📓 Path-based instructions (1)
apps/judicial-system/web/src/routes/Court/Indictments/Conclusion/Conclusion.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 (1)
apps/judicial-system/web/src/routes/Court/Indictments/Conclusion/Conclusion.tsx (1)
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-11-12T15:15:11.835Z
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.
🔇 Additional comments (2)
apps/judicial-system/web/src/routes/Court/Indictments/Conclusion/Conclusion.tsx (2)

188-189: LGTM! This fixes the UI flashing issue.

The early return when postponedIndefinitelyExplanation exists prevents unnecessary state resets to SCHEDULING, effectively fixing the UI flashing issue when users select the postponed indefinitely option.


Line range hint 516-530: Improve error handling for file uploads.

Consider adding user feedback for upload failures and handling edge cases more explicitly.

+ const handleUploadError = (error: Error) => {
+   // Add appropriate error notification/feedback
+ }

  onChange={(files) => {
    handleUpload(
      addUploadFiles(files, {
        category: CaseFileCategory.COURT_RECORD,
      }),
      updateUploadFile,
-   )
+   ).catch(handleUploadError)
  }}

Also applies to: 557-571

Copy link
Member

@gudjong gudjong left a comment

Choose a reason for hiding this comment

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

One comment

@gudjong gudjong added the deprecated:automerge (Disabled) Merge this PR as soon as all checks pass label Nov 27, 2024
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