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(citizenship): wrong path error fix #16251

Merged
merged 3 commits into from
Oct 3, 2024
Merged

Conversation

berglindoma13
Copy link
Member

@berglindoma13 berglindoma13 commented Oct 3, 2024

...

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

  • New Features

    • Updated routing for hidden input fields in the Children's Supporting Documents section to enhance clarity and organization.
  • Bug Fixes

    • Ensured that the logic for determining default values for consent requirements remains accurate based on the child's age and custody status.

@berglindoma13 berglindoma13 requested a review from a team as a code owner October 3, 2024 09:37
Copy link
Contributor

coderabbitai bot commented Oct 3, 2024

Walkthrough

The changes in this pull request focus on the ChildrenOtherDocumentsSubSection component within the ChildrenOtherDocumentsSubSection.ts file. The primary modification involves updating the IDs of hidden input fields to align with a new routing structure, specifically changing references from ${Routes.SUPPORTINGDOCUMENTS} to ${Routes.CHILDSUPPORTINGDOCUMENTS}. The logic for determining default values for these inputs remains unchanged, ensuring that the component continues to function as intended while reflecting the updated routing context.

Changes

File Change Summary
libs/application/templates/directorate-of-immigration/citizenship/src/forms/CitizenshipForm/ChildrenSupportingDocuments/ChildrenOtherDocumentsSubSection.ts Updated IDs of hidden input fields to reflect new routing structure, retaining existing logic.

Possibly related PRs

Suggested reviewers

  • sigruntg

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.

@berglindoma13 berglindoma13 added the automerge Merge this PR as soon as all checks pass label Oct 3, 2024
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 (4)
libs/application/templates/directorate-of-immigration/citizenship/src/forms/CitizenshipForm/ChildrenSupportingDocuments/ChildrenOtherDocumentsSubSection.ts (4)

Line range hint 78-89: LGTM with a minor suggestion for improvement

The change from ${Routes.SUPPORTINGDOCUMENTS} to ${Routes.CHILDSUPPORTINGDOCUMENTS} aligns with the PR objective of fixing the wrong path error. This update ensures consistency with the child supporting documents context.

Consider extracting the age check logic into a separate function for improved readability and reusability:

const isWrittenConsentRequired = (age: number | null) => !!age && age >= MIN_AGE_WRITTEN_CONSENT;

// Then in the defaultValue function:
return isWrittenConsentRequired(age) ? 'true' : 'false';

This change would enhance code clarity and potentially improve reusability across the application.


Line range hint 113-134: Approved with suggestions for improvement

The change from ${Routes.SUPPORTINGDOCUMENTS} to ${Routes.CHILDSUPPORTINGDOCUMENTS} correctly addresses the wrong path error, ensuring consistency with the child supporting documents context.

To improve code clarity and maintainability, consider refactoring the complex logic for determining if written consent from the other parent is required:

  1. Extract the logic into a separate function:
const isWrittenConsentFromOtherParentRequired = (
  selectedInCustody: any[],
  index: number,
  customAddedParent: string
) => {
  const thisChild = selectedInCustody && selectedInCustody[index - 1];
  const hasOtherParent = thisChild && !!thisChild.otherParent;
  return hasOtherParent || !!customAddedParent;
};
  1. Use this function in the defaultValue:
defaultValue: (application: Application) => {
  const answers = application.answers as Citizenship;
  const selectedInCustody = getSelectedCustodyChildren(
    application.externalData,
    answers
  );
  const customAddedParent = getValueViaPath(
    answers,
    `selectedChildrenExtraData[${index}].otherParentName`,
    ''
  ) as string;

  return isWrittenConsentFromOtherParentRequired(selectedInCustody, index, customAddedParent)
    ? 'true'
    : 'false';
},

This refactoring would improve code readability and make the logic easier to test and maintain.


Line range hint 174-189: Approved with suggestions for consistency and reusability

The change from ${Routes.SUPPORTINGDOCUMENTS} to ${Routes.CHILDSUPPORTINGDOCUMENTS} correctly addresses the wrong path error, maintaining consistency with the child supporting documents context.

To improve code consistency and reusability, consider the following refactoring:

  1. Extract the common logic for checking if a child has another parent into a reusable function:
const hasOtherParent = (selectedInCustody: any[], index: number) => {
  const thisChild = selectedInCustody && selectedInCustody[index - 1];
  return thisChild && !!thisChild.otherParent;
};
  1. Use this function in both the custodyDocumentsRequired and writtenConsentFromOtherParentRequired logic:
defaultValue: (application: Application) => {
  const answers = application.answers as Citizenship;
  const selectedInCustody = getSelectedCustodyChildren(
    application.externalData,
    answers
  );
  return hasOtherParent(selectedInCustody, index) ? 'true' : 'false';
},

This refactoring would improve code consistency across different sections and enhance reusability, adhering to the DRY principle.


Line range hint 1-224: Summary of changes and overall impact

The changes in this file consistently address the wrong path error mentioned in the PR objectives by updating the IDs of hidden input fields from ${Routes.SUPPORTINGDOCUMENTS} to ${Routes.CHILDSUPPORTINGDOCUMENTS}. This update ensures that the routing aligns correctly with the context of the child's supporting documents section.

While the changes effectively fix the immediate issue, consider the following architectural advice to further improve the code:

  1. Implement a centralized route management system to prevent similar path-related errors in the future.
  2. Create utility functions for common logic patterns (as suggested in the individual comments) to improve code reusability across the application.
  3. Consider using TypeScript's enum or const assertions for the Routes object to provide better type safety and autocompletion when referencing routes.

These improvements would enhance the overall maintainability and scalability of the codebase while adhering to the reusability requirements for components in the libs/**/* path pattern.

📜 Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between 9af30c0 and d3e3c86.

📒 Files selected for processing (1)
  • libs/application/templates/directorate-of-immigration/citizenship/src/forms/CitizenshipForm/ChildrenSupportingDocuments/ChildrenOtherDocumentsSubSection.ts (3 hunks)
🧰 Additional context used
📓 Path-based instructions (1)
libs/application/templates/directorate-of-immigration/citizenship/src/forms/CitizenshipForm/ChildrenSupportingDocuments/ChildrenOtherDocumentsSubSection.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."

Copy link

codecov bot commented Oct 3, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 36.92%. Comparing base (7a9c112) to head (f9770e2).
Report is 1 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main   #16251      +/-   ##
==========================================
- Coverage   36.93%   36.92%   -0.01%     
==========================================
  Files        6781     6781              
  Lines      140002   140009       +7     
  Branches    39809    39810       +1     
==========================================
  Hits        51703    51703              
- Misses      88299    88306       +7     
Flag Coverage Δ
api 3.37% <ø> (ø)
application-system-api 41.63% <ø> (-0.01%) ⬇️
application-template-api-modules 24.38% <ø> (+0.01%) ⬆️
application-ui-shell 21.29% <ø> (ø)

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

see 1 file 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 7a9c112...f9770e2. Read the comment docs.

@datadog-island-is
Copy link

Datadog Report

All test runs 9cd2f00 🔗

5 Total Test Services: 0 Failed, 5 Passed
➡️ Test Sessions change in coverage: 10 no change

Test Services
Service Name Failed Known Flaky New Flaky Passed Skipped Total Time Code Coverage Change Test Service View
api 0 0 0 4 0 3.2s 1 no change Link
application-system-api 0 0 0 120 2 3m 38.24s 1 no change Link
application-template-api-modules 0 0 0 135 0 2m 9.16s 1 no change Link
application-ui-shell 0 0 0 74 0 37.98s 1 no change Link
judicial-system-backend 0 0 0 21216 0 21m 11.03s 1 no change Link

@kodiakhq kodiakhq bot merged commit e8844cb into main Oct 3, 2024
38 checks passed
@kodiakhq kodiakhq bot deleted the fix/citizenship-file-upload branch October 3, 2024 10:35
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.

2 participants