Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions assets/javascripts/discourse/models/docs.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import EmberObject from "@ember/object";
import { ajax } from "discourse/lib/ajax";
import Topic from "discourse/models/topic";
import User from "discourse/models/user";
import { getDocs } from "../../lib/get-docs";

const Docs = EmberObject.extend({});
Expand Down Expand Up @@ -41,6 +42,9 @@ Docs.reopenClass({
(topic) => Topic.create(topic)
);
data.topic = Topic.create(data.topic);
data.topic.post_stream?.posts.forEach((post) =>
this._initUserModels(post)
);
return data;
});
},
Expand All @@ -53,6 +57,12 @@ Docs.reopenClass({
return data;
});
},

_initUserModels(post) {
if (post.mentioned_users) {
post.mentioned_users = post.mentioned_users.map((u) => User.create(u));
}
},
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We just need to make sure users data are wrapped into user models to make status live.

});

export default Docs;
63 changes: 63 additions & 0 deletions test/javascripts/acceptance/docs-user-status-test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
import {
acceptance,
publishToMessageBus,
} from "discourse/tests/helpers/qunit-helpers";
import { test } from "qunit";
import docsFixtures from "../fixtures/docs";
import { visit } from "@ember/test-helpers";

acceptance("Docs - user status", function (needs) {
needs.user();
needs.site({ docs_path: "docs" });
needs.settings({
docs_enabled: true,
});

const mentionedUserId = 1;

needs.pretender((server, helper) => {
server.get("/docs.json", () => {
docsFixtures.topic = {
post_stream: {
posts: [
{
id: 427,
topic_id: 1,
username: "admin1",
cooked:
'<p>This is a document.</p>\n<p>I am mentioning another user <a class="mention" href="/u/andrei4">@andrei4</a></p>',
mentioned_users: [
{
id: mentionedUserId,
username: "andrei4",
name: "andrei",
avatar_template:
"/letter_avatar_proxy/v4/letter/a/a87d85/{size}.png",
assign_icon: "user-plus",
assign_path: "/u/andrei4/activity/assigned",
},
],
},
],
stream: [427],
},
};

return helper.response(docsFixtures);
});
});

test("user status on mentions is live", async function (assert) {
await visit("/docs?topic=1");
assert.dom(".mention .user-status").doesNotExist();

const newStatus = { emoji: "surfing_man", description: "surfing" };
await publishToMessageBus(`/user-status`, { [mentionedUserId]: newStatus });
assert
.dom(".mention .user-status")
.hasAttribute("title", newStatus.description);

await publishToMessageBus(`/user-status`, { [mentionedUserId]: null });
assert.dom(".mention .user-status").doesNotExist();
});
});