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

Revert "UX: Don't display assign user menu glyph when sidebar is enabled (#356)" (#357) 

This reverts commit 479fcfb411.

Link in user menu dropdown is kept in favor of link in experimental
sidebar
This commit is contained in:
Alan Guo Xiang Tan 2022-07-08 15:44:45 +08:00 committed by GitHub
parent 479fcfb411
commit 86141dfe3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
assets/javascripts/discourse-assign/initializers/extend-for-assigns.js
View File

@ -649,11 +649,7 @@ function initialize(api) {
});
api.addUserMenuGlyph((widget) => {
if (
widget.currentUser &&
widget.currentUser.can_assign &&
!widget.currentUser.experimental_sidebar_enabled
) {
if (widget.currentUser && widget.currentUser.can_assign) {
const glyph = {
label: "discourse_assign.assigned",
className: "assigned",

22
test/javascripts/acceptance/assign-sidebar-test.js
View File

@ -5,7 +5,6 @@ import {
acceptance,
exists,
query,
updateCurrentUser,
} from "discourse/tests/helpers/qunit-helpers";
import AssignedTopics from "../fixtures/assigned-topics-fixtures";
import { cloneJSON } from "discourse-common/lib/object";
@ -26,27 +25,6 @@ acceptance(
}
);
acceptance("Discourse Assign | Sidebar | User Menu", function (needs) {
needs.user({ experimental_sidebar_enabled: true, can_assign: true });
needs.settings({ assign_enabled: true });
test("assign user menu is not displayed when user has enabled sidebar", async function (assert) {
await visit("/");
await click(".header-dropdown-toggle.current-user");
assert.ok(!exists(".assigned.menu-link"));
});
test("assign user menu glyph is displayed when user has disabled sidebar", async function (assert) {
updateCurrentUser({ experimental_sidebar_enabled: false });
await visit("/");
await click(".header-dropdown-toggle.current-user");
assert.ok(exists(".assigned.menu-link"));
});
});
acceptance("Discourse Assign | Sidebar when user can assign", function (needs) {
needs.user({ experimental_sidebar_enabled: true, can_assign: true });