|
|
@ -2,45 +2,15 @@ |
|
|
|
|
|
|
|
|
import { PureComponent } from 'react' |
|
|
import { PureComponent } from 'react' |
|
|
import { connect } from 'react-redux' |
|
|
import { connect } from 'react-redux' |
|
|
import moment from 'moment' |
|
|
|
|
|
import find from 'lodash/find' |
|
|
|
|
|
import first from 'lodash/first' |
|
|
|
|
|
import last from 'lodash/last' |
|
|
|
|
|
|
|
|
|
|
|
import type { Accounts } from 'types/common' |
|
|
import type { Accounts } from 'types/common' |
|
|
|
|
|
|
|
|
import { getBalanceHistoryForAccounts } from 'helpers/balance' |
|
|
import calculateBalance from 'helpers/balance' |
|
|
|
|
|
|
|
|
const mapStateToProps = state => ({ |
|
|
const mapStateToProps = state => ({ |
|
|
counterValues: state.counterValues, |
|
|
counterValues: state.counterValues, |
|
|
}) |
|
|
}) |
|
|
|
|
|
|
|
|
function calculateBalance(props: Object) { |
|
|
|
|
|
const interval = { |
|
|
|
|
|
start: moment() |
|
|
|
|
|
.subtract(props.daysCount, 'days') |
|
|
|
|
|
.format('YYYY-MM-DD'), |
|
|
|
|
|
end: moment().format('YYYY-MM-DD'), |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
const allBalances = getBalanceHistoryForAccounts({ |
|
|
|
|
|
counterValue: props.counterValue, |
|
|
|
|
|
accounts: props.accounts, |
|
|
|
|
|
counterValues: props.counterValues, |
|
|
|
|
|
interval, |
|
|
|
|
|
}).map(e => ({ name: e.date, value: e.balance })) |
|
|
|
|
|
|
|
|
|
|
|
const firstNonEmptyDay = find(allBalances, e => e.value) |
|
|
|
|
|
const refBalance = firstNonEmptyDay ? firstNonEmptyDay.value : 0 |
|
|
|
|
|
|
|
|
|
|
|
return { |
|
|
|
|
|
allBalances, |
|
|
|
|
|
totalBalance: last(allBalances).value, |
|
|
|
|
|
sinceBalance: first(allBalances).value, |
|
|
|
|
|
refBalance, |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
type Props = { |
|
|
type Props = { |
|
|
accounts: Accounts, |
|
|
accounts: Accounts, |
|
|
counterValues: Object, |
|
|
counterValues: Object, |
|
|
@ -55,20 +25,24 @@ type State = { |
|
|
refBalance: number, |
|
|
refBalance: number, |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
class CalculateBalance extends PureComponent<Props, State> { |
|
|
function calculateBalanceToState(props: Object) { |
|
|
state = { |
|
|
const { accounts, counterValue, counterValues, daysCount } = props |
|
|
...calculateBalance(this.props), |
|
|
|
|
|
|
|
|
return { |
|
|
|
|
|
...calculateBalance({ accounts, counterValue, counterValues, daysCount }), |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
class CalculateBalance extends PureComponent<Props, State> { |
|
|
|
|
|
state = calculateBalanceToState(this.props) |
|
|
|
|
|
|
|
|
componentWillReceiveProps(nextProps) { |
|
|
componentWillReceiveProps(nextProps) { |
|
|
const sameAccounts = this.props.accounts === nextProps.accounts |
|
|
const sameAccounts = this.props.accounts === nextProps.accounts |
|
|
const sameCounterValues = this.props.counterValues === nextProps.counterValues |
|
|
const sameCounterValues = this.props.counterValues === nextProps.counterValues |
|
|
const sameDaysCount = this.props.daysCount === nextProps.daysCount |
|
|
const sameDaysCount = this.props.daysCount === nextProps.daysCount |
|
|
|
|
|
|
|
|
if (!sameAccounts || !sameCounterValues || !sameDaysCount) { |
|
|
if (!sameAccounts || !sameCounterValues || !sameDaysCount) { |
|
|
this.setState({ |
|
|
this.setState(calculateBalanceToState(nextProps)) |
|
|
...calculateBalance(nextProps), |
|
|
|
|
|
}) |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
Loëck Vézien
7 years ago