Skip to content

Fix entering single date in date range picker #1119

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.

Sign up for GitHub

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

Merged
gregorydlogan merged 1 commit into from
Mar 7, 2025
Merged

Fix entering single date in date range picker #1119

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 40 additions & 15 deletions src/components/shared/TableFilters.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,26 +158,47 @@ const TableFilters = ({
end?.setMinutes(59);
end?.setSeconds(59);

if (start && end && moment(start).isValid() && moment(end).isValid()) {
let filter = filterMap.find(({ name }) => name === selectedFilter);
if (filter) {
dispatch(editFilterValue({
filterName: filter.name,
value: start.toISOString() + "/" + end.toISOString()
}));
setFilterSelector(false);
dispatch(removeSelectedFilter());
// Reload of resource after going to very first page.
dispatch(goToPage(0))
await dispatch(loadResource());
dispatch(loadResourceIntoTable());
}
}
submitDateFilter(start, end);

if (start) setStartDate(start);
if (end) setEndDate(end);
}
}

// Workaround for entering a date range by only entering one date
// (e.g. 01/01/2025 results in a range of 01/01/2025 - 01/01/2025)
const handleDatePickerOnKeyDown = async(keyEvent: React.KeyboardEvent<HTMLElement>) => {
if (keyEvent.key === "Enter") {
let end = endDate ?? (startDate ? new Date(startDate) : undefined);
end?.setHours(23);
end?.setMinutes(59);
end?.setSeconds(59);

submitDateFilter(
startDate,
end
)
}
}

const submitDateFilter = async(start: Date | undefined | null, end: Date | undefined | null) => {
if (start && end && moment(start).isValid() && moment(end).isValid()) {
let filter = filterMap.find(({ name }) => name === selectedFilter);
if (filter) {
dispatch(editFilterValue({
filterName: filter.name,
value: start.toISOString() + "/" + end.toISOString()
}));
setFilterSelector(false);
dispatch(removeSelectedFilter());
// Reload of resource after going to very first page.
dispatch(goToPage(0))
await dispatch(loadResource());
dispatch(loadResourceIntoTable());
}
}
}

useHotkeys(
availableHotkeys.general.REMOVE_FILTERS.sequence,
() => removeFilters(),
Expand Down Expand Up @@ -274,6 +295,7 @@ const TableFilters = ({
startDate={startDate}
endDate={endDate}
handleDate={handleDatepicker}
handleDatePickerOnKeyDown={handleDatePickerOnKeyDown}
handleChange={handleChange}
openSecondFilterMenu={openSecondFilterMenu}
setOpenSecondFilterMenu={setOpenSecondFilterMenu}
Expand Down Expand Up @@ -352,6 +374,7 @@ const TableFilters = ({
const FilterSwitch = ({
filter,
handleChange,
handleDatePickerOnKeyDown,
startDate,
endDate,
handleDate,
Expand All @@ -361,6 +384,7 @@ const FilterSwitch = ({
} : {
filter: FilterData | undefined,
handleChange: (name: string, value: string) => void,
handleDatePickerOnKeyDown: (keyEvent: React.KeyboardEvent<HTMLElement>) => void,
startDate: Date | undefined,
endDate: Date | undefined,
handleDate: (dates: [Date | undefined | null, Date | undefined | null]) => void,
Expand Down Expand Up @@ -428,6 +452,7 @@ const FilterSwitch = ({
autoFocus
selected={startDate}
onChange={(dates) => handleDate(dates)}
onKeyDown={(key) => handleDatePickerOnKeyDown(key)}
startDate={startDate}
endDate={endDate}
selectsRange
Expand Down