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(application-system): Contentful strings removed #17478

Merged
merged 2 commits into from
Jan 13, 2025

Conversation

Ballioli
Copy link
Member

@Ballioli Ballioli commented Jan 13, 2025

...

Attach a link to issue if relevant

What

Specify what you're trying to achieve

Why

Specify why you need to achieve this

Screenshots / Gifs

Attach Screenshots / Gifs to help reviewers understand the scope of the pull request

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

Release Notes

  • Bug Fixes

    • Simplified announcement section text and removed secondary heading
    • Updated description message for work accident notification form
  • Documentation

    • Minor text refinement in external data messages

The changes focus on streamlining the user interface and clarifying messaging for the work accident notification process.

@Ballioli Ballioli requested a review from a team as a code owner January 13, 2025 14:25
Copy link
Contributor

coderabbitai bot commented Jan 13, 2025

Walkthrough

This pull request involves modifications to the work accident notification template, specifically removing a description field from the announcement section. The changes include deleting a secondary heading field in the form's component and removing the corresponding message definition in the external data messages file. The alteration simplifies the form's structure while maintaining the core functionality of the work accident notification process.

Changes

File Change Summary
libs/application/templates/aosh/work-accident-notification/src/forms/WorkAccidentNotificationForm/AnnouncementSection/index.ts Removed buildDescriptionField with id: 'externalData.secondHeading' from buildMultiField children
libs/application/templates/aosh/work-accident-notification/src/lib/messages/externalData.ts - Removed announcementHeadingSecond message definition
- Modified announcementDescription message text

Possibly related PRs

Suggested labels

automerge

Suggested reviewers

  • sigruntg

Finishing Touches

  • 📝 Generate Docstrings (Beta)

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.

@Ballioli Ballioli added the deprecated:automerge (Disabled) Merge this PR as soon as all checks pass label Jan 13, 2025
Copy link

codecov bot commented Jan 13, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 35.68%. Comparing base (9156725) to head (c407f49).
Report is 1 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main   #17478      +/-   ##
==========================================
+ Coverage   35.66%   35.68%   +0.01%     
==========================================
  Files        6977     6977              
  Lines      149793   149636     -157     
  Branches    42835    42769      -66     
==========================================
- Hits        53425    53395      -30     
+ Misses      96368    96241     -127     
Flag Coverage Δ
api 3.33% <ø> (ø)
api-domains-auth-admin 48.49% <ø> (ø)
api-domains-communications 39.49% <ø> (ø)
application-system-api 38.75% <ø> (+<0.01%) ⬆️
application-template-api-modules 27.57% <ø> (+0.02%) ⬆️
application-ui-shell 22.19% <ø> (ø)
cms 0.39% <ø> (ø)
cms-translations 38.81% <ø> (ø)
judicial-system-api 20.23% <ø> (ø)
judicial-system-backend 55.87% <ø> (ø)
services-user-notification 46.54% <ø> (-0.01%) ⬇️
web 2.39% <ø> (ø)

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

see 8 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 9156725...c407f49. 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: 0

🧹 Nitpick comments (1)
libs/application/templates/aosh/work-accident-notification/src/lib/messages/externalData.ts (1)

Line range hint 31-45: Improve message structure and readability.

The message uses template literals for multiline content, but the formatting could be improved:

  1. Consider breaking down this long message into smaller, more manageable chunks.
  2. The line breaks and indentation in the template literal could be more consistent.

Consider this structure:

     announcementDescription: {
       id: 'aosh.wan.application:externalData.dataProvider.announcementDescription',
-      defaultMessage: `Vinsamlega athugaðu að þú ert innskráð/ur sem einstaklingur. 
-        Atvinnurekanda ber skylda til að sjá til þess að vinnuslys sé tilkynnt til 
-        Vinnueftirlitsins þegar slys verður vegna eða við vinnu á vinnustað hans 
-        og starfsmaður verður óvinnufær í einn eða fleiri daga, umfram þann dag 
-        sem slysið varð. Einstaklingar eiga ekki að tilkynna eigin slys inn til 
-        Vinnueftirlitsins eina undantekningin á þessari reglu eru einstaklingar 
-        sem reka eigin starfsemi á sinni eigin kennitölu. 
-        \n Ef þú ert að skrá þessa tilkynningu fyrir hönd fyrirtækis þá væri æskilegra 
-        að þú værir innskráður á vefinn með auðkenni viðkomandi fyrirtækis eða með umboð 
-        frá fyrirtækinu til að skrá vinnuslys fyrir hönd þess. Athugaðu að þú munt ekki hafa aðgang að neinum upplýsingum 
-        um aðrar tilkynningar fyrirtækisins.`,
+      defaultMessage: [
+        'Vinsamlega athugaðu að þú ert innskráð/ur sem einstaklingur.',
+        'Atvinnurekanda ber skylda til að sjá til þess að vinnuslys sé tilkynnt til ',
+        'Vinnueftirlitsins þegar slys verður vegna eða við vinnu á vinnustað hans ',
+        'og starfsmaður verður óvinnufær í einn eða fleiri daga, umfram þann dag ',
+        'sem slysið varð. Einstaklingar eiga ekki að tilkynna eigin slys inn til ',
+        'Vinnueftirlitsins eina undantekningin á þessari reglu eru einstaklingar ',
+        'sem reka eigin starfsemi á sinni eigin kennitölu.',
+        '',
+        'Ef þú ert að skrá þessa tilkynningu fyrir hönd fyrirtækis þá væri æskilegra ',
+        'að þú værir innskráður á vefinn með auðkenni viðkomandi fyrirtækis eða með umboð ',
+        'frá fyrirtækinu til að skrá vinnuslys fyrir hönd þess. Athugaðu að þú munt ekki ',
+        'hafa aðgang að neinum upplýsingum um aðrar tilkynningar fyrirtækisins.'
+      ].join(''),
       description: 'Announcement description following prerequisites',
     },
📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 3849d14 and c6fa439.

📒 Files selected for processing (2)
  • libs/application/templates/aosh/work-accident-notification/src/forms/WorkAccidentNotificationForm/AnnouncementSection/index.ts (0 hunks)
  • libs/application/templates/aosh/work-accident-notification/src/lib/messages/externalData.ts (2 hunks)
💤 Files with no reviewable changes (1)
  • libs/application/templates/aosh/work-accident-notification/src/forms/WorkAccidentNotificationForm/AnnouncementSection/index.ts
🧰 Additional context used
📓 Path-based instructions (1)
libs/application/templates/aosh/work-accident-notification/src/lib/messages/externalData.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/application/templates/aosh/work-accident-notification/src/lib/messages/externalData.ts (1)

31-31: Verify the removal of announcementHeadingSecond message.

The removal of this message should be coordinated with the removal of its usage in the announcement section's form component.

Let's verify that there are no remaining references to this message:

✅ Verification successful

The removal of announcementHeadingSecond message is safe

The message is not referenced anywhere in the codebase, and the AnnouncementSection component only uses other heading messages.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Search for any remaining references to the removed message ID
rg -i "externalData\.dataProvider\.announcementHeadingSecond" \
   -g '!*.{test,spec}.*'

# Search for any remaining references to "secondHeading" in form components
rg -i "secondHeading" \
   -g '**/WorkAccidentNotificationForm/**/*.{ts,tsx}' \
   -g '!*.{test,spec}.*'

Length of output: 180


Script:

#!/bin/bash
# Search for files containing both "announcement" and "heading"
rg -l -i "announcement.*heading|heading.*announcement" \
   -g '!*.{test,spec}.*' \
   -g '**/work-accident-notification/**'

# Find all files importing from externalData
rg -l "from.*messages/externalData" \
   -g '**/work-accident-notification/**' \
   -g '!*.{test,spec}.*'

# Search for any component using "heading" in the work accident notification template
rg -i "heading" \
   -g '**/work-accident-notification/**/*.{tsx,ts}' \
   -g '!*.{test,spec}.*' \
   -g '!**/messages/**'

Length of output: 4325

@datadog-island-is
Copy link

datadog-island-is bot commented Jan 13, 2025

Datadog Report

All test runs 001065e 🔗

10 Total Test Services: 0 Failed, 9 Passed
➡️ Test Sessions change in coverage: 32 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
api 0 0 0 4 0 2.63s 1 no change Link
api-domains-auth-admin 0 0 0 18 0 10.17s 1 no change Link
api-domains-communications 0 0 0 5 0 30.75s 1 no change Link
api-domains-license-service 0 0 0 0 0 478.27ms 1 no change Link
application-system-api 0 0 0 46 0 2m 11.31s 1 no change Link
application-template-api-modules 0 0 0 118 0 2m 6.38s 1 no change Link
application-ui-shell 0 0 0 74 0 32.39s 1 no change Link
cms-translations 0 0 0 3 0 26.79s 1 no change Link
judicial-system-api 0 0 0 61 0 5.33s 1 no change Link
judicial-system-backend 0 0 0 21250 0 18m 32.05s 1 no change Link

@kodiakhq kodiakhq bot merged commit 7579e2b into main Jan 13, 2025
65 checks passed
@kodiakhq kodiakhq bot deleted the fix/aosh-accidents-contentful-strings-delete branch January 13, 2025 15:13
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