-
Notifications
You must be signed in to change notification settings - Fork 536
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
Fix : Cancelled requests in appointments page and Remove files button from actions #10219
base: develop
Are you sure you want to change the base?
Fix : Cancelled requests in appointments page and Remove files button from actions #10219
Conversation
WalkthroughThe pull request introduces two primary changes: the addition of tooltip functionality to the Changes
Assessment against linked issues
Possibly related PRs
Suggested Labels
Suggested Reviewers
Poem
Tip 🌐 Web search-backed reviews and chat
📜 Recent review detailsConfiguration used: CodeRabbit UI 📒 Files selected for processing (1)
🚧 Files skipped from review as they are similar to previous changes (1)
⏰ Context from checks skipped due to timeout of 90000ms (1)
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? 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
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)
Other keywords and placeholders
CodeRabbit Configuration File (
|
✅ Deploy Preview for care-ohc ready!
To edit notification comments on pull requests, go to your Netlify site configuration. |
There was a problem hiding this 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 (2)
src/components/Patient/PatientHome.tsx (2)
171-186
: Consider increasing the tooltip delay duration.The tooltip implementation is good, but a 1ms delay might cause unintended tooltip flickers during mouse movement. Consider increasing
delayDuration
to a more standard value (e.g., 200-300ms) for better UX.- <TooltipProvider delayDuration={1}> + <TooltipProvider delayDuration={200}>
199-214
: Consider extracting a reusable date tooltip component.The tooltip implementation is duplicated between modified and created dates. Consider extracting this into a reusable component to improve maintainability and reduce code duplication.
Example implementation:
const DateTooltip = ({ date }: { date: string | null }) => ( <TooltipProvider delayDuration={200}> <Tooltip> <TooltipTrigger asChild> <span> {date ? relativeDate(date) : "--:--"} </span> </TooltipTrigger> <TooltipContent> {date ? formatDateTime(date) : "--:--"} </TooltipContent> </Tooltip> </TooltipProvider> );Usage:
- <TooltipProvider delayDuration={1}> - <Tooltip> - <TooltipTrigger asChild> - <span> - {patientData.created_date - ? relativeDate(patientData.created_date) - : "--:--"} - </span> - </TooltipTrigger> - <TooltipContent> - {patientData.created_date - ? formatDateTime(patientData.created_date) - : "--:--"} - </TooltipContent> - </Tooltip> - </TooltipProvider> + <DateTooltip date={patientData.created_date} />
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (2)
src/components/Patient/PatientHome.tsx
(3 hunks)src/pages/Appointments/AppointmentsPage.tsx
(2 hunks)
🔇 Additional comments (3)
src/components/Patient/PatientHome.tsx (1)
8-13
: LGTM!The tooltip component imports are correctly structured and properly utilized in the implementation.
src/pages/Appointments/AppointmentsPage.tsx (2)
669-669
: LGTM! Good performance optimization.The use of
query.debounced
is a good optimization that will help reduce unnecessary API calls during rapid parameter changes.
778-778
: LGTM! Consistent implementation.The use of
query.debounced
is consistent with the implementation in AppointmentColumn, maintaining a uniform approach to API call optimization.
There was a problem hiding this 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 (1)
src/components/Patient/PatientHome.tsx (1)
182-197
: Consider extracting the date tooltip into a reusable component.The tooltip implementation is duplicated for both modified and created dates. Consider extracting this into a reusable component to improve maintainability.
+ // Create a new file: src/components/Common/DateTooltip.tsx + import { + Tooltip, + TooltipContent, + TooltipProvider, + TooltipTrigger, + } from "@/components/ui/tooltip"; + import { formatDateTime, relativeDate } from "@/Utils/utils"; + + interface DateTooltipProps { + date?: string; + delayDuration?: number; + } + + export const DateTooltip = ({ date, delayDuration = 1 }: DateTooltipProps) => ( + <TooltipProvider delayDuration={delayDuration}> + <Tooltip> + <TooltipTrigger asChild> + <span> + {date ? relativeDate(date) : "--:--"} + </span> + </TooltipTrigger> + <TooltipContent> + {date ? formatDateTime(date) : "--:--"} + </TooltipContent> + </Tooltip> + </TooltipProvider> + ); // In PatientHome.tsx - <TooltipProvider delayDuration={1}> - <Tooltip> - <TooltipTrigger asChild> - <span> - {patientData.modified_date - ? relativeDate(patientData.modified_date) - : "--:--"} - </span> - </TooltipTrigger> - <TooltipContent> - {patientData.modified_date - ? formatDateTime(patientData.modified_date) - : "--:--"} - </TooltipContent> - </Tooltip> - </TooltipProvider> + <DateTooltip date={patientData.modified_date} /> - <TooltipProvider delayDuration={1}> - <Tooltip> - <TooltipTrigger asChild> - <span> - {patientData.created_date - ? relativeDate(patientData.created_date) - : "--:--"} - </span> - </TooltipTrigger> - <TooltipContent> - {patientData.created_date - ? formatDateTime(patientData.created_date) - : "--:--"} - </TooltipContent> - </Tooltip> - </TooltipProvider> + <DateTooltip date={patientData.created_date} />Also applies to: 210-225
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (2)
src/components/Patient/PatientHome.tsx
(3 hunks)src/pages/Appointments/AppointmentsPage.tsx
(2 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
- src/pages/Appointments/AppointmentsPage.tsx
⏰ Context from checks skipped due to timeout of 90000ms (1)
- GitHub Check: cypress-run (1)
🔇 Additional comments (2)
src/components/Patient/PatientHome.tsx (2)
8-13
: LGTM! Clean import structure for tooltip components.The imports are well-organized and properly structured using named imports.
182-197
: Great UX improvement with tooltips!The implementation provides a good user experience by:
- Showing relative dates for quick reference
- Providing detailed datetime information in tooltips
- Using consistent delay duration
- Handling null/undefined dates gracefully
Also applies to: 210-225
There was a problem hiding this 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 (1)
src/components/Patient/PatientHome.tsx (1)
203-227
: Consider extracting the date display logic into a reusable component.The tooltip implementation for created_date is identical to modified_date. To improve maintainability and reduce code duplication, consider extracting this pattern into a reusable component.
Example implementation:
type DateDisplayProps = { date: string | null; label: string; user?: { first_name?: string; last_name?: string; }; }; const DateDisplay: React.FC<DateDisplayProps> = ({ date, label, user }) => ( <div> <div className="text-xs font-normal leading-5 text-gray-600"> {label} <div className="font-semibold text-gray-900"> {user?.first_name} {user?.last_name} </div> </div> <div className="whitespace-normal text-sm font-semibold text-gray-900"> {date ? ( <TooltipProvider delayDuration={1}> <Tooltip> <TooltipTrigger asChild> <span>{relativeTime(date)}</span> </TooltipTrigger> <TooltipContent> {formatDateTime(date)} </TooltipContent> </Tooltip> </TooltipProvider> ) : ( "--:--" )} </div> </div> );Usage:
-<div> - <div className="text-xs font-normal leading-5 text-gray-600"> - {t("last_updated_by")} - <div className="font-semibold text-gray-900"> - {patientData.updated_by?.first_name}{" "} - {patientData.updated_by?.last_name} - </div> - </div> - ... -</div> +<DateDisplay + date={patientData.modified_date} + label={t("last_updated_by")} + user={patientData.updated_by} +/>
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (1)
src/components/Patient/PatientHome.tsx
(3 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (2)
- GitHub Check: OSSAR-Scan
- GitHub Check: cypress-run (1)
🔇 Additional comments (2)
src/components/Patient/PatientHome.tsx (2)
8-13
: LGTM!The imports are well-organized and include all necessary components for the tooltip implementation.
Also applies to: 26-26
174-199
: LGTM! Changes align with previous review feedback.The implementation successfully addresses the previous review comments:
- Tooltip is only rendered when modified_date is available
- Using relativeTime for display with detailed tooltip
- Updated by name is properly placed in a separate div
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM.
I'd suggest adjusting the font size (smaller than the user's name) + font color of the times as well, something with grey. Test and see what works.
Proposed Changes
@ohcnetwork/care-fe-code-reviewers
Merge Checklist
Summary by CodeRabbit
Summary by CodeRabbit
New Features
Improvements