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

Feat: Display total no. of entities with heading in Organization #10092

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from

Conversation

AdityaJ2305
Copy link
Contributor

@AdityaJ2305 AdityaJ2305 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

Release Notes

  • New Features

    • Added count badges to various organization-related pages (Users, Patients, Facilities, Organization View)
    • Introduced a more flexible localization strategy for entity counts
  • Improvements

    • Enhanced UI with dynamic count displays
    • Improved header layouts across organization pages
    • Generalized count representation for different entity types
  • Localization

    • Updated translation strings to support generic entity counting
    • Replaced user-specific count translations with more flexible format

@AdityaJ2305 AdityaJ2305 requested a review from a team as a code owner January 22, 2025 06:26
Copy link
Contributor

coderabbitai bot commented Jan 22, 2025

Walkthrough

This pull request introduces a consistent approach to displaying entity counts across various organization-related tabs. The changes involve modifying localization files and updating multiple components to include a Badge that shows the count of entities (facilities, patients, users, organizations). The implementation generalizes the count display mechanism, moving from user-specific to a more flexible entity-count approach. The changes aim to provide a uniform user interface that clearly shows the number of entities in different sections.

Changes

File Change Summary
public/locale/en.json Replaced user-specific count entries with generalized entity_count_one and entity_count_other localization strings
src/components/Facility/FacilityUsers.tsx Updated to use generalized entity count translation
src/pages/Organization/* Added Badge component to display entity counts for Facilities, Patients, Users, and Organizations

Assessment against linked issues

Objective Addressed Explanation
Display total number of entities in Organization tabs [#10087]
Consistent count display across Facilities, Patients, Users, Organizations

Possibly related PRs

Suggested labels

tested, reviewed

Suggested reviewers

  • rithviknishad
  • Jacobjeevan

Poem

🐰 Counting entities, oh what delight!
Badges dancing, numbers shining bright
From users to patients, facilities galore
Our UI now speaks with numbers to explore
A rabbit's count of joy, precise and clear! 🔢


📜 Recent review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 70337a2 and 93a7a72.

📒 Files selected for processing (2)
  • public/locale/en.json (2 hunks)
  • src/pages/Organization/OrganizationUsers.tsx (2 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • src/pages/Organization/OrganizationUsers.tsx
🔇 Additional comments (1)
public/locale/en.json (1)

985-986: LGTM! Well-structured localization refactoring.

The change from user-specific count entries to a generic entity count mechanism is a good refactoring that:

  1. Improves reusability by supporting any entity type
  2. Maintains proper i18n pluralization with "one" and "other" variants
  3. Uses consistent placeholder format for count and entity name

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 c3e6a53
🔍 Latest deploy log https://app.netlify.com/sites/care-ohc/deploys/6790abf52fd678000877c482
😎 Deploy Preview https://deploy-preview-10092--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

🧹 Nitpick comments (4)
src/pages/Organization/OrganizationView.tsx (2)

54-65: Maintain consistency with heading and translation keys.

The heading shows "organizations" while viewing child organizations, which might be confusing. Consider changing it to "child organizations" or similar for clarity.

-            <h2 className="text-lg font-semibold">{t("organizations")}</h2>
+            <h2 className="text-lg font-semibold">{t("child_organizations")}</h2>

57-58: Extract common Badge styling to a shared component.

The Badge styling is duplicated across all organization pages. Consider creating a shared component to maintain consistency and reduce duplication.

// src/components/Common/EntityCountBadge.tsx
export const EntityCountBadge = ({ count, entity }: { count: number; entity: string }) => (
  <Badge
    className="bg-purple-50 text-purple-700 ml-2 text-sm font-medium rounded-xl px-3 m-3"
    variant="outline"
  >
    {t("entity_count", { count, entity })}
  </Badge>
);

Also applies to: 63-63

src/pages/Organization/OrganizationFacilities.tsx (1)

67-69: Standardize translation key usage.

Use the common entity_count translation key for consistency with other organization pages.

-              {t("facility_count", {
-                count: facilities?.count || 0,
-              })}
+              {t("entity_count", {
+                count: facilities?.count || 0,
+                entity: "Facility"
+              })}
src/pages/Organization/OrganizationPatients.tsx (1)

102-110: Consider adding ARIA label for screen readers.

The Badge component should have an aria-label for better accessibility.

             <Badge
               className="bg-purple-50 text-purple-700 ml-2 text-sm font-medium rounded-xl px-3 m-3"
               variant="outline"
+              aria-label={t("entity_count", {
+                count: patients?.count || 0,
+                entity: "Patient"
+              })}
             >
📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 9f2d856 and 70337a2.

📒 Files selected for processing (6)
  • public/locale/en.json (2 hunks)
  • src/components/Facility/FacilityUsers.tsx (1 hunks)
  • src/pages/Organization/OrganizationFacilities.tsx (2 hunks)
  • src/pages/Organization/OrganizationPatients.tsx (2 hunks)
  • src/pages/Organization/OrganizationUsers.tsx (2 hunks)
  • src/pages/Organization/OrganizationView.tsx (1 hunks)
👮 Files not reviewed due to content moderation or server errors (2)
  • src/components/Facility/FacilityUsers.tsx
  • public/locale/en.json

src/pages/Organization/OrganizationUsers.tsx Outdated Show resolved Hide resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Display Total Number of Entities in Organization Tabs
1 participant