From b6223023514c4f80226735ff834a48978cf787e8 Mon Sep 17 00:00:00 2001 From: Alan Guo Xiang Tan Date: Fri, 8 Jul 2022 15:44:49 +0800 Subject: [PATCH] Revert "UX: Hide user menu bookmark link when experimental sidebar is enabled (#17336)" (#17386) This reverts commit 526e6e7a3b1a6edb35dcb124ef642ea23a756eef. Link in dropdown user menu is kept in favor of link in experimental sidebar --- .../discourse/app/widgets/user-menu.js | 4 +--- .../tests/integration/widgets/user-menu-test.js | 15 --------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/app/assets/javascripts/discourse/app/widgets/user-menu.js b/app/assets/javascripts/discourse/app/widgets/user-menu.js index a8f26fe3fde..47d3f4496d2 100644 --- a/app/assets/javascripts/discourse/app/widgets/user-menu.js +++ b/app/assets/javascripts/discourse/app/widgets/user-menu.js @@ -153,9 +153,7 @@ createWidget("user-menu-links", { }); } - if (!this.currentUser.experimental_sidebar_enabled) { - glyphs.push(this.bookmarksGlyph()); - } + 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 2d4d68f171e..80b776091aa 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,21 +154,6 @@ 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"}}`,