-
-
-
setIsCustomDatePicker(false)}
- />
- setIsCustomDatePicker(true)}
+
+ {activeSection === BACKTEST_TAB_SECTIONS.HISTORY_BT_DETAILS ? (
+
}
/>
-
- {isCustomDatePicker ? (
- <>
-
-
-
-
-
-
-
- ) : (
-
-
}
/>
-
- {t('strategyEditor.timePeriod')}
-
-
- )}
-
-
-
- {t('strategyEditor.useCandlesCheckboxDescription')}
-
- {candles && (
- <>
-
-
-
- {t('strategyEditor.selectCandleDurationDescription')}
-
-
-
-
+ {activeSection === BACKTEST_TAB_SECTIONS.NEW_BT && (
+
)}
- {/* {!isPaperTrading && _includes(symbol?.contexts, 'm') && (
-
-
-
{t('strategyEditor.useMarginCheckboxDescription')}
-
- )} */}
-
-
-
- {t('strategyEditor.useTradesCheckboxDescription')}
-
-
-
- {isLoading && (
-
-
-
+ {activeSection === BACKTEST_TAB_SECTIONS.HISTORY_BT_LIST && (
+
+ )}
+ {activeSection === BACKTEST_TAB_SECTIONS.HISTORY_BT_DETAILS && (
+
)}
-
- {isLoading ? (
-
- ) : (
-
- )}
-
)
}
-BacktestOptionsPanel.propTypes = {
- strategy: PropTypes.shape(STRATEGY_SHAPE).isRequired,
- onCancelProcess: PropTypes.func.isRequired,
- onBacktestStart: PropTypes.func,
- isLoading: PropTypes.bool.isRequired,
- saveStrategyOptions: PropTypes.func.isRequired,
-}
-
-BacktestOptionsPanel.defaultProps = {
- onBacktestStart: () => { },
-}
-
export default BacktestOptionsPanel
diff --git a/src/components/BacktestOptionsPanel/BacktestResultsOptionsPanel.js b/src/components/BacktestOptionsPanel/BacktestResultsOptionsPanel.js
index 0315efb9c..6c6bfa01e 100644
--- a/src/components/BacktestOptionsPanel/BacktestResultsOptionsPanel.js
+++ b/src/components/BacktestOptionsPanel/BacktestResultsOptionsPanel.js
@@ -1,22 +1,81 @@
import React from 'react'
+import _toUpper from 'lodash/toUpper'
+import _get from 'lodash/get'
import PropTypes from 'prop-types'
import { useTranslation } from 'react-i18next'
+import { useDispatch, useSelector } from 'react-redux'
+import { Icon } from 'react-fa'
import Button from '../../ui/Button'
+import {
+ getBacktestActiveSection,
+ getFormatTimeFn,
+} from '../../redux/selectors/ui'
+import { renderDate } from '../../util/ui'
+import PanelButton from '../../ui/Panel/Panel.Button'
+
+import UIActions from '../../redux/actions/ui'
+import WSActions from '../../redux/actions/ws'
+import { BACKTEST_TAB_SECTIONS } from '../../redux/reducers/ui'
+import { getCurrentHistoryBacktest } from '../../redux/selectors/ws'
+
+const renderBacktestRange = (backtest, formatTime, t) => (
+
+ {t('strategyEditor.backtestHistoryResults')}
+
+ {renderDate(_get(backtest, 'start', 0), formatTime, false)}
+ -
+ {renderDate(_get(backtest, 'end', 0), formatTime, false)}
+
+)
+
+const BacktestResultsOptionsPanel = ({ showFullscreenChart }) => {
+ const formatTime = useSelector(getFormatTimeFn)
+ const backtest = useSelector(getCurrentHistoryBacktest)
+ const activeSection = useSelector(getBacktestActiveSection)
-const BacktestResultsOptionsPanel = ({ showFullscreenChart, openNewTest }) => {
const { t } = useTranslation()
+ const dispatch = useDispatch()
+
+ const setActiveSection = (section) => dispatch(UIActions.setBacktestActiveSection(section))
+ const onBackButtonClick = () => setActiveSection(BACKTEST_TAB_SECTIONS.HISTORY_BT_DETAILS)
+ const onNewTestButtonClick = () => {
+ dispatch(WSActions.purgeBacktestData())
+ setActiveSection(BACKTEST_TAB_SECTIONS.NEW_BT)
+ }
+
+ const showBtHistoryResults = activeSection === BACKTEST_TAB_SECTIONS.HISTORY_BT_RESULTS
return (
-
-
{t('strategyEditor.backtestSuccessful')}
-
-
+ {showBtHistoryResults ? (
+
+
}
+ />
+ {renderBacktestRange(backtest, formatTime, t)}
+
+
+ ) : (
+
+
{t('strategyEditor.backtestSuccessful')}
+ {renderBacktestRange(backtest, formatTime, t)}
+
+
+ )}
+