diff --git a/assets/js/dashboard/stats/behaviours/funnel.js b/assets/js/dashboard/stats/behaviours/funnel.js
index d05d01053..ce00ed667 100644
--- a/assets/js/dashboard/stats/behaviours/funnel.js
+++ b/assets/js/dashboard/stats/behaviours/funnel.js
@@ -10,10 +10,12 @@ import LazyLoader from '../../components/lazy-loader'
Chart.register(ChartDataLabels);
+// TODO: still need to update the state nicely if a funnel gets deleted
+
export default class Funnel extends React.Component {
constructor(props) {
super(props)
- this.state = { loading: true, error: null }
+ this.state = { loading: true, error: undefined }
this.onVisible = this.onVisible.bind(this)
this.fetchFunnel = this.fetchFunnel.bind(this)
}
@@ -27,7 +29,7 @@ export default class Funnel extends React.Component {
const funnelChanged = this.props.funnelName !== prevProps.funnelName
if (queryChanged || funnelChanged) {
- this.setState({ loading: true, error: null })
+ this.setState({ loading: true, error: undefined })
this.fetchFunnel()
}
}
@@ -42,19 +44,23 @@ export default class Funnel extends React.Component {
}
}
+ getFunnel() {
+ return this.props.site.funnels.find(funnel => funnel.name === this.props.funnelName)
+ }
+
fetchFunnel() {
- if (this.props.funnelName) {
- const funnel = this.props.site.funnels.find(funnel => funnel.name === this.props.funnelName)
+ const funnel = this.getFunnel()
+ if (typeof funnel === 'undefined') {
+ this.setState({ loading: false, error: { message: "Failed to locate funnel" } })
+ } else {
api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/funnels/${funnel.id}`, this.props.query)
.then((res) => {
- this.setState({ loading: false, funnel: res, error: null })
+ this.setState({ loading: false, funnel: res, error: undefined })
})
.then(this.initialiseChart.bind(this))
.catch((error) => {
this.setState({ loading: false, error: error })
})
- } else {
- this.setState({ loading: false, error: { message: "Failed to locate funnel" } })
}
}
@@ -93,7 +99,7 @@ export default class Funnel extends React.Component {
{
label: 'Dropoff',
data: dropOffData,
- backgroundColor: ['rgb(224, 231, 255)'],
+ backgroundColor: ['rgb(224, 231, 255)'], // TODO: support dark mode
borderRadius: 4,
stack: 'Stack 0',
}
@@ -141,28 +147,32 @@ export default class Funnel extends React.Component {
)
}
+ renderError() {
+ if (this.state.error.payload && this.state.error.payload.level === "normal") {
+ return (