summaryrefslogtreecommitdiffstats
path: root/webapp/stores/team_store.jsx
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2016-10-19 14:49:25 -0400
committerGitHub <noreply@github.com>2016-10-19 14:49:25 -0400
commit365b8b465e8a53ebb2da2bf3aef659ac81a2bc6a (patch)
tree643b2dd52b478c2c0b049ac28798d870b9dfd397 /webapp/stores/team_store.jsx
parent0512bd26ee85473aa47206d5f207a9a506019138 (diff)
downloadchat-365b8b465e8a53ebb2da2bf3aef659ac81a2bc6a.tar.gz
chat-365b8b465e8a53ebb2da2bf3aef659ac81a2bc6a.tar.bz2
chat-365b8b465e8a53ebb2da2bf3aef659ac81a2bc6a.zip
Merging performance branch into master (#4268)
* improve performance on sendNotifications * Fix SQL queries * Remove get direct profiles, not needed anymore * Add raw data to error details if AppError fails to decode * men * Fix decode (#4052) * Fixing json decode * Adding unit test * Initial work for client scaling (#4051) * Begin adding paging to profiles API * Added more paging functionality * Finish hooking up admin console user lists * Add API for searching users and add searching to all user lists * Add lazy loading of profiles * Revert config.json * Fix unit tests and some style issues * Add GetProfilesFromList to Go driver and fix web unit test * Update etag for GetProfiles * Updating ui for filters and pagination (#4044) * Updating UI for pagination * Adjusting margins for filter row * Adjusting margin for specific modals * Adding relative padding to system console * Adjusting responsive view * Update client user tests * Minor fixes for direct messages modal (#4056) * Remove some unneeded initial load calls (#4057) * UX updates to user lists, added smart counts and bug fixes (#4059) * Improved getExplicitMentions and unit tests (#4064) * Refactor getting posts to lazy load profiles correctly (#4062) * Comment out SetActiveChannel test (#4066) * Profiler cpu, block, and memory profiler. (#4081) * Fix TestSetActiveChannel unit test (#4071) * Fixing build failure caused by dependancies updating (#4076) * Adding profiler * Fix admin_team_member_dropdown eslint errors * Bumping session cache size (#4077) * Bumping session cache size * Bumping status cache * Refactor how the client handles channel members to be large team friendly (#4106) * Refactor how the client handles channel members to be large team friendly * Change Id to ChannelId in ChannelStats model * Updated getChannelMember and getProfilesByIds routes to match proposal * Performance improvements (#4100) * Performance improvements * Fixing re-connect issue * Fixing error message * Some other minor perf tweaks * Some other minor perf tweaks * Fixing config file * Fixing buffer size * Fixing web socket send message * adding some error logging * fix getMe to be user required * Fix websocket event for new user * Fixing shutting down * Reverting web socket changes * Fixing logging lvl * Adding caching to GetMember * Adding some logging * Fixing caching * Fixing caching invalidate * Fixing direct message caching * Fixing caching * Fixing caching * Remove GetDirectProfiles from initial load * Adding logging and fixing websocket client * Adding back caching from bad merge. * Explicitly close go driver requests (#4162) * Refactored how the client handles team members to be more large team friendly (#4159) * Refactor getProfilesForDirectMessageList API into getAllProfiles API * Refactored how the client handles team members to be more large team friendly * Fix js error when receiving a notification * Fix JS error caused by current user being overwritten with sanitized version (#4165) * Adding error message to status failure (#4167) * Fix a few bugs caused by client scaling refactoring (#4170) * When there is no read replica, don't open a second set of connections to the master database (#4173) * Adding connection tacking to stats (#4174) * Reduce DB writes for statuses and other status related changes (#4175) * Fix bug preventing opening of DM channels from more modal (#4181) * Fixing socket timing error (#4183) * Fixing ping/pong handler * Fixing socket timing error * Commenting out status broadcasting * Removing user status changes * Removing user status changes * Removing user status changes * Removing user status changes * Adding DoPreComputeJson() * Performance improvements (#4194) * * Fix System Console Analytics queries * Add db.SetConnMaxLifetime to 15 minutes * Add "net/http/pprof" for profiling * Add FreeOSMemory() to manually release memory on reload config * Add flag to enable http profiler * Fix memory leak (#4197) * Fix memory leak * removed unneeded nil assignment * Fixing go routine leak (#4208) * Merge fixes * Merge fix * Refactored statuses to be queried by the client rather than broadcast by the server (#4212) * Refactored server code to reduce status broadcasts and to allow getting statuses by IDs * Refactor client code to periodically fetch statuses * Add store unit test for getting statuses by ids * Fix status unit test * Add getStatusesByIds REST API and move the client over to use that instead of the WebSocket * Adding multiple threads to websocket hub (#4230) * Adding multiple threads to websocket hub * Fixing unit tests * Fixing so websocket connections from the same user end up in the sameā€¦ (#4240) * Fixing so websocket connections from the same user end up in the same list * Removing old comment * Refactor user autocomplete to query the server (#4239) * Add API for autocompleting users * Converted at mention autocomplete to query server * Converted user search autocomplete to query server * Switch autocomplete API naming to use term instead of username * Split autocomplete API into two, one for channels and for teams * Fix copy/paste error * Some final client scaling fixes (#4246) * Add lazy loading of profiles to integration pages * Add lazy loading of profiles to emoji page * Fix JS error when receiving post in select team menu and also clean up channel store
Diffstat (limited to 'webapp/stores/team_store.jsx')
-rw-r--r--webapp/stores/team_store.jsx123
1 files changed, 92 insertions, 31 deletions
diff --git a/webapp/stores/team_store.jsx b/webapp/stores/team_store.jsx
index c71cc685b..3a4ae73b9 100644
--- a/webapp/stores/team_store.jsx
+++ b/webapp/stores/team_store.jsx
@@ -9,6 +9,7 @@ import Constants from 'utils/constants.jsx';
const ActionTypes = Constants.ActionTypes;
const CHANGE_EVENT = 'change';
+const STATS_EVENT = 'stats';
var Utils;
@@ -20,8 +21,10 @@ class TeamStoreClass extends EventEmitter {
clear() {
this.teams = {};
- this.team_members = [];
- this.members_for_team = [];
+ this.my_team_members = [];
+ this.members_in_team = {};
+ this.members_not_in_team = {};
+ this.stats = {};
this.teamListings = {};
this.currentTeamId = '';
}
@@ -38,6 +41,18 @@ class TeamStoreClass extends EventEmitter {
this.removeListener(CHANGE_EVENT, callback);
}
+ emitStatsChange() {
+ this.emit(STATS_EVENT);
+ }
+
+ addStatsChangeListener(callback) {
+ this.on(STATS_EVENT, callback);
+ }
+
+ removeStatsChangeListener(callback) {
+ this.removeListener(STATS_EVENT, callback);
+ }
+
get(id) {
var c = this.getAll();
return c[id];
@@ -114,6 +129,27 @@ class TeamStoreClass extends EventEmitter {
return origin + '/' + team.name;
}
+ getCurrentStats() {
+ return this.getStats(this.getCurrentId());
+ }
+
+ getStats(teamId) {
+ let stats;
+
+ if (teamId) {
+ stats = this.stats[teamId];
+ }
+
+ if (stats) {
+ // create a defensive copy
+ stats = Object.assign({}, stats);
+ } else {
+ stats = {member_count: 0};
+ }
+
+ return stats;
+ }
+
saveTeam(team) {
this.teams[team.id] = team;
}
@@ -127,44 +163,62 @@ class TeamStoreClass extends EventEmitter {
this.currentTeamId = team.id;
}
- saveTeamMembers(members) {
- this.team_members = members;
+ saveStats(teamId, stats) {
+ this.stats[teamId] = stats;
}
- appendTeamMember(member) {
- this.team_members.push(member);
+ saveMyTeamMembers(members) {
+ this.my_team_members = members;
}
- removeTeamMember(teamId) {
- for (var index in this.team_members) {
- if (this.team_members.hasOwnProperty(index)) {
- if (this.team_members[index].team_id === teamId) {
- this.team_members.splice(index, 1);
+ appendMyTeamMember(member) {
+ this.my_team_members.push(member);
+ }
+
+ removeMyTeamMember(teamId) {
+ for (var index in this.my_team_members) {
+ if (this.my_team_members.hasOwnProperty(index)) {
+ if (this.my_team_members[index].team_id === teamId) {
+ Reflect.deleteProperty(this.my_team_members, index);
}
}
}
}
- getTeamMembers() {
- return this.team_members;
+ getMyTeamMembers() {
+ return this.my_team_members;
}
- saveMembersForTeam(members) {
- this.members_for_team = members;
+ saveMembersInTeam(teamId = this.getCurrentId(), members) {
+ const oldMembers = this.members_in_team[teamId] || {};
+ this.members_in_team[teamId] = Object.assign({}, oldMembers, members);
}
- getMembersForTeam() {
- return this.members_for_team;
+ saveMembersNotInTeam(teamId = this.getCurrentId(), nonmembers) {
+ this.members_not_in_team[teamId] = nonmembers;
}
- hasActiveMemberForTeam(userId) {
- for (var index in this.members_for_team) {
- if (this.members_for_team.hasOwnProperty(index)) {
- if (this.members_for_team[index].user_id === userId &&
- this.members_for_team[index].team_id === this.currentTeamId) {
- return this.members_for_team[index].delete_at === 0;
- }
- }
+ removeMemberInTeam(teamId = this.getCurrentId(), userId) {
+ if (this.members_in_team[teamId]) {
+ Reflect.deleteProperty(this.members_in_team[teamId], userId);
+ }
+ }
+
+ getMembersInTeam(teamId = this.getCurrentId()) {
+ return this.members_in_team[teamId] || {};
+ }
+
+ hasActiveMemberInTeam(teamId = this.getCurrentId(), userId) {
+ if (this.members_in_team[teamId] && this.members_in_team[teamId][userId]) {
+ return true;
+ }
+
+ return false;
+ }
+
+ hasMemberNotInTeam(teamId = this.getCurrentId(), userId) {
+ if (this.members_not_in_team[teamId] && this.members_not_in_team[teamId][userId]) {
+ return true;
}
return false;
@@ -187,7 +241,7 @@ class TeamStoreClass extends EventEmitter {
Utils = require('utils/utils.jsx'); //eslint-disable-line global-require
}
- var teamMembers = this.getTeamMembers();
+ var teamMembers = this.getMyTeamMembers();
const teamMember = teamMembers.find((m) => m.user_id === userId && m.team_id === teamId);
if (teamMember) {
@@ -210,25 +264,32 @@ TeamStore.dispatchToken = AppDispatcher.register((payload) => {
break;
case ActionTypes.CREATED_TEAM:
TeamStore.saveTeam(action.team);
- TeamStore.appendTeamMember(action.member);
+ TeamStore.appendMyTeamMember(action.member);
TeamStore.emitChange();
break;
case ActionTypes.RECEIVED_ALL_TEAMS:
TeamStore.saveTeams(action.teams);
TeamStore.emitChange();
break;
- case ActionTypes.RECEIVED_TEAM_MEMBERS:
- TeamStore.saveTeamMembers(action.team_members);
+ case ActionTypes.RECEIVED_MY_TEAM_MEMBERS:
+ TeamStore.saveMyTeamMembers(action.team_members);
TeamStore.emitChange();
break;
case ActionTypes.RECEIVED_ALL_TEAM_LISTINGS:
TeamStore.saveTeamListings(action.teams);
TeamStore.emitChange();
break;
- case ActionTypes.RECEIVED_MEMBERS_FOR_TEAM:
- TeamStore.saveMembersForTeam(action.team_members);
+ case ActionTypes.RECEIVED_MEMBERS_IN_TEAM:
+ TeamStore.saveMembersInTeam(action.team_id, action.team_members);
+ if (action.non_team_members) {
+ TeamStore.saveMembersNotInTeam(action.team_id, action.non_team_members);
+ }
TeamStore.emitChange();
break;
+ case ActionTypes.RECEIVED_TEAM_STATS:
+ TeamStore.saveStats(action.team_id, action.stats);
+ TeamStore.emitStatsChange();
+ break;
default:
}
});