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

Add count to resource and encounter page #10700

Conversation

Mahendar0701
Copy link
Contributor

@Mahendar0701 Mahendar0701 commented Feb 19, 2025

Proposed Changes

image

image

@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
    • Enhanced both resource and encounter pages with a dynamic badge that visibly indicates whether data is loading or shows the count of available items.
    • This improvement provides immediate, clear feedback during data retrieval, enriching the overall user interface.

@Mahendar0701 Mahendar0701 requested a review from a team as a code owner February 19, 2025 13:18
Copy link
Contributor

coderabbitai bot commented Feb 19, 2025

Walkthrough

This pull request updates two UI components—ResourceList and EncounterList—to enhance user feedback regarding data loading. Both components now pass a new componentRight prop to the Page component, which renders a Badge that conditionally shows a loading message or the resource/encounter count. The changes adjust only the rendering logic without altering the overall component structure or public API.

Changes

File(s) Change Summary
src/components/.../ResourceList.tsx
src/pages/.../EncounterList.tsx
Added a componentRight prop to the Page component that renders a Badge. The badge conditionally displays a loading message or the count (with translation in EncounterList), based on the isLoading state.

Sequence Diagram(s)

sequenceDiagram
    participant List as List Component (Resource/Encounter)
    participant Page as Page Component
    participant Badge as Badge Component

    List->>Page: Render component with title and componentRight (Badge)
    Page->>Badge: Provide isLoading state and count data
    alt Data is loading
        Badge-->>Page: Display "loading" message
    else Data loaded
        Badge-->>Page: Display count (with translation in EncounterList)
    end
    Page-->>List: Render updated UI with Badge
Loading

Possibly related PRs

Suggested labels

needs review, tested

Suggested reviewers

  • rithviknishad
  • Jacobjeevan

Poem

I'm a bunny hopping through the code trail,
Adding badges so the UI won't fail.
A tiny flag of loading or a count so neat,
Making every page a joy to greet.
Hop along, enjoy the changes – that's my treat!
🐇✨


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 Feb 19, 2025

Deploy Preview for care-ohc ready!

Name Link
🔨 Latest commit fbac46f
🔍 Latest deploy log https://app.netlify.com/sites/care-ohc/deploys/67b5da1118362100087426b2
😎 Deploy Preview https://deploy-preview-10700.preview.ohc.network
📱 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 (4)
src/components/Resource/ResourceList.tsx (1)

109-119: Consider adding ARIA attributes for better accessibility.

While the Badge implementation is solid, consider adding ARIA attributes to improve accessibility for screen readers.

Apply this diff to enhance accessibility:

 <Badge
   className="bg-purple-50 text-purple-700 ml-2 text-sm font-medium rounded-xl px-3 m-3 w-max"
   variant="outline"
+  role="status"
+  aria-live="polite"
 >
   {isLoading
     ? t("loading")
     : t("entity_count", {
         count: queryResources?.count ?? 0,
         entity: "Resource",
       })}
 </Badge>
src/pages/Encounters/EncounterList.tsx (3)

213-213: Consider adding type-safety for translation keys.

While the translation implementation is correct, consider using TypeScript to enforce type-safety for translation keys to prevent potential runtime errors from typos or missing translations.

// Create a type for your translation keys
type TranslationKey = 
  | 'loading'
  | 'entity_count'
  | 'encounters'
  // ... other keys

// Use it with your translation function
const { t } = useTranslation<TranslationKey>();

Also applies to: 224-228


685-691: Add error state handling.

While loading and empty states are well-handled, consider adding error state handling for failed API requests.

-  {isLoading ? (
+  {error ? (
+    <div className="col-span-full">
+      <ErrorState 
+        message={t('error_loading_encounters')}
+        retry={() => refetch()}
+      />
+    </div>
+  ) : isLoading ? (
     <CardGridSkeleton count={6} />
   ) : encounters.length === 0 ? (
     <div className="col-span-full">
       <EmptyState />
     </div>
   ) : (

117-764: Consider breaking down the component for better maintainability.

The component is handling multiple responsibilities (filtering, search, display). Consider splitting it into smaller, focused components:

  • EncounterFilters
  • EncounterSearchBar
  • EncounterCard
  • EncounterList

This would improve maintainability and make the code more testable.

Example structure:

// EncounterFilters.tsx
const EncounterFilters = ({ 
  status, 
  encounterClass, 
  priority, 
  onFilterChange 
}: EncounterFiltersProps) => {
  // Filter implementation
};

// EncounterSearchBar.tsx
const EncounterSearchBar = ({ 
  onSearch 
}: EncounterSearchBarProps) => {
  // Search implementation
};

// EncounterCard.tsx
const EncounterCard = ({ 
  encounter 
}: EncounterCardProps) => {
  // Card implementation
};

// EncounterList.tsx
const EncounterList = () => {
  return (
    <Page>
      <EncounterFilters />
      <EncounterSearchBar />
      <div className="grid">
        {encounters.map(encounter => (
          <EncounterCard key={encounter.id} encounter={encounter} />
        ))}
      </div>
    </Page>
  );
};
📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 56defe9 and fbac46f.

📒 Files selected for processing (2)
  • src/components/Resource/ResourceList.tsx (1 hunks)
  • src/pages/Encounters/EncounterList.tsx (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (2)
  • GitHub Check: Test
  • GitHub Check: cypress-run (1)
🔇 Additional comments (3)
src/components/Resource/ResourceList.tsx (2)

106-121: LGTM! Clean implementation of the count display.

The componentRight prop usage provides a good solution for displaying the count, maintaining a clean component composition pattern.


86-101: LGTM! Excellent integration with existing data flow.

The count display is well integrated with the existing query system, reusing the data and loading states without introducing additional complexity.

Also applies to: 113-119

src/pages/Encounters/EncounterList.tsx (1)

216-230: LGTM! Well-implemented count badge.

The count badge implementation is clean and follows best practices:

  • Handles loading states appropriately
  • Uses internationalization for text
  • Maintains consistent styling with the design system

@Jacobjeevan Jacobjeevan merged commit ac6ba9c into ohcnetwork:develop Feb 20, 2025
14 of 15 checks passed
Copy link

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

@coderabbitai coderabbitai bot mentioned this pull request Feb 27, 2025
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add count in Encounter and Resource page
2 participants