github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-26 06:15:51 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Display similar topics for anons on mobile. (#22907)

Browse Source 
We never propagated the preference change because of the early return, meaning lists listening to it never got to decide if they had to remain hidden.

Also, we don't want to track the preference when there's a single list, as the user didn't choose to see it.
This commit is contained in:
Roman Rizzi 2023-08-01 13:34:02 -03:00 committed by GitHub
parent ed000be722
commit a418dce1aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/assets/javascripts/discourse/app/components/more-topics.js
View File

@ -34,18 +34,21 @@ export default class MoreTopics extends Component {
};
});
if (pills.length <= 1) {
this.singleList = true;
}
if (this.singleList || !this.site.mobileView) {
if (pills.length === 0) {
return;
} else if (pills.length === 1) {
this.singleList = true;
}
let preference = this.moreTopicsPreferenceTracking.preference;
if (!preference) {
this.moreTopicsPreferenceTracking.updatePreference(pills[0].id);
const rememberPref = this.site.mobileView && !this.singleList;
this.moreTopicsPreferenceTracking.updatePreference(
pills[0].id,
rememberPref
);
preference = pills[0].id;
}

7
app/assets/javascripts/discourse/app/services/more-topics-preference-tracking.js
View File

@ -13,8 +13,11 @@ export default class MoreTopicsPreferenceTracking extends Service {
this.preference = this.keyValueStore.get(TOPIC_LIST_PREFERENCE_KEY);
}
updatePreference(value) {
this.keyValueStore.set({ key: TOPIC_LIST_PREFERENCE_KEY, value });
updatePreference(value, rememberPref = false) {
if (!rememberPref) {
this.keyValueStore.set({ key: TOPIC_LIST_PREFERENCE_KEY, value });
}
this.preference = value;
}
}

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

@ -764,12 +764,9 @@ acceptance(
await publishUnreadToMessageBus({ userId: 5, topicId: 2 });
assert.ok(
query(".suggested-topics-message")
.innerText.trim()
.match(
/There is 1 unread\s+ and 1 new message remaining, or browse other personal messages/
),
assert.strictEqual(
query(".suggested-topics-message").innerText.trim(),
"There is 1 unread and 1 new message remaining, or browse other personal messages",
"displays the right browse more message"
);
@ -816,7 +813,7 @@ acceptance(
query(".suggested-topics-message")
.innerText.trim()
.match(
/There is 1 unread\s+ and 1 new message remaining, or browse other messages in\s+awesome_group/
/There is 1 unread and 1 new message remaining, or browse other messages in\s+awesome_group/
),
"displays the right browse more message"
);