Fixed:Show more monitors in CNS on very large displays #6503 #9013

i0am0arunava · 2024-11-06T08:45:56Z

Proposed Changes

Fixes Show more monitors in CNS on very large displays #6503

@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 responsive design for the Central Nursing Station component, allowing dynamic pagination limits based on screen size.
- Support for new screen sizes "4xl" and "4k" in the application.
Bug Fixes
- Improved pagination logic to adapt to various screen sizes, ensuring a better user experience.

from develop

coderabbitai · 2024-11-06T08:46:04Z

Walkthrough

The changes made in this pull request enhance the CentralNursingStation component by introducing responsive pagination based on screen size breakpoints. The static pagination limit has been replaced with a dynamic perPageLimit constant, which adjusts the number of displayed patient vitals monitors according to the screen size. Additionally, the useBreakpoints hook has been updated to support new breakpoint values for larger displays, specifically "4xl" and "4k", ensuring better utilization of screen real estate.

Changes

File	Change Summary
src/components/Facility/CentralNursingStation.tsx	Added responsive `perPageLimit` using `useBreakpoints`, updated pagination logic, and modified JSX for responsive grid layout.
src/hooks/useBreakpoints.ts	Updated `Breakpoints` type to include "4xl" and "4k", modified `BREAKPOINT_WIDTH` to reflect new values.

Assessment against linked issues

Objective	Addressed	Explanation
Show more monitors in CNS on very large displays (6503)	✅

Possibly related PRs

Conditionaly renders pagination component if number of entries is more than results per page #9004: This PR modifies the pagination logic to conditionally render the pagination component based on the number of entries, which is directly related to the changes made in the main PR regarding the dynamic perPageLimit for pagination in the CentralNursingStation component.

Suggested labels

tested, good to merge

Suggested reviewers

rithviknishad
shivankacker

Poem

In a world where screens are wide,
More monitors now can abide.
With breakpoints set, we see the light,
Vitals displayed, a joyful sight!
Hooray for change, let’s hop and cheer,
For every patient, we hold dear! 🐇✨

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.

netlify · 2024-11-06T08:46:12Z

✅ Deploy Preview for care-ohc ready!

Name	Link
🔨 Latest commit	`ecd0871`
🔍 Latest deploy log	https://app.netlify.com/sites/care-ohc/deploys/673b333ce420510008647889
😎 Deploy Preview	https://deploy-preview-9013--care-ohc.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

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

coderabbitai

Actionable comments posted: 0

🧹 Outside diff range and nitpick comments (3)

src/components/Facility/CentralNursingStation.tsx (3)
215-215: LGTM! Consider additional improvements for ultra-wide displays.

The change from '3xl' to 'min-[2080px]' effectively addresses the screen space utilization issue on 4K displays. The explicit pixel breakpoint provides more precise control over the layout transition.

Consider these additional improvements:
-        <div className="mt-1 grid grid-cols-1 gap-1 lg:grid-cols-2 min-[2080px]:grid-cols-3">
+        <div className="mt-1 grid grid-cols-1 gap-1 lg:grid-cols-2 min-[2080px]:grid-cols-3 min-[3440px]:grid-cols-4">
This would better utilize ultra-wide displays (e.g., 3440x1440) while maintaining the current improvements for 4K displays.

Line range hint 19-19: Consider dynamic pagination limits for larger displays.

The fixed PER_PAGE_LIMIT of 6 items might not be optimal for larger displays that can now show more monitors. When displaying 3 or 4 columns, this results in partially filled rows.

Consider implementing dynamic pagination limits based on screen size:
// Example implementation
const getPerPageLimit = (screenWidth: number) => {
  if (screenWidth >= 3440) return 12; // 4 columns x 3 rows
  if (screenWidth >= 2080) return 9;  // 3 columns x 3 rows
  if (screenWidth >= 1024) return 6;  // 2 columns x 3 rows
  return 4;                           // 1 column x 4 rows
};
Line range hint 63-71: Update aspect ratio configuration to match new breakpoint.

The aspect ratio configuration uses different breakpoints than the grid layout. This mismatch could lead to suboptimal monitor display proportions on larger screens.

Update the aspect ratio configuration to match the new breakpoint:
  const { config, hash } = useVitalsAspectRatioConfig({
    default: 6 / 11,
    sm: 17 / 11,
    md: 19 / 11,
    lg: 11 / 11,
    xl: 13 / 11,
    "2xl": 16 / 11,
-   "3xl": 12 / 11,
+   "min-[2080px]": 12 / 11,
+   "min-[3440px]": 14 / 11,
  });

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 6b57124 and 7163bf8.

⛔ Files ignored due to path filters (1)

package-lock.json is excluded by !**/package-lock.json

📒 Files selected for processing (1)

src/components/Facility/CentralNursingStation.tsx (1 hunks)

rithviknishad

I don't see how this adds value compared to how it was before.

Before:

After:

bodhish · 2024-11-06T12:36:05Z

@i0am0arunava please close the previous PR before picking something else.

i0am0arunava · 2024-11-06T12:51:33Z

@i0am0arunava please close the previous PR before picking something else.

@bodhish ,But I am working on the previous issue
You required some changes....I am working on that

github-actions · 2024-11-06T13:18:01Z

👋 Hi, @i0am0arunava,
Conflicts have been detected against the base branch. Please rebase your branch against the base branch.

This message is automatically generated by prince-chrismc/label-merge-conflicts-action so don't hesitate to report issues/improvements there.

merge

merge fromdevelop branch

nihal467 · 2024-11-13T11:24:19Z

whenever i click on the setting button in the cns page, it going to a loading state before showing the dropdown, fix it

i0am0arunava

creating a new parent instead of placing className="@container" inside <Page .../> will not cause the bug and work properly

src/components/Facility/CentralNursingStation.tsx

…Son4k

i0am0arunava

@nihal467 @rithviknishad fixed the issue #9013 (comment)

src/components/Facility/CentralNursingStation.tsx

i0am0arunava · 2024-11-14T17:49:58Z

whenever i click on the setting button in the cns page, it going to a loading state before showing the dropdown, fix it

@nihal467 ,fixed it

nihal467 · 2024-11-18T12:15:05Z

LGTM

github-actions · 2024-11-18T13:41:28Z

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

i0am0arunava added 2 commits November 6, 2024 13:48

Merge pull request #1 from ohcnetwork/develop

ce241c3

from develop

Show more monitors in CNS on very large displays

7163bf8

i0am0arunava requested a review from a team as a code owner November 6, 2024 08:45

i0am0arunava mentioned this pull request Nov 6, 2024

Show more monitors in CNS on very large displays #6503

Closed

coderabbitai bot reviewed Nov 6, 2024

View reviewed changes

rithviknishad requested changes Nov 6, 2024

View reviewed changes

rithviknishad added invalid This doesn't seem right do not merge labels Nov 6, 2024

Merge branch 'develop' into issues/6503/displayCNSon4k

ebc5613

bodhish added the blocked label Nov 6, 2024

github-actions bot added the merge conflict pull requests with merge conflict label Nov 6, 2024

i0am0arunava closed this Nov 6, 2024

i0am0arunava deleted the issues/6503/displayCNSon4k branch November 6, 2024 13:54

Merge pull request #2 from ohcnetwork/develop

80e48d6

merge

rithviknishad mentioned this pull request Nov 6, 2024

Fixed:Show more monitors in CNS on very large displays #9028

Closed

6 tasks

i0am0arunava added 3 commits November 6, 2024 20:36

Merge pull request #3 from ohcnetwork/develop

3f5fcd3

merge fromdevelop branch

per page 9 monitors inserted for large display

7974ef2

added state per page 9 monitors inserted for large display

1801e16

rithviknishad mentioned this pull request Nov 6, 2024

Fixed: Show more monitors in CNS on very large displays #6503 #9031

Closed

6 tasks

i0am0arunava restored the issues/6503/displayCNSon4k branch November 6, 2024 15:39

i0am0arunava reopened this Nov 6, 2024

i0am0arunava added 3 commits November 6, 2024 23:44

added state per page 9 monitors inserted for large display

180b214

added state per page 9 monitors inserted for large display

6509672

added usebreakpoint hook

2eb15ff

github-actions bot added the Deploy-Failed Deplyment is not showing preview label Nov 6, 2024

rithviknishad added the needs review label Nov 9, 2024

i0am0arunava added 4 commits November 10, 2024 10:20

Merge branch 'develop' into issues/6503/displayCNSon4k

e969002

Merge branch 'develop' into issues/6503/displayCNSon4k

33f0bac

Merge branch 'develop' into issues/6503/displayCNSon4k

01d7b71

Merge branch 'develop' into issues/6503/displayCNSon4k

a00d6d4

nihal467 added test failed changes required and removed needs testing labels Nov 13, 2024

i0am0arunava commented Nov 14, 2024

View reviewed changes

src/components/Facility/CentralNursingStation.tsx Outdated Show resolved Hide resolved

i0am0arunava added 2 commits November 14, 2024 22:28

fixed the bug of button click event.

8c9723c

Merge remote-tracking branch 'kkp/develop' into issues/6503/displayCN…

ea9e1ff

…Son4k

i0am0arunava commented Nov 14, 2024

View reviewed changes

src/components/Facility/CentralNursingStation.tsx Show resolved Hide resolved

github-actions bot added needs-triage question Further information is requested labels Nov 14, 2024

rithviknishad approved these changes Nov 15, 2024

View reviewed changes

rithviknishad added needs testing and removed question Further information is requested test failed changes required needs-triage labels Nov 15, 2024

Merge branch 'develop' into issues/6503/displayCNSon4k

21a5bd9

nihal467 added tested and removed needs testing labels Nov 18, 2024

Merge branch 'develop' into issues/6503/displayCNSon4k

ecd0871

rithviknishad approved these changes Nov 18, 2024

View reviewed changes

rithviknishad merged commit 2dc5923 into ohcnetwork:develop Nov 18, 2024
5 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixed:Show more monitors in CNS on very large displays #6503 #9013

Fixed:Show more monitors in CNS on very large displays #6503 #9013

i0am0arunava commented Nov 6, 2024 •

edited by coderabbitai bot

Loading

coderabbitai bot commented Nov 6, 2024 •

edited

Loading

Chat

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (`.coderabbit.yaml`)

Documentation and Community

netlify bot commented Nov 6, 2024 •

edited

Loading

coderabbitai bot left a comment

rithviknishad left a comment •

edited

Loading

bodhish commented Nov 6, 2024

i0am0arunava commented Nov 6, 2024 •

edited

Loading

github-actions bot commented Nov 6, 2024

nihal467 commented Nov 13, 2024

i0am0arunava left a comment •

edited

Loading

i0am0arunava left a comment

i0am0arunava commented Nov 14, 2024

nihal467 commented Nov 18, 2024

github-actions bot commented Nov 18, 2024

Fixed:Show more monitors in CNS on very large displays #6503 #9013

Fixed:Show more monitors in CNS on very large displays #6503 #9013

Conversation

i0am0arunava commented Nov 6, 2024 • edited by coderabbitai bot Loading

Proposed Changes

Merge Checklist

Summary by CodeRabbit

coderabbitai bot commented Nov 6, 2024 • edited Loading

Walkthrough

Changes

Assessment against linked issues

Possibly related PRs

Suggested labels

Suggested reviewers

Poem

Chat

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (.coderabbit.yaml)

Documentation and Community

netlify bot commented Nov 6, 2024 • edited Loading

✅ Deploy Preview for care-ohc ready!

coderabbitai bot left a comment

Choose a reason for hiding this comment

rithviknishad left a comment • edited Loading

Choose a reason for hiding this comment

bodhish commented Nov 6, 2024

i0am0arunava commented Nov 6, 2024 • edited Loading

github-actions bot commented Nov 6, 2024

nihal467 commented Nov 13, 2024

i0am0arunava left a comment • edited Loading

Choose a reason for hiding this comment

i0am0arunava left a comment

Choose a reason for hiding this comment

i0am0arunava commented Nov 14, 2024

nihal467 commented Nov 18, 2024

github-actions bot commented Nov 18, 2024

i0am0arunava commented Nov 6, 2024 •

edited by coderabbitai bot

Loading

coderabbitai bot commented Nov 6, 2024 •

edited

Loading

CodeRabbit Configuration File (`.coderabbit.yaml`)

netlify bot commented Nov 6, 2024 •

edited

Loading

rithviknishad left a comment •

edited

Loading

i0am0arunava commented Nov 6, 2024 •

edited

Loading

i0am0arunava left a comment •

edited

Loading