fix: max date
This commit is contained in:
parent
bc8335adee
commit
fea170e141
2 changed files with 13 additions and 5 deletions
|
|
@ -1,7 +1,7 @@
|
||||||
import { useLazyQuery } from '@apollo/react-hooks'
|
import { useLazyQuery } from '@apollo/react-hooks'
|
||||||
import { makeStyles, ClickAwayListener } from '@material-ui/core'
|
import { makeStyles, ClickAwayListener } from '@material-ui/core'
|
||||||
import classnames from 'classnames'
|
import classnames from 'classnames'
|
||||||
import { format } from 'date-fns/fp'
|
import { format, set } from 'date-fns/fp'
|
||||||
import FileSaver from 'file-saver'
|
import FileSaver from 'file-saver'
|
||||||
import * as R from 'ramda'
|
import * as R from 'ramda'
|
||||||
import React, { useState, useCallback } from 'react'
|
import React, { useState, useCallback } from 'react'
|
||||||
|
|
@ -280,7 +280,15 @@ const LogsDownloaderPopover = ({
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
<DateRangePicker
|
<DateRangePicker
|
||||||
maxDate={new Date()}
|
maxDate={set(
|
||||||
|
{
|
||||||
|
hours: 23,
|
||||||
|
minutes: 59,
|
||||||
|
seconds: 59,
|
||||||
|
milliseconds: 999
|
||||||
|
},
|
||||||
|
new Date()
|
||||||
|
)}
|
||||||
onRangeChange={handleRangeChange}
|
onRangeChange={handleRangeChange}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
import { makeStyles } from '@material-ui/core/styles'
|
import { makeStyles } from '@material-ui/core/styles'
|
||||||
import classnames from 'classnames'
|
import classnames from 'classnames'
|
||||||
import { differenceInDays, set } from 'date-fns/fp'
|
import { compareAsc, differenceInDays, set } from 'date-fns/fp'
|
||||||
import React, { useState, useEffect } from 'react'
|
import React, { useState, useEffect } from 'react'
|
||||||
|
|
||||||
import Calendar from './Calendar'
|
import Calendar from './Calendar'
|
||||||
|
|
@ -24,9 +24,9 @@ const DateRangePicker = ({ minDate, maxDate, className, onRangeChange }) => {
|
||||||
|
|
||||||
const classes = useStyles()
|
const classes = useStyles()
|
||||||
|
|
||||||
const handleSelect = (day, minDate, maxDate) => {
|
const handleSelect = day => {
|
||||||
if (
|
if (
|
||||||
(maxDate && differenceInDays(maxDate, day) > 0) ||
|
(maxDate && compareAsc(maxDate, day) > 0) ||
|
||||||
(minDate && differenceInDays(day, minDate) > 0)
|
(minDate && differenceInDays(day, minDate) > 0)
|
||||||
)
|
)
|
||||||
return
|
return
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue