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: Year Of Birth Field Validation Condition in Patient transfer form #9133

Conversation

AdityaJ2305
Copy link
Contributor

@AdityaJ2305 AdityaJ2305 commented Nov 15, 2024

Proposed Changes

@ohcnetwork/care-fe-code-reviewers
@nihal467

Screen Recording

Screen.Recording.2024-11-16.at.12.04.38.AM.mov

Merge Checklist

  • Prep screenshot or demo video for changelog entry, and attach it to issue.
  • Request for Peer Reviews

Summary by CodeRabbit

  • New Features

    • Enhanced validation for the year_of_birth input, including checks for acceptable range and improved error messaging.
  • Bug Fixes

    • Simplified validation logic by removing unnecessary maximum year checks and restructuring event handling for better clarity.

@AdityaJ2305 AdityaJ2305 requested a review from a team as a code owner November 15, 2024 18:32
Copy link
Contributor

coderabbitai bot commented Nov 15, 2024

Walkthrough

The changes in TransferPatientDialog.tsx focus on improving the validation logic for the year_of_birth field. The handleChange function was simplified by removing the maximum year check, which is now handled in a new handleOnBlur function. This function validates the year of birth against a minimum of 1900 and a maximum year, dispatching appropriate error messages. The TextFormField attributes for year_of_birth were also updated to remove min and max, with the validation logic encapsulated in the new onBlur event handler.

Changes

Files Change Summary
src/components/Facility/TransferPatientDialog.tsx Simplified handleChange, added handleOnBlur for year validation, updated validateForm with new checks, removed min and max attributes from TextFormField.

Assessment against linked issues

Objective Addressed Explanation
Validation should only occur on blur for the Year of Birth field (9132)

Possibly related PRs

  • Fix min date for discharge  #9083: The changes in DischargeModal.tsx involve validation logic for dates, which is related to the handling of date fields similar to the modifications made to the year_of_birth field in TransferPatientDialog.tsx.

Suggested labels

urgent, needs review, tested, P1

🐇 In the dialog where patients transfer,
A year of birth now brings less pressure.
With checks on blur, it’s neat and clear,
No more errors with each keystroke near!
So hop along, let’s celebrate,
A smoother form, oh, isn’t it great? 🌼


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.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

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

netlify bot commented Nov 15, 2024

Deploy Preview for care-ohc ready!

Name Link
🔨 Latest commit ba605ee
🔍 Latest deploy log https://app.netlify.com/sites/care-ohc/deploys/673c3f622e20d90008ace60f
😎 Deploy Preview https://deploy-preview-9133--care-ohc.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

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: 1

🧹 Outside diff range and nitpick comments (2)
src/components/Facility/TransferPatientDialog.tsx (2)

133-137: Consider extracting validation logic to reduce duplication

The validation logic for year of birth is duplicated between handleOnBlur and validateForm. Consider extracting this into a shared utility function.

+const MIN_BIRTH_YEAR = 1900;
+
+const validateYearOfBirth = (year: number | null): string => {
+  if (!year) return t("field_required");
+  if (year > maxYear) return `Cannot be greater than ${maxYear}`;
+  if (year < MIN_BIRTH_YEAR) return `Cannot be smaller than ${MIN_BIRTH_YEAR}`;
+  return "";
+};

 case "year_of_birth":
-  if (!state.form[field]) {
-    errors[field] = t("field_required");
-    invalidForm = true;
-  }
-
-  if (parseInt(state.form[field] || "0") > maxYear) {
-    errors[field] = `Cannot be greater than ${maxYear}`;
-    invalidForm = true;
-  }
-
-  if (parseInt(state.form[field] || "0") < 1900) {
-    errors[field] = `Cannot be smaller than 1900`;
-    invalidForm = true;
-  }
+  const errorMessage = validateYearOfBirth(Number(state.form[field]));
+  if (errorMessage) {
+    errors[field] = errorMessage;
+    invalidForm = true;
+  }
   return;

Line range hint 78-217: Consider implementing form validation using a schema validator

While the current implementation meets the requirements, consider using a form validation library like Yup or Zod for more maintainable and type-safe form validation. This would:

  1. Centralize validation rules
  2. Provide better type safety
  3. Reduce code duplication
  4. Make it easier to add new validations in the future

Example implementation with Yup:

import * as yup from 'yup';

const validationSchema = yup.object().shape({
  patient: yup.string().required('Please select the suspect/patient'),
  year_of_birth: yup.number()
    .required(t("field_required"))
    .min(1900, 'Cannot be smaller than 1900')
    .max(maxYear, `Cannot be greater than ${maxYear}`)
});
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between da5d576 and f1d8ed4.

📒 Files selected for processing (1)
  • src/components/Facility/TransferPatientDialog.tsx (3 hunks)
🔇 Additional comments (2)
src/components/Facility/TransferPatientDialog.tsx (2)

78-82: LGTM! Good separation of concerns

The simplified handleChange function now focuses solely on updating form state, which aligns well with the PR objective of avoiding validation on every keystroke.


217-217: LGTM! Validation timing improved

The addition of the onBlur handler successfully addresses the UX issue by validating only after the user has finished entering data.

src/components/Facility/TransferPatientDialog.tsx Outdated Show resolved Hide resolved
@nihal467
Copy link
Member

@AdityaJ2305
image

  • the text limit of 4 digits in the input field is removed by you in the PR, revert it back

@nihal467
Copy link
Member

LGTM

@khavinshankar khavinshankar merged commit b076d4f into ohcnetwork:develop Nov 20, 2024
20 checks passed
Copy link

@AdityaJ2305 Your efforts have helped advance digital healthcare and TeleICU systems. 🚀 Thank you for taking the time out to make CARE better. We hope you continue to innovate and contribute; your impact is immense! 🙌

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Year Of Birth Field Validation Condition in Patient transfer form is not working as expected
4 participants