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

FIX: Correct tracking context for some category routes (#14685)

Browse Source 
We were previously showing the "n new or updated topics" alert on
category routes like `/c/category-slug/ID/none` on every new/unread
topic update. This PR looks up the category by ID, which should be more
precise.
This commit is contained in:
Penar Musaraj
2021-10-25 15:05:00 -04:00
committed by GitHub
parent facf7d6f56
commit 116982fca9
2 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/assets/javascripts/discourse/app/models/topic-tracking-state.js
View File

@@ -284,13 +284,15 @@ const TopicTrackingState = EmberObject.extend({
trackIncoming(filter) {
this.newIncoming = [];
const split = filter.split("/");
if (split.length >= 4) {
filter = split[split.length - 1];
let category = Category.findSingleBySlug(
split.splice(1, split.length - 4).join("/")
);
if (filter.startsWith("c/")) {
const categoryId = filter.match(/\/(\d*)\//);
const category = Category.findById(parseInt(categoryId[1], 10));
this.set("filterCategory", category);
const split = filter.split("/");
if (split.length >= 4) {
filter = split[split.length - 1];
}
} else {
this.set("filterCategory", null);
}

41
app/assets/javascripts/discourse/tests/unit/models/topic-tracking-state-test.js
View File

@@ -745,20 +745,9 @@ discourseModule("Unit | Model | topic-tracking-state", function (hooks) {
});
test("subscribe to category", function (assert) {
const store = createStore();
const darth = store.createRecord("category", { id: 1, slug: "darth" }),
luke = store.createRecord("category", {
id: 2,
slug: "luke",
parentCategory: darth,
}),
categoryList = [darth, luke];
sinon.stub(Category, "list").returns(categoryList);
const trackingState = TopicTrackingState.create();
trackingState.trackIncoming("c/darth/1/l/latest");
trackingState.trackIncoming("c/feature/2/l/latest");
trackingState.notifyIncoming({
message_type: "new_topic",
@@ -773,7 +762,7 @@ discourseModule("Unit | Model | topic-tracking-state", function (hooks) {
trackingState.notifyIncoming({
message_type: "new_topic",
topic_id: 3,
payload: { category_id: 1 },
payload: { category_id: 26 },
});
assert.equal(
@@ -783,7 +772,7 @@ discourseModule("Unit | Model | topic-tracking-state", function (hooks) {
);
trackingState.resetTracking();
trackingState.trackIncoming("c/darth/luke/2/l/latest");
trackingState.trackIncoming("c/feature/spec/26/l/latest");
trackingState.notifyIncoming({
message_type: "new_topic",
@@ -795,10 +784,17 @@ discourseModule("Unit | Model | topic-tracking-state", function (hooks) {
topic_id: 2,
payload: { category_id: 3 },
});
assert.equal(
trackingState.get("incomingCount"),
0,
"parent or other category doesn't affect subcategory"
);
trackingState.notifyIncoming({
message_type: "new_topic",
topic_id: 3,
payload: { category_id: 1 },
payload: { category_id: 26 },
});
assert.equal(
@@ -806,6 +802,21 @@ discourseModule("Unit | Model | topic-tracking-state", function (hooks) {
1,
"expect to properly track incoming for subcategory"
);
trackingState.resetTracking();
trackingState.trackIncoming("c/feature/spec/26/none/l/latest");
trackingState.notifyIncoming({
message_type: "new_topic",
topic_id: 3,
payload: { category_id: 26 },
});
assert.equal(
trackingState.get("incomingCount"),
1,
"expect to properly track incoming for subcategory using none tags route"
);
});
test("getSubCategoryIds", function (assert) {