From 2bcd780439dfeff91a872c474c6eb4d04fe6d3f7 Mon Sep 17 00:00:00 2001 From: Tanya Ranjan Date: Wed, 4 Jan 2023 19:48:33 +0530 Subject: [PATCH 1/8] X2-4379: Test commit --- src/components/DatePicker/DatePicker.jsx | 5 +++++ src/components/DatePicker/RelativeDateRange.jsx | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/src/components/DatePicker/DatePicker.jsx b/src/components/DatePicker/DatePicker.jsx index 95f02adf7..a7ce9f236 100644 --- a/src/components/DatePicker/DatePicker.jsx +++ b/src/components/DatePicker/DatePicker.jsx @@ -11,12 +11,15 @@ import { Day } from "./Day"; import { MonthYearSelector } from "./MonthYearSelector"; import { NavbarElement } from "./NavbarElement"; import { RelativeDateRange } from "./RelativeDateRange"; +import getUserLocale from "get-user-locale"; const variants = { single: "single", range: "range", }; +const userLocale = getUserLocale(); + /** * Figma Design link: https://www.figma.com/file/tL2vrxuBIzujkDfYvVjUhs/%F0%9F%9B%A0-Xola-DS-Desktop-Master-%F0%9F%9B%A0?node-id=2689%3A101580 */ @@ -198,7 +201,9 @@ export const DatePicker = ({ onDayClick={handleDayClick} onMonthChange={handleMonthChange} onTodayButtonClick={handleTodayClick} + locale={userLocale} {...rest} + weekStartsOn={1} /> diff --git a/src/components/DatePicker/RelativeDateRange.jsx b/src/components/DatePicker/RelativeDateRange.jsx index bd7ff1e39..0a27cbe3a 100644 --- a/src/components/DatePicker/RelativeDateRange.jsx +++ b/src/components/DatePicker/RelativeDateRange.jsx @@ -2,6 +2,7 @@ import dayjs from "dayjs"; import PropTypes from "prop-types"; import React from "react"; import { Button, Select } from "../.."; +import getUserLocale from "get-user-locale"; const options = { YESTERDAY: "P1D:last", @@ -24,6 +25,8 @@ const options = { THIS_YEAR: "P1Y:current", }; +const userLocale = getUserLocale(); + export const dateRanges = { day: { label: "Day", @@ -241,6 +244,7 @@ export const RelativeDateRange = ({ })} {showApply && } + {userLocale} ); }; From 97d4488b4a6c5f7348117b962f41b6d89943b19d Mon Sep 17 00:00:00 2001 From: Tanya Ranjan Date: Wed, 4 Jan 2023 20:24:46 +0530 Subject: [PATCH 2/8] Fix for test commit --- src/components/DatePicker/DatePicker.jsx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/components/DatePicker/DatePicker.jsx b/src/components/DatePicker/DatePicker.jsx index a7ce9f236..26a50b2ea 100644 --- a/src/components/DatePicker/DatePicker.jsx +++ b/src/components/DatePicker/DatePicker.jsx @@ -11,15 +11,12 @@ import { Day } from "./Day"; import { MonthYearSelector } from "./MonthYearSelector"; import { NavbarElement } from "./NavbarElement"; import { RelativeDateRange } from "./RelativeDateRange"; -import getUserLocale from "get-user-locale"; const variants = { single: "single", range: "range", }; -const userLocale = getUserLocale(); - /** * Figma Design link: https://www.figma.com/file/tL2vrxuBIzujkDfYvVjUhs/%F0%9F%9B%A0-Xola-DS-Desktop-Master-%F0%9F%9B%A0?node-id=2689%3A101580 */ @@ -201,9 +198,8 @@ export const DatePicker = ({ onDayClick={handleDayClick} onMonthChange={handleMonthChange} onTodayButtonClick={handleTodayClick} - locale={userLocale} - {...rest} weekStartsOn={1} + {...rest} /> From 5b0bddb36762a93f150d0e662b9d85f85d8bb8e1 Mon Sep 17 00:00:00 2001 From: Tanya Ranjan Date: Thu, 5 Jan 2023 18:36:54 +0530 Subject: [PATCH 3/8] X2-4379: Select/unselect future dates in ranges --- src/components/DatePicker/DatePicker.jsx | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/components/DatePicker/DatePicker.jsx b/src/components/DatePicker/DatePicker.jsx index 26a50b2ea..627cda7f2 100644 --- a/src/components/DatePicker/DatePicker.jsx +++ b/src/components/DatePicker/DatePicker.jsx @@ -35,6 +35,7 @@ export const DatePicker = ({ components = {}, getTooltip, upcomingDates, + shouldShowFutureDatesForRelativeRange = true, ...rest }) => { const initialValue = variant === variants.single ? value : value.from; @@ -87,7 +88,14 @@ export const DatePicker = ({ const handleRelativeRangeChanged = (rangeName, range) => { setCurrentMonth(range.from); - onChange(range, modifiers, null); + let newRange = {...range}; + if (!shouldShowFutureDatesForRelativeRange) { + // don't select future dates, e.g. for cash flow report + if (range.to.isAfter(dayjs().get('date'))) { + newRange.to = dayjs().get('date'); + } + } + onChange(newRange, modifiers, null); }; const handleMonthChange = (m) => { From 267ee8af2ed4621b75816356a328eb090433d191 Mon Sep 17 00:00:00 2001 From: Tanya Ranjan Date: Thu, 5 Jan 2023 18:51:57 +0530 Subject: [PATCH 4/8] X2-4379: Cleanup --- src/components/DatePicker/DatePicker.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/DatePicker/DatePicker.jsx b/src/components/DatePicker/DatePicker.jsx index 627cda7f2..4a6b32d40 100644 --- a/src/components/DatePicker/DatePicker.jsx +++ b/src/components/DatePicker/DatePicker.jsx @@ -35,7 +35,7 @@ export const DatePicker = ({ components = {}, getTooltip, upcomingDates, - shouldShowFutureDatesForRelativeRange = true, + shouldSelectFutureDatesInRelativeRange = true, ...rest }) => { const initialValue = variant === variants.single ? value : value.from; @@ -89,7 +89,7 @@ export const DatePicker = ({ const handleRelativeRangeChanged = (rangeName, range) => { setCurrentMonth(range.from); let newRange = {...range}; - if (!shouldShowFutureDatesForRelativeRange) { + if (!shouldSelectFutureDatesInRelativeRange) { // don't select future dates, e.g. for cash flow report if (range.to.isAfter(dayjs().get('date'))) { newRange.to = dayjs().get('date'); From f427887353aaa05296c7efbd4c838fc260cecb9b Mon Sep 17 00:00:00 2001 From: Tanya Ranjan Date: Thu, 5 Jan 2023 21:06:39 +0530 Subject: [PATCH 5/8] X2-4379: Test commit --- src/components/DatePicker/RelativeDateRange.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/DatePicker/RelativeDateRange.jsx b/src/components/DatePicker/RelativeDateRange.jsx index 0a27cbe3a..b8f631d5b 100644 --- a/src/components/DatePicker/RelativeDateRange.jsx +++ b/src/components/DatePicker/RelativeDateRange.jsx @@ -243,7 +243,8 @@ export const RelativeDateRange = ({ ); })} - {showApply && } + {showApply && } + {userLocale} ); From 5825e7a2f0f9b3798984e7d0b653b7d065fd174b Mon Sep 17 00:00:00 2001 From: Tanya Ranjan Date: Thu, 5 Jan 2023 21:27:16 +0530 Subject: [PATCH 6/8] X2-4379: Revert test change --- src/components/DatePicker/RelativeDateRange.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/DatePicker/RelativeDateRange.jsx b/src/components/DatePicker/RelativeDateRange.jsx index b8f631d5b..bee1e50c4 100644 --- a/src/components/DatePicker/RelativeDateRange.jsx +++ b/src/components/DatePicker/RelativeDateRange.jsx @@ -243,7 +243,7 @@ export const RelativeDateRange = ({ ); })} - {showApply && } + {showApply && } {userLocale} From 9d6cd2508b6a1ffdb556acd76e8e04801c02a18f Mon Sep 17 00:00:00 2001 From: Tanya Ranjan Date: Thu, 5 Jan 2023 21:30:40 +0530 Subject: [PATCH 7/8] X2-4379: Cleanup --- src/components/DatePicker/DatePicker.jsx | 1 - src/components/DatePicker/RelativeDateRange.jsx | 5 ----- 2 files changed, 6 deletions(-) diff --git a/src/components/DatePicker/DatePicker.jsx b/src/components/DatePicker/DatePicker.jsx index 4a6b32d40..404b1c7ad 100644 --- a/src/components/DatePicker/DatePicker.jsx +++ b/src/components/DatePicker/DatePicker.jsx @@ -206,7 +206,6 @@ export const DatePicker = ({ onDayClick={handleDayClick} onMonthChange={handleMonthChange} onTodayButtonClick={handleTodayClick} - weekStartsOn={1} {...rest} /> diff --git a/src/components/DatePicker/RelativeDateRange.jsx b/src/components/DatePicker/RelativeDateRange.jsx index bee1e50c4..bd7ff1e39 100644 --- a/src/components/DatePicker/RelativeDateRange.jsx +++ b/src/components/DatePicker/RelativeDateRange.jsx @@ -2,7 +2,6 @@ import dayjs from "dayjs"; import PropTypes from "prop-types"; import React from "react"; import { Button, Select } from "../.."; -import getUserLocale from "get-user-locale"; const options = { YESTERDAY: "P1D:last", @@ -25,8 +24,6 @@ const options = { THIS_YEAR: "P1Y:current", }; -const userLocale = getUserLocale(); - export const dateRanges = { day: { label: "Day", @@ -244,8 +241,6 @@ export const RelativeDateRange = ({ })} {showApply && } - - {userLocale} ); }; From 7f2df0d9c3c0203edaddb023dba744d4313e26b2 Mon Sep 17 00:00:00 2001 From: Tanya Ranjan Date: Fri, 6 Jan 2023 16:22:32 +0530 Subject: [PATCH 8/8] X2-4379: Fix lint error --- src/components/DatePicker/DatePicker.jsx | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/components/DatePicker/DatePicker.jsx b/src/components/DatePicker/DatePicker.jsx index 404b1c7ad..4b2a333fa 100644 --- a/src/components/DatePicker/DatePicker.jsx +++ b/src/components/DatePicker/DatePicker.jsx @@ -88,13 +88,14 @@ export const DatePicker = ({ const handleRelativeRangeChanged = (rangeName, range) => { setCurrentMonth(range.from); - let newRange = {...range}; - if (!shouldSelectFutureDatesInRelativeRange) { - // don't select future dates, e.g. for cash flow report - if (range.to.isAfter(dayjs().get('date'))) { - newRange.to = dayjs().get('date'); - } + const newRange = { ...range }; + if ( + !shouldSelectFutureDatesInRelativeRange && // don't select future dates, e.g. for cash flow report + range.to.isAfter(dayjs().get("date")) + ) { + newRange.to = dayjs().get("date"); } + onChange(newRange, modifiers, null); };