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

Sort converation parts by insertedAt:asc #1661

Merged
merged 1 commit into from
Dec 28, 2017
Merged

Sort converation parts by insertedAt:asc #1661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/templates/components/conversations/conversation-thread.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
sentAt=conversation.message.insertedAt
}}
{{/if}}
{{#each conversation.conversationParts as |conversationPart|}}
{{#each (sort-by "insertedAt:asc" conversation.conversationParts) as |conversationPart|}}
{{#if conversationPart.isLoaded}}
{{conversations/conversation-part
author=conversationPart.author
Expand Down
14 changes: 7 additions & 7 deletions tests/integration/components/conversations/conversation-thread-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,21 +60,21 @@ test('it delays rendering head until loaded', function(assert) {
assert.equal(page.conversationParts().count, 0, 'No part is rendered.');
});

test('it renders each conversation part', function(assert) {
test('it renders each conversation part, sorted by insertedAt', function(assert) {
assert.expect(4);

let conversationParts = [
{ isLoaded: true, body: 'foo 1' },
{ isLoaded: true, body: 'foo 2' },
{ isLoaded: true, body: 'foo 3' }
{ isLoaded: true, body: 'foo 1', insertedAt: new Date('2017-11-01') },
{ isLoaded: true, body: 'foo 2', insertedAt: new Date('2017-12-01') },
{ isLoaded: true, body: 'foo 3', insertedAt: new Date('2017-10-01') }
];
set(this, 'conversation', { conversationParts });
renderPage();

assert.equal(page.conversationParts().count, 3, 'Each part is rendered.');
assert.equal(page.conversationParts(0).body.text, 'foo 1', 'Part 1 is rendered correctly.');
assert.equal(page.conversationParts(1).body.text, 'foo 2', 'Part 2 is rendered correctly.');
assert.equal(page.conversationParts(2).body.text, 'foo 3', 'Part 3 is rendered correctly.');
assert.equal(page.conversationParts(1).body.text, 'foo 1', 'Part 1 is rendered second to last.');
assert.equal(page.conversationParts(2).body.text, 'foo 2', 'Part 2 is rendered last (newest).');
assert.equal(page.conversationParts(0).body.text, 'foo 3', 'Part 3 is rendered first (earliest date).');
});

test('it delays rendering conversation parts not yet loaded', function(assert) {
Expand Down