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

Appointments: Update relative date filters; configurable default filter #9933

Merged

Conversation

rithviknishad
Copy link
Member

@rithviknishad rithviknishad commented Jan 13, 2025

Proposed Changes

  • Appointments Page: Update relative date filters
  • Make default applied date range filter for appointments configurable via care config.
image

cc: @aravindm4

@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

    • Added configurable default date filter for appointments page
    • Introduced new predefined date range options (yesterday, next month)
  • Localization

    • Updated English locale keys for time-related expressions
    • Removed "last fortnight" short label
    • Added "next month" label
  • Improvements

    • Enhanced date range selection flexibility
    • Updated default date range calculation logic

@rithviknishad rithviknishad requested a review from a team as a code owner January 13, 2025 10:13
Copy link
Contributor

coderabbitai bot commented Jan 13, 2025

Walkthrough

This pull request introduces a new configuration option defaultDateFilter in the care configuration, allowing dynamic control over the default date range displayed on the appointments page. The changes modify the date range selection in the AppointmentsPage.tsx, update localization in en.json, and provide a flexible way to set default date filters based on an environment variable. The implementation supports showing appointments for today, future, or past dates through a configurable numeric value.

Changes

File Change Summary
care.config.ts Added defaultDateFilter property to appointments object, reading from REACT_APPOINTMENTS_DEFAULT_DATE_FILTER env variable
public/locale/en.json Removed "last_fortnight_short" key, added "next_month" key
src/pages/Appointments/AppointmentsPage.tsx Updated date range logic, added "yesterday" range, modified "next month" range, implemented dynamic default date filter

Sequence Diagram

sequenceDiagram
    participant Config as Care Configuration
    participant Page as AppointmentsPage
    participant Env as Environment Variable

    Env->>Config: Read REACT_APPOINTMENTS_DEFAULT_DATE_FILTER
    Config->>Page: Set defaultDateFilter
    Page->>Page: Calculate Date Range
    alt defaultDateFilter is 0
        Page->>Page: Set to Today
    else defaultDateFilter is positive
        Page->>Page: Set Future Days
    else defaultDateFilter is negative
        Page->>Page: Set Past Days
    end
Loading

Possibly related PRs

Suggested labels

tested, reviewed

Suggested reviewers

  • Jacobjeevan

Poem

🐰 Hopping through dates with glee,
Appointments filtered, now we see!
From past to future, near and far,
Our config's magic raises the bar!
Dates dance freely, no more strife! 🗓️


📜 Recent review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 554054b and 8910f48.

📒 Files selected for processing (3)
  • care.config.ts (1 hunks)
  • public/locale/en.json (1 hunks)
  • src/pages/Appointments/AppointmentsPage.tsx (6 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (3)
  • GitHub Check: OSSAR-Scan
  • GitHub Check: cypress-run (1)
  • GitHub Check: Cloudflare Pages: care-fe
🔇 Additional comments (5)
care.config.ts (1)

106-113: Well-structured configuration addition!

The new defaultDateFilter configuration is well documented and implements a flexible way to control default date ranges. The implementation handles both environment variable parsing and default value gracefully.

src/pages/Appointments/AppointmentsPage.tsx (3)

Line range hint 482-492: LGTM! Added yesterday filter option.

The implementation correctly sets both start and end dates to yesterday (1 day before today).


532-541: LGTM! Updated next month filter.

Changed from 14 days to 30 days for better user experience.


270-285: Verify the default date filter configuration.

The implementation uses careConfig.appointments.defaultDateFilter to determine the default date range. The logic handles three cases:

  • 0: Today only
  • Positive value: Today to future days
  • Negative value: Past days to today

Let's verify the configuration exists:

✅ Verification successful

Default date filter configuration is properly implemented.

The configuration exists in care.config.ts with a default value of 7 days ahead, which can be overridden via the REACT_APPOINTMENTS_DEFAULT_DATE_FILTER environment variable. The implementation correctly handles all cases (today only, future days, and past days).

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Check if the defaultDateFilter configuration exists in the care config file
rg -A 2 "defaultDateFilter" 

Length of output: 446

public/locale/en.json (1)

1292-1292: LGTM! Localization changes align with the UI modifications.

The changes correctly support the updated date range filters in the appointments page:

  • Added "next_month" for the new 30-day filter
  • Removed unused "last_fortnight_short" key

Finishing Touches

  • 📝 Generate Docstrings (Beta)

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 Jan 13, 2025

Deploy Preview for care-ohc ready!

Name Link
🔨 Latest commit 8910f48
🔍 Latest deploy log https://app.netlify.com/sites/care-ohc/deploys/6784e730679dd900085a0104
😎 Deploy Preview https://deploy-preview-9933--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

Deploying care-fe with  Cloudflare Pages  Cloudflare Pages

Latest commit: 8910f48
Status: ✅  Deploy successful!
Preview URL: https://76937db3.care-fe.pages.dev
Branch Preview URL: https://rithviknishad-feat-appointme.care-fe.pages.dev

View logs

Copy link

cypress bot commented Jan 13, 2025

CARE    Run #4292

Run Properties:  status check passed Passed #4292  •  git commit 8910f48bb5: Appointments: Update relative date filters; configurable default filter
Project CARE
Branch Review rithviknishad/feat/appointments-configurable-date-filters
Run status status check passed Passed #4292
Run duration 01m 44s
Commit git commit 8910f48bb5: Appointments: Update relative date filters; configurable default filter
Committer Rithvik Nishad
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 4
View all changes introduced in this branch ↗︎

Copy link
Member

@bodhish bodhish left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@bodhish bodhish merged commit b8f25c2 into develop Jan 13, 2025
31 checks passed
@bodhish bodhish deleted the rithviknishad/feat/appointments-configurable-date-filters branch January 13, 2025 10:51
Copy link

@rithviknishad 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.

2 participants