summaryrefslogtreecommitdiffstats
path: root/webapp/components/analytics
diff options
context:
space:
mode:
Diffstat (limited to 'webapp/components/analytics')
-rw-r--r--webapp/components/analytics/doughnut_chart.jsx12
-rw-r--r--webapp/components/analytics/line_chart.jsx12
-rw-r--r--webapp/components/analytics/statistic_count.jsx42
-rw-r--r--webapp/components/analytics/table_chart.jsx90
-rw-r--r--webapp/components/analytics/team_analytics/team_analytics.jsx6
5 files changed, 84 insertions, 78 deletions
diff --git a/webapp/components/analytics/doughnut_chart.jsx b/webapp/components/analytics/doughnut_chart.jsx
index b6539bd54..598922acd 100644
--- a/webapp/components/analytics/doughnut_chart.jsx
+++ b/webapp/components/analytics/doughnut_chart.jsx
@@ -5,6 +5,8 @@ import {FormattedMessage} from 'react-intl';
import * as Utils from 'utils/utils.jsx';
+import PropTypes from 'prop-types';
+
import React from 'react';
import ReactDOM from 'react-dom';
import Chart from 'chart.js';
@@ -80,9 +82,9 @@ export default class DoughnutChart extends React.Component {
}
DoughnutChart.propTypes = {
- title: React.PropTypes.node,
- width: React.PropTypes.string,
- height: React.PropTypes.string,
- data: React.PropTypes.object,
- options: React.PropTypes.object
+ title: PropTypes.node,
+ width: PropTypes.string,
+ height: PropTypes.string,
+ data: PropTypes.object,
+ options: PropTypes.object
};
diff --git a/webapp/components/analytics/line_chart.jsx b/webapp/components/analytics/line_chart.jsx
index 7f4ca51d0..67a1162fc 100644
--- a/webapp/components/analytics/line_chart.jsx
+++ b/webapp/components/analytics/line_chart.jsx
@@ -5,6 +5,8 @@ import {FormattedMessage} from 'react-intl';
import * as Utils from 'utils/utils.jsx';
+import PropTypes from 'prop-types';
+
import React from 'react';
import ReactDOM from 'react-dom';
import Chart from 'chart.js';
@@ -110,10 +112,10 @@ export default class LineChart extends React.Component {
}
LineChart.propTypes = {
- title: React.PropTypes.node.isRequired,
- width: React.PropTypes.string.isRequired,
- height: React.PropTypes.string.isRequired,
- data: React.PropTypes.object,
- options: React.PropTypes.object
+ title: PropTypes.node.isRequired,
+ width: PropTypes.string.isRequired,
+ height: PropTypes.string.isRequired,
+ data: PropTypes.object,
+ options: PropTypes.object
};
diff --git a/webapp/components/analytics/statistic_count.jsx b/webapp/components/analytics/statistic_count.jsx
index d7849f6dd..4b505bb3f 100644
--- a/webapp/components/analytics/statistic_count.jsx
+++ b/webapp/components/analytics/statistic_count.jsx
@@ -3,33 +3,33 @@
import {FormattedMessage} from 'react-intl';
+import PropTypes from 'prop-types';
+
import React from 'react';
-export default class StatisticCount extends React.Component {
- render() {
- const loading = (
- <FormattedMessage
- id='analytics.chart.loading'
- defaultMessage='Loading...'
- />
- );
+export default function StatisticCount(props) {
+ const loading = (
+ <FormattedMessage
+ id='analytics.chart.loading'
+ defaultMessage='Loading...'
+ />
+ );
- return (
- <div className='col-md-3 col-sm-6'>
- <div className='total-count'>
- <div className='title'>
- {this.props.title}
- <i className={'fa ' + this.props.icon}/>
- </div>
- <div className='content'>{this.props.count == null ? loading : this.props.count}</div>
+ return (
+ <div className='col-md-3 col-sm-6'>
+ <div className='total-count'>
+ <div className='title'>
+ {props.title}
+ <i className={'fa ' + props.icon}/>
</div>
+ <div className='content'>{props.count == null ? loading : props.count}</div>
</div>
- );
- }
+ </div>
+ );
}
StatisticCount.propTypes = {
- title: React.PropTypes.node.isRequired,
- icon: React.PropTypes.string.isRequired,
- count: React.PropTypes.number
+ title: PropTypes.node.isRequired,
+ icon: PropTypes.string.isRequired,
+ count: PropTypes.number
};
diff --git a/webapp/components/analytics/table_chart.jsx b/webapp/components/analytics/table_chart.jsx
index e6e210876..408871cb7 100644
--- a/webapp/components/analytics/table_chart.jsx
+++ b/webapp/components/analytics/table_chart.jsx
@@ -5,57 +5,57 @@ import Constants from 'utils/constants.jsx';
import {Tooltip, OverlayTrigger} from 'react-bootstrap';
+import PropTypes from 'prop-types';
+
import React from 'react';
-export default class TableChart extends React.Component {
- render() {
- return (
- <div className='col-sm-6'>
- <div className='total-count recent-active-users'>
- <div className='title'>
- {this.props.title}
- </div>
- <div className='content'>
- <table>
- <tbody>
- {
- this.props.data.map((item) => {
- const tooltip = (
- <Tooltip id={'tip-table-entry-' + item.name}>
- {item.tip}
- </Tooltip>
- );
+export default function TableChart(props) {
+ return (
+ <div className='col-sm-6'>
+ <div className='total-count recent-active-users'>
+ <div className='title'>
+ {props.title}
+ </div>
+ <div className='content'>
+ <table>
+ <tbody>
+ {
+ props.data.map((item) => {
+ const tooltip = (
+ <Tooltip id={'tip-table-entry-' + item.name}>
+ {item.tip}
+ </Tooltip>
+ );
- return (
- <tr key={'table-entry-' + item.name}>
- <td>
- <OverlayTrigger
- delayShow={Constants.OVERLAY_TIME_DELAY}
- placement='top'
- overlay={tooltip}
- >
- <time>
- {item.name}
- </time>
- </OverlayTrigger>
- </td>
- <td>
- {item.value}
- </td>
- </tr>
- );
- })
- }
- </tbody>
- </table>
- </div>
+ return (
+ <tr key={'table-entry-' + item.name}>
+ <td>
+ <OverlayTrigger
+ delayShow={Constants.OVERLAY_TIME_DELAY}
+ placement='top'
+ overlay={tooltip}
+ >
+ <time>
+ {item.name}
+ </time>
+ </OverlayTrigger>
+ </td>
+ <td>
+ {item.value}
+ </td>
+ </tr>
+ );
+ })
+ }
+ </tbody>
+ </table>
</div>
</div>
- );
- }
+ </div>
+ );
}
TableChart.propTypes = {
- title: React.PropTypes.node,
- data: React.PropTypes.array
+ title: PropTypes.node,
+ data: PropTypes.array
};
diff --git a/webapp/components/analytics/team_analytics/team_analytics.jsx b/webapp/components/analytics/team_analytics/team_analytics.jsx
index 40efcd065..eff19a309 100644
--- a/webapp/components/analytics/team_analytics/team_analytics.jsx
+++ b/webapp/components/analytics/team_analytics/team_analytics.jsx
@@ -1,3 +1,5 @@
+import PropTypes from 'prop-types';
+
// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
@@ -24,8 +26,8 @@ const LAST_ANALYTICS_TEAM = 'last_analytics_team';
export default class TeamAnalytics extends React.Component {
static propTypes = {
- actions: React.PropTypes.shape({
- getTeams: React.PropTypes.func.isRequired
+ actions: PropTypes.shape({
+ getTeams: PropTypes.func.isRequired
}).isRequired
}