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): Double service not required #16938

Merged
merged 27 commits into from
Nov 20, 2024
Merged

Conversation

oddsson
Copy link
Member

@oddsson oddsson commented Nov 19, 2024

Double service not required

Asana

What

When a service is not required, we'd show "Birting dóms ekki þörf" twice in some info cards. This has now been fixed.

Why

It's a bug

Screenshots / Gifs

Before

Screenshot 2024-11-19 at 10 32 15

After

Screenshot 2024-11-19 at 10 31 47

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 rendering of appeal expiration information for improved clarity.
    • Streamlined display conditions for verdict view date.
  • Bug Fixes

    • Removed unnecessary parameter from the verdict view date function, simplifying its logic.

@oddsson oddsson requested review from a team as code owners November 19, 2024 14:25
@oddsson oddsson requested a review from snaerseljan November 19, 2024 14:25
Copy link
Contributor

coderabbitai bot commented Nov 19, 2024

Walkthrough

The pull request introduces changes to the DefendantInfo component in DefendantInfo.tsx. Key modifications include the removal of the serviceNotRequired parameter from the getVerdictViewDateText function, simplifying its signature. The rendering logic for appeal expiration information has been updated to directly display the message, and the conditions for showing the verdict view date have been refined to streamline the control flow. These changes aim to enhance the clarity of the component's rendering logic while preserving its core functionality.

Changes

File Path Change Summary
apps/judicial-system/web/src/components/InfoCard/DefendantInfo/DefendantInfo.tsx Removed serviceNotRequired parameter from getVerdictViewDateText function; updated rendering logic for appeal expiration and verdict view date.

Possibly related PRs

Suggested labels

automerge

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.

@oddsson oddsson changed the title J s/duplicate service not required 2 fix(j-s): Double service not required Nov 19, 2024
@oddsson oddsson removed request for a team and snaerseljan November 19, 2024 14:26
Copy link

codecov bot commented Nov 19, 2024

Codecov Report

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

Project coverage is 36.40%. Comparing base (c2d4dfb) to head (6382bdc).
Report is 1 commits behind head on main.

Files with missing lines Patch % Lines
...omponents/InfoCard/DefendantInfo/DefendantInfo.tsx 20.00% 4 Missing ⚠️
Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main   #16938      +/-   ##
==========================================
- Coverage   36.41%   36.40%   -0.01%     
==========================================
  Files        6898     6898              
  Lines      144883   144883              
  Branches    41410    41411       +1     
==========================================
- Hits        52753    52751       -2     
- Misses      92130    92132       +2     
Flag Coverage Δ
air-discount-scheme-backend 54.08% <ø> (ø)
air-discount-scheme-web 0.00% <ø> (ø)
api 3.34% <ø> (ø)
api-catalogue-services 77.85% <ø> (ø)
api-domains-air-discount-scheme 37.08% <ø> (ø)
api-domains-assets 26.71% <ø> (ø)
api-domains-auth-admin 48.48% <ø> (ø)
api-domains-communications 39.58% <ø> (ø)
api-domains-criminal-record 47.56% <ø> (ø)
api-domains-driving-license 44.50% <ø> (ø)
api-domains-education 30.57% <ø> (ø)
api-domains-health-insurance 34.43% <ø> (ø)
api-domains-mortgage-certificate 34.74% <ø> (ø)
api-domains-payment-schedule 41.31% <ø> (ø)
application-api-files 62.42% <ø> (ø)
application-core 70.79% <ø> (-0.24%) ⬇️
application-system-api 41.02% <ø> (ø)
application-template-api-modules 27.72% <ø> (-0.01%) ⬇️
application-templates-accident-notification 28.98% <ø> (ø)
application-templates-car-recycling 3.12% <ø> (ø)
application-templates-criminal-record 25.87% <ø> (ø)
application-templates-driving-license 18.14% <ø> (ø)
application-templates-estate 12.14% <ø> (ø)
application-templates-example-payment 24.80% <ø> (ø)
application-templates-financial-aid 15.77% <ø> (ø)
application-templates-general-petition 23.07% <ø> (ø)
application-templates-inheritance-report 6.52% <ø> (ø)
application-templates-marriage-conditions 15.04% <ø> (ø)
application-templates-mortgage-certificate 43.42% <ø> (ø)
application-templates-parental-leave 29.86% <ø> (ø)
application-types 6.57% <ø> (ø)
application-ui-components 1.27% <ø> (ø)
application-ui-shell 20.57% <ø> (ø)
auth-admin-web 2.43% <ø> (ø)
auth-nest-tools 31.10% <ø> (ø)
auth-react 21.85% <ø> (ø)
auth-shared 75.00% <ø> (ø)
clients-charge-fjs-v2 24.11% <ø> (ø)
clients-driving-license 40.28% <ø> (ø)
clients-driving-license-book 43.50% <ø> (ø)
clients-financial-statements-inao 49.06% <ø> (ø)
clients-license-client 1.26% <ø> (ø)
clients-middlewares 73.59% <ø> (+0.25%) ⬆️
clients-regulations 42.36% <ø> (ø)
clients-rsk-company-registry 29.76% <ø> (ø)
clients-rsk-personal-tax-return 38.00% <ø> (ø)
clients-smartsolutions 12.77% <ø> (ø)
clients-syslumenn 49.23% <ø> (ø)
clients-zendesk 50.61% <ø> (ø)
cms 0.41% <ø> (ø)
cms-translations 38.91% <ø> (ø)
content-search-index-manager 95.65% <ø> (ø)
content-search-toolkit 8.14% <ø> (ø)
contentful-apps 4.69% <ø> (ø)
dokobit-signing 62.76% <ø> (ø)
download-service 44.16% <ø> (ø)
email-service 60.57% <ø> (ø)
feature-flags 90.62% <ø> (ø)
file-storage 45.80% <ø> (ø)
financial-aid-backend 51.29% <ø> (ø)
financial-aid-shared 17.81% <ø> (ø)
icelandic-names-registry-backend 54.34% <ø> (ø)
infra-nest-server 48.37% <ø> (ø)
infra-tracing 43.24% <ø> (ø)
island-ui-core 28.88% <ø> (ø)
judicial-system-api 19.86% <ø> (ø)
judicial-system-audit-trail 68.86% <ø> (ø)
judicial-system-backend 55.60% <ø> (ø)
judicial-system-formatters 79.35% <ø> (ø)
judicial-system-message 67.05% <ø> (ø)
judicial-system-message-handler 48.08% <ø> (ø)
judicial-system-scheduler 70.79% <ø> (ø)
judicial-system-types 43.31% <ø> (ø)
judicial-system-web 27.16% <20.00%> (ø)
license-api 42.52% <ø> (+0.01%) ⬆️
localization 10.15% <ø> (ø)
logging 48.43% <ø> (ø)
message-queue 68.05% <ø> (-0.74%) ⬇️
nest-audit 68.20% <ø> (ø)
nest-aws 53.04% <ø> (ø)
nest-config 78.00% <ø> (ø)
nest-core 43.54% <ø> (ø)
nest-feature-flags 51.09% <ø> (ø)
nest-problem 45.82% <ø> (ø)
nest-sequelize 94.44% <ø> (ø)
nest-swagger 51.71% <ø> (ø)
nova-sms 62.09% <ø> (ø)
portals-admin-regulations-admin 1.85% <ø> (ø)
portals-core 15.89% <ø> (ø)
reference-backend 49.74% <ø> (ø)
regulations 16.78% <ø> (ø)
residence-history 85.00% <ø> (ø)
services-auth-admin-api 52.50% <ø> (-0.01%) ⬇️
services-auth-delegation-api 57.51% <ø> (ø)
services-auth-ids-api 52.10% <ø> (+<0.01%) ⬆️
services-auth-personal-representative 45.63% <ø> (ø)
services-auth-personal-representative-public 41.76% <ø> (-0.05%) ⬇️
services-auth-public-api 48.91% <ø> (ø)
services-documents 60.81% <ø> (ø)
services-endorsements-api 53.21% <ø> (ø)
services-sessions 65.46% <ø> (ø)
services-university-gateway 49.34% <ø> (+0.08%) ⬆️
services-user-notification 46.74% <ø> (-0.03%) ⬇️
services-user-profile 61.89% <ø> (ø)
shared-components 26.90% <ø> (ø)
shared-form-fields 31.26% <ø> (ø)
shared-mocking 60.89% <ø> (ø)
shared-pii 92.85% <ø> (ø)
shared-problem 87.50% <ø> (ø)
shared-utils 27.69% <ø> (ø)
skilavottord-ws 24.14% <ø> (ø)
web 1.76% <ø> (ø)

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

Files with missing lines Coverage Δ
...omponents/InfoCard/DefendantInfo/DefendantInfo.tsx 75.60% <20.00%> (ø)

... and 2 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 c2d4dfb...6382bdc. Read the comment docs.

---- 🚨 Try these New Features:

@datadog-island-is
Copy link

datadog-island-is bot commented Nov 19, 2024

Datadog Report

All test runs 811b5b5 🔗

99 Total Test Services: 0 Failed, 97 Passed
🔻 Test Sessions change in coverage: 2 decreased, 2 increased, 196 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-backend 0 0 0 82 0 30.08s N/A Link
air-discount-scheme-web 0 0 0 2 0 8.65s N/A Link
api 0 0 0 4 0 3.08s N/A Link
api-catalogue-services 0 0 0 23 0 12.69s N/A Link
api-domains-air-discount-scheme 0 0 0 6 0 23.24s N/A Link
api-domains-assets 0 0 0 3 0 14.02s N/A Link
api-domains-auth-admin 0 0 0 18 0 14.87s 1 no change Link
api-domains-communications 0 0 0 5 0 33.58s N/A Link
api-domains-criminal-record 0 0 0 5 0 9.47s 1 no change Link
api-domains-driving-license 0 0 0 23 0 32.9s N/A Link

🔻 Code Coverage Decreases vs Default Branch (2)

  • message-queue - jest 68.43% (-0.84%) - Details
  • services-sessions - jest 68.93% (-0.05%) - 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 (1)
apps/judicial-system/web/src/components/InfoCard/DefendantInfo/DefendantInfo.tsx (1)

135-141: Consider simplifying the conditional rendering.

While the current implementation is correct, we could improve readability by extracting the conditions into a separate variable or helper function.

Here's a suggested refactor:

-      {displayVerdictViewDate &&
-        defendant.serviceRequirement &&
-        defendant.serviceRequirement !== ServiceRequirement.NOT_REQUIRED && (
-          <Text marginTop={1} fontWeight="semiBold">
-            {getVerdictViewDateText(formatMessage, defendant.verdictViewDate)}
-          </Text>
-        )}
+      {(() => {
+        const shouldDisplayVerdict =
+          displayVerdictViewDate &&
+          defendant.serviceRequirement &&
+          defendant.serviceRequirement !== ServiceRequirement.NOT_REQUIRED;
+        
+        return shouldDisplayVerdict ? (
+          <Text marginTop={1} fontWeight="semiBold">
+            {getVerdictViewDateText(formatMessage, defendant.verdictViewDate)}
+          </Text>
+        ) : null;
+      })()}

This approach:

  • Improves readability by giving the condition a descriptive name
  • Makes the rendering logic more explicit
  • Maintains the same functionality
📜 Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between ff67649 and 58d7d76.

📒 Files selected for processing (1)
  • apps/judicial-system/web/src/components/InfoCard/DefendantInfo/DefendantInfo.tsx (1 hunks)
🧰 Additional context used
📓 Path-based instructions (1)
apps/judicial-system/web/src/components/InfoCard/DefendantInfo/DefendantInfo.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/components/InfoCard/DefendantInfo/DefendantInfo.tsx (1)
Learnt from: oddsson
PR: island-is/island.is#15461
File: apps/judicial-system/web/src/components/InfoCard/DefendantInfo/DefendantInfo.tsx:36-62
Timestamp: 2024-11-12T15:15:11.835Z
Learning: The user prefers readability over optimization in the `getAppealExpirationInfo` function within `DefendantInfo.tsx`.
🔇 Additional comments (1)
apps/judicial-system/web/src/components/InfoCard/DefendantInfo/DefendantInfo.tsx (1)

129-132: LGTM! Clean and readable implementation.

The appeal expiration info display follows best practices with proper i18n handling and component structure.

@oddsson oddsson added the automerge Merge this PR as soon as all checks pass label Nov 20, 2024
@kodiakhq kodiakhq bot merged commit c20e595 into main Nov 20, 2024
263 checks passed
@kodiakhq kodiakhq bot deleted the j-s/duplicate-service-not-required-2 branch November 20, 2024 13:47
jonnigs pushed a commit that referenced this pull request Nov 26, 2024
* Checkpoint

* Refactor AlertMessage

* Format date

* Cleanup

* Cleanup

* Merge

* Add key

* Refactor

* Remove console.log

* Merge

* Merge

* Remove duplicate service not required

* Revert

---------

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Guðjón Guðjónsson <[email protected]>
Co-authored-by: unakb <[email protected]>
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.

3 participants