github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 09:42:07 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

DEV: Reorder categories in sidebar edit modal (#25792)

Browse Source 
Sort categories by relevance instead of alphabetically.
This commit is contained in:
Daniel Waterworth 2024-02-21 14:35:04 -06:00 committed by GitHub
parent 087712c1a6
commit 9db009bf96
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/categories-modal.gjs
View File

@ -72,8 +72,6 @@ export default class extends Component {
if (this.siteSettings.fixed_category_positions) {
allCategories.sort((a, b) => a.position - b.position);
} else {
allCategories.sort((a, b) => a.name.localeCompare(b.name));
}
this.filteredCategoriesGroupings = splitWhere(

18
spec/system/editing_sidebar_categories_navigation_spec.rb
View File

@ -55,7 +55,7 @@ RSpec.describe "Editing sidebar categories navigation", type: :system do
expect(modal).to have_no_reset_to_defaults_button
expect(modal).to have_categories(
[category, category_subcategory, category_subcategory2, category2, category2_subcategory],
[category2, category2_subcategory, category, category_subcategory2, category_subcategory],
)
modal
@ -165,13 +165,13 @@ RSpec.describe "Editing sidebar categories navigation", type: :system do
modal.filter("subcategory")
expect(modal).to have_categories(
[category, category_subcategory, category_subcategory2, category2, category2_subcategory],
[category2, category2_subcategory, category, category_subcategory2, category_subcategory],
)
modal.filter("2")
expect(modal).to have_categories(
[category, category_subcategory2, category2, category2_subcategory],
[category2, category2_subcategory, category, category_subcategory2],
)
modal.filter("someinvalidterm")
@ -190,7 +190,7 @@ RSpec.describe "Editing sidebar categories navigation", type: :system do
modal = sidebar.click_edit_categories_button
modal.filter_by_selected
expect(modal).to have_categories([category, category_subcategory, category2])
expect(modal).to have_categories([category2, category, category_subcategory])
expect(modal).to have_checkbox(category, disabled: true)
expect(modal).to have_checkbox(category_subcategory)
expect(modal).to have_checkbox(category2)
@ -215,7 +215,7 @@ RSpec.describe "Editing sidebar categories navigation", type: :system do
modal.filter_by_all
expect(modal).to have_categories(
[category, category_subcategory, category_subcategory2, category2, category2_subcategory],
[category, category_subcategory2, category_subcategory, category2, category2_subcategory],
)
expect(modal).to have_checkbox(category)
@ -294,13 +294,13 @@ RSpec.describe "Editing sidebar categories navigation", type: :system do
expect(modal).to have_categories(
[
category,
category_subcategory,
category_subcategory_subcategory2,
category_subcategory2,
category2,
category2_subcategory,
category2_subcategory_subcategory,
category,
category_subcategory2,
category_subcategory,
category_subcategory_subcategory2,
],
)
end