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

fix: module date picker #6691

Merged
merged 13 commits into from
Mar 3, 2025
Merged

fix: module date picker #6691

merged 13 commits into from
Mar 3, 2025

Conversation

gakshita
Copy link
Collaborator

@gakshita gakshita commented Mar 3, 2025

Description

This PR reverts the module date picker back to date range picker

Summary by CodeRabbit

  • New Features
    • Consolidated date selection into a unified date range picker across several areas, including analytics and module views.
    • Users can now select both start and end dates in one streamlined interface, enhancing the overall date filtering experience.

Copy link
Contributor

coderabbitai bot commented Mar 3, 2025

Walkthrough

The changes consolidate date selection by replacing the old DateDropdown with a unified DateRangeDropdown component. In the DateRangeDropdown, the state update within the onSelect callback has been removed so that the local state is no longer updated automatically. In several module components, corresponding date handling functions have been updated to process and format both start and end dates. Additionally, unused icon imports have been removed and UI placeholders adjusted accordingly.

Changes

File(s) Change Summary
web/core/components/dropdowns/date-range.tsx Removed the state update in the onSelect callback. The component now calls onSelect with the selected date range without updating its internal dateRange state.
web/core/components/modules/analytics-sidebar/root.tsx, web/core/components/modules/module-card-item.tsx, web/core/components/modules/module-list-item-action.tsx Replaced DateDropdown with DateRangeDropdown. Updated date handling functions to accept and format both start and end dates. Removed unused icon imports and adjusted UI placeholders accordingly.

Sequence Diagram(s)

sequenceDiagram
    participant U as User
    participant DRD as DateRangeDropdown
    participant C as Parent Component
    U->>DRD: Select date range (from, to)
    DRD->>C: Trigger onSelect({from, to})
    C->>C: Process selected date range (format, update via handler, submit changes)
Loading

Possibly related PRs

Suggested labels

🐛bug, 🌟improvement, 🌐frontend

Suggested reviewers

  • SatishGandham
  • sriramveeraghanta

Poem

I'm a little rabbit, hopping with glee,
Watching date ranges set new paths to see.
No more state updates on each click and tap,
Clean flows in code—now that's a cap!
With every change, I hop forward, ear to the code, keeping it fab!
🐇✨

✨ Finishing Touches
  • 📝 Generate Docstrings

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

@gakshita gakshita changed the title Fix module date picker fix: module date picker Mar 3, 2025
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

🧹 Nitpick comments (2)
web/core/components/modules/module-card-item.tsx (1)

240-260: Consider using translations for placeholder texts.

While the implementation of DateRangeDropdown is correct, the placeholder texts are hardcoded strings instead of using the translation function like in other components.

Consider using the translation function for consistency with other components:

  placeholder={{
-    from: "Start date",
-    to: "End date",
+    from: t("start_date"),
+    to: t("end_date"),
  }}
web/core/components/modules/analytics-sidebar/root.tsx (1)

420-456: Nested Controllers implementation is functional but complex.

The implementation uses nested React Hook Form Controller components to handle both date fields, which works but introduces some complexity.

Consider simplifying the nested Controllers with a single Controller that manages both date fields:

<div className="h-7 w-3/5">
  <Controller
    control={control}
-   name="start_date"
-   render={({ field: { value: startDateValue, onChange: onChangeStartDate } }) => (
-     <Controller
-       control={control}
-       name="target_date"
-       render={({ field: { value: endDateValue, onChange: onChangeEndDate } }) => {
+   name={["start_date", "target_date"]}
+   render={({ field }) => {
        const startDate = getDate(startDateValue);
        const endDate = getDate(endDateValue);
        return (
          <DateRangeDropdown
            buttonContainerClassName="w-full"
            buttonVariant="background-with-text"
            value={{
              from: startDate,
              to: endDate,
            }}
            onSelect={(val) => {
-             onChangeStartDate(val?.from ? renderFormattedPayloadDate(val.from) : null);
-             onChangeEndDate(val?.to ? renderFormattedPayloadDate(val.to) : null);
+             // Update form values for both fields
+             control.setValue("start_date", val?.from ? renderFormattedPayloadDate(val.from) : null);
+             control.setValue("target_date", val?.to ? renderFormattedPayloadDate(val.to) : null);
              handleDateChange(val?.from, val?.to);
            }}
            placeholder={{
              from: t("start_date"),
              to: t("target_date"),
            }}
            disabled={!isEditingAllowed || isArchived}
          />
        );
-     }}
-   />
  )}
/>
</div>

This is just a suggestion - the current implementation is functional and works correctly.

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 7e62c60 and 80251e9.

📒 Files selected for processing (4)
  • web/core/components/dropdowns/date-range.tsx (0 hunks)
  • web/core/components/modules/analytics-sidebar/root.tsx (4 hunks)
  • web/core/components/modules/module-card-item.tsx (4 hunks)
  • web/core/components/modules/module-list-item-action.tsx (3 hunks)
💤 Files with no reviewable changes (1)
  • web/core/components/dropdowns/date-range.tsx
⏰ Context from checks skipped due to timeout of 90000ms (2)
  • GitHub Check: Analyze (javascript)
  • GitHub Check: Analyze (python)
🔇 Additional comments (10)
web/core/components/modules/module-list-item-action.tsx (4)

7-7: Unused imports have been removed.

The import list has been cleaned up by removing unused icon imports, leaving only SquareUser which is actually used in the component.


21-21: DateDropdown replaced with DateRangeDropdown.

This change aligns with the PR objective of reverting the module date picker back to a date range picker.


56-56: LGTM!

This variable sets up a conditional check to determine whether icons should be displayed in the date dropdown based on the presence of dates.


141-161: DateRangeDropdown implementation properly handles both start and end dates.

The implementation correctly:

  1. Passes both start and end dates as a single value object
  2. Properly formats dates for the API payload in the onSelect handler
  3. Sets appropriate placeholders with translations
  4. Controls icon visibility based on whether dates exist

The change consolidates the UI and provides a better user experience by allowing date range selection in a single component.

web/core/components/modules/module-card-item.tsx (3)

7-7: Unused icon imports have been removed.

The import list has been simplified by removing calendar-related icons that were likely used with the previous individual date pickers.


29-29: DateDropdown replaced with DateRangeDropdown.

This change aligns with the PR objective of reverting to a date range picker component.


69-69: LGTM!

This variable determines whether icons should be displayed in the date dropdown based on the presence of dates.

web/core/components/modules/analytics-sidebar/root.tsx (3)

45-45: DateDropdown replaced with DateRangeDropdown.

This import change aligns with the PR objective of using a date range picker component.


197-207: Updated date handling function to support date ranges.

The function has been properly updated to:

  1. Accept separate start and target date parameters
  2. Format both dates for the API payload
  3. Submit both dates in a single update

This implementation correctly supports the new date range picker functionality.


418-418: Updated label text to reflect the date range functionality.

The label now uses "date_range" rather than individual labels for start and target dates, which aligns with the UI changes.

@sriramveeraghanta sriramveeraghanta merged commit 0188cab into preview Mar 3, 2025
5 of 6 checks passed
@sriramveeraghanta sriramveeraghanta deleted the fix-module-date-picker branch March 3, 2025 12:26
sriramveeraghanta added a commit that referenced this pull request Mar 5, 2025
* fix: issue activity for project id validation (#6668)

* fix: work item attachment count mutation (#6670)

* updated the action to modify the release build assets (#6669)

* feat: russian translation (#6666)

* chore: ru translation updated (#6672)

* fix: state drop down refactor

* fix: intake work item creation refactor

* fix: cleanup for deprecated functions

* fix: date range picker on cycles and modules list (#6676)

* fix: Handled workspace switcher closing on click

* fix: replaced date range picker with date picker at some places

* chore: add common translation keys (#6688)

* chore: add missing translation keys

* chore: add russian translation keys

* fix: issue activity task (#6689)

* changed github workflow action ubuntu version to `ubuntu-22.04` (#6683)

* chore: update russian translation (#6682)

* chore: update russian translation

* chore: rename issues to work items in russian translation

* [PE-275] chore: editor line spacing variables (#6678)

* chore: variable editor line spacing

* chore: variable list spacing

---------

Co-authored-by: Aaryan Khandelwal <aaryankhandu123@gmail.com>

* [WEB-3475] fix: cycle dates dropdown (#6690)

* fix: Handled workspace switcher closing on click

* fix: Cycle date picker

* fix: Made onSelect optional in range range component

* fix: module date picker (#6691)

* fix: Handled workspace switcher closing on click

* fix: reverted module date picker changes

* chore: extended sidebar improvement (#6693)

* feat: italian translations (#6692)

* Create translations.json - ITALIAN translation (#6667)

* chore: italian translation updated

* feat: italian translation added

* fix: module end date translation

---------

Co-authored-by: Nicolas Bossi <nicolasbossi@gmail.com>
Co-authored-by: gakshita <akshitagoyal1516@gmail.com>

* fix: attachment item created by (#6695)

* fix: module flicker issue on property updation (#6699)

* [WEB-3477] fix: mutation issue on moving work items for a manually ended cycle (#6696)

* fix: package version update

* fix: esbuild version fix

* fix: package license repliation

* [WEB-3488] improvement: assignee validation for work item creation (#6701)

* fix: work item assignee update validation (#6704)

---------

Co-authored-by: Nikhil <118773738+pablohashescobar@users.noreply.github.com>
Co-authored-by: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com>
Co-authored-by: Manish Gupta <59428681+mguptahub@users.noreply.github.com>
Co-authored-by: Nikita Mitasov <32384814+ch4og@users.noreply.github.com>
Co-authored-by: Akshita Goyal <36129505+gakshita@users.noreply.github.com>
Co-authored-by: Aaryan Khandelwal <65252264+aaryan610@users.noreply.github.com>
Co-authored-by: Akshat Jain <akshatjain9782@gmail.com>
Co-authored-by: Lakhan Baheti <94619783+1akhanBaheti@users.noreply.github.com>
Co-authored-by: Aaryan Khandelwal <aaryankhandu123@gmail.com>
Co-authored-by: Nicolas Bossi <nicolasbossi@gmail.com>
Co-authored-by: gakshita <akshitagoyal1516@gmail.com>
Co-authored-by: Prateek Shourya <prateekshourya29@gmail.com>
@sriramveeraghanta sriramveeraghanta added this to the v0.25.1 milestone Mar 9, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants