IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

UX: PM inboxes being expanded incorrectly when viewing tags. (#14478)

Browse Source 
Follow-up to 9d5da2b383
This commit is contained in:
Alan Guo Xiang Tan 2021-10-01 10:48:30 +08:00 committed by GitHub
parent 62b27ea9f3
commit dad4781806
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/discourse/app/controllers/user-private-messages.js
View File

@ -12,7 +12,8 @@ export default Controller.extend({
pmView: false, pmView: false,
viewingSelf: alias("user.viewingSelf"), viewingSelf: alias("user.viewingSelf"),
isGroup: equal("pmView", "groups"), isGroup: equal("pmView", "group"),
isPersonal: equal("pmView", "user"),
group: null, group: null,
groupFilter: alias("group.name"), groupFilter: alias("group.name"),
currentPath: alias("router._router.currentPath"), currentPath: alias("router._router.currentPath"),

6
app/assets/javascripts/discourse/app/templates/user/messages.hbs
View File

@ -6,7 +6,7 @@
{{/link-to}} {{/link-to}}
</li> </li>
{{#unless group}} {{#if isPersonal}}
<li class="archive"> <li class="archive">
{{#link-to "userPrivateMessages.sent" model}} {{#link-to "userPrivateMessages.sent" model}}
{{i18n "user.messages.sent"}} {{i18n "user.messages.sent"}}
@ -32,7 +32,7 @@
{{i18n "user.messages.archive"}} {{i18n "user.messages.archive"}}
{{/link-to}} {{/link-to}}
</li> </li>
{{/unless}} {{/if}}
{{#each model.groups as |group|}} {{#each model.groups as |group|}}
{{#if group.has_messages}} {{#if group.has_messages}}
@ -43,7 +43,7 @@
{{/link-to}} {{/link-to}}
</li> </li>
{{#if (eq groupFilter group.name)}} {{#if (and isGroup (eq groupFilter group.name))}}
{{#if viewingSelf}} {{#if viewingSelf}}
<li class="archive"> <li class="archive">
{{#link-to "userPrivateMessages.groupNew" group.name class="new"}} {{#link-to "userPrivateMessages.groupNew" group.name class="new"}}

14
app/assets/javascripts/discourse/tests/acceptance/user-private-messages-test.js
View File

@ -73,6 +73,10 @@ acceptance(
}); });
needs.pretender((server, helper) => { needs.pretender((server, helper) => {
server.get("/tags/personal_messages/:username.json", () => {
return helper.response({ tags: [] });
});
server.get("/t/13.json", () => { server.get("/t/13.json", () => {
const response = { ...fixturesByUrl["/t/12/1.json"] }; const response = { ...fixturesByUrl["/t/12/1.json"] };
response.suggested_group_name = "awesome_group"; response.suggested_group_name = "awesome_group";
@ -268,6 +272,16 @@ acceptance(
); );
}; };
test("viewing messages filtered by tags", async function (assert) {
await visit("/u/charlie/messages/tags");
assert.equal(
count(".action-list li"),
3,
"it does not expand personal or group inbox"
);
});
test("incoming group archive message acted by current user", async function (assert) { test("incoming group archive message acted by current user", async function (assert) {
await visit("/u/charlie/messages"); await visit("/u/charlie/messages");