github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-29 03:58:34 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Build correct topic list filter (#11473)

Browse Source 
* FIX: 'false' value was treated as a truthy value

For example, latest.json?no_subcategories=false used to have set
no_subcategories to the string value of 'false', which is not false.

* DEV: Remove dead code

* FIX: Redirect to /none under the right conditions

These conditions are:
 - neither /all or /none present
 - only for default filter

* FIX: Build correct topic list filter

/none was never added to the topic list filter

* FIX: Do not show count for subcategories if 'none' category

* FIX: preload_key must contain /none if no_subcategories
This commit is contained in:
Bianca Nenciu 2020-12-11 14:20:48 +02:00 committed by GitHub
parent 36b4712349
commit df26d2e72a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/discourse/app/models/nav-item.js
View File

@ -75,12 +75,13 @@ const NavItem = EmberObject.extend({
"name",
"category",
"tagId",
"noSubcategories",
"topicTrackingState.messageCount"
)
count(name, category, tagId) {
count(name, category, tagId, noSubcategories) {
const state = this.topicTrackingState;
if (state) {
return state.lookupCount(name, category, tagId);
return state.lookupCount(name, category, tagId, noSubcategories);
}
},
});

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

@ -466,8 +466,10 @@ const TopicTrackingState = EmberObject.extend({
return new Set(result);
},
countCategoryByState(type, categoryId, tagId) {
const subcategoryIds = this.getSubCategoryIds(categoryId);
countCategoryByState(type, categoryId, tagId, noSubcategories) {
const subcategoryIds = noSubcategories
? new Set()
: this.getSubCategoryIds(categoryId);
const mutedCategoryIds =
this.currentUser && this.currentUser.muted_category_ids;
let filter = type === "new" ? isNew : isUnread;
@ -485,12 +487,17 @@ const TopicTrackingState = EmberObject.extend({
).length;
},
countNew(categoryId, tagId) {
return this.countCategoryByState("new", categoryId, tagId);
countNew(categoryId, tagId, noSubcategories) {
return this.countCategoryByState("new", categoryId, tagId, noSubcategories);
},
countUnread(categoryId, tagId) {
return this.countCategoryByState("unread", categoryId, tagId);
countUnread(categoryId, tagId, noSubcategories) {
return this.countCategoryByState(
"unread",
categoryId,
tagId,
noSubcategories
);
},
forEachTracked(fn) {
@ -548,20 +555,20 @@ const TopicTrackingState = EmberObject.extend({
return sum;
},
lookupCount(name, category, tagId) {
lookupCount(name, category, tagId, noSubcategories) {
if (name === "latest") {
return (
this.lookupCount("new", category, tagId) +
this.lookupCount("unread", category, tagId)
this.lookupCount("new", category, tagId, noSubcategories) +
this.lookupCount("unread", category, tagId, noSubcategories)
);
}
let categoryId = category ? get(category, "id") : null;
if (name === "new") {
return this.countNew(categoryId, tagId);
return this.countNew(categoryId, tagId, noSubcategories);
} else if (name === "unread") {
return this.countUnread(categoryId, tagId);
return this.countUnread(categoryId, tagId, noSubcategories);
} else {
const categoryName = name.split("/")[1];
if (categoryName) {

55
app/assets/javascripts/discourse/app/routes/build-category-route.js
View File

@ -20,42 +20,7 @@ export default (filterArg, params) => {
return DiscourseRoute.extend({
queryParams,
serialize(modelParams) {
if (!modelParams.category_slug_path_with_id) {
if (modelParams.id === "none") {
const category_slug_path_with_id = [
modelParams.parentSlug,
modelParams.slug,
].join("/");
const category = Category.findBySlugPathWithID(
category_slug_path_with_id
);
this.replaceWith("discovery.categoryNone", {
category,
category_slug_path_with_id,
});
} else if (modelParams.id === "all") {
modelParams.category_slug_path_with_id = [
modelParams.parentSlug,
modelParams.slug,
].join("/");
} else {
modelParams.category_slug_path_with_id = [
modelParams.parentSlug,
modelParams.slug,
modelParams.id,
]
.filter((x) => x)
.join("/");
}
}
return modelParams;
},
model(modelParams) {
modelParams = this.serialize(modelParams);
const category = Category.findBySlugPathWithID(
modelParams.category_slug_path_with_id
);
@ -88,12 +53,11 @@ export default (filterArg, params) => {
const { category, modelParams } = model;
if (
(!params || params.no_subcategories === undefined) &&
category.default_list_filter === "none" &&
filterArg === "default" &&
modelParams &&
modelParams.id !== "all"
filterArg === "default"
) {
this.replaceWith("discovery.categoryNone", {
return this.replaceWith("discovery.categoryNone", {
category,
category_slug_path_with_id: modelParams.category_slug_path_with_id,
});
@ -137,11 +101,14 @@ export default (filterArg, params) => {
},
_retrieveTopicList(category, transition, modelParams) {
const listFilter = `c/${Category.slugFor(category)}/${
category.id
}/l/${this.filter(category)}`,
findOpts = filterQueryParams(modelParams, params),
extras = { cached: this.isPoppedState(transition) };
const findOpts = filterQueryParams(modelParams, params);
const extras = { cached: this.isPoppedState(transition) };
let listFilter = `c/${Category.slugFor(category)}/${category.id}`;
if (findOpts.no_subcategories) {
listFilter += "/none";
}
listFilter += `/l/${this.filter(category)}`;
return findTopicList(
this.store,

4
app/models/topic_list.rb
View File

@ -64,7 +64,11 @@ class TopicList < DraftableList
def preload_key
if @category
if @opts[:no_subcategories]
"topic_list_#{@category.url.sub(/^\//, '')}/none/l/#{@filter}"
else
"topic_list_#{@category.url.sub(/^\//, '')}/l/#{@filter}"
end
else
"topic_list_#{@filter}"
end

4
lib/topic_query_params.rb
View File

@ -16,9 +16,7 @@ module TopicQueryParams
# hacky columns get special handling
options[:topic_ids] = param_to_integer_list(:topic_ids)
if options[:no_subcategories] == 'true'
options[:no_subcategories] = true
end
options[:no_subcategories] = options[:no_subcategories] == 'true' if options[:no_subcategories].present?
options
end

14
spec/models/topic_list_spec.rb
View File

@ -90,4 +90,18 @@ describe TopicList do
end
end
end
describe "#preload_key" do
let(:category) { Fabricate(:category) }
it "generates correct key for categories" do
topic_list = TopicList.new('latest', nil, nil, category: category, category_id: category.id)
expect(topic_list.preload_key).to eq("topic_list_c/#{category.slug}/#{category.id}/l/latest")
end
it "generates correct key for 'no subcategories' option" do
topic_list = TopicList.new('latest', nil, nil, category: category, category_id: category.id, no_subcategories: true)
expect(topic_list.preload_key).to eq("topic_list_c/#{category.slug}/#{category.id}/none/l/latest")
end
end
end

9
spec/requests/list_controller_spec.rb
View File

@ -88,6 +88,9 @@ RSpec.describe ListController do
end
describe "categories and X" do
let(:category) { Fabricate(:category_with_definition) }
let(:sub_category) { Fabricate(:category_with_definition, parent_category: category) }
it "returns top topics" do
Fabricate(:topic, like_count: 1000, posts_count: 100)
TopTopic.refresh!
@ -100,6 +103,12 @@ RSpec.describe ListController do
data = response.parsed_body
expect(data["topic_list"]["topics"].length).to eq(2)
end
it "returns topics from subcategories when no_subcategories=false" do
Fabricate(:topic, category: sub_category)
get "/c/#{category.slug}/#{category.id}/l/latest.json?no_subcategories=false"
expect(response.parsed_body["topic_list"]["topics"].length).to eq(2)
end
end
describe 'titles for crawler layout' do