From c8ca70870f1e202eb5784839520199fdf0beaeec Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Wed, 27 Jan 2016 15:49:26 -0300 Subject: PLT-7: Refactoring frontend (chunk 2) - System Console complete --- web/react/components/admin_console/analytics.jsx | 119 +++++++++++++++++++---- 1 file changed, 98 insertions(+), 21 deletions(-) (limited to 'web/react/components/admin_console/analytics.jsx') diff --git a/web/react/components/admin_console/analytics.jsx b/web/react/components/admin_console/analytics.jsx index 70ef1ecab..ff5903c62 100644 --- a/web/react/components/admin_console/analytics.jsx +++ b/web/react/components/admin_console/analytics.jsx @@ -8,6 +8,8 @@ import LineChart from './line_chart.jsx'; var Tooltip = ReactBootstrap.Tooltip; var OverlayTrigger = ReactBootstrap.OverlayTrigger; +import {FormattedMessage} from 'mm-intl'; + export default class Analytics extends React.Component { constructor(props) { super(props); @@ -21,11 +23,23 @@ export default class Analytics extends React.Component { serverError =
; } + let loading = ( + + ); + var totalCount = (
-
{'Total Users'}
-
{this.props.uniqueUserCount == null ? 'Loading...' : this.props.uniqueUserCount}
+
+ +
+
{this.props.uniqueUserCount == null ? loading : this.props.uniqueUserCount}
); @@ -33,8 +47,13 @@ export default class Analytics extends React.Component { var openChannelCount = (
-
{'Public Channels'}
-
{this.props.channelOpenCount == null ? 'Loading...' : this.props.channelOpenCount}
+
+ +
+
{this.props.channelOpenCount == null ? loading : this.props.channelOpenCount}
); @@ -42,8 +61,13 @@ export default class Analytics extends React.Component { var openPrivateCount = (
-
{'Private Groups'}
-
{this.props.channelPrivateCount == null ? 'Loading...' : this.props.channelPrivateCount}
+
+ +
+
{this.props.channelPrivateCount == null ? loading : this.props.channelPrivateCount}
); @@ -51,8 +75,13 @@ export default class Analytics extends React.Component { var postCount = (
-
{'Total Posts'}
-
{this.props.postCount == null ? 'Loading...' : this.props.postCount}
+
+ +
+
{this.props.postCount == null ? loading : this.props.postCount}
); @@ -60,8 +89,13 @@ export default class Analytics extends React.Component { var postCountsByDay = (
-
{'Total Posts'}
-
{'Loading...'}
+
+ +
+
{loading}
); @@ -69,7 +103,12 @@ export default class Analytics extends React.Component { if (this.props.postCountsDay != null) { let content; if (this.props.postCountsDay.labels.length === 0) { - content = 'Not enough data for a meaningful representation.'; + content = ( + + ); } else { content = (
-
{'Total Posts'}
+
+ +
{content}
@@ -94,8 +138,13 @@ export default class Analytics extends React.Component { var usersWithPostsByDay = (
-
{'Active Users With Posts'}
-
{'Loading...'}
+
+ +
+
{loading}
); @@ -103,7 +152,12 @@ export default class Analytics extends React.Component { if (this.props.userCountsWithPostsDay != null) { let content; if (this.props.userCountsWithPostsDay.labels.length === 0) { - content = 'Not enough data for a meaningful representation.'; + content = ( + + ); } else { content = (
-
{'Active Users With Posts'}
+
+ +
{content}
@@ -129,7 +188,7 @@ export default class Analytics extends React.Component { if (this.props.recentActiveUsers != null) { let content; if (this.props.recentActiveUsers.length === 0) { - content = 'Loading...'; + content = loading; } else { content = ( @@ -167,7 +226,12 @@ export default class Analytics extends React.Component { recentActiveUser = (
-
{'Recent Active Users'}
+
+ +
{content}
@@ -180,7 +244,7 @@ export default class Analytics extends React.Component { if (this.props.newlyCreatedUsers != null) { let content; if (this.props.newlyCreatedUsers.length === 0) { - content = 'Loading...'; + content = loading; } else { content = (
@@ -218,7 +282,12 @@ export default class Analytics extends React.Component { newUsers = (
-
{'Newly Created Users'}
+
+ +
{content}
@@ -229,7 +298,15 @@ export default class Analytics extends React.Component { return (
-

{'Statistics for ' + this.props.title}

+

+ +

{serverError}
{totalCount} -- cgit v1.2.3-1-g7c22