Skip to content

Regression: sorting direct message by asc on favorites group #11090

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ggazzo merged 2 commits into from
Jun 12, 2018
Merged

Regression: sorting direct message by asc on favorites group #11090

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb18e79
fix sorting by asc on favorites DM
ggazzo Jun 11, 2018
211f207
removed useless param
ggazzo Jun 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions packages/rocketchat-ui-sidenav/client/roomList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') {
Expand Down Expand Up @@ -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', );
Expand All @@ -120,9 +123,11 @@ const mergeSubRoom = (record/*, t*/) => {
};

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);