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

Fixed delete button size in asset details & consent record pages #8996

Merged
merged 3 commits into from
Nov 5, 2024

Conversation

nihal467
Copy link
Member

@nihal467 nihal467 commented Nov 4, 2024

Proposed Changes

  • Fixes #issue_number
  • Change 1
  • Change 2
  • More?

@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 user interface for the asset management and consent records components.
    • Improved file upload process with checks for existing consent records.
    • Added skeleton loader for better user experience during data loading.
  • Bug Fixes

    • Refined confirmation logic for consent record actions to ensure correct identification.
  • Style

    • Increased icon size for buttons in the AssetManage and PatientConsentRecords components for improved visibility.

@nihal467 nihal467 requested a review from a team as a code owner November 4, 2024 19:36
Copy link

netlify bot commented Nov 4, 2024

Deploy Preview for care-ohc ready!

Name Link
🔨 Latest commit 7a80044
🔍 Latest deploy log https://app.netlify.com/sites/care-ohc/deploys/6729f25ab7a07900081c3646
😎 Deploy Preview https://deploy-preview-8996--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

cloudflare-workers-and-pages bot commented Nov 4, 2024

Deploying care-fe with  Cloudflare Pages  Cloudflare Pages

Latest commit: 7a80044
Status: ✅  Deploy successful!
Preview URL: https://6e0a4406.care-fe.pages.dev
Branch Preview URL: https://delete-button.care-fe.pages.dev

View logs

Copy link

cypress bot commented Nov 4, 2024

CARE    Run #3803

Run Properties:  status check passed Passed #3803  •  git commit 7a80044f68: Fixed delete button size in asset details & consent record pages
Project CARE
Branch Review delete-button
Run status status check passed Passed #3803
Run duration 04m 48s
Commit git commit 7a80044f68: Fixed delete button size in asset details & consent record pages
Committer Mohammed Nihal
View all properties for this run ↗︎

Test results
Tests that failed  Failures 0
Tests that were flaky  Flaky 0
Tests that did not run due to a developer annotating a test with .skip  Pending 0
Tests that did not run due to a failure in a mocha hook  Skipped 0
Tests that passed  Passing 125
View all changes introduced in this branch ↗︎

src/components/Assets/AssetManage.tsx Outdated Show resolved Hide resolved
src/components/Patient/PatientConsentRecords.tsx Outdated Show resolved Hide resolved
Copy link

coderabbitai bot commented Nov 5, 2024

Walkthrough

The changes involve updates to two components: AssetManage and PatientConsentRecords. In AssetManage, the icon size for the buttons related to asset management was modified for better visibility. In PatientConsentRecords, several adjustments were made to enhance the user interface and logic for managing patient consent records, including updates to the delete button, checks for existing consent records, and improved rendering logic to handle loading states and the absence of records.

Changes

File Path Change Summary
src/components/Assets/AssetManage.tsx Adjusted icon size for buttons in ButtonV2 from h-4 to text-lg.
src/components/Patient/PatientConsentRecords.tsx Enhanced delete button icon, refined handleUpload logic for consent records, improved ConfirmDialog logic, and adjusted rendering for loading states and absence of records.

Poem

In the garden where assets play,
A button's icon grew today.
With consent records now in sight,
Uploads and deletions feel just right.
Hopping through code, a joyful spree,
Enhancements made, oh what glee! 🐇✨


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 4599777 and 7a80044.

📒 Files selected for processing (2)
  • src/components/Assets/AssetManage.tsx (3 hunks)
  • src/components/Patient/PatientConsentRecords.tsx (1 hunks)
🚧 Files skipped from review as they are similar to previous changes (2)
  • src/components/Assets/AssetManage.tsx
  • src/components/Patient/PatientConsentRecords.tsx

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.

@nihal467 nihal467 self-assigned this Nov 5, 2024
Copy link

@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 (3)
src/components/Patient/PatientConsentRecords.tsx (3)

222-222: Use consistent icon sizing class.

For consistency with other icons in the codebase (like the one on line 234), consider using text-lg instead of h-5.

-                  <CareIcon icon="l-trash-alt" className="h-5" />
+                  <CareIcon icon="l-trash-alt" className="text-lg" />

Line range hint 89-103: Add error handling for consent creation failure.

The function continues with undefined consentId if the API request fails. Consider adding proper error handling to prevent silent failures.

   if (!consentExists || diffPCS) {
     consentId = undefined;
-    const res = await request(routes.createConsent, {
-      pathParams: { consultationId: consultationId },
-      body: {
-        ...newConsent,
-        patient_code_status:
-          newConsent.type === 2 ? newConsent.patient_code_status : undefined,
-      },
-    });
-    if (res.data) {
-      consentId = res.data.id;
-    }
+    try {
+      const res = await request(routes.createConsent, {
+        pathParams: { consultationId: consultationId },
+        body: {
+          ...newConsent,
+          patient_code_status:
+            newConsent.type === 2 ? newConsent.patient_code_status : undefined,
+        },
+      });
+      if (res.data) {
+        consentId = res.data.id;
+      } else {
+        throw new Error('Failed to create consent record');
+      }
+    } catch (error) {
+      console.error('Failed to create consent record:', error);
+      return;
+    }
   }
   consentId && (await fileUpload.handleFileUpload(consentId));

Line range hint 303-313: Improve loading state handling.

The skeleton loader is only shown after checking for filtered records, which could lead to a flash of "No consent records found" message during loading. Consider restructuring the condition to show the skeleton first.

-          {consentRecords?.filter(
-            (r) =>
-              r.files?.filter(
-                (f) =>
-                  f.associating_id === r.id && f.is_archived === showArchived,
-              ).length,
-          ).length === 0 ? (
+          {!consentRecords ? (
+            <div className="skeleton-animate-alpha h-32 rounded-lg" />
+          ) : consentRecords.filter(
+            (r) =>
+              r.files?.filter(
+                (f) =>
+                  f.associating_id === r.id && f.is_archived === showArchived,
+              ).length,
+          ).length === 0 ? (
             <div className="flex h-32 items-center justify-center text-secondary-500">
               No consent records found
             </div>
-          ) : (
-            !consentRecords && (
-              <div className="skeleton-animate-alpha h-32 rounded-lg" />
-            )
+          ) : null
           )}
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between a65d7ec and 4599777.

📒 Files selected for processing (2)
  • src/components/Assets/AssetManage.tsx (1 hunks)
  • src/components/Patient/PatientConsentRecords.tsx (1 hunks)
✅ Files skipped from review due to trivial changes (1)
  • src/components/Assets/AssetManage.tsx

@bodhish bodhish merged commit 6b57124 into develop Nov 5, 2024
55 checks passed
@bodhish bodhish deleted the delete-button branch November 5, 2024 10:49
Copy link

github-actions bot commented Nov 5, 2024

@nihal467 @nihal467 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
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants