github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-19 03:22:46 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Revert "Cleaner implementation of postsWithPlaceholders and more tests."

Browse Source 
This reverts commit 4c0670a109.
This commit is contained in:
Robin Ward 2015-12-04 15:59:46 -05:00
parent a51c91ac05
commit 255a5be015
3 changed files with 86 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
app/assets/javascripts/discourse/models/post-stream.js.es6
View File

@ -36,9 +36,71 @@ export function loadTopicView(topic, args) {
});
}
const PostsWithPlaceholders = Ember.Object.extend(Ember.Array, {
posts: null,
_appendingIds: null,
init() {
this._appendingIds = {};
},
@computed
length() {
return this.get('posts.length') + Object.keys(this._appendingIds || {}).length;
},
append(cb) {
const l = this.get('posts.length');
this.arrayContentWillChange(l, 0, 1);
cb();
this.arrayContentDidChange(l, 0, 1);
this.propertyDidChange('length');
},
removePost(cb) {
const l = this.get('posts.length') - 1;
this.arrayContentWillChange(l, 1, 0);
cb();
this.arrayContentDidChange(l, 1, 0);
this.propertyDidChange('length');
},
appending(postIds) {
console.log('appending');
const l = this.get('length');
this.arrayContentWillChange(l, 0, postIds.length);
const appendingIds = this._appendingIds;
postIds.forEach(pid => appendingIds[pid] = true);
this.arrayContentDidChange(l, 0, postIds.length);
this.propertyDidChange('length');
},
finishedAppending(postIds) {
const l = this.get('posts.length') - postIds.length;
this.arrayContentWillChange(l, postIds.length, postIds.length);
const appendingIds = this._appendingIds;
postIds.forEach(pid => delete appendingIds[pid]);
this.arrayContentDidChange(l, postIds.length, postIds.length);
this.propertyDidChange('length');
},
finishedPrepending(postIds) {
this.arrayContentDidChange(0, 0, postIds.length);
this.propertyDidChange('length');
},
objectAt(index) {
const posts = this.get('posts');
if (index < posts.length) {
return posts[index];
} else {
return new Placeholder('post-placeholder');
}
},
});
export default RestModel.extend({
_identityMap: null,
_placeholders: null,
posts: null,
stream: null,
userFilters: null,
@ -52,9 +114,8 @@ export default RestModel.extend({
init() {
this._identityMap = {};
this._placeholders = {};
const posts = [];
const postsWithPlaceholders = [];
const postsWithPlaceholders = PostsWithPlaceholders.create({ posts, store: this.store });
this.setProperties({
posts,
@ -329,18 +390,12 @@ export default RestModel.extend({
this.set('loadingBelow', true);
const postsWithPlaceholders = this.get('postsWithPlaceholders');
const placeholders = postIds.map(pid => {
this._placeholders[pid] = this._placeholders[pid] || new Placeholder(pid, 'post-placeholder');
return this._placeholders[pid];
});
postsWithPlaceholders.pushObjects(placeholders);
postsWithPlaceholders.appending(postIds);
return this.findPostsByIds(postIds).then(posts => {
posts.forEach(p => this.appendPost(p));
return posts;
}).finally(() => {
postsWithPlaceholders.removeObjects(placeholders);
postIds.forEach(pid => delete this._placeholders[pid]);
postsWithPlaceholders.finishedAppending(postIds);
this.set('loadingBelow', false);
});
},
@ -357,6 +412,8 @@ export default RestModel.extend({
return this.findPostsByIds(postIds.reverse()).then(posts => {
posts.forEach(p => this.prependPost(p));
}).finally(() => {
const postsWithPlaceholders = this.get('postsWithPlaceholders');
postsWithPlaceholders.finishedPrepending(postIds);
this.set('loadingAbove', false);
});
},
@ -418,8 +475,7 @@ export default RestModel.extend({
**/
undoPost(post) {
this.get('stream').removeObject(-1);
this.get('posts').removeObject(post);
this.get('postsWithPlaceholders').removeObject(post);
this.get('postsWithPlaceholders').removePost(() => this.posts.removeObject(post));
this._identityMap[-1] = null;
const topic = this.get('topic');
@ -439,7 +495,6 @@ export default RestModel.extend({
const posts = this.get('posts');
calcDayDiff(posts.get('firstObject'), stored);
posts.unshiftObject(stored);
this.get('postsWithPlaceholders').unshiftObject(stored);
}
return post;
@ -451,8 +506,13 @@ export default RestModel.extend({
const posts = this.get('posts');
calcDayDiff(stored, this.get('lastAppended'));
this.get('postsWithPlaceholders').addObject(stored);
posts.addObject(stored);
if (!posts.contains(stored)) {
if (!this.get('loadingBelow')) {
this.get('postsWithPlaceholders').append(() => posts.pushObject(stored));
} else {
posts.pushObject(stored);
}
}
if (stored.get('id') !== -1) {
this.set('lastAppended', stored);
@ -469,7 +529,6 @@ export default RestModel.extend({
this.get('stream').removeObjects(postIds);
this.get('posts').removeObjects(posts);
this.get('postsWithPlaceholders').removeObjects(posts);
postIds.forEach(id => delete identityMap[id]);
},

3
app/assets/javascripts/discourse/views/cloaked.js.es6
View File

@ -1,5 +1,4 @@
export function Placeholder(id, viewName) {
this.id = id;
export function Placeholder(viewName) {
this.viewName = viewName;
}

36
test/javascripts/models/post-stream-test.js.es6
View File

@ -44,24 +44,17 @@ test('daysSincePrevious when appending', function(assert) {
assert.equal(p3.get('daysSincePrevious'), 1);
});
test('prepending', assert => {
test('daysSincePrevious when prepending', function(assert) {
const postStream = buildStream(10000001, [1,2,3]);
const store = postStream.store;
const postsWithPlaceholders = postStream.get('postsWithPlaceholders');
const p1 = store.createRecord('post', {id: 1, post_number: 1, created_at: "2015-05-29T18:17:35.868Z"}),
p2 = store.createRecord('post', {id: 2, post_number: 2, created_at: "2015-06-01T01:07:25.761Z"}),
p3 = store.createRecord('post', {id: 3, post_number: 3, created_at: "2015-06-02T01:07:25.761Z"});
postStream.prependPost(p3);
assert.equal(postStream.get('posts.length'), 1);
assert.equal(postsWithPlaceholders.get('length'), 1);
postStream.prependPost(p2);
assert.equal(postStream.get('posts.length'), 2);
assert.equal(postsWithPlaceholders.get('length'), 2);
postStream.prependPost(p1);
assert.equal(postStream.get('posts.length'), 3);
assert.equal(postsWithPlaceholders.get('length'), 3);
assert.ok(!p1.get('daysSincePrevious'));
assert.equal(p2.get('daysSincePrevious'), 2);
@ -71,7 +64,6 @@ test('prepending', assert => {
test('appending posts', function() {
const postStream = buildStream(4567, [1, 3, 4]);
const store = postStream.store;
const postsWithPlaceholders = postStream.get('postsWithPlaceholders');
equal(postStream.get('firstPostId'), 1);
equal(postStream.get('lastPostId'), 4, "the last post id is 4");
@ -80,29 +72,24 @@ test('appending posts', function() {
ok(!postStream.get('firstPostPresent'), "the first post is not loaded");
ok(!postStream.get('loadedAllPosts'), "the last post is not loaded");
equal(postStream.get('posts.length'), 0, "it has no posts initially");
equal(postsWithPlaceholders.get('length'), 0);
postStream.appendPost(store.createRecord('post', {id: 2, post_number: 2}));
ok(!postStream.get('firstPostPresent'), "the first post is still not loaded");
equal(postStream.get('posts.length'), 1, "it has one post in the stream");
equal(postsWithPlaceholders.get('length'), 1);
postStream.appendPost(store.createRecord('post', {id: 4, post_number: 4}));
ok(!postStream.get('firstPostPresent'), "the first post is still loaded");
ok(postStream.get('loadedAllPosts'), "the last post is now loaded");
equal(postStream.get('posts.length'), 2, "it has two posts in the stream");
equal(postsWithPlaceholders.get('length'), 2);
postStream.appendPost(store.createRecord('post', {id: 4, post_number: 4}));
equal(postStream.get('posts.length'), 2, "it will not add the same post with id twice");
equal(postsWithPlaceholders.get('length'), 2);
const stagedPost = store.createRecord('post', {raw: 'incomplete post'});
postStream.appendPost(stagedPost);
equal(postStream.get('posts.length'), 3, "it can handle posts without ids");
postStream.appendPost(stagedPost);
equal(postStream.get('posts.length'), 3, "it won't add the same post without an id twice");
equal(postsWithPlaceholders.get('length'), 3);
// change the stream
postStream.set('stream', [1, 2, 4]);
@ -143,7 +130,6 @@ test('updateFromJson', function() {
test("removePosts", function() {
const postStream = buildStream(10000001, [1,2,3]);
const store = postStream.store;
const postsWithPlaceholders = postStream.get('postsWithPlaceholders');
const p1 = store.createRecord('post', {id: 1, post_number: 2}),
p2 = store.createRecord('post', {id: 2, post_number: 3}),
@ -152,17 +138,15 @@ test("removePosts", function() {
postStream.appendPost(p1);
postStream.appendPost(p2);
postStream.appendPost(p3);
equal(postsWithPlaceholders.get('length'), 3);
// Removing nothing does nothing
postStream.removePosts();
equal(postStream.get('posts.length'), 3);
equal(postsWithPlaceholders.get('length'), 3);
postStream.removePosts([p1, p3]);
equal(postStream.get('posts.length'), 1);
deepEqual(postStream.get('stream'), [2]);
equal(postsWithPlaceholders.get('length'), 1);
});
test("cancelFilter", function() {
@ -350,7 +334,6 @@ test("loading a post's history", function() {
test("staging and undoing a new post", function() {
const postStream = buildStream(10101, [1]);
const store = postStream.store;
const postsWithPlaceholders = postStream.get('postsWithPlaceholders');
const original = store.createRecord('post', {id: 1, post_number: 1, topic_id: 10101});
postStream.appendPost(original);
@ -364,7 +347,6 @@ test("staging and undoing a new post", function() {
posts_count: 1,
highest_post_number: 1
});
equal(postsWithPlaceholders.get('length'), 1);
// Stage the new post in the stream
const result = postStream.stagePost(stagedPost, user);
@ -374,7 +356,6 @@ test("staging and undoing a new post", function() {
ok(postStream.get('lastAppended'), original, "it doesn't consider staged posts as the lastAppended");
equal(topic.get('posts_count'), 2, "it increases the post count");
equal(postsWithPlaceholders.get('length'), 2);
present(topic.get('last_posted_at'), "it updates last_posted_at");
equal(topic.get('details.last_poster'), user, "it changes the last poster");
@ -390,7 +371,6 @@ test("staging and undoing a new post", function() {
ok(!postStream.get('loading'), "it is no longer loading");
equal(topic.get('highest_post_number'), 1, "it reverts the highest_post_number");
equal(topic.get('posts_count'), 1, "it reverts the post count");
equal(postsWithPlaceholders.get('length'), 1);
equal(postStream.get('filteredPostsCount'), 1, "it retains the filteredPostsCount");
ok(!postStream.get('posts').contains(stagedPost), "the post is removed from the stream");
ok(postStream.get('lastAppended'), original, "it doesn't consider undid post lastAppended");
@ -399,7 +379,6 @@ test("staging and undoing a new post", function() {
test("staging and committing a post", function() {
const postStream = buildStream(10101, [1]);
const store = postStream.store;
const postsWithPlaceholders = postStream.get('postsWithPlaceholders');
const original = store.createRecord('post', {id: 1, post_number: 1, topic_id: 10101});
postStream.appendPost(original);
@ -411,8 +390,6 @@ test("staging and committing a post", function() {
const topic = postStream.get('topic');
topic.set('posts_count', 1);
equal(postsWithPlaceholders.get('length'), 1);
// Stage the new post in the stream
let result = postStream.stagePost(stagedPost, user);
equal(result, "staged", "it returns staged");
@ -423,7 +400,6 @@ test("staging and committing a post", function() {
result = postStream.stagePost(stagedPost, user);
equal(result, "alreadyStaging", "you can't stage a post while it is currently staging");
ok(postStream.get('lastAppended'), original, "staging a post doesn't change the lastAppended");
equal(postsWithPlaceholders.get('length'), 2);
postStream.commitPost(stagedPost);
ok(postStream.get('posts').contains(stagedPost), "the post is still in the stream");
@ -436,7 +412,6 @@ test("staging and committing a post", function() {
ok(postStream.indexOf(stagedPost) > -1, "the post is in the stream");
equal(found.get('raw'), 'different raw value', 'it also updated the value in the stream');
ok(postStream.get('lastAppended'), found, "comitting a post changes lastAppended");
equal(postsWithPlaceholders.get('length'), 2);
});
test('triggerNewPostInStream', function() {
@ -508,6 +483,8 @@ test("postsWithPlaceholders", () => {
const postsWithPlaceholders = postStream.get('postsWithPlaceholders');
const store = postStream.store;
const testProxy = Ember.ArrayProxy.create({ content: postsWithPlaceholders });
const p1 = store.createRecord('post', {id: 1, post_number: 1});
const p2 = store.createRecord('post', {id: 2, post_number: 2});
const p3 = store.createRecord('post', {id: 3, post_number: 3});
@ -519,6 +496,7 @@ test("postsWithPlaceholders", () => {
// Test enumerable and array access
equal(postsWithPlaceholders.get('length'), 3);
equal(testProxy.get('length'), 3);
equal(postsWithPlaceholders.nextObject(0), p1);
equal(postsWithPlaceholders.objectAt(0), p1);
equal(postsWithPlaceholders.nextObject(1, p1), p2);
@ -528,13 +506,17 @@ test("postsWithPlaceholders", () => {
const promise = postStream.appendMore();
equal(postsWithPlaceholders.get('length'), 8, 'we immediately have a larger placeholder window');
equal(testProxy.get('length'), 8);
ok(!!postsWithPlaceholders.nextObject(3, p3));
ok(!!postsWithPlaceholders.objectAt(4));
ok(postsWithPlaceholders.objectAt(3) !== p4);
ok(testProxy.objectAt(3) !== p4);
return promise.then(() => {
equal(postsWithPlaceholders.objectAt(3), p4);
equal(postsWithPlaceholders.get('length'), 8, 'have a larger placeholder window when loaded');
equal(testProxy.get('length'), 8);
equal(testProxy.objectAt(3), p4);
});
});