From e4cb9141a456bbedc4f0e173bc1d912f33846043 Mon Sep 17 00:00:00 2001 From: enahum Date: Mon, 30 May 2016 09:44:32 -0300 Subject: PLT-3051 Fix broken site statistics (#3143) --- webapp/components/analytics/doughnut_chart.jsx | 2 +- webapp/components/analytics/line_chart.jsx | 2 +- webapp/components/analytics/system_analytics.jsx | 81 +++++++++++------------- webapp/components/analytics/team_analytics.jsx | 10 +++ 4 files changed, 49 insertions(+), 46 deletions(-) (limited to 'webapp') diff --git a/webapp/components/analytics/doughnut_chart.jsx b/webapp/components/analytics/doughnut_chart.jsx index ca037c180..b946ad8bb 100644 --- a/webapp/components/analytics/doughnut_chart.jsx +++ b/webapp/components/analytics/doughnut_chart.jsx @@ -42,7 +42,7 @@ export default class DoughnutChart extends React.Component { } var el = ReactDOM.findDOMNode(this.refs.canvas); var ctx = el.getContext('2d'); - this.chart = new Chart(ctx).Doughnut(this.props.data, this.props.options || {}); //eslint-disable-line new-cap + this.chart = new Chart(ctx, {type: 'doughnut', data: this.props.data, options: this.props.options || {}}); //eslint-disable-line new-cap } render() { diff --git a/webapp/components/analytics/line_chart.jsx b/webapp/components/analytics/line_chart.jsx index f45e7f5fa..bebeb0223 100644 --- a/webapp/components/analytics/line_chart.jsx +++ b/webapp/components/analytics/line_chart.jsx @@ -42,7 +42,7 @@ export default class LineChart extends React.Component { } var el = ReactDOM.findDOMNode(this.refs.canvas); var ctx = el.getContext('2d'); - this.chart = new Chart(ctx).Line(this.props.data, this.props.options || {}); //eslint-disable-line new-cap + this.chart = new Chart(ctx, {type: 'line', data: this.props.data, options: this.props.options || {}}); //eslint-disable-line new-cap } render() { diff --git a/webapp/components/analytics/system_analytics.jsx b/webapp/components/analytics/system_analytics.jsx index 1625a919e..8decf523d 100644 --- a/webapp/components/analytics/system_analytics.jsx +++ b/webapp/components/analytics/system_analytics.jsx @@ -222,6 +222,11 @@ class SystemAnalytics extends React.Component { /> } data={postCountsDay} + options={{ + legend: { + display: false + } + }} width='740' height='225' /> @@ -235,6 +240,11 @@ class SystemAnalytics extends React.Component { /> } data={userCountsWithPostsDay} + options={{ + legend: { + display: false + } + }} width='740' height='225' /> @@ -252,46 +262,28 @@ export default injectIntl(SystemAnalytics); export function formatChannelDoughtnutData(totalPublic, totalPrivate, intl) { const {formatMessage} = intl; - const channelTypeData = [ - { - value: totalPublic, - color: '#46BFBD', - highlight: '#5AD3D1', - label: formatMessage(holders.analyticsPublicChannels) - }, - { - value: totalPrivate, - color: '#FDB45C', - highlight: '#FFC870', - label: formatMessage(holders.analyticsPrivateGroups) - } - ]; + const channelTypeData = { + labels: [formatMessage(holders.analyticsPublicChannels), formatMessage(holders.analyticsPrivateGroups)], + datasets: [{ + data: [totalPublic, totalPrivate], + backgroundColor: ['#46BFBD', '#FDB45C'], + hoverBackgroundColor: ['#5AD3D1', '#FFC870'] + }] + }; return channelTypeData; } export function formatPostDoughtnutData(filePosts, hashtagPosts, totalPosts, intl) { const {formatMessage} = intl; - const postTypeData = [ - { - value: filePosts, - color: '#46BFBD', - highlight: '#5AD3D1', - label: formatMessage(holders.analyticsFilePosts) - }, - { - value: hashtagPosts, - color: '#F7464A', - highlight: '#FF5A5E', - label: formatMessage(holders.analyticsHashtagPosts) - }, - { - value: totalPosts - filePosts - hashtagPosts, - color: '#FDB45C', - highlight: '#FFC870', - label: formatMessage(holders.analyticsTextPosts) - } - ]; + const postTypeData = { + labels: [formatMessage(holders.analyticsFilePosts), formatMessage(holders.analyticsHashtagPosts), formatMessage(holders.analyticsTextPosts)], + datasets: [{ + data: [filePosts, hashtagPosts, (totalPosts - filePosts - hashtagPosts)], + backgroundColor: ['#46BFBD', '#F7464A', '#FDB45C'], + hoverBackgroundColor: ['#5AD3D1', '#FF5A5E', '#FFC870'] + }] + }; return postTypeData; } @@ -301,11 +293,11 @@ export function formatPostsPerDayData(data) { labels: [], datasets: [{ fillColor: 'rgba(151,187,205,0.2)', - strokeColor: 'rgba(151,187,205,1)', - pointColor: 'rgba(151,187,205,1)', - pointStrokeColor: '#fff', - pointHighlightFill: '#fff', - pointHighlightStroke: 'rgba(151,187,205,1)', + borderColor: 'rgba(151,187,205,1)', + pointBackgroundColor: 'rgba(151,187,205,1)', + pointBorderColor: '#fff', + pointHoverBackgroundColor: '#fff', + pointHoverBorderColor: 'rgba(151,187,205,1)', data: [] }] }; @@ -325,12 +317,13 @@ export function formatUsersWithPostsPerDayData(data) { var chartData = { labels: [], datasets: [{ + label: '', fillColor: 'rgba(151,187,205,0.2)', - strokeColor: 'rgba(151,187,205,1)', - pointColor: 'rgba(151,187,205,1)', - pointStrokeColor: '#fff', - pointHighlightFill: '#fff', - pointHighlightStroke: 'rgba(151,187,205,1)', + borderColor: 'rgba(151,187,205,1)', + pointBackgroundColor: 'rgba(151,187,205,1)', + pointBorderColor: '#fff', + pointHoverBackgroundColor: '#fff', + pointHoverBorderColor: 'rgba(151,187,205,1)', data: [] }] }; diff --git a/webapp/components/analytics/team_analytics.jsx b/webapp/components/analytics/team_analytics.jsx index ffca9199a..574a388d0 100644 --- a/webapp/components/analytics/team_analytics.jsx +++ b/webapp/components/analytics/team_analytics.jsx @@ -160,6 +160,11 @@ export default class TeamAnalytics extends React.Component { /> } data={postCountsDay} + options={{ + legend: { + display: false + } + }} width='740' height='225' /> @@ -173,6 +178,11 @@ export default class TeamAnalytics extends React.Component { /> } data={userCountsWithPostsDay} + options={{ + legend: { + display: false + } + }} width='740' height='225' /> -- cgit v1.2.3-1-g7c22