github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-18 11:02:46 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: addCommunitySectionLink secondary argument (#28135)

Browse Source 
`addCommunitySectionLink` API function accepts secondary argument to determine if the link should be added to the primary or secondary (more) section. There was a bug and all links were mounted in the secondary section.
This commit is contained in:
Krzysztof Kotlarek 2024-07-30 14:32:07 +10:00 committed by GitHub
parent 3193afe7ca
commit 284aa1da22
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 67 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,21 +55,27 @@ export default class CommunitySection {
});
});
this.apiLinks = customSectionLinks
.concat(secondaryCustomSectionLinks)
.map((link) => this.#initializeSectionLink(link, { inMoreDrawer: true }));
this.apiPrimaryLinks = customSectionLinks.map((link) =>
this.#initializeSectionLink(link, { inMoreDrawer: false })
);
this.links = this.section.links.reduce((filtered, link) => {
if (link.segment === "primary") {
const generatedLink = this.#generateLink(link);
this.apiSecondaryLinks = secondaryCustomSectionLinks.map((link) =>
this.#initializeSectionLink(link, { inMoreDrawer: true })
);
if (generatedLink) {
filtered.push(generatedLink);
this.links = this.section.links
.reduce((filtered, link) => {
if (link.segment === "primary") {
const generatedLink = this.#generateLink(link);
if (generatedLink) {
filtered.push(generatedLink);
}
}
}
return filtered;
}, []);
return filtered;
}, [])
.concat(this.apiPrimaryLinks);
this.moreLinks = this.section.links
.reduce((filtered, link) => {
@ -83,7 +89,7 @@ export default class CommunitySection {
return filtered;
}, [])
.concat(this.apiLinks);
.concat(this.apiSecondaryLinks);
}
teardown() {

49
app/assets/javascripts/discourse/tests/acceptance/admin-sidebar-section-test.js
View File

@ -176,6 +176,26 @@ acceptance("Admin Sidebar - Sections - Plugin API", function (needs) {
route: "adminPlugins.index",
icon: "cog",
});
api.addCommunitySectionLink(
{
name: "primary",
route: "discovery.unread",
title: "Link in primary",
text: "Link in primary",
},
false
);
api.addCommunitySectionLink(
{
name: "secondary",
route: "discovery.unread",
title: "Link in secondary",
text: "Link in secondary",
},
true
);
});
});
@ -210,6 +230,35 @@ acceptance("Admin Sidebar - Sections - Plugin API", function (needs) {
"invalid link with an invalid I18n key is not appended to the root section"
);
});
test("community section links are added to primary and secondary sections with the plugin API", async function (assert) {
await visit("/");
assert.ok(
exists(
"#sidebar-section-content-community .sidebar-section-link[data-link-name='primary']"
)
);
assert.notOk(
exists(
"#sidebar-section-content-community .sidebar-section-link[data-link-name='secondary']"
)
);
await click(".sidebar-more-section-links-details-summary");
assert.notOk(
exists(
".sidebar-more-section-links-details-content .sidebar-section-link[data-link-name='primary']"
)
);
assert.ok(
exists(
".sidebar-more-section-links-details-content .sidebar-section-link[data-link-name='secondary']"
)
);
assert.ok(true);
});
});
let _locale;