Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 9 additions & 4 deletions client/src/app/components/FilterPanel/DateRangeFilter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
DatePicker,
Form,
FormGroup,
isValidDate,
isValidDate as isValidJSDate,
} from "@patternfly/react-core";

Expand Down Expand Up @@ -72,6 +73,11 @@ export const DateRangeFilter = <TItem,>({
}
};

const toValidator = (date: Date) =>
from && isValidDate(from) && date >= from
? ""
: 'The "to" date must be after the "from" date';

return (
<Form>
<FormGroup role="group" isInline label="From">
Expand All @@ -82,8 +88,7 @@ export const DateRangeFilter = <TItem,>({
onChange={onFromDateChange}
aria-label="Interval start"
placeholder="MM/DD/YYYY"
// disable error text (no space in toolbar scenario)
invalidFormatText={""}
invalidFormatText={"Invalid date"}
// default value ("parent") creates collision with sticky table header
appendTo={document.body}
isDisabled={isDisabled}
Expand All @@ -96,9 +101,9 @@ export const DateRangeFilter = <TItem,>({
isDisabled={isDisabled || !isValidJSDate(from)}
dateFormat={americanDateFormat}
dateParse={parseAmericanDate}
// disable error text (no space in toolbar scenario)
invalidFormatText={""}
invalidFormatText={"Invalid date"}
rangeStart={from}
validators={[toValidator]}
aria-label="Interval end"
placeholder="MM/DD/YYYY"
appendTo={document.body}
Expand Down
13 changes: 9 additions & 4 deletions client/src/app/components/FilterToolbar/DateRangeFilter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
type ToolbarLabel,
type ToolbarLabelGroup,
Tooltip,
isValidDate,
isValidDate as isValidJSDate,
} from "@patternfly/react-core";

Expand Down Expand Up @@ -115,6 +116,11 @@ export const DateRangeFilter = <TItem,>({
}
};

const toValidator = (date: Date) =>
from && isValidDate(from) && date >= from
? ""
: 'The "to" date must be after the "from" date';

return (
<ToolbarFilter
key={category.categoryKey}
Expand All @@ -132,8 +138,7 @@ export const DateRangeFilter = <TItem,>({
onChange={onFromDateChange}
aria-label="Interval start"
placeholder="MM/DD/YYYY"
// disable error text (no space in toolbar scenario)
invalidFormatText={""}
invalidFormatText={"Invalid date"}
// default value ("parent") creates collision with sticky table header
appendTo={document.body}
isDisabled={isDisabled}
Expand All @@ -144,9 +149,9 @@ export const DateRangeFilter = <TItem,>({
isDisabled={isDisabled || !isValidJSDate(from)}
dateFormat={americanDateFormat}
dateParse={parseAmericanDate}
// disable error text (no space in toolbar scenario)
invalidFormatText={""}
invalidFormatText={"Invalid date"}
rangeStart={from}
validators={[toValidator]}
aria-label="Interval end"
placeholder="MM/DD/YYYY"
appendTo={document.body}
Expand Down