[FIX] Rooms list sorting by activity multiple re-renders and case sensitive sorting alphabetically

packages/rocketchat-api/server/v1/users.js

@@ -327,7 +327,6 @@ RocketChat.API.v1.addRoute('users.setPreferences', { authRequired: true }, {
 				collapseMediaByDefault: Match.Maybe(Boolean),
 				autoImageLoad: Match.Maybe(Boolean),
 				emailNotificationMode: Match.Maybe(String),
-				roomsListExhibitionMode: Match.Maybe(String),
 				unreadAlert: Match.Maybe(Boolean),
 				notificationsSoundVolume: Match.Maybe(Number),
 				desktopNotifications: Match.Maybe(String),
@@ -348,7 +347,7 @@ RocketChat.API.v1.addRoute('users.setPreferences', { authRequired: true }, {
 				sidebarSortby: Match.Optional(String),
 				sidebarViewMode: Match.Optional(String),
 				sidebarHideAvatar: Match.Optional(Boolean),
-				groupByType: Match.Optional(Boolean),
+				sidebarGroupByType: Match.Optional(Boolean),
 				muteFocusedConversations: Match.Optional(Boolean)
 			})
 		});

packages/rocketchat-authorization/client/lib/models/Users.js

@@ -11,7 +11,7 @@ Object.assign(RocketChat.models.Users, {
 			roles: roleName
 		};
 
-		return !_.isUndefined(this.findOne(query));
+		return !_.isUndefined(this.findOne(query, {fields: {roles: 1}}));
 	},
 
 	findUsersInRoles(roles, scope, options) {

packages/rocketchat-authorization/server/models/Base.js

@@ -17,7 +17,7 @@ RocketChat.models._Base.prototype.isUserInRole = function(userId, roleName, scop
 	}
 
 	query.roles = roleName;
-	return !_.isUndefined(this.findOne(query));
+	return !_.isUndefined(this.findOne(query, {fields: {roles: 1}}));
 };
 
 RocketChat.models._Base.prototype.addRolesByUserId = function(userId, roles, scope) {

packages/rocketchat-lib/client/lib/cachedCollection.js

@@ -86,6 +86,13 @@ class CachedCollectionManager {
 
 RocketChat.CachedCollectionManager = new CachedCollectionManager;
 
+const debug = false;
+
+const nullLog = function() {};
+
+const log = function(...args) {
+	console.log(`CachedCollection ${ this.name } =>`, ...args);
+};
 
 class CachedCollection {
 	constructor({
@@ -98,7 +105,6 @@ class CachedCollection {
 		userRelated = true,
 		useSync = true,
 		useCache = true,
-		debug = false,
 		version = 7,
 		maxCacheTime = 60*60*24*30,
 		onSyncData = (/* action, record */) => {}
@@ -119,7 +125,7 @@ class CachedCollection {
 		this.updatedAt = new Date(0);
 		this.maxCacheTime = maxCacheTime;
 		this.onSyncData = onSyncData;
-
+		this.log = debug ? log : nullLog;
 		RocketChat.CachedCollectionManager.register(this);
 
 		if (userRelated === true) {
@@ -137,12 +143,6 @@ class CachedCollection {
 		}
 	}
 
-	log(...args) {
-		if (this.debug === true) {
-			console.log(`CachedCollection ${ this.name } =>`, ...args);
-		}
-	}
-
 	countQueries() {
 		this.log(`${ Object.keys(this.collection._collection.queries).length } queries`);
 	}
@@ -184,6 +184,7 @@ class CachedCollection {
 			if (data && data.records && data.records.length > 0) {
 				this.log(`${ data.records.length } records loaded from cache`);
 				data.records.forEach((record) => {
+					RocketChat.callbacks.run(`cachedCollection-loadFromCache-${ this.name }`, record);
 					record.__cache__ = true;
 					this.collection.upsert({ _id: record._id }, _.omit(record, '_id'));
 
@@ -207,6 +208,7 @@ class CachedCollection {
 			this.log(`${ data.length } records loaded from server`);
 			data.forEach((record) => {
 				delete record.$loki;
+				RocketChat.callbacks.run(`cachedCollection-loadFromServer-${ this.name }`, record, 'changed');
 				this.collection.upsert({ _id: record._id }, _.omit(record, '_id'));
 
 				this.onSyncData('changed', record);
@@ -269,7 +271,7 @@ class CachedCollection {
 
 			for (const record of changes) {
 				delete record.$loki;
-
+				RocketChat.callbacks.run(`cachedCollection-sync-${ this.name }`, record, record._deletedAt? 'removed' : 'changed');
 				if (record._deletedAt) {
 					this.collection.remove({ _id: record._id });
 
@@ -329,6 +331,7 @@ class CachedCollection {
 	setupListener(eventType, eventName) {
 		RocketChat.Notifications[eventType || this.eventType](eventName || this.eventName, (t, record) => {
 			this.log('record received', t, record);
+			RocketChat.callbacks.run(`cachedCollection-received-${ this.name }`, record, t);
 			if (t === 'removed') {
 				this.collection.remove(record._id);
 				RoomManager.close(record.t+record.name);

packages/rocketchat-lib/lib/getUserPreference.js

@@ -4,7 +4,9 @@
 */
 RocketChat.getUserPreference = function(user, key, defaultValue=undefined) {
 	let preference;
-
+	if (typeof user === typeof '') {
+		user = RocketChat.models.Users.findOne(user, {fields: {[`settings.preferences.${ key }`]: 1}});
+	}
 	if (user && user.settings && user.settings.preferences &&
 		user.settings.preferences.hasOwnProperty(key)) {
 		preference = user.settings.preferences[key];

packages/rocketchat-lib/lib/roomTypes/conversation.js

@@ -10,8 +10,7 @@ export class ConversationRoomType extends RoomTypeConfig {
 	}
 
 	condition() {
-		const user = Meteor.user();
-		// returns true only if groupByType is not set
-		return !RocketChat.getUserPreference(user, 'groupByType');
+		// returns true only if sidebarGroupByType is not set
+		return !RocketChat.getUserPreference(Meteor.userId(), 'sidebarGroupByType');
 	}
 }

packages/rocketchat-lib/lib/roomTypes/direct.js

@@ -61,8 +61,7 @@ export class DirectMessageRoomType extends RoomTypeConfig {
 	}
 
 	condition() {
-		const user = Meteor.user();
-		const groupByType = RocketChat.getUserPreference(user, 'groupByType');
+		const groupByType = RocketChat.getUserPreference(Meteor.userId(), 'sidebarGroupByType');
 		return groupByType && RocketChat.authz.hasAtLeastOnePermission(['view-d-room', 'view-joined-room']);
 	}
 

packages/rocketchat-lib/lib/roomTypes/favorite.js

@@ -11,7 +11,6 @@ export class FavoriteRoomType extends RoomTypeConfig {
 		});
 	}
 	condition() {
-		const user = Meteor.user();
-		return RocketChat.settings.get('Favorite_Rooms') && RocketChat.getUserPreference(user, 'sidebarShowFavorites');
+		return RocketChat.settings.get('Favorite_Rooms') && RocketChat.getUserPreference(Meteor.userId(), 'sidebarShowFavorites');
 	}
 }

packages/rocketchat-lib/lib/roomTypes/private.js

@@ -43,8 +43,7 @@ export class PrivateRoomType extends RoomTypeConfig {
 	}
 
 	condition() {
-		const user = Meteor.user();
-		const groupByType = RocketChat.getUserPreference(user, 'groupByType');
+		const groupByType = RocketChat.getUserPreference(Meteor.userId(), 'sidebarGroupByType');
 		return groupByType && RocketChat.authz.hasAllPermission('view-p-room');
 	}
 

packages/rocketchat-lib/lib/roomTypes/public.js

@@ -41,9 +41,7 @@ export class PublicRoomType extends RoomTypeConfig {
 	}
 
 	condition() {
-		const user = Meteor.user();
-		// const roomsListExhibitionMode = RocketChat.getUserPreference(user, 'roomsListExhibitionMode');
-		const groupByType = RocketChat.getUserPreference(user, 'groupByType');
+		const groupByType = RocketChat.getUserPreference(Meteor.userId(), 'sidebarGroupByType');
 		return groupByType && (RocketChat.authz.hasAtLeastOnePermission(['view-c-room', 'view-joined-room']) || RocketChat.settings.get('Accounts_AllowAnonymousRead') === true);
 	}
 

packages/rocketchat-lib/lib/roomTypes/unread.js

@@ -12,7 +12,6 @@ export class UnreadRoomType extends RoomTypeConfig {
 	}
 
 	condition() {
-		const user = Meteor.user();
-		return RocketChat.getUserPreference(user, 'sidebarShowUnread');
+		return RocketChat.getUserPreference(Meteor.userId(), 'sidebarShowUnread');
 	}
 }

packages/rocketchat-lib/server/startup/settings.js

@@ -299,24 +299,10 @@ RocketChat.settings.addGroup('Accounts', function() {
 			'public': true,
 			i18nLabel: 'Hide_Avatars'
 		});
-		this.add('Accounts_Default_User_Preferences_roomsListExhibitionMode', 'category', {
-			type: 'select',
-			values: [
-				{
-					key: 'unread',
-					i18nLabel: 'Unread_Rooms_Mode'
-				},
-				{
-					key: 'activity',
-					i18nLabel: 'Sort_by_activity'
-				},
-				{
-					key: 'category',
-					i18nLabel: 'Split_by_categories'
-				}
-			],
+		this.add('Accounts_Default_User_Preferences_sidebarGroupByType', true, {
+			type: 'boolean',
 			'public': true,
-			i18nLabel: 'Sidebar_list_mode'
+			i18nLabel: 'Group_by_Type'
 		});
 		this.add('Accounts_Default_User_Preferences_sidebarViewMode', 'medium', {
 			type: 'select',