Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UX: Include muted categories on the category page by default (#8842) 

* DEV: Add data-notification-level attribute to category UI

* Show muted categories on the category page by default

This reverts commit ed9c21e42c.

* Remove redundant spec - muted categories are now visible by default
This commit is contained in:
David Taylor 2020-02-03 18:40:02 +00:00 committed by GitHub
parent 6301477b4c
commit 7640914552
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
View File

@ -1,5 +1,5 @@
{{#each categories as |c|}}
<div class='category category-box category-box-{{unbound c.slug}}' style={{border-color c.color}}
<div class='category category-box category-box-{{unbound c.slug}}' style={{border-color c.color}} data-category-id={{c.id}} data-notification-level={{c.notification_level}}
data-url={{c.url}}>
<div class='category-box-inner'>
<div class="category-logo">
@ -28,7 +28,7 @@
</div>
{{#if c.isGrandParent}}
{{#each c.subcategories as |subcategory|}}
<div data-category-id={{subcategory.id}} style={{border-color subcategory.color}} class="subcategory with-subcategories {{if subcategory.uploaded_logo.url 'has-logo' 'no-logo'}}">
<div data-category-id={{subcategory.id}} data-notification-level={{subcategory.notification_level}} style={{border-color subcategory.color}} class="subcategory with-subcategories {{if subcategory.uploaded_logo.url 'has-logo' 'no-logo'}}">
<div class="subcategory-box-inner">
{{category-title-link tagName="h4" category=subcategory}}
{{#if subcategory.subcategories}}

4
app/assets/javascripts/discourse/templates/components/categories-only.hbs
View File

@ -11,7 +11,7 @@
</thead>
<tbody aria-labelledby="categories-only-category">
{{#each categories as |c|}}
<tr data-category-id={{c.id}} class="{{if c.description_excerpt 'has-description' 'no-description'}} {{if c.uploaded_logo.url 'has-logo' 'no-logo'}}">
<tr data-category-id={{c.id}} data-notification-level={{c.notification_level}} class="{{if c.description_excerpt 'has-description' 'no-description'}} {{if c.uploaded_logo.url 'has-logo' 'no-logo'}}">
<td class="category" style={{border-color c.color}}>
{{category-title-link category=c}}
{{#if c.description_excerpt}}
@ -22,7 +22,7 @@
{{#if c.isGrandParent}}
<table class="category-list subcategories-with-subcategories">
{{#each c.subcategories as |subcategory|}}
<tr data-category-id={{subcategory.id}} class="{{if subcategory.description_excerpt 'has-description' 'no-description'}} {{if subcategory.uploaded_logo.url 'has-logo' 'no-logo'}}">
<tr data-category-id={{subcategory.id}} data-notification-level={{subcategory.notification_level}} class="{{if subcategory.description_excerpt 'has-description' 'no-description'}} {{if subcategory.uploaded_logo.url 'has-logo' 'no-logo'}}">
<td class="category" style={{border-color subcategory.color}}>
{{category-title-link tagName="h4" category=subcategory}}
{{#if subcategory.description_excerpt}}

5
app/models/category_list.rb
View File

@ -20,7 +20,6 @@ class CategoryList
find_categories
prune_empty
prune_muted
find_user_data
sort_unpinned
trim_results
@ -139,10 +138,6 @@ class CategoryList
@categories.delete_if { |c| c.uncategorized? && c.displayable_topics.blank? }
end
def prune_muted
@categories.delete_if { |c| c.notification_level == CategoryUser.notification_levels[:muted] }
end
# Attach some data for serialization to each topic
def find_user_data
if @guardian.current_user && @all_topics.present?

15
spec/models/category_list_spec.rb
View File

@ -53,16 +53,6 @@ describe CategoryList do
expect(CategoryList.new(Guardian.new(nil), include_topics: true).categories.find { |x| x.name == private_cat.name }).to eq(nil)
end
it "properly hide muted categories" do
cat_muted = Fabricate(:category_with_definition)
CategoryUser.create!(user_id: user.id,
category_id: cat_muted.id,
notification_level: CategoryUser.notification_levels[:muted])
# uncategorized + cat_muted for admin
expect(CategoryList.new(Guardian.new admin).categories.count).to eq(2)
expect(CategoryList.new(Guardian.new user).categories.count).to eq(1)
end
end
context "when mute_all_categories_by_default enabled" do
@ -87,11 +77,6 @@ describe CategoryList do
notification_level = CategoryList.new(Guardian.new).categories.find { |c| c.id == category.id }.notification_level
expect(notification_level).to eq(CategoryUser.notification_levels[:regular])
end
it "removes the default muted categories for anonymous" do
SiteSetting.default_categories_muted = category.id.to_s
expect(CategoryList.new(Guardian.new).categories).not_to include(category)
end
end
context "with a category" do