Skip to content
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

Jump to bottom

Regression: grouping messages on threads #14238

Merged
merged 3 commits into from
Apr 24, 2019
Merged

Regression: grouping messages on threads #14238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ff970a
fix grouping messages
ggazzo Apr 24, 2019
8329ba3
Update message.js
ggazzo Apr 24, 2019
91f3b67
Update message.js
ggazzo Apr 24, 2019
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
2 changes: 1 addition & 1 deletion app/threads/client/flextab/thread.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ <h2 class="contextual-bar__header-title">
<div class="thread-list js-scroll-thread">
<ul class="thread">
{{# with messageContext}}
{{> nrr nrrargs 'message' hideRoles=true msg=mainMessage room=room subscription=subscription settings=settings customClass="thread-message" templatePrefix='thread-' customClass="thread-main" u=u}}
{{> nrr nrrargs 'message' groupable=false hideRoles=true msg=mainMessage room=room subscription=subscription settings=settings customClass="thread-message" templatePrefix='thread-' customClass="thread-main" u=u}}
{{#each msg in messages}}
{{> nrr nrrargs 'message' hideRoles=true msg=msg room=room subscription=subscription settings=settings templatePrefix='thread-' u=u}}
{{/each}}
Expand Down
2 changes: 1 addition & 1 deletion app/threads/client/flextab/threads.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ <h2 class="thread-empty">{{_ "No_Threads"}}</h2>
settings=settings
templatePrefix='threads-'
u=u
noDate=true
showDateSeparator=false
context="threads"
timeAgo=true
}}
Expand Down
22 changes: 11 additions & 11 deletions app/ui-message/client/message.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ Template.message.helpers({
},
isGroupable() {
const { msg, room = {}, settings, groupable } = this;
if (groupable === false || settings.allowGroup === false || room.broadcast || msg.groupable === false || MessageTypes.isSystemMessage(msg)) {
if ((msg.tmid && settings.showreply) || groupable === false || settings.allowGroup === false || room.broadcast || msg.groupable === false || MessageTypes.isSystemMessage(msg)) {
return 'false';
}
},
Expand Down Expand Up @@ -385,8 +385,8 @@ Template.message.helpers({
return !!(tmid && showreply);
},
collapsed() {
const { msg: { tmid, collapsed }, settings: { showreply } } = this;
const isCollapsedThreadReply = tmid && showreply && collapsed !== false;
const { msg: { tmid, collapsed }, settings: { showreply }, shouldCollapseReplies } = this;
const isCollapsedThreadReply = shouldCollapseReplies && tmid && showreply && collapsed !== false;
if (isCollapsedThreadReply) {
return 'collapsed';
}
Expand Down Expand Up @@ -505,20 +505,20 @@ const getPreviousSentMessage = (currentNode) => {
}
};

const setNewDayAndGroup = (currentNode, previousNode, forceDate, period, noDate) => {
const setNewDayAndGroup = (currentNode, previousNode, forceDate, period, showDateSeparator) => {
const { classList, dataset: currentDataset } = currentNode;

if (!previousNode) {
classList.remove('sequential');
!noDate && classList.add('new-day');
showDateSeparator && classList.add('new-day');
return;
}

const { dataset: previousDataset } = previousNode;
const previousMessageDate = new Date(parseInt(previousDataset.timestamp));
const currentMessageDate = new Date(parseInt(currentDataset.timestamp));

if (!noDate && (forceDate || previousMessageDate.toDateString() !== currentMessageDate.toDateString())) {
if (showDateSeparator && previousMessageDate.toDateString() !== currentMessageDate.toDateString()) {
classList.remove('sequential');
classList.add('new-day');
}
Expand All @@ -533,9 +533,9 @@ const setNewDayAndGroup = (currentNode, previousNode, forceDate, period, noDate)
};

Template.message.onViewRendered = function() {
const { settings, forceDate, noDate, groupable, msg } = messageArgs(Template.currentData());
const { settings, forceDate, showDateSeparator = true, groupable, msg } = messageArgs(Template.currentData());

if (noDate && !groupable) {
if (!showDateSeparator && !groupable) {
return;
}

Expand All @@ -547,11 +547,11 @@ Template.message.onViewRendered = function() {
const currentDataset = currentNode.dataset;
const previousNode = getPreviousSentMessage(currentNode);
const nextNode = currentNode.nextElementSibling;
setNewDayAndGroup(currentNode, previousNode, forceDate, settings.Message_GroupingPeriod, noDate);
setNewDayAndGroup(currentNode, previousNode, forceDate, settings.Message_GroupingPeriod, showDateSeparator);
if (nextNode && nextNode.dataset) {
const nextDataset = nextNode.dataset;
if (forceDate || nextDataset.date !== currentDataset.date) {
if (!noDate) {
if (showDateSeparator) {
currentNode.classList.add('new-day');
}
currentNode.classList.remove('sequential');
Expand All @@ -562,7 +562,7 @@ Template.message.onViewRendered = function() {
if (nextDataset.groupable !== 'false') {
if (nextDataset.username !== currentDataset.username || parseInt(nextDataset.timestamp) - parseInt(currentDataset.timestamp) > settings.Message_GroupingPeriod) {
nextNode.classList.remove('sequential');
} else if (!nextNode.classList.contains('new-day') && !currentNode.classList.contains('temp') && !currentNode.dataset.tmid) {
} else if (!nextNode.classList.contains('new-day') && !currentNode.classList.contains('temp')) {
nextNode.classList.add('sequential');
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/ui/client/views/app/room.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
{{/if}}

{{# with messageContext}}
{{#each msg in messagesHistory}}{{#nrr nrrargs 'message' msg=msg room=room subscription=subscription settings=settings u=u}}{{/nrr}}{{/each}}
{{#each msg in messagesHistory}}{{#nrr nrrargs 'message' shouldCollapseReplies=true msg=msg room=room subscription=subscription settings=settings u=u}}{{/nrr}}{{/each}}
{{/with}}

{{#if hasMoreNext}}
Expand Down