diff --git a/assets/js/dashboard/historical.js b/assets/js/dashboard/historical.js
index 688bc4b0a..38a663739 100644
--- a/assets/js/dashboard/historical.js
+++ b/assets/js/dashboard/historical.js
@@ -9,7 +9,7 @@ import Sources from './stats/sources'
import Pages from './stats/pages'
import Locations from './stats/locations';
import Devices from './stats/devices'
-import Funnel from './stats/funnel'
+import Behaviours from './stats/behaviours'
import ComparisonInput from './comparison-input'
import { withPinnedHeader } from './pinned-header-hoc';
@@ -20,7 +20,7 @@ function Historical(props) {
if (props.site.hasGoals) {
return (
-
+
)
}
diff --git a/assets/js/dashboard/mount.js b/assets/js/dashboard/mount.js
index 9c923a88b..ef0413a33 100644
--- a/assets/js/dashboard/mount.js
+++ b/assets/js/dashboard/mount.js
@@ -16,6 +16,7 @@ if (container) {
domain: container.dataset.domain,
offset: container.dataset.offset,
hasGoals: container.dataset.hasGoals === 'true',
+ funnels: JSON.parse(container.dataset.funnels),
statsBegin: container.dataset.statsBegin,
nativeStatsBegin: container.dataset.nativeStatsBegin,
embedded: container.dataset.embedded,
diff --git a/assets/js/dashboard/realtime.js b/assets/js/dashboard/realtime.js
index 1c85f8b8c..a4cb6ca49 100644
--- a/assets/js/dashboard/realtime.js
+++ b/assets/js/dashboard/realtime.js
@@ -8,7 +8,7 @@ import Sources from './stats/sources'
import Pages from './stats/pages'
import Locations from './stats/locations'
import Devices from './stats/devices'
-import Conversions from './stats/conversions'
+import Behaviours from './stats/behaviours'
import { withPinnedHeader } from './pinned-header-hoc';
class Realtime extends React.Component {
@@ -16,7 +16,7 @@ class Realtime extends React.Component {
if (this.props.site.hasGoals) {
return (
-
+
)
}
diff --git a/assets/js/dashboard/stats/conversions/index.js b/assets/js/dashboard/stats/behaviours/conversions.js
similarity index 93%
rename from assets/js/dashboard/stats/conversions/index.js
rename to assets/js/dashboard/stats/behaviours/conversions.js
index 4b0976803..cfe1a0a8b 100644
--- a/assets/js/dashboard/stats/conversions/index.js
+++ b/assets/js/dashboard/stats/behaviours/conversions.js
@@ -100,7 +100,6 @@ export default class Conversions extends React.Component {
} else if (this.state.goals) {
return (
- {this.props.title || "Goal Conversions"}
Goal
@@ -119,7 +118,7 @@ export default class Conversions extends React.Component {
render() {
return (
-
+
{ this.renderInner() }
)
diff --git a/assets/js/dashboard/stats/funnel.js b/assets/js/dashboard/stats/behaviours/funnel.js
similarity index 70%
rename from assets/js/dashboard/stats/funnel.js
rename to assets/js/dashboard/stats/behaviours/funnel.js
index 539272161..f4224cef7 100644
--- a/assets/js/dashboard/stats/funnel.js
+++ b/assets/js/dashboard/stats/behaviours/funnel.js
@@ -1,10 +1,12 @@
import React from 'react';
import Chart from 'chart.js/auto';
+import ChartDataLabels from 'chartjs-plugin-datalabels';
+Chart.register(ChartDataLabels);
+
+import * as api from '../../api'
+import LazyLoader from '../../components/lazy-loader'
-import * as api from '../api'
-import LazyLoader from '../components/lazy-loader'
-const FUNNEL_ID = 5
export default class Funnel extends React.Component {
constructor(props) {
@@ -19,22 +21,31 @@ export default class Funnel extends React.Component {
}
componentDidUpdate(prevProps) {
- if (this.props.query !== prevProps.query) {
+ const queryChanged = this.props.query !== prevProps.query
+ const funnelChanged = this.props.funnel !== prevProps.funnel
+
+ if (queryChanged || funnelChanged) {
+ this.setState({loading: true})
this.fetchFunnel()
}
}
+ formatDataLabel(visitors) {
+ return `${visitors} Visitors`
+ }
+
fetchFunnel() {
- api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/funnels/${FUNNEL_ID}`, this.props.query)
+ api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/funnels/${this.props.funnel.id}`, this.props.query)
.then((res) => this.setState({ loading: false, funnel: res }))
.then(this.initialiseChart.bind(this))
}
initialiseChart() {
- console.info(this.state.funnel);
-
+ if (this.chart) {
+ this.chart.destroy()
+ }
const labels = this.state.funnel.steps.map(step => step.label);
- const stepData = this.state.funnel.steps.map(step => step.visitors);
+ const stepData = this.state.funnel.steps.map(step => step.visitors)
const ctx = document.getElementById('funnel').getContext('2d')
var gradient = ctx.createLinearGradient(0, 0, 0, 300);
@@ -44,24 +55,30 @@ export default class Funnel extends React.Component {
const data = {
labels: labels,
datasets: [{
- label: 'My First Dataset',
+ label: 'Visitors',
data: stepData,
backgroundColor: [gradient],
borderColor: ['rgba(101,116,205)'],
- borderWidth: 3,
+ borderWidth: 1,
+ borderSkipped: false,
borderRadius: 4
}]
};
const config = {
+ plugins: [ChartDataLabels],
type: 'bar',
data: data,
options: {
responsive: true,
+ barThickness: 120,
plugins: {
legend: {
display: false,
},
+ datalabels: {
+ formatter: this.formatDataLabel.bind(this)
+ }
},
scales: {
y: { display: false, border: { display: false } },
@@ -70,7 +87,7 @@ export default class Funnel extends React.Component {
},
};
- new Chart(ctx, config);
+ this.chart = new Chart(ctx, config);
}
renderInner() {
@@ -88,7 +105,7 @@ export default class Funnel extends React.Component {
render() {
return (
-
+
{this.renderInner()}
)
diff --git a/assets/js/dashboard/stats/behaviours/index.js b/assets/js/dashboard/stats/behaviours/index.js
new file mode 100644
index 000000000..a0ffe63af
--- /dev/null
+++ b/assets/js/dashboard/stats/behaviours/index.js
@@ -0,0 +1,76 @@
+import React, { Fragment, useState } from 'react'
+import { Menu, Transition } from '@headlessui/react'
+import { ChevronDownIcon } from '@heroicons/react/20/solid'
+import classNames from 'classnames'
+
+import Funnel from './funnel'
+import Conversions from './conversions'
+
+function Tabs({tab, setTab, funnelNames}) {
+ const activeClass = 'inline-block h-5 text-indigo-700 dark:text-indigo-500 font-bold active-prop-heading truncate text-left'
+ const defaultClass = 'hover:text-indigo-600 cursor-pointer truncate text-left'
+
+ return (
+
+
setTab('conversions')}>Conversions
+
+
+ )
+}
+
+export default function Behaviours({ query, site }) {
+ const [tab, setTab] = useState('Signup funnel')
+ const funnelNames = site.funnels.map(({name}) => name)
+ const selectedFunnel = site.funnels.find(funnel => funnel.name === tab)
+
+ return (
+
+
+
Behaviors
+
+
+ { tab == 'conversions' &&
}
+ { funnelNames.includes(tab) &&
}
+
+ )
+}
diff --git a/assets/js/dashboard/stats/conversions/prop-breakdown.js b/assets/js/dashboard/stats/behaviours/prop-breakdown.js
similarity index 100%
rename from assets/js/dashboard/stats/conversions/prop-breakdown.js
rename to assets/js/dashboard/stats/behaviours/prop-breakdown.js
diff --git a/assets/package-lock.json b/assets/package-lock.json
index c543d9e30..551aa0fef 100644
--- a/assets/package-lock.json
+++ b/assets/package-lock.json
@@ -25,6 +25,7 @@
"autoprefixer": "^10.2.6",
"babel-loader": "^8.2.2",
"chart.js": "^3.3.2",
+ "chartjs-plugin-datalabels": "^2.2.0",
"classnames": "^2.3.1",
"copy-webpack-plugin": "^9.0.0",
"css-loader": "^5.2.6",
@@ -2848,6 +2849,14 @@
"version": "3.3.2",
"license": "MIT"
},
+ "node_modules/chartjs-plugin-datalabels": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/chartjs-plugin-datalabels/-/chartjs-plugin-datalabels-2.2.0.tgz",
+ "integrity": "sha512-14ZU30lH7n89oq+A4bWaJPnAG8a7ZTk7dKf48YAzMvJjQtjrgg5Dpk9f+LbjCF6bpx3RAGTeL13IXpKQYyRvlw==",
+ "peerDependencies": {
+ "chart.js": ">=3.0.0"
+ }
+ },
"node_modules/chokidar": {
"version": "3.5.3",
"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
@@ -10851,6 +10860,12 @@
"chart.js": {
"version": "3.3.2"
},
+ "chartjs-plugin-datalabels": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/chartjs-plugin-datalabels/-/chartjs-plugin-datalabels-2.2.0.tgz",
+ "integrity": "sha512-14ZU30lH7n89oq+A4bWaJPnAG8a7ZTk7dKf48YAzMvJjQtjrgg5Dpk9f+LbjCF6bpx3RAGTeL13IXpKQYyRvlw==",
+ "requires": {}
+ },
"chokidar": {
"version": "3.5.3",
"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
diff --git a/assets/package.json b/assets/package.json
index c4c782b40..69d015442 100644
--- a/assets/package.json
+++ b/assets/package.json
@@ -27,6 +27,7 @@
"autoprefixer": "^10.2.6",
"babel-loader": "^8.2.2",
"chart.js": "^3.3.2",
+ "chartjs-plugin-datalabels": "^2.2.0",
"classnames": "^2.3.1",
"copy-webpack-plugin": "^9.0.0",
"css-loader": "^5.2.6",