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(regulations-admin): Update text amending #16859

Merged
merged 2 commits into from
Nov 14, 2024

Conversation

thordurhhh
Copy link
Member

@thordurhhh thordurhhh commented Nov 14, 2024

What

Update text amending

Why

its not correct.

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

    • Updated the phrasing for regulation titles related to repeals for improved clarity.
  • Bug Fixes

    • Ensured consistent formatting for affected regulations and their respective dates, maintaining output integrity.

@thordurhhh thordurhhh added the deprecated:automerge (Disabled) Merge this PR as soon as all checks pass label Nov 14, 2024
@thordurhhh thordurhhh requested a review from a team as a code owner November 14, 2024 10:20
Copy link
Contributor

coderabbitai bot commented Nov 14, 2024

Walkthrough

The pull request modifies the PREFIX_REPEALING constant in the formatAmendingRegulation.ts file, changing its value to adjust the phrasing used in regulation titles related to repeals. The functions responsible for formatting regulations, including formatAffectedAndPlaceAffectedAtEnd, formatAmendingRegTitle, and formatAmendingRegBody, remain structurally unchanged, preserving their internal logic and functionality while incorporating the new constant.

Changes

File Path Change Summary
libs/portals/admin/regulations-admin/src/utils/formatAmendingRegulation.ts Updated PREFIX_REPEALING constant from 'brottfellingu á reglugerð nr. ' to 'brottfellingu reglugerðar nr. '; no other changes to function logic.

Possibly related PRs

Suggested reviewers

  • thorkellmani
  • Tryggvig

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
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)
libs/portals/admin/regulations-admin/src/utils/formatAmendingRegulation.ts (2)

Line range hint 147-186: Add defensive checks for empty arrays in title formatting

While the logic for formatting titles is correct, consider adding defensive checks for empty arrays to prevent unnecessary prefixes.

Consider this improvement:

    const amendingTitles = uniq(
      amendingArray.map(
        (item) =>
          `${removeRegNamePrefix(item.name)} ${removeRegPrefix(item.regTitle)}`,
      ),
    )

-   const prefixedAmendingTitles = amendingTitles.map(
-     (title, i) => `${i === 0 ? `${PREFIX_AMENDING}` : ''}${title}`,
-   )
+   const prefixedAmendingTitles = amendingTitles.length 
+     ? amendingTitles.map(
+       (title, i) => `${i === 0 ? `${PREFIX_AMENDING}` : ''}${title}`,
+     )
+     : []

-   const repealTitles = repealArray.map(
-     (item, i) =>
-       `${i === 0 ? `${PREFIX_REPEALING}` : ''}${removeRegNamePrefix(
-         item.name,
-       )} ${removeRegPrefix(item.regTitle)}`,
-   )
+   const repealTitles = repealArray.length
+     ? repealArray.map(
+       (item, i) =>
+         `${i === 0 ? `${PREFIX_REPEALING}` : ''}${removeRegNamePrefix(
+           item.name,
+         )} ${removeRegPrefix(item.regTitle)}`,
+     )
+     : []

Line range hint 1-11: Enhance type safety with explicit return types

While the TypeScript usage is good, consider adding explicit return type annotations to exported functions for better type safety and documentation.

Example improvement:

export const formatAmendingRegTitle = (draft: RegDraftForm): string => {
  // ...
}

export const formatAmendingRegBody = (
  name: string,
  repeal?: boolean,
  diff?: HTMLText | string | undefined,
  regTitle?: string,
  appendixes?: AppendixDraftForm[],
): HTMLText[] => {
  // ...
}
📜 Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between e1dd2d5 and 6d58ce5.

📒 Files selected for processing (1)
  • libs/portals/admin/regulations-admin/src/utils/formatAmendingRegulation.ts (1 hunks)
🧰 Additional context used
📓 Path-based instructions (1)
libs/portals/admin/regulations-admin/src/utils/formatAmendingRegulation.ts (1)

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

  • Reusability of components and hooks across different NextJS apps.
  • TypeScript usage for defining props and exporting types.
  • Effective tree-shaking and bundling practices."
🔇 Additional comments (1)
libs/portals/admin/regulations-admin/src/utils/formatAmendingRegulation.ts (1)

26-26: LGTM: Grammatical correction in the repealing prefix

The constant update improves the grammatical accuracy of the Icelandic text used for repealing regulation titles.

Copy link

codecov bot commented Nov 14, 2024

Codecov Report

Attention: Patch coverage is 0% with 1 line in your changes missing coverage. Please review.

Project coverage is 36.45%. Comparing base (70a5f31) to head (c821e0a).
Report is 1 commits behind head on main.

Files with missing lines Patch % Lines
...ations-admin/src/utils/formatAmendingRegulation.ts 0.00% 1 Missing ⚠️
Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff           @@
##             main   #16859   +/-   ##
=======================================
  Coverage   36.44%   36.45%           
=======================================
  Files        6851     6851           
  Lines      143569   143585   +16     
  Branches    40980    40988    +8     
=======================================
+ Hits        52330    52345   +15     
- Misses      91239    91240    +1     
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.64% <ø> (ø)
api-domains-criminal-record 47.56% <ø> (ø)
api-domains-driving-license 44.50% <ø> (ø)
api-domains-education 30.62% <ø> (ø)
api-domains-health-insurance 34.43% <ø> (ø)
api-domains-mortgage-certificate 34.74% <ø> (ø)
api-domains-payment-schedule 41.31% <ø> (ø)
application-api-files 62.52% <ø> (ø)
application-core 70.98% <ø> (-0.08%) ⬇️
application-system-api 40.99% <ø> (ø)
application-template-api-modules 27.67% <ø> (ø)
application-templates-accident-notification 28.98% <ø> (ø)
application-templates-car-recycling 3.12% <ø> (ø)
application-templates-criminal-record 25.87% <ø> (ø)
application-templates-driving-license 18.26% <ø> (ø)
application-templates-estate 12.14% <ø> (ø)
application-templates-example-payment 24.80% <ø> (ø)
application-templates-financial-aid 15.48% <ø> (ø)
application-templates-general-petition 23.07% <ø> (ø)
application-templates-inheritance-report 6.52% <ø> (ø)
application-templates-marriage-conditions 15.04% <ø> (ø)
application-templates-mortgage-certificate 43.34% <ø> (ø)
application-templates-parental-leave 29.86% <ø> (ø)
application-types 6.60% <ø> (ø)
application-ui-components 1.27% <ø> (ø)
application-ui-shell 20.83% <ø> (ø)
auth-admin-web 2.43% <ø> (ø)
auth-nest-tools 30.92% <ø> (ø)
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.31% <ø> (+0.08%) ⬆️
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.42% <ø> (ø)
cms-translations 38.94% <ø> (ø)
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 46.09% <ø> (ø)
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.76% <ø> (ø)
judicial-system-audit-trail 68.86% <ø> (ø)
judicial-system-backend 55.14% <ø> (ø)
judicial-system-formatters 79.26% <ø> (ø)
judicial-system-message 66.99% <ø> (ø)
judicial-system-message-handler 47.99% <ø> (ø)
judicial-system-scheduler 70.67% <ø> (ø)
judicial-system-types 43.58% <ø> (ø)
judicial-system-web 27.16% <ø> (ø)
license-api 42.60% <ø> (+0.07%) ⬆️
localization 10.15% <ø> (ø)
logging 48.43% <ø> (ø)
message-queue 68.79% <ø> (ø)
nest-audit 68.20% <ø> (ø)
nest-aws 54.03% <ø> (ø)
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% <0.00%> (ø)
portals-core 15.89% <ø> (ø)
reference-backend 49.74% <ø> (ø)
regulations 16.78% <ø> (ø)
residence-history 85.00% <ø> (ø)
services-auth-admin-api 52.50% <ø> (ø)
services-auth-delegation-api 58.22% <ø> (ø)
services-auth-ids-api 52.10% <ø> (ø)
services-auth-personal-representative 45.62% <ø> (+0.02%) ⬆️
services-auth-personal-representative-public 41.75% <ø> (-0.04%) ⬇️
services-auth-public-api 49.58% <ø> (-0.02%) ⬇️
services-documents 60.81% <ø> (ø)
services-endorsements-api 53.26% <ø> (ø)
services-sessions 65.44% <ø> (ø)
services-university-gateway 49.25% <ø> (-0.12%) ⬇️
services-user-notification 46.88% <ø> (-0.01%) ⬇️
services-user-profile 61.81% <ø> (-0.08%) ⬇️
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.80% <ø> (ø)

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

Files with missing lines Coverage Δ
...ations-admin/src/utils/formatAmendingRegulation.ts 0.00% <0.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 70a5f31...c821e0a. Read the comment docs.

@datadog-island-is
Copy link

datadog-island-is bot commented Nov 14, 2024

Datadog Report

All test runs d8a12ec 🔗

99 Total Test Services: 0 Failed, 97 Passed
❄️ 1 with New Flaky
🔻 Test Sessions change in coverage: 3 decreased, 2 increased, 194 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
services-auth-delegation-api 0 0 1 262 0 3m 32.9s 1 no change Link
air-discount-scheme-backend 0 0 0 82 0 31.42s N/A Link
air-discount-scheme-web 0 0 0 2 0 8.54s N/A Link
api 0 0 0 4 0 3.29s N/A Link
api-catalogue-services 0 0 0 23 0 13.22s N/A Link
api-domains-air-discount-scheme 0 0 0 6 0 20.99s N/A Link
api-domains-assets 0 0 0 3 0 13.07s N/A Link
api-domains-auth-admin 0 0 0 18 0 14.21s N/A Link
api-domains-communications 0 0 0 5 0 36.29s N/A Link
api-domains-criminal-record 0 0 0 5 0 10.56s N/A Link

🔻 Code Coverage Decreases vs Default Branch (3)

  • services-university-gateway - jest 45.1% (-0.03%) - Details
  • services-user-profile - jest 52.58% (-0.02%) - Details
  • services-auth-personal-representative-public - jest 41.05% (-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)
libs/portals/admin/regulations-admin/src/utils/formatAmendingRegulation.ts (2)

Line range hint 1-27: Add explicit TypeScript type annotations

Consider adding explicit type annotations to improve type safety and code maintainability:

- export const formatAmendingRegTitle = (draft: RegDraftForm) => {
+ export const formatAmendingRegTitle = (draft: RegDraftForm): string => {

- const formatAmendingRegBody = (
+ export const formatAmendingRegBody = (
   name: string,
   repeal?: boolean,
   diff?: HTMLText | string | undefined,
   regTitle?: string,
   appendixes?: AppendixDraftForm[],
-) => {
+): HTMLText[] => {

Line range hint 196-200: Improve error handling for undefined diff parameter

When repeal is false and diff is undefined, the function silently returns an empty array. Consider adding validation or logging to handle this case explicitly.

   if (!diff) {
+    console.warn('Diff is undefined for non-repeal regulation');
     return []
   }
📜 Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between e1dd2d5 and 6d58ce5.

📒 Files selected for processing (1)
  • libs/portals/admin/regulations-admin/src/utils/formatAmendingRegulation.ts (1 hunks)
🧰 Additional context used
📓 Path-based instructions (1)
libs/portals/admin/regulations-admin/src/utils/formatAmendingRegulation.ts (1)

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

  • Reusability of components and hooks across different NextJS apps.
  • TypeScript usage for defining props and exporting types.
  • Effective tree-shaking and bundling practices."
🔇 Additional comments (2)
libs/portals/admin/regulations-admin/src/utils/formatAmendingRegulation.ts (2)

26-26: LGTM: Grammatical correction in repealing prefix

The modification to PREFIX_REPEALING improves the grammatical structure of the repealing regulation titles in Icelandic.


Line range hint 1-11: LGTM: Effective tree-shaking practices

The code follows good practices for tree-shaking and reusability:

  • Individual lodash imports enable better tree-shaking
  • Named exports allow for selective imports
  • Utility functions are modular and reusable

@kodiakhq kodiakhq bot merged commit d06732d into main Nov 14, 2024
265 checks passed
@kodiakhq kodiakhq bot deleted the regulations-admin/amending-title-wording branch November 14, 2024 18:25
@coderabbitai coderabbitai bot mentioned this pull request Nov 15, 2024
6 tasks
jonnigs pushed a commit that referenced this pull request Nov 26, 2024
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
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