From fb18e7965f838d049e724f3969231ff3ba7b80cb Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Mon, 11 Jun 2018 14:30:33 -0300 Subject: [PATCH 1/2] fix sorting by asc on favorites DM --- .../rocketchat-ui-sidenav/client/roomList.js | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/packages/rocketchat-ui-sidenav/client/roomList.js b/packages/rocketchat-ui-sidenav/client/roomList.js index 194a95c33d675..54bad4bb2df22 100644 --- a/packages/rocketchat-ui-sidenav/client/roomList.js +++ b/packages/rocketchat-ui-sidenav/client/roomList.js @@ -26,6 +26,7 @@ Template.roomList.helpers({ sort.lm = -1; } else { // alphabetical sort[this.identifier === 'd' && RocketChat.settings.get('UI_Use_Real_Name') ? 'lowerCaseFName' : 'lowerCaseName'] = /descending/.test(sortBy) ? -1 : 1; + sort['name'] = /descending/.test(sortBy) ? -1 : 1; } if (this.identifier === 'unread') { @@ -100,11 +101,13 @@ Template.roomList.helpers({ } }); -const getLowerCaseNames = (room) => { - const lowerCaseNamesRoom = {}; - lowerCaseNamesRoom.lowerCaseName = room.name ? room.name.toLowerCase() : undefined; - lowerCaseNamesRoom.lowerCaseFName = room.fname ? room.fname.toLowerCase() : undefined; - return lowerCaseNamesRoom; +const getLowerCaseNames = (room, nameDefault = '') => { + const name = room.name || nameDefault; + const fname = room.fname || name; + return { + lowerCaseName: name.toLowerCase(), + lowerCaseFName: fname.toLowerCase() + }; }; // RocketChat.Notifications['onUser']('rooms-changed', ); @@ -116,13 +119,15 @@ const mergeSubRoom = (record/*, t*/) => { } record.lastMessage = room.lastMessage; record.lm = room._updatedAt; - return _.extend(record, getLowerCaseNames(record)); + return _.extend(record, getLowerCaseNames(record, record.name)); }; RocketChat.callbacks.add('cachedCollection-received-rooms', (room) => { - const $set = {lastMessage : room.lastMessage, lm: room._updatedAt, ...getLowerCaseNames(room)}; + const sub = RocketChat.models.Subscriptions.findOne({ rid: room._id }); + const $set = {lastMessage : room.lastMessage, lm: room._updatedAt, ...getLowerCaseNames(room, sub.name)}; RocketChat.models.Subscriptions.update({ rid: room._id }, {$set}); }); + RocketChat.callbacks.add('cachedCollection-received-subscriptions', mergeSubRoom); RocketChat.callbacks.add('cachedCollection-sync-subscriptions', mergeSubRoom); RocketChat.callbacks.add('cachedCollection-loadFromServer-subscriptions', mergeSubRoom); From 211f207cdb7232796aa29745f54a7e1eb5fb3784 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Mon, 11 Jun 2018 14:57:36 -0300 Subject: [PATCH 2/2] removed useless param --- packages/rocketchat-ui-sidenav/client/roomList.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/rocketchat-ui-sidenav/client/roomList.js b/packages/rocketchat-ui-sidenav/client/roomList.js index 54bad4bb2df22..28e8d558bcfa4 100644 --- a/packages/rocketchat-ui-sidenav/client/roomList.js +++ b/packages/rocketchat-ui-sidenav/client/roomList.js @@ -119,7 +119,7 @@ const mergeSubRoom = (record/*, t*/) => { } record.lastMessage = room.lastMessage; record.lm = room._updatedAt; - return _.extend(record, getLowerCaseNames(record, record.name)); + return _.extend(record, getLowerCaseNames(record)); }; RocketChat.callbacks.add('cachedCollection-received-rooms', (room) => {