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 cancel button in update encounter form #9772

Conversation

Mahendar0701
Copy link
Contributor

@Mahendar0701 Mahendar0701 commented Jan 5, 2025

Proposed Changes

@ohcnetwork/care-fe-code-reviewers

Merge Checklist

  • Add specs that demonstrate bug / test a new feature.
  • Update product documentation.
  • Ensure that UI text is kept in I18n files.
  • Prep screenshot or demo video for changelog entry, and attach it to issue.
  • Request for Peer Reviews
  • Completion of QA

Summary by CodeRabbit

  • Localization

    • Added new translations for questionnaire-related messages
    • Implemented localized error handling for questionnaire loading
    • Updated button labels with internationalization support
  • User Experience

    • Improved error messaging for questionnaire interactions
    • Added more descriptive feedback when accessing non-existent questionnaires

@Mahendar0701 Mahendar0701 requested a review from a team as a code owner January 5, 2025 20:07
Copy link
Contributor

coderabbitai bot commented Jan 5, 2025

Walkthrough

This pull request focuses on enhancing the questionnaire feature by adding localization support and improving error handling. The changes include updating the English locale JSON file with new translation keys for questionnaire-related messages, modifying the EncounterQuestionnaire component to use the useAppHistory hook for navigation, and updating the QuestionnaireForm to use internationalized error messages and button labels.

Changes

File Change Summary
public/locale/en.json Added three new translation keys:
- "questionnaire": "Questionnaire"
- "questionnaire_error_loading": "Error loading questionnaire"
- "questionnaire_not_exist": "The questionnaire you tried to access does not exist."
src/components/Patient/EncounterQuestionnaire.tsx - Added useAppHistory hook
- Implemented goBack functionality for cancel action
- Used internationalized title for the page
src/components/Questionnaire/QuestionnaireForm.tsx - Localized error messages
- Updated button labels using translation function
- Improved error handling with user-friendly alerts

Assessment against linked issues

Objective Addressed Explanation
Cancel button navigation [#9771]

Possibly related PRs

Suggested reviewers

  • rithviknishad

Poem

🐰 A Questionnaire's Tale of Delight

Locales dancing, errors take flight,
Buttons now speak in languages bright,
Cancel and submit, a linguistic might,
CodeRabbit's magic makes everything right!

🌈✨


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.

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 Jan 5, 2025

Deploy Preview for care-ohc ready!

Name Link
🔨 Latest commit 7821322
🔍 Latest deploy log https://app.netlify.com/sites/care-ohc/deploys/677aebc73ccf80000868e6a1
😎 Deploy Preview https://deploy-preview-9772--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: 0

🧹 Nitpick comments (3)
src/components/Patient/EncounterQuestionnaire.tsx (2)

26-26: Double-check that goBack aligns with backUrl handling.
Both a manual backUrl prop in <Page> and goBack() might overlap. If goBack() supersedes backUrl, consider removing the redundant backUrl or clarifying the intended navigation path.


49-49: Provide a user confirmation if needed.
If cancelling the form leads to data loss, prompt the user to confirm navigation. Otherwise, the direct goBack() call is sufficient.

src/components/Questionnaire/QuestionnaireForm.tsx (1)

417-417: Show a loading indicator text for screen readers.
The hidden text <span className="opacity-0">{t("submit")}</span> is a great approach for preserving layout. Also consider adding an aria-label or similar attribute to improve accessibility for assistive technologies.

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 539862e and 7821322.

📒 Files selected for processing (3)
  • public/locale/en.json (1 hunks)
  • src/components/Patient/EncounterQuestionnaire.tsx (3 hunks)
  • src/components/Questionnaire/QuestionnaireForm.tsx (4 hunks)
🔇 Additional comments (7)
src/components/Patient/EncounterQuestionnaire.tsx (3)

1-1: Ensure all translations are properly loaded in the app.
By switching from a static string to t("questionnaire"), this step completes the i18n integration. Verify the usage of the translation hook and confirm that the questionnaire key is available in all locales in use.


9-10: Validate fallback behavior if useAppHistory hook fails.
Although rare, if the hook or goBack is unavailable (e.g., in certain test or SSR scenarios), ensure graceful fallback to avoid any navigation errors.


29-29: Internationalize the page title.
Using title={t("questionnaire")} is consistent with i18n best practices. Good job localizing the title.

src/components/Questionnaire/QuestionnaireForm.tsx (3)

110-111: Localized error messages.
Replacing static text with t("questionnaire_error_loading") and t("questionnaire_not_exist") improves accessibility for non-English speakers. Nicely done.


407-407: Ensure consistent button labeling.
The "Cancel" button now uses t("cancel"). Verify that this key-value translation is consistent with other areas of the UI for cohesive user experience.


423-423: Localized “Submit” label.
Using t("submit") ensures consistent language support. Looks good.

public/locale/en.json (1)

1475-1477: Keys align with usage in the components.
"questionnaire", "questionnaire_error_loading", and "questionnaire_not_exist" match the references in EncounterQuestionnaire.tsx and QuestionnaireForm.tsx. This is consistent and correct.

@rithviknishad rithviknishad merged commit 83a115d into ohcnetwork:develop Jan 6, 2025
20 of 21 checks passed
Copy link

github-actions bot commented Jan 6, 2025

@Mahendar0701 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! 🙌

@Mahendar0701 Mahendar0701 deleted the cancel-button-in-update-encounter-form branch January 6, 2025 03:32
nihal467 added a commit that referenced this pull request Jan 13, 2025
* added patient home actions plugin hook

* expose core app env in global scope

* enable heatmap and fix appointments column size (#9713)

* Fix: Forgot password error should be handled properly  (#9707)

* forgot password mutation

* updated

* Added no user assingned message (#9666)

Co-authored-by: Rithvik Nishad <rithvikn2001@gmail.com>

* Remove facility name from facility users page (#9746)

* Enhance organization management by adding new organization types and updating related components. Refactor organization level retrieval to use metadata for improved localization. Remove deprecated organization levels constant and clean up unused code in various components.

* Cancel button fix in Book Appointment screen (#9757)

* Add public flag to facility (#9759)

* Auto-Hide Sidebar on mobile (#9758)

* Implement Permission Context and Update User Permissions Handling

- Introduced a new PermissionContext to manage user permissions and super admin status across the application.
- Updated AppRouter to utilize PermissionProvider for managing permissions.
- Changed UserModel to store permissions as strings instead of objects.
- Refactored OrganizationFacilities and OrganizationPatients components to use updated permission checks and organization identifiers.
- Enhanced OrganizationLayout to conditionally render navigation items based on user permissions.

This commit improves the permission management system and ensures consistent handling of user permissions throughout the application.

* Replaced ButtonV2's with Button in entire codebase (#9736)

* fixes overlapping text (#9767)

* Care Loading icon in organization and facility users (#9723)

* Clean up facility search in index

* Add searchPostFix prop to ValueSetSelect and related components

- Introduced a new `searchPostFix` prop in `ValueSetSelect` to allow appending a suffix to the search query.
- Updated `MedicationRequestQuestion` and `MedicationStatementQuestion` components to utilize the `searchPostFix` prop with a default value of " clinical drug".
- This change enhances search functionality by providing more context in search queries.

* Clean up patient login

* Fix cancel button in update encounter form (#9772)

* disabled image build and deploy for care stagin (#9779)

* Bump @tanstack/react-query-devtools from 5.62.11 to 5.62.15 (#9785)

Bumps [@tanstack/react-query-devtools](https://github.com/TanStack/query/tree/HEAD/packages/react-query-devtools) from 5.62.11 to 5.62.15.
- [Release notes](https://github.com/TanStack/query/releases)
- [Commits](https://github.com/TanStack/query/commits/HEAD/packages/react-query-devtools)

---
updated-dependencies:
- dependency-name: "@tanstack/react-query-devtools"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Patient encounter notes (#9617)

Co-authored-by: Bodhisha Thomas <bodhi@Bodhishas-MacBook-Air.local>
Co-authored-by: Bodhish Thomas <bodhish@gmail.com>

* Fix Auto hide without hook (#9780)

* Enhance encounter data handling by adding encounterId prop across multiple components (#9793)

* Disable encounter create during save (#9795)

* Enhance encounter data handling by adding encounterId prop across multiple components

- Added `encounterId` prop to `ObservationChart`, `ObservationHistoryTable`, `ObservationsList`, `QuestionnaireResponsesList`, and `StructuredResponseView` components to improve data fetching and display related to specific encounters.
- Updated query parameters in API calls to include `encounterId` for better data context.
- Refactored `EncounterPlotsTab` and `EncounterUpdatesTab` to pass the new `encounterId` prop, ensuring consistent data handling across the application.

This change improves the overall functionality and user experience by ensuring that encounter-specific data is accurately retrieved and displayed.

* fix: disable encounter create button during save to prevent multiple submissions #9794

* Refactor PatientHome and EncounterShow components; update FacilityOrganizationSelector labels

- Removed unused state and commented-out code in PatientHome for improved readability.
- Enhanced patient data display by updating the last updated and created by fields to use `updated_by` instead of `modified_by`.
- Updated date formatting functions to ensure consistent display of patient and encounter dates.
- Changed labels in FacilityOrganizationSelector from "Organization" to "Select Department" and adjusted related text for clarity.

These changes streamline the codebase and improve user interface clarity.

* Partial Cleanup Public Router | Public Pages Header

* Rewire enableWhen

* Remove localStorage watch from AuthUserProvider

* Implement immediate redirection after successful login

* Fix: Update the value to Home Health in Create Encounter Form (#9806)

* Update Questionnaire Styling

* Update Questionnaire Styling

* Update Auth Handling

* Cleanup Patient Auth State

* Handle Null created_by

* Types for null patient.created_by

* Bump i18next from 24.2.0 to 24.2.1 (#9818)

Bumps [i18next](https://github.com/i18next/i18next) from 24.2.0 to 24.2.1.
- [Release notes](https://github.com/i18next/i18next/releases)
- [Changelog](https://github.com/i18next/i18next/blob/master/CHANGELOG.md)
- [Commits](i18next/i18next@v24.2.0...v24.2.1)

---
updated-dependencies:
- dependency-name: i18next
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump input-otp from 1.4.1 to 1.4.2 (#9819)

Bumps [input-otp](https://github.com/guilhermerodz/input-otp/tree/HEAD/packages/input-otp) from 1.4.1 to 1.4.2.
- [Changelog](https://github.com/guilhermerodz/input-otp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/guilhermerodz/input-otp/commits/HEAD/packages/input-otp)

---
updated-dependencies:
- dependency-name: input-otp
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Rename dosage field to frequency in ongoing medication form (#9811)

* feat: Add new fields to Question interface (#9824)

* Cleanup Labels in Questionnaire

* Allergy intolerance Cleanup (#9812)

* cleanup CarePatientTokenKey (#9827)

* changed the facility name (#9829)

* Cleanup localStorage Management in Patient Login; Fix Time in Confirmation

* Use PatientContext from Router when required

* Cleanup Navbars

* AllergyList: Add i18n; map key

* Add Actions in Encounter

* Remove Shortcut for Nursing Care

* Update Crowdin configuration file

* Update Crowdin configuration file

* Fix: Replace InputWithError and InputErrors components with ShadCN’s components directly. (#9847)

* fixed eslint errors caused while creating plugin map

* refactored the patient registration form using react hook form

* added patient registration form plugin hook

* updated validations

* added patient info card actions plugin hook

* set same_phone_number to true by default in patient registration

* set same_address to true and same_phone_number to false by default in patient registration

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Mohammed Nihal <57055998+nihal467@users.noreply.github.com>
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.

Cancel button not working in update encounter form
3 participants