mirror of
https://github.com/mattermost/mattermost.git
synced 2025-02-25 18:55:24 -06:00
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
This commit is contained in:
@@ -285,11 +285,10 @@ describe('Client.Channels', function() {
|
||||
});
|
||||
});
|
||||
|
||||
it('getChannelExtraInfo', function(done) {
|
||||
it('getChannelStats', function(done) {
|
||||
TestHelper.initBasic(() => {
|
||||
TestHelper.basicClient().getChannelExtraInfo(
|
||||
TestHelper.basicClient().getChannelStats(
|
||||
TestHelper.basicChannel().id,
|
||||
5,
|
||||
function(data) {
|
||||
assert.equal(data.member_count, 1);
|
||||
done();
|
||||
@@ -301,6 +300,23 @@ describe('Client.Channels', function() {
|
||||
});
|
||||
});
|
||||
|
||||
it('getChannelMember', function(done) {
|
||||
TestHelper.initBasic(() => {
|
||||
TestHelper.basicClient().getChannelMember(
|
||||
TestHelper.basicChannel().id,
|
||||
TestHelper.basicUser().id,
|
||||
function(data) {
|
||||
assert.equal(data.channel_id, TestHelper.basicChannel().id);
|
||||
assert.equal(data.user_id, TestHelper.basicUser().id);
|
||||
done();
|
||||
},
|
||||
function(err) {
|
||||
done(new Error(err.message));
|
||||
}
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
/* TODO FIX THIS TEST
|
||||
it('addChannelMember', function(done) {
|
||||
TestHelper.initBasic(() => {
|
||||
|
||||
@@ -130,10 +130,12 @@ describe('Client.Team', function() {
|
||||
});
|
||||
});
|
||||
|
||||
it('GetTeamMembers', function(done) {
|
||||
it('getTeamMembers', function(done) {
|
||||
TestHelper.initBasic(() => {
|
||||
TestHelper.basicClient().getTeamMembers(
|
||||
TestHelper.basicTeam().id,
|
||||
0,
|
||||
100,
|
||||
function(data) {
|
||||
assert.equal(data.length > 0, true);
|
||||
done();
|
||||
@@ -145,6 +147,55 @@ describe('Client.Team', function() {
|
||||
});
|
||||
});
|
||||
|
||||
it('getTeamMember', function(done) {
|
||||
TestHelper.initBasic(() => {
|
||||
TestHelper.basicClient().getTeamMember(
|
||||
TestHelper.basicTeam().id,
|
||||
TestHelper.basicUser().id,
|
||||
function(data) {
|
||||
assert.equal(data.user_id, TestHelper.basicUser().id);
|
||||
assert.equal(data.team_id, TestHelper.basicTeam().id);
|
||||
done();
|
||||
},
|
||||
function(err) {
|
||||
done(new Error(err.message));
|
||||
}
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
it('getTeamStats', function(done) {
|
||||
TestHelper.initBasic(() => {
|
||||
TestHelper.basicClient().getTeamStats(
|
||||
TestHelper.basicTeam().id,
|
||||
function(data) {
|
||||
assert.equal(data.member_count > 0, true);
|
||||
done();
|
||||
},
|
||||
function(err) {
|
||||
done(new Error(err.message));
|
||||
}
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
it('getTeamMembersByIds', function(done) {
|
||||
TestHelper.initBasic(() => {
|
||||
TestHelper.basicClient().getTeamMembersByIds(
|
||||
TestHelper.basicTeam().id,
|
||||
[TestHelper.basicUser().id],
|
||||
function(data) {
|
||||
assert.equal(data[0].user_id, TestHelper.basicUser().id);
|
||||
assert.equal(data[0].team_id, TestHelper.basicTeam().id);
|
||||
done();
|
||||
},
|
||||
function(err) {
|
||||
done(new Error(err.message));
|
||||
}
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
it('inviteMembers', function(done) {
|
||||
TestHelper.initBasic(() => {
|
||||
var data = {};
|
||||
|
||||
@@ -444,52 +444,11 @@ describe('Client.User', function() {
|
||||
});
|
||||
});
|
||||
|
||||
it('getDirectProfiles', function(done) {
|
||||
TestHelper.initBasic(() => {
|
||||
TestHelper.basicClient().getDirectProfiles(
|
||||
function(data) {
|
||||
assert.equal(Object.keys(data).length === 0, true);
|
||||
done();
|
||||
},
|
||||
function(err) {
|
||||
done(new Error(err.getDirectProfiles));
|
||||
}
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
it('getProfiles', function(done) {
|
||||
TestHelper.initBasic(() => {
|
||||
TestHelper.basicClient().getProfiles(
|
||||
function(data) {
|
||||
assert.equal(data[TestHelper.basicUser().id].id, TestHelper.basicUser().id);
|
||||
done();
|
||||
},
|
||||
function(err) {
|
||||
done(new Error(err.message));
|
||||
}
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
it('getProfilesForTeam', function(done) {
|
||||
TestHelper.initBasic(() => {
|
||||
TestHelper.basicClient().getProfilesForTeam(
|
||||
TestHelper.basicTeam().id,
|
||||
function(data) {
|
||||
assert.equal(data[TestHelper.basicUser().id].id, TestHelper.basicUser().id);
|
||||
done();
|
||||
},
|
||||
function(err) {
|
||||
done(new Error(err.message));
|
||||
}
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
it('getProfilesForDirectMessageList', function(done) {
|
||||
TestHelper.initBasic(() => {
|
||||
TestHelper.basicClient().getProfilesForDirectMessageList(
|
||||
0,
|
||||
100,
|
||||
function(data) {
|
||||
assert.equal(Object.keys(data).length > 0, true);
|
||||
done();
|
||||
@@ -501,16 +460,129 @@ describe('Client.User', function() {
|
||||
});
|
||||
});
|
||||
|
||||
/* TODO: FIX THIS TEST
|
||||
it('getStatuses', function(done) {
|
||||
it('getProfilesInTeam', function(done) {
|
||||
TestHelper.initBasic(() => {
|
||||
var ids = [];
|
||||
ids.push(TestHelper.basicUser().id);
|
||||
|
||||
TestHelper.basicClient().getStatuses(
|
||||
ids,
|
||||
TestHelper.basicClient().getProfilesInTeam(
|
||||
TestHelper.basicTeam().id,
|
||||
0,
|
||||
100,
|
||||
function(data) {
|
||||
assert.equal(data[TestHelper.basicUser().id], 'online');
|
||||
assert.equal(data[TestHelper.basicUser().id].id, TestHelper.basicUser().id);
|
||||
done();
|
||||
},
|
||||
function(err) {
|
||||
done(new Error(err.message));
|
||||
}
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
it('getProfilesByIds', function(done) {
|
||||
TestHelper.initBasic(() => {
|
||||
TestHelper.basicClient().getProfilesByIds(
|
||||
[TestHelper.basicUser().id],
|
||||
function(data) {
|
||||
assert.equal(data[TestHelper.basicUser().id].id, TestHelper.basicUser().id);
|
||||
done();
|
||||
},
|
||||
function(err) {
|
||||
done(new Error(err.message));
|
||||
}
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
it('getProfilesInChannel', function(done) {
|
||||
TestHelper.initBasic(() => {
|
||||
TestHelper.basicClient().getProfilesInChannel(
|
||||
TestHelper.basicChannel().id,
|
||||
0,
|
||||
100,
|
||||
function(data) {
|
||||
assert.equal(Object.keys(data).length > 0, true);
|
||||
done();
|
||||
},
|
||||
function(err) {
|
||||
done(new Error(err.message));
|
||||
}
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
it('getProfilesNotInChannel', function(done) {
|
||||
TestHelper.initBasic(() => {
|
||||
TestHelper.basicClient().getProfilesNotInChannel(
|
||||
TestHelper.basicChannel().id,
|
||||
0,
|
||||
100,
|
||||
function(data) {
|
||||
assert.equal(Object.keys(data).length > 0, false);
|
||||
done();
|
||||
},
|
||||
function(err) {
|
||||
done(new Error(err.message));
|
||||
}
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
it('searchUsers', function(done) {
|
||||
TestHelper.initBasic(() => {
|
||||
TestHelper.basicClient().searchUsers(
|
||||
'uid',
|
||||
TestHelper.basicTeam().id,
|
||||
{},
|
||||
function(data) {
|
||||
assert.equal(data.length > 0, true);
|
||||
done();
|
||||
},
|
||||
function(err) {
|
||||
done(new Error(err.message));
|
||||
}
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
it('autocompleteUsersInChannel', function(done) {
|
||||
TestHelper.initBasic(() => {
|
||||
TestHelper.basicClient().autocompleteUsersInChannel(
|
||||
'uid',
|
||||
TestHelper.basicChannel().id,
|
||||
function(data) {
|
||||
assert.equal(data != null, true);
|
||||
done();
|
||||
},
|
||||
function(err) {
|
||||
done(new Error(err.message));
|
||||
}
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
it('autocompleteUsersInTeam', function(done) {
|
||||
TestHelper.initBasic(() => {
|
||||
TestHelper.basicClient().autocompleteUsersInTeam(
|
||||
'uid',
|
||||
function(data) {
|
||||
assert.equal(data != null, true);
|
||||
done();
|
||||
},
|
||||
function(err) {
|
||||
done(new Error(err.message));
|
||||
}
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
it('getStatusesByIds', function(done) {
|
||||
TestHelper.initBasic(() => {
|
||||
var ids = [];
|
||||
ids.push(TestHelper.basicUser().id);
|
||||
|
||||
TestHelper.basicClient().getStatusesByIds(
|
||||
ids,
|
||||
function(data) {
|
||||
assert.equal(data[TestHelper.basicUser().id] != null, true);
|
||||
done();
|
||||
},
|
||||
function(err) {
|
||||
@@ -519,7 +591,6 @@ describe('Client.User', function() {
|
||||
);
|
||||
});
|
||||
});
|
||||
*/
|
||||
|
||||
it('setActiveChannel', function(done) {
|
||||
TestHelper.initBasic(() => {
|
||||
|
||||
Reference in New Issue
Block a user