diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55e754046..46a5ece9a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file.
### Added
- Data exported via the download button will contain CSV data for all visible graps in a zip file.
+- JSON API has renamed some metric items to be more clear and match the CSV API output.
### Fixed
- Fixes database error when pathname contains a question mark
diff --git a/assets/js/dashboard/stats/bar.js b/assets/js/dashboard/stats/bar.js
index f1585b3f2..1acb6f977 100644
--- a/assets/js/dashboard/stats/bar.js
+++ b/assets/js/dashboard/stats/bar.js
@@ -1,17 +1,17 @@
import React from 'react';
-function barWidth(count, all) {
- let maxVal = all[0].count;
+function barWidth(count, all, plot) {
+ let maxVal = all[0][plot];
- for (const entry of all) {
- if (entry.count > maxVal) maxVal = entry.count
+ for (const val of all) {
+ if (val > maxVal) maxVal = val[plot]
}
return count / maxVal * 100
}
-export default function Bar({count, all, bg, maxWidthDeduction, children}) {
- const width = barWidth(count, all)
+export default function Bar({count, all, bg, maxWidthDeduction, children, plot = "visitors"}) {
+ const width = barWidth(count, all, plot)
return (
- {numberFormatter(goal.count)}
+ {numberFormatter(goal.visitors)}
{viewport > MOBILE_UPPER_WIDTH && {numberFormatter(goal.total_count)} }
{goal.conversion_rate}%
diff --git a/assets/js/dashboard/stats/conversions/prop-breakdown.js b/assets/js/dashboard/stats/conversions/prop-breakdown.js
index 7811df43e..cab4e4a5a 100644
--- a/assets/js/dashboard/stats/conversions/prop-breakdown.js
+++ b/assets/js/dashboard/stats/conversions/prop-breakdown.js
@@ -115,7 +115,7 @@ export default class PropertyBreakdown extends React.Component {
return (
-
{numberFormatter(value.count)}
+
{numberFormatter(value.visitors)}
{
viewport > MOBILE_UPPER_WIDTH ?
(
diff --git a/assets/js/dashboard/stats/devices/browsers.js b/assets/js/dashboard/stats/devices/browsers.js
index 256820767..6dd907f4a 100644
--- a/assets/js/dashboard/stats/devices/browsers.js
+++ b/assets/js/dashboard/stats/devices/browsers.js
@@ -68,7 +68,7 @@ export default class Browsers extends React.Component {
return (
- {numberFormatter(browser.count)} ({browser.percentage}%)
+ {numberFormatter(browser.visitors)} ({browser.percentage}%)
{this.showConversionRate() && {numberFormatter(browser.conversion_rate)}% }
diff --git a/assets/js/dashboard/stats/devices/index.js b/assets/js/dashboard/stats/devices/index.js
index e2905746f..1447af65e 100644
--- a/assets/js/dashboard/stats/devices/index.js
+++ b/assets/js/dashboard/stats/devices/index.js
@@ -83,7 +83,7 @@ class ScreenSizes extends React.Component {
return (
- {numberFormatter(size.count)} ({size.percentage}%)
+ {numberFormatter(size.visitors)} ({size.percentage}%)
{this.showConversionRate() && {numberFormatter(size.conversion_rate)}% }
diff --git a/assets/js/dashboard/stats/devices/operating-systems.js b/assets/js/dashboard/stats/devices/operating-systems.js
index 5603c1a14..9a9d50470 100644
--- a/assets/js/dashboard/stats/devices/operating-systems.js
+++ b/assets/js/dashboard/stats/devices/operating-systems.js
@@ -56,7 +56,7 @@ export default class OperatingSystems extends React.Component {
key={os.name}
>
-
{numberFormatter(os.count)} ({os.percentage}%)
+
{numberFormatter(os.visitors)} ({os.percentage}%)
{this.showConversionRate() &&
{numberFormatter(os.conversion_rate)}% }
)
diff --git a/assets/js/dashboard/stats/locations/countries.js b/assets/js/dashboard/stats/locations/countries.js
index 8e8e77137..b2c2180bd 100644
--- a/assets/js/dashboard/stats/locations/countries.js
+++ b/assets/js/dashboard/stats/locations/countries.js
@@ -59,7 +59,7 @@ export default class Countries extends React.Component {
key={country.name}
>
- {numberFormatter(country.count)}
+ {numberFormatter(country.visitors)}
{this.showConversionRate() && {numberFormatter(country.conversion_rate)}% }
)
diff --git a/assets/js/dashboard/stats/locations/map.js b/assets/js/dashboard/stats/locations/map.js
index 8dc82d49c..4839df654 100644
--- a/assets/js/dashboard/stats/locations/map.js
+++ b/assets/js/dashboard/stats/locations/map.js
@@ -49,7 +49,7 @@ class CountriesMap extends React.Component {
getDataset() {
var dataset = {};
- var onlyValues = this.state.countries.map(function(obj){ return obj.count });
+ var onlyValues = this.state.countries.map(function(obj){ return obj.visitors });
var maxValue = Math.max.apply(null, onlyValues);
var paletteScale = d3.scale.linear()
@@ -60,7 +60,7 @@ class CountriesMap extends React.Component {
]);
this.state.countries.forEach(function(item){
- dataset[item.name] = {numberOfThings: item.count, fillColor: paletteScale(item.count)};
+ dataset[item.name] = {numberOfThings: item.visitors, fillColor: paletteScale(item.visitors)};
});
return dataset
diff --git a/assets/js/dashboard/stats/modals/countries.js b/assets/js/dashboard/stats/modals/countries.js
index 1819e5c2d..cce890f54 100644
--- a/assets/js/dashboard/stats/modals/countries.js
+++ b/assets/js/dashboard/stats/modals/countries.js
@@ -58,7 +58,7 @@ class CountriesModal extends React.Component {
{this.showConversionRate() && {country.total_visitors} }
- {numberFormatter(country.count)} {!this.showConversionRate() && ({country.percentage}%) }
+ {numberFormatter(country.visitors)} {!this.showConversionRate() && ({country.percentage}%) }
{this.showConversionRate() && {country.conversion_rate}% }
diff --git a/assets/js/dashboard/stats/modals/entry-pages.js b/assets/js/dashboard/stats/modals/entry-pages.js
index ddb6b3a51..198c32f36 100644
--- a/assets/js/dashboard/stats/modals/entry-pages.js
+++ b/assets/js/dashboard/stats/modals/entry-pages.js
@@ -90,8 +90,8 @@ class EntryPagesModal extends React.Component {
{this.showConversionRate() && {numberFormatter(page.total_visitors)} }
- {numberFormatter(page.count)}
- {this.showExtra() && {numberFormatter(page.entries)} }
+ {numberFormatter(page.unique_entrances)}
+ {this.showExtra() && {numberFormatter(page.total_entrances)} }
{this.showExtra() && {durationFormatter(page.visit_duration)} }
{this.showConversionRate() && {numberFormatter(page.conversion_rate)}% }
diff --git a/assets/js/dashboard/stats/modals/exit-pages.js b/assets/js/dashboard/stats/modals/exit-pages.js
index d0eb0961b..21b895214 100644
--- a/assets/js/dashboard/stats/modals/exit-pages.js
+++ b/assets/js/dashboard/stats/modals/exit-pages.js
@@ -72,8 +72,8 @@ class ExitPagesModal extends React.Component {
{page.name}
{this.showConversionRate() && {numberFormatter(page.total_visitors)} }
- {numberFormatter(page.count)}
- {this.showExtra() && {numberFormatter(page.exits)} }
+ {numberFormatter(page.unique_exits)}
+ {this.showExtra() && {numberFormatter(page.total_exits)} }
{this.showExtra() && {this.formatPercentage(page.exit_rate)} }
{this.showConversionRate() && {numberFormatter(page.conversion_rate)}% }
diff --git a/assets/js/dashboard/stats/modals/google-keywords.js b/assets/js/dashboard/stats/modals/google-keywords.js
index 0dcf4b624..b2ac56957 100644
--- a/assets/js/dashboard/stats/modals/google-keywords.js
+++ b/assets/js/dashboard/stats/modals/google-keywords.js
@@ -44,7 +44,7 @@ class GoogleKeywordsModal extends React.Component {
{term.name}
- {numberFormatter(term.count)}
+ {numberFormatter(term.visitors)}
)
diff --git a/assets/js/dashboard/stats/modals/pages.js b/assets/js/dashboard/stats/modals/pages.js
index 7208974da..f243298b5 100644
--- a/assets/js/dashboard/stats/modals/pages.js
+++ b/assets/js/dashboard/stats/modals/pages.js
@@ -67,7 +67,7 @@ class PagesModal extends React.Component {
{page.name}
{this.showConversionRate() && {page.total_visitors} }
- {numberFormatter(page.count)}
+ {numberFormatter(page.visitors)}
{this.showPageviews() && {numberFormatter(page.pageviews)} }
{this.showExtra() && {this.formatBounceRate(page)} }
{this.showExtra() && {timeOnPage} }
diff --git a/assets/js/dashboard/stats/modals/referrer-drilldown.js b/assets/js/dashboard/stats/modals/referrer-drilldown.js
index e97a25ffe..a38a55aa9 100644
--- a/assets/js/dashboard/stats/modals/referrer-drilldown.js
+++ b/assets/js/dashboard/stats/modals/referrer-drilldown.js
@@ -124,7 +124,7 @@ class ReferrerDrilldownModal extends React.Component {
{this.showConversionRate() &&
{numberFormatter(referrer.total_visitors)} }
-
{numberFormatter(referrer.count)}
+
{numberFormatter(referrer.visitors)}
{this.showExtra() &&
{this.formatBounceRate(referrer)} }
{this.showExtra() &&
{this.formatDuration(referrer)} }
{this.showConversionRate() &&
{referrer.conversion_rate}% }
@@ -137,7 +137,7 @@ class ReferrerDrilldownModal extends React.Component {
{ this.renderReferrerName(referrer) }
{this.showConversionRate() &&
{numberFormatter(referrer.total_visitors)} }
-
{numberFormatter(referrer.count)}
+
{numberFormatter(referrer.visitors)}
{this.showExtra() &&
{this.formatBounceRate(referrer)} }
{this.showExtra() &&
{this.formatDuration(referrer)} }
{this.showConversionRate() &&
{referrer.conversion_rate}% }
diff --git a/assets/js/dashboard/stats/modals/sources.js b/assets/js/dashboard/stats/modals/sources.js
index d74aa9b3c..2005422ca 100644
--- a/assets/js/dashboard/stats/modals/sources.js
+++ b/assets/js/dashboard/stats/modals/sources.js
@@ -97,7 +97,7 @@ class SourcesModal extends React.Component {
{ source.name }
{this.showConversionRate() &&
{numberFormatter(source.total_visitors)} }
-
{numberFormatter(source.count)}
+
{numberFormatter(source.visitors)}
{this.showExtra() &&
{this.formatBounceRate(source)} }
{this.showExtra() &&
{this.formatDuration(source)} }
{this.showConversionRate() &&
{source.conversion_rate}% }
diff --git a/assets/js/dashboard/stats/pages/entry-pages.js b/assets/js/dashboard/stats/pages/entry-pages.js
index 13414c29c..58689fc31 100644
--- a/assets/js/dashboard/stats/pages/entry-pages.js
+++ b/assets/js/dashboard/stats/pages/entry-pages.js
@@ -57,8 +57,9 @@ export default class EntryPages extends React.Component {
return (
@@ -79,7 +80,7 @@ export default class EntryPages extends React.Component {
- {numberFormatter(page.count)}
+ {numberFormatter(page.unique_entrances)}
{this.showConversionRate() && {numberFormatter(page.conversion_rate)}% }
)
diff --git a/assets/js/dashboard/stats/pages/exit-pages.js b/assets/js/dashboard/stats/pages/exit-pages.js
index ba8970a59..b7d2e3aaf 100644
--- a/assets/js/dashboard/stats/pages/exit-pages.js
+++ b/assets/js/dashboard/stats/pages/exit-pages.js
@@ -57,8 +57,9 @@ export default class ExitPages extends React.Component {
return (
@@ -79,7 +80,7 @@ export default class ExitPages extends React.Component {
- {numberFormatter(page.count)}
+ {numberFormatter(page.unique_exits)}
{this.showConversionRate() && {numberFormatter(page.conversion_rate)}% }
)
diff --git a/assets/js/dashboard/stats/pages/pages.js b/assets/js/dashboard/stats/pages/pages.js
index d9c153516..438dfdd0b 100644
--- a/assets/js/dashboard/stats/pages/pages.js
+++ b/assets/js/dashboard/stats/pages/pages.js
@@ -60,7 +60,7 @@ export default class Visits extends React.Component {
key={page.name}
>
-
{numberFormatter(page.count)}
+
{numberFormatter(page.visitors)}
{this.showConversionRate() &&
{numberFormatter(page.conversion_rate)}% }
)
diff --git a/assets/js/dashboard/stats/sources/referrer-list.js b/assets/js/dashboard/stats/sources/referrer-list.js
index 5e32a5579..f4bc65c84 100644
--- a/assets/js/dashboard/stats/sources/referrer-list.js
+++ b/assets/js/dashboard/stats/sources/referrer-list.js
@@ -78,7 +78,7 @@ export default class Referrers extends React.Component {
return (