Merge pull request #1438 from chaotixkilla/fix-log-downloader-date-range-8.1
[Release 8.1] Fix log downloader date range when selecting later dates first
This commit is contained in:
commit
f60ca20d5b
2 changed files with 8 additions and 2 deletions
|
|
@ -1,6 +1,7 @@
|
||||||
import { makeStyles } from '@material-ui/core/styles'
|
import { makeStyles } from '@material-ui/core/styles'
|
||||||
import classnames from 'classnames'
|
import classnames from 'classnames'
|
||||||
import { compareAsc, differenceInDays, set } from 'date-fns/fp'
|
import { compareAsc, differenceInDays, set } from 'date-fns/fp'
|
||||||
|
import * as R from 'ramda'
|
||||||
import React, { useState, useEffect } from 'react'
|
import React, { useState, useEffect } from 'react'
|
||||||
|
|
||||||
import Calendar from './Calendar'
|
import Calendar from './Calendar'
|
||||||
|
|
@ -37,7 +38,12 @@ const DateRangePicker = ({ minDate, maxDate, className, onRangeChange }) => {
|
||||||
set({ hours: 23, minutes: 59, seconds: 59, milliseconds: 999 }, day)
|
set({ hours: 23, minutes: 59, seconds: 59, milliseconds: 999 }, day)
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
setTo(from)
|
setTo(
|
||||||
|
set(
|
||||||
|
{ hours: 23, minutes: 59, seconds: 59, milliseconds: 999 },
|
||||||
|
R.clone(from)
|
||||||
|
)
|
||||||
|
)
|
||||||
setFrom(day)
|
setFrom(day)
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
|
|
|
||||||
|
|
@ -107,7 +107,7 @@ const DetailsRow = ({ it: tx, timezone }) => {
|
||||||
const zip = new JSZip()
|
const zip = new JSZip()
|
||||||
|
|
||||||
const [fetchSummary] = useLazyQuery(TX_SUMMARY, {
|
const [fetchSummary] = useLazyQuery(TX_SUMMARY, {
|
||||||
onCompleted: data => createCsv(data)
|
onCompleted: data => createCsv(R.filter(it => !R.isEmpty(it), data))
|
||||||
})
|
})
|
||||||
|
|
||||||
const [cancelTransaction] = useMutation(
|
const [cancelTransaction] = useMutation(
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue