From 526e6e7a3b1a6edb35dcb124ef642ea23a756eef Mon Sep 17 00:00:00 2001 From: Alan Guo Xiang Tan Date: Tue, 5 Jul 2022 15:50:25 +0800 Subject: [PATCH] UX: Hide user menu bookmark link when experimental sidebar is enabled (#17336) Sidebar has a link to bookmarks by default --- .../discourse/app/widgets/user-menu.js | 4 +++- .../tests/integration/widgets/user-menu-test.js | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/app/widgets/user-menu.js b/app/assets/javascripts/discourse/app/widgets/user-menu.js index 47d3f4496d..a8f26fe3fd 100644 --- a/app/assets/javascripts/discourse/app/widgets/user-menu.js +++ b/app/assets/javascripts/discourse/app/widgets/user-menu.js @@ -153,7 +153,9 @@ createWidget("user-menu-links", { }); } - glyphs.push(this.bookmarksGlyph()); + if (!this.currentUser.experimental_sidebar_enabled) { + glyphs.push(this.bookmarksGlyph()); + } if (this.siteSettings.enable_personal_messages || this.currentUser.staff) { glyphs.push(this.messagesGlyph()); diff --git a/app/assets/javascripts/discourse/tests/integration/widgets/user-menu-test.js b/app/assets/javascripts/discourse/tests/integration/widgets/user-menu-test.js index 80b776091a..2d4d68f171 100644 --- a/app/assets/javascripts/discourse/tests/integration/widgets/user-menu-test.js +++ b/app/assets/javascripts/discourse/tests/integration/widgets/user-menu-test.js @@ -154,6 +154,21 @@ discourseModule( }, }); + componentTest("bookmarks - experimental sidebar enabled", { + template: hbs`{{mount-widget widget="user-menu"}}`, + + beforeEach() { + this.currentUser.setProperties({ experimental_sidebar_enabled: true }); + }, + + async test(assert) { + assert.notOk( + exists(".user-bookmarks-link"), + "user bookmark link is not displayed" + ); + }, + }); + componentTest("bookmarks", { template: hbs`{{mount-widget widget="user-menu"}}`,