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

GovtOrganization Selector #10090

Merged

Conversation

Jacobjeevan
Copy link
Contributor

@Jacobjeevan Jacobjeevan commented Jan 22, 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

  • New Features

    • Introduced a new custom hook for managing government organization data
    • Enhanced organization selection component with improved filtering and selection logic
    • Added dynamic organization level selection with loading indicators
  • Improvements

    • Refactored organization selection to use a more modular, component-driven approach
    • Improved user experience during data retrieval with loading states

@Jacobjeevan Jacobjeevan requested a review from a team as a code owner January 22, 2025 04:24
Copy link
Contributor

coderabbitai bot commented Jan 22, 2025

Walkthrough

The pull request introduces a new custom hook useGovtOrganizationLevel and refactors the GovtOrganizationSelector component to improve organization level selection. The changes focus on creating a more dynamic and modular approach to handling dependent dropdown selections for government organizations. The new implementation aims to simplify the user experience by automatically managing organization level selections and removing the need for manual trash button interactions.

Changes

File Change Summary
src/hooks/useGovtOrganizationLevel.ts Added new custom hook for fetching and managing government organization levels with search and autocomplete functionality
src/pages/Organization/components/GovtOrganizationSelector.tsx Introduced OrganizationLevelSelect component, refactored selection logic, added dynamic level rendering, updated component props

Assessment against linked issues

Objective Addressed Explanation
Dynamically update dependent dropdowns
Automatically clear previous selections
Remove trash icons

Possibly related PRs

Suggested labels

needs testing, needs review

Suggested reviewers

  • rithviknishad
  • gigincg

Poem

🐰 Dropdowns dance with grace and might,
No more trash icons in our sight!
Levels cascade, smooth and clean,
A rabbit's code, a user's dream!
Selections flow like gentle streams 🌊

✨ 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.

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 22, 2025

Deploy Preview for care-ohc ready!

Name Link
🔨 Latest commit a9865e7
🔍 Latest deploy log https://app.netlify.com/sites/care-ohc/deploys/6790f952491f5f0008d9a1a2
😎 Deploy Preview https://deploy-preview-10090--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: 3

🧹 Nitpick comments (1)
src/pages/Organization/components/GovtOrganizationSelector.tsx (1)

63-68: Improve Readability by Refactoring Nested Ternary Operators

The nested ternary operators used here reduce code readability and can make the code harder to maintain. Consider refactoring this logic using a helper function or if-else statements to enhance clarity.

Apply this diff to refactor the label rendering:

-{t(
-  currentLevel
-    ? `SYSTEM__govt_org_type__${currentLevel.metadata?.govt_org_type}`
-    : index === 0
-      ? "SYSTEM__govt_org_type__default"
-      : `SYSTEM__govt_org_type__${previousLevel?.metadata?.govt_org_children_type || "default"}`,
-)}
+{
+  const labelKey = currentLevel
+    ? `SYSTEM__govt_org_type__${currentLevel.metadata?.govt_org_type}`
+    : index === 0
+    ? "SYSTEM__govt_org_type__default"
+    : `SYSTEM__govt_org_type__${previousLevel?.metadata?.govt_org_children_type || "default"}`;
+  t(labelKey);
+}
📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 6a26ae0 and ca7220a.

📒 Files selected for processing (2)
  • src/hooks/useGovtOrganizationLevel.ts (1 hunks)
  • src/pages/Organization/components/GovtOrganizationSelector.tsx (2 hunks)
🔇 Additional comments (2)
src/pages/Organization/components/GovtOrganizationSelector.tsx (1)

136-142: Calculation of totalLevels is Correct

The logic for calculating totalLevels accurately determines the number of organization levels to display based on the selected levels and whether the last selected organization has children.

src/hooks/useGovtOrganizationLevel.ts (1)

66-71: Handle Undefined organizations Safely

While mapping organizations?.results to options, ensure that organizations is defined to prevent potential runtime errors. The current implementation uses the optional chaining operator and defaults to an empty array, which is appropriate.

@rithviknishad rithviknishad self-requested a review January 22, 2025 05:19
@nihal467
Copy link
Member

PR looks good to me, need to fix the cypress

@nihal467 nihal467 added tested Cypress Test Pending The Cypress test are to be verified and removed needs testing labels Jan 22, 2025
@khavinshankar khavinshankar merged commit 39caada into ohcnetwork:develop Jan 22, 2025
15 of 16 checks passed
Copy link

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

@khavinshankar
Copy link
Member

Let's fix the cypress issue in a separate PR.

cc: @Jacobjeevan @nihal467

@nihal467
Copy link
Member

image

when you type to try aluva in the local body dropdown, its goes into loading state in between, seem like a state management issue, can you look into it

@Jacobjeevan
Copy link
Contributor Author

Jacobjeevan commented Jan 22, 2025

image

when you type to try aluva in the local body dropdown, its goes into loading state in between, seem like a state management issue, can you look into it

I had added a spinner, funnily missed testing the search portion after adding the spinner 😅 . Anyways, adjusted to display spinner alongside the dropdown, rather than instead of.

#10105

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Cypress Test Pending The Cypress test are to be verified test failed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Trash button alternative for patients page.
3 participants