summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-07-05 09:00:30 -0400
committerHarrison Healey <harrisonmhealey@gmail.com>2017-07-05 09:00:30 -0400
commit0a1b34366b0308c62b64df7d27b36b6c6ae348e9 (patch)
tree80f73ed746c33965fe879aeadfd3aa81f69b28b7 /webapp
parent5bd60a4d1ea36839e7bdc8cc65f9038ac3732d5f (diff)
downloadchat-0a1b34366b0308c62b64df7d27b36b6c6ae348e9.tar.gz
chat-0a1b34366b0308c62b64df7d27b36b6c6ae348e9.tar.bz2
chat-0a1b34366b0308c62b64df7d27b36b6c6ae348e9.zip
Update mattermost redux to latest (#6846)
* Update to latest mattermost-redux * Add back recent and new users to team analytics page * Update to latest
Diffstat (limited to 'webapp')
-rw-r--r--webapp/components/analytics/team_analytics/index.js4
-rw-r--r--webapp/components/analytics/team_analytics/team_analytics.jsx25
-rw-r--r--webapp/yarn.lock2
3 files changed, 24 insertions, 7 deletions
diff --git a/webapp/components/analytics/team_analytics/index.js b/webapp/components/analytics/team_analytics/index.js
index 0620a8fdb..fe53a1559 100644
--- a/webapp/components/analytics/team_analytics/index.js
+++ b/webapp/components/analytics/team_analytics/index.js
@@ -4,6 +4,7 @@
import {connect} from 'react-redux';
import {bindActionCreators} from 'redux';
import {getTeams} from 'mattermost-redux/actions/teams';
+import {getProfilesInTeam} from 'mattermost-redux/actions/users';
import {getTeamsList} from 'mattermost-redux/selectors/entities/teams';
import BrowserStore from 'stores/browser_store.jsx';
@@ -26,7 +27,8 @@ function mapStateToProps(state, ownProps) {
function mapDispatchToProps(dispatch) {
return {
actions: bindActionCreators({
- getTeams
+ getTeams,
+ getProfilesInTeam
}, dispatch)
};
}
diff --git a/webapp/components/analytics/team_analytics/team_analytics.jsx b/webapp/components/analytics/team_analytics/team_analytics.jsx
index c2616fede..f2f12d938 100644
--- a/webapp/components/analytics/team_analytics/team_analytics.jsx
+++ b/webapp/components/analytics/team_analytics/team_analytics.jsx
@@ -13,6 +13,7 @@ import BrowserStore from 'stores/browser_store.jsx';
import * as AdminActions from 'actions/admin_actions.jsx';
import {StatTypes} from 'utils/constants.jsx';
+import {General} from 'mattermost-redux/constants';
import LineChart from 'components/analytics/line_chart.jsx';
import StatisticCount from 'components/analytics/statistic_count.jsx';
@@ -39,7 +40,12 @@ export default class TeamAnalytics extends React.Component {
/*
* Function to get teams
*/
- getTeams: PropTypes.func.isRequired
+ getTeams: PropTypes.func.isRequired,
+
+ /*
+ * Function to get users in a team
+ */
+ getProfilesInTeam: PropTypes.func.isRequired
}).isRequired
}
@@ -50,7 +56,9 @@ export default class TeamAnalytics extends React.Component {
this.state = {
team: props.initialTeam,
- stats: AnalyticsStore.getAllTeam(teamId)
+ stats: AnalyticsStore.getAllTeam(teamId),
+ recentlyActiveUsers: [],
+ newUsers: []
};
}
@@ -70,10 +78,17 @@ export default class TeamAnalytics extends React.Component {
}
}
- getData(id) {
+ getData = async (id) => {
AdminActions.getStandardAnalytics(id);
AdminActions.getPostsPerDayAnalytics(id);
AdminActions.getUsersPerDayAnalytics(id);
+ const recentlyActiveUsers = await this.props.actions.getProfilesInTeam(id, 0, General.PROFILE_CHUNK_SIZE, 'last_activity_at');
+ const newUsers = await this.props.actions.getProfilesInTeam(id, 0, General.PROFILE_CHUNK_SIZE, 'create_at');
+
+ this.setState({
+ recentlyActiveUsers,
+ newUsers
+ });
}
componentWillUnmount() {
@@ -200,8 +215,8 @@ export default class TeamAnalytics extends React.Component {
);
}
- const recentActiveUsers = formatRecentUsersData(stats[StatTypes.RECENTLY_ACTIVE_USERS]);
- const newlyCreatedUsers = formatNewUsersData(stats[StatTypes.NEWLY_CREATED_USERS]);
+ const recentActiveUsers = formatRecentUsersData(this.state.recentlyActiveUsers);
+ const newlyCreatedUsers = formatNewUsersData(this.state.newUsers);
const teams = this.props.teams.map((team) => {
return (
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 2cf4095ea..66774deb5 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -5043,7 +5043,7 @@ math-expression-evaluator@^1.2.14:
mattermost-redux@mattermost/mattermost-redux#webapp-master:
version "0.0.1"
- resolved "https://codeload.github.com/mattermost/mattermost-redux/tar.gz/36bdc456028c19605263958ecb2e5b9612b4a67f"
+ resolved "https://codeload.github.com/mattermost/mattermost-redux/tar.gz/dd48556075c8be41aa5ac4a0165bbe830d496875"
dependencies:
deep-equal "1.0.1"
harmony-reflect "1.5.1"