From 55cc7df8bcd1f72057369b8f7d82e3373093f7a4 Mon Sep 17 00:00:00 2001 From: Adam Rutkowski Date: Tue, 9 May 2023 13:25:38 +0200 Subject: [PATCH] Reorganize component responsibility --- .../js/dashboard/stats/behaviours/funnel.js | 19 ++++++++++--------- assets/js/dashboard/stats/behaviours/index.js | 16 ++++++---------- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/assets/js/dashboard/stats/behaviours/funnel.js b/assets/js/dashboard/stats/behaviours/funnel.js index b24b8bb6b..46edc2b98 100644 --- a/assets/js/dashboard/stats/behaviours/funnel.js +++ b/assets/js/dashboard/stats/behaviours/funnel.js @@ -22,7 +22,7 @@ export default class Funnel extends React.Component { componentDidUpdate(prevProps) { const queryChanged = this.props.query !== prevProps.query - const funnelChanged = this.props.funnel !== prevProps.funnel + const funnelChanged = this.props.funnelName !== prevProps.funnelName if (queryChanged || funnelChanged) { this.setState({ loading: true, error: null }) @@ -41,8 +41,9 @@ export default class Funnel extends React.Component { } fetchFunnel() { - if (this.props.funnel) { - api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/funnels/${this.props.funnel.id}`, this.props.query) + if (this.props.funnelName) { + const funnel = this.props.site.funnels.find(funnel => funnel.name === this.props.funnelName) + 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 }) }) @@ -129,10 +130,10 @@ export default class Funnel extends React.Component { this.chart = new Chart(ctx, config); } - tabs() { + header() { return (
-

Funnels

+

Funnel: {this.props.funnelName}

{this.props.tabs}
) @@ -142,15 +143,15 @@ export default class Funnel extends React.Component { if (this.state.loading) { return
} else if (this.state.error) { - if (this.state.error && this.state.error.payload.level === "normal") { + if (this.state.error.payload.level === "normal") { return ( - {this.tabs()} + {this.header()}
{this.state.error.message}
) } else { return ( - {this.tabs()} + {this.header()}
Oops! Something went wrong
@@ -167,7 +168,7 @@ export default class Funnel extends React.Component { return ( - {this.tabs()} + {this.header()}

{this.state.funnel.steps.length}-step funnel • {conversionRate}% conversion rate

diff --git a/assets/js/dashboard/stats/behaviours/index.js b/assets/js/dashboard/stats/behaviours/index.js index 1a1bbaf81..58f3f4c1f 100644 --- a/assets/js/dashboard/stats/behaviours/index.js +++ b/assets/js/dashboard/stats/behaviours/index.js @@ -45,10 +45,6 @@ export default class Behaviours extends React.Component { } } - selectedFunnel() { - return this.props.site.funnels.find(funnel => funnel.name === this.state.selectedFunnelName) - } - hasFunnels() { const site = this.props.site return site.flags.funnels && site.funnels.length > 0 @@ -74,19 +70,19 @@ export default class Behaviours extends React.Component { >
- {this.state.funnelNames.map((option) => { + {this.state.funnelNames.map((funnelName) => { return ( - + {({ active }) => ( - {option} + {funnelName} )} @@ -118,7 +114,7 @@ export default class Behaviours extends React.Component { case CONVERSIONS: return case FUNNELS: - return + return } }