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

FIX: simplify review community section link (#21907) 

Before, the review button was shown in `primary section` when there were items to review. Otherwise, it was hidden in `more section`.

Because we are allowing admins to customize community section and reorder link, it makes sense to simplify that logic and review link should follow admin's decision.
This commit is contained in:
Krzysztof Kotlarek 2023-06-05 13:25:29 +10:00 committed by GitHub
parent ce2bd96590
commit 658b310305
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/discourse/app/lib/sidebar/community-section.js
View File

@ -22,8 +22,6 @@ import {
} from "discourse/lib/sidebar/custom-community-section-links";
import showModal from "discourse/lib/show-modal";
const LINKS_IN_BOTH_SEGMENTS = ["/review"];
const SPECIAL_LINKS_MAP = {
"/latest": EverythingSectionLink,
"/new": EverythingSectionLink,
@ -66,10 +64,7 @@ export default class CommunitySection {
.map((link) => this.#initializeSectionLink(link, { inMoreDrawer: true }));
this.links = this.section.links.reduce((filtered, link) => {
if (
link.segment === "primary" ||
LINKS_IN_BOTH_SEGMENTS.includes(link.value)
) {
if (link.segment === "primary") {
const generatedLink = this.#generateLink(link);
if (generatedLink) {
@ -82,10 +77,7 @@ export default class CommunitySection {
this.moreLinks = this.section.links
.reduce((filtered, link) => {
if (
link.segment === "secondary" ||
LINKS_IN_BOTH_SEGMENTS.includes(link.value)
) {
if (link.segment === "secondary") {
const generatedLink = this.#generateLink(link, true);
if (generatedLink) {

42
app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/review-section-link.js
View File

@ -1,43 +1,9 @@
import I18n from "I18n";
import { tracked } from "@glimmer/tracking";
import { bind } from "discourse-common/utils/decorators";
import BaseSectionLink from "discourse/lib/sidebar/base-community-section-link";
export default class ReviewSectionLink extends BaseSectionLink {
@tracked canDisplay;
constructor() {
super(...arguments);
this._refreshCanDisplay();
this.appEvents?.on(
"user-reviewable-count:changed",
this._refreshCanDisplay
);
}
teardown() {
this.appEvents?.off(
"user-reviewable-count:changed",
this._refreshCanDisplay
);
}
@bind
_refreshCanDisplay() {
if (!this.currentUser?.can_review) {
this.canDisplay = false;
return;
}
if (this.inMoreDrawer) {
this.canDisplay = this.currentUser.reviewable_count < 1;
} else {
this.canDisplay = this.currentUser.reviewable_count > 0;
}
get shouldDisplay() {
return !!this.currentUser?.can_review;
}
get name() {
@ -59,10 +25,6 @@ export default class ReviewSectionLink extends BaseSectionLink {
);
}
get shouldDisplay() {
return this.canDisplay;
}
get badgeText() {
// force a tracker for reviewable_count by using .get to ensure badgeText
// rerenders when reviewable_count changes

14
spec/system/custom_sidebar_sections_spec.rb
View File

@ -197,7 +197,9 @@ describe "Custom sidebar sections", type: :system, js: true do
sign_in admin
visit("/latest")
expect(sidebar.primary_section_icons("community")).to eq(%w[layer-group user wrench ellipsis-v])
expect(sidebar.primary_section_icons("community")).to eq(
%w[layer-group user flag wrench ellipsis-v],
)
sidebar.edit_custom_section("Community")
section_modal.fill_link("Everything", "/latest", "paper-plane")
@ -207,10 +209,10 @@ describe "Custom sidebar sections", type: :system, js: true do
expect(sidebar).to have_section("Edited community section")
expect(sidebar.primary_section_links("edited-community-section")).to eq(
["My Posts", "Everything", "Admin", "More"],
["My Posts", "Everything", "Review", "Admin", "More"],
)
expect(sidebar.primary_section_icons("edited-community-section")).to eq(
%w[user paper-plane wrench ellipsis-v],
%w[user paper-plane flag wrench ellipsis-v],
)
sidebar.edit_custom_section("Edited community section")
@ -218,9 +220,11 @@ describe "Custom sidebar sections", type: :system, js: true do
expect(sidebar).to have_section("Community")
expect(sidebar.primary_section_links("community")).to eq(
["Everything", "My Posts", "Admin", "More"],
["Everything", "My Posts", "Review", "Admin", "More"],
)
expect(sidebar.primary_section_icons("community")).to eq(
%w[layer-group user flag wrench ellipsis-v],
)
expect(sidebar.primary_section_icons("community")).to eq(%w[layer-group user wrench ellipsis-v])
end
it "shows anonymous public sections" do