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

Solved the problem of overlapping notifications during updates #9207

Merged

Conversation

ANIR1604
Copy link
Contributor

@ANIR1604 ANIR1604 commented Nov 25, 2024

Proposed Changes

  • Fixes Software Update notification badges are overlapping #9039
  • User clicks "Check for Update," triggering the checkUpdates function and showing a spinner (isChecking: true).
  • System checks for updates, then sets isUpdateAvailable to true or false based on the result.
  • If updates are available, show "Update Available"; otherwise, reset UI and notify "No update available."

Plz review : @bodhish
Screencast from 2024-11-25 22-12-33.webm

Summary by CodeRabbit

  • New Features

    • Improved user feedback during update checks with a loading spinner and conditional rendering for update statuses.
  • Bug Fixes

    • Enhanced readability and maintainability of the update status logic.
  • Chores

    • Removed unused import statement for classNames.

@ANIR1604 ANIR1604 requested a review from a team as a code owner November 25, 2024 17:48
Copy link
Contributor

coderabbitai bot commented Nov 25, 2024

Walkthrough

The changes in the UserProfile component focus on improving the update status handling logic. The implementation now features conditional rendering to distinguish between three states: checking for updates, an update available, and the default state. The button for checking updates displays a loading spinner during the check, enhancing user feedback. Additionally, the unused classNames import has been removed, while the core functionality and error handling remain unchanged.

Changes

File Change Summary
src/components/Users/UserProfile.tsx Restructured update status handling logic; added conditional rendering for update states; removed unused classNames import.

Assessment against linked issues

Objective Addressed Explanation
Show update notification before the success notification (#9039) The changes do not address the overlapping notifications issue.

Possibly related PRs

Suggested labels

needs review, tested

Suggested reviewers

  • Jacobjeevan
  • rithviknishad

Poem

In the profile, updates now shine,
A spinner spins, oh so fine!
Notifications clear, no overlap,
Click to check, then take a nap!
With each change, the UI's bright,
Hopping forward, all feels 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 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 Nov 25, 2024

Deploy Preview for care-ohc ready!

Name Link
🔨 Latest commit ceb4b68
🔍 Latest deploy log https://app.netlify.com/sites/care-ohc/deploys/6747172f1717360008440fdc
😎 Deploy Preview https://deploy-preview-9207--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

🧹 Outside diff range and nitpick comments (1)
src/components/Users/UserProfile.tsx (1)

1008-1037: LGTM! The implementation effectively prevents notification overlap.

The conditional rendering approach with distinct UI states successfully addresses the issue of overlapping notifications during updates. The implementation provides clear visual feedback and proper state management.

Consider these minor improvements for maintainability:

+ // Constants for animation and icons
+ const SPIN_ANIMATION_CLASS = "animate-spin";
+ const UPDATE_ICONS = {
+   CHECK: "l-sync",
+   WARNING: "l-exclamation"
+ };

  {updateStatus.isChecking ? (
    <ButtonV2 disabled>
      <div className="flex items-center gap-4">
-       <CareIcon icon="l-sync" className="text-2xl animate-spin" />
+       <CareIcon icon={UPDATE_ICONS.CHECK} className={`text-2xl ${SPIN_ANIMATION_CLASS}`} />
        {t("checking_for_update")}
      </div>
    </ButtonV2>
  ) : updateStatus.isUpdateAvailable ? (
    <UpdatableApp silentlyAutoUpdate={false}>
      <ButtonV2 disabled>
        <div className="flex items-center gap-4">
          <CareIcon
-           icon="l-exclamation"
+           icon={UPDATE_ICONS.WARNING}
            className="text-2xl text-warning"
          />
          {t("update_available")}
        </div>
      </ButtonV2>
    </UpdatableApp>
  ) : (
    <ButtonV2 onClick={checkUpdates}>
      <div className="flex items-center gap-4">
-       <CareIcon icon="l-sync" className="text-2xl" />
+       <CareIcon icon={UPDATE_ICONS.CHECK} className="text-2xl" />
        {t("check_for_update")}
      </div>
    </ButtonV2>
  )}
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between fdfc53d and 00dc74c.

⛔ Files ignored due to path filters (1)
  • package-lock.json is excluded by !**/package-lock.json
📒 Files selected for processing (1)
  • src/components/Users/UserProfile.tsx (1 hunks)

@nihal467
Copy link
Member

LGTM

@rithviknishad rithviknishad merged commit 0d13f6c into ohcnetwork:develop Nov 27, 2024
19 checks passed
Copy link

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

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.

Software Update notification badges are overlapping
5 participants