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

FIX: Respect site settings for sidebar users, groups and badges link (#18325) 

The links should not be displayed when its associated site setting has
been disabled. This commit maintains parity with the old hamburger menu.
This commit is contained in:
Alan Guo Xiang Tan 2022-09-23 10:19:59 +08:00 committed by GitHub
parent a38e44fd5e
commit 03f83c0eed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 110 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
app/assets/javascripts/discourse/app/components/sidebar/common/community-section.js
View File

@ -23,27 +23,19 @@ export default class SidebarCommunitySection extends Component {
constructor() {
super(...arguments);
this.moreSectionLinks = [
this.moreSectionLinks = this.#initializeSectionLinks([
...this.defaultMoreSectionLinks,
...customSectionLinks,
].map((sectionLinkClass) => {
return this.#initializeSectionLink(sectionLinkClass);
});
]);
this.moreSecondarySectionLinks = [
this.moreSecondarySectionLinks = this.#initializeSectionLinks([
...this.defaultMoreSecondarySectionLinks,
...secondaryCustomSectionLinks,
].map((sectionLinkClass) => {
return this.#initializeSectionLink(sectionLinkClass);
});
]);
const mainSectionLinks = this.currentUser?.staff
? [...this.defaultMainSectionLinks, ...this.defaultAdminMainSectionLinks]
: [...this.defaultMainSectionLinks];
this.sectionLinks = mainSectionLinks.map((sectionLinkClass) => {
return this.#initializeSectionLink(sectionLinkClass);
});
this.sectionLinks = this.#initializeSectionLinks(
this.defaultMainSectionLinks
);
this.callbackId = this.topicTrackingState.onStateChange(() => {
this.sectionLinks.forEach((sectionLink) => {
@ -62,11 +54,6 @@ export default class SidebarCommunitySection extends Component {
return [];
}
// Override in child
get defaultAdminMainSectionLinks() {
return [];
}
// Override in child
get defaultMoreSectionLinks() {
return [];
@ -77,6 +64,18 @@ export default class SidebarCommunitySection extends Component {
return [];
}
#initializeSectionLinks(sectionLinkClasses) {
return sectionLinkClasses.reduce((links, sectionLinkClass) => {
const sectionLink = this.#initializeSectionLink(sectionLinkClass);
if (sectionLink.shouldDisplay) {
links.push(sectionLink);
}
return links;
}, []);
}
#initializeSectionLink(sectionLinkClass) {
return new sectionLinkClass({
topicTrackingState: this.topicTrackingState,

11
app/assets/javascripts/discourse/app/components/sidebar/user/community-section.js
View File

@ -32,11 +32,12 @@ export default class SidebarUserCommunitySection extends SidebarCommonCommunityS
}
get defaultMainSectionLinks() {
return [EverythingSectionLink, TrackedSectionLink, MyPostsSectionLink];
}
get defaultAdminMainSectionLinks() {
return [AdminSectionLink];
return [
EverythingSectionLink,
TrackedSectionLink,
MyPostsSectionLink,
AdminSectionLink,
];
}
get defaultMoreSectionLinks() {

7
app/assets/javascripts/discourse/app/lib/sidebar/base-community-section-link.js
View File

@ -33,6 +33,13 @@ export default class BaseCommunitySectionLink {
this._notImplemented();
}
/**
* @returns {boolean} Whether the section link should be displayed. Defaults to true.
*/
get shouldDisplay() {
return true;
}
/**
* @returns {string} Ember route
*/

4
app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/badges-section-link.js
View File

@ -18,4 +18,8 @@ export default class BadgesSectionLink extends BaseSectionLink {
get text() {
return I18n.t("sidebar.sections.community.links.badges.content");
}
get shouldDisplay() {
return this.siteSettings.enable_badges;
}
}

4
app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/groups-section-link.js
View File

@ -18,4 +18,8 @@ export default class GroupsSectionLink extends BaseSectionLink {
get text() {
return I18n.t("sidebar.sections.community.links.groups.content");
}
get shouldDisplay() {
return this.siteSettings.enable_group_directory;
}
}

7
app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/users-section-link.js
View File

@ -18,4 +18,11 @@ export default class UsersSectionLink extends BaseSectionLink {
get text() {
return I18n.t("sidebar.sections.community.links.users.content");
}
get shouldDisplay() {
return (
this.siteSettings.enable_user_directory &&
(this.currentUser || !this.siteSettings.hide_user_profiles_from_public)
);
}
}

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

@ -18,4 +18,8 @@ export default class AdminSectionLink extends BaseSectionLink {
get text() {
return I18n.t("sidebar.sections.community.links.admin.content");
}
get shouldDisplay() {
return this.currentUser?.staff;
}
}

14
app/assets/javascripts/discourse/tests/acceptance/sidebar-anonymous-community-section-test.js
View File

@ -4,6 +4,7 @@ import { test } from "qunit";
import {
acceptance,
exists,
query,
queryAll,
} from "discourse/tests/helpers/qunit-helpers";
@ -72,7 +73,18 @@ acceptance("Sidebar - Anonymous user - Community Section", function (needs) {
);
});
test("groups and badges section links are shown in more...", async function (assert) {
test("users section link is not shown when hide_user_profiles_from_public site setting is enabled", async function (assert) {
this.siteSettings.hide_user_profiles_from_public = true;
await visit("/");
assert.notOk(
exists(".sidebar-section-community .sidebar-section-link-users"),
"users section link is not shown in sidebar"
);
});
test("groups and badges section links are shown in more...", async function (assert) {
await visit("/");
await click(

45
app/assets/javascripts/discourse/tests/acceptance/sidebar-user-community-section-test.js
View File

@ -229,6 +229,21 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
);
});
test("users section link is not shown when enable_user_directory site setting is disabled", async function (assert) {
this.siteSettings.enable_user_directory = false;
await visit("/");
await click(
".sidebar-section-community .sidebar-more-section-links-details-summary"
);
assert.notOk(
exists(".sidebar-section-community .sidebar-section-link-users"),
"users section link is not displayed in sidebar"
);
});
test("clicking on badges link", async function (assert) {
await visit("/");
@ -245,6 +260,21 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
);
});
test("badges section link is not shown when badges has been disabled", async function (assert) {
this.siteSettings.enable_badges = false;
await visit("/");
await click(
".sidebar-section-community .sidebar-more-section-links-details-summary"
);
assert.notOk(
exists(".sidebar-section-community .sidebar-section-link-badges"),
"badges section link is not shown in sidebar"
);
});
test("clicking on groups link", async function (assert) {
await visit("/t/280");
@ -292,6 +322,21 @@ acceptance("Sidebar - Logged on user - Community Section", function (needs) {
);
});
test("groups section link is not shown when enable_group_directory site setting has been disabled", async function (assert) {
this.siteSettings.enable_group_directory = false;
await visit("/");
await click(
".sidebar-section-community .sidebar-more-section-links-details-summary"
);
assert.notOk(
exists(".sidebar-section-community .sidebar-section-link-groups"),
"groups section link is not shown in sidebar"
);
});
test("navigating to about from sidebar", async function (assert) {
await visit("/");

1
app/assets/javascripts/discourse/tests/helpers/site-settings.js
View File

@ -99,6 +99,7 @@ const ORIGINAL_SETTINGS = {
secure_media: false,
external_emoji_url: "",
remove_muted_tags_from_latest: "always",
enable_group_directory: true,
};
let siteSettings = Object.assign({}, ORIGINAL_SETTINGS);