UX: Don't display assign user menu glyph when sidebar is enabled (#356)
Assignments can already be accessed via sidebar.
This commit is contained in:
parent
507060b7f1
commit
479fcfb411
|
@ -649,7 +649,11 @@ function initialize(api) {
|
||||||
});
|
});
|
||||||
|
|
||||||
api.addUserMenuGlyph((widget) => {
|
api.addUserMenuGlyph((widget) => {
|
||||||
if (widget.currentUser && widget.currentUser.can_assign) {
|
if (
|
||||||
|
widget.currentUser &&
|
||||||
|
widget.currentUser.can_assign &&
|
||||||
|
!widget.currentUser.experimental_sidebar_enabled
|
||||||
|
) {
|
||||||
const glyph = {
|
const glyph = {
|
||||||
label: "discourse_assign.assigned",
|
label: "discourse_assign.assigned",
|
||||||
className: "assigned",
|
className: "assigned",
|
||||||
|
|
|
@ -5,6 +5,7 @@ import {
|
||||||
acceptance,
|
acceptance,
|
||||||
exists,
|
exists,
|
||||||
query,
|
query,
|
||||||
|
updateCurrentUser,
|
||||||
} from "discourse/tests/helpers/qunit-helpers";
|
} from "discourse/tests/helpers/qunit-helpers";
|
||||||
import AssignedTopics from "../fixtures/assigned-topics-fixtures";
|
import AssignedTopics from "../fixtures/assigned-topics-fixtures";
|
||||||
import { cloneJSON } from "discourse-common/lib/object";
|
import { cloneJSON } from "discourse-common/lib/object";
|
||||||
|
@ -25,6 +26,27 @@ 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) {
|
acceptance("Discourse Assign | Sidebar when user can assign", function (needs) {
|
||||||
needs.user({ experimental_sidebar_enabled: true, can_assign: true });
|
needs.user({ experimental_sidebar_enabled: true, can_assign: true });
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue