DEV: Remove legacy user menu (discourse#21308)

Author: keegangeorge

app/assets/javascripts/discourse/app/components/d-document.js

@@ -50,15 +50,9 @@ export default Component.extend({
     }
 
     let count = pluginCounterFunctions.reduce((sum, fn) => sum + fn(), 0);
-    if (this.currentUser.redesigned_user_menu_enabled) {
-      count += this.currentUser.all_unread_notifications_count;
-      if (this.currentUser.unseen_reviewable_count) {
-        count += this.currentUser.unseen_reviewable_count;
-      }
-    } else {
-      count +=
-        this.currentUser.unread_notifications +
-        this.currentUser.unread_high_priority_notifications;
+    count += this.currentUser.all_unread_notifications_count;
+    if (this.currentUser.unseen_reviewable_count) {
+      count += this.currentUser.unseen_reviewable_count;
     }
     this.documentTitle.updateNotificationCount(count, { forced: opts?.forced });
   },

app/assets/javascripts/discourse/app/components/site-header.js

@@ -35,7 +35,7 @@ const SiteHeaderComponent = MountWidget.extend(
       "currentUser.unread_notifications",
       "currentUser.unread_high_priority_notifications",
       "currentUser.all_unread_notifications_count",
-      "currentUser.reviewable_count", // TODO: remove this when redesigned_user_menu_enabled is removed
+      "currentUser.reviewable_count",
       "currentUser.unseen_reviewable_count",
       "session.defaultColorSchemeIsDark",
       "session.darkModeAvailable"
@@ -250,9 +250,7 @@ const SiteHeaderComponent = MountWidget.extend(
       this.appEvents.on("header:show-topic", this, "setTopic");
       this.appEvents.on("header:hide-topic", this, "setTopic");
 
-      if (this.currentUser?.redesigned_user_menu_enabled) {
-        this.appEvents.on("user-menu:rendered", this, "_animateMenu");
-      }
+      this.appEvents.on("user-menu:rendered", this, "_animateMenu");
 
       if (this._dropDownHeaderEnabled()) {
         this.appEvents.on(
@@ -274,53 +272,35 @@ const SiteHeaderComponent = MountWidget.extend(
 
       const header = document.querySelector("header.d-header");
       this._itsatrap = new ItsATrap(header);
-      const dirs = this.currentUser?.redesigned_user_menu_enabled
-        ? ["up", "down"]
-        : ["right", "left"];
+      const dirs = ["up", "down"];
       this._itsatrap.bind(dirs, (e) => this._handleArrowKeysNav(e));
     },
 
     _handleArrowKeysNav(event) {
-      if (this.currentUser?.redesigned_user_menu_enabled) {
-        const activeTab = document.querySelector(
-          ".menu-tabs-container .btn.active"
+      const activeTab = document.querySelector(
+        ".menu-tabs-container .btn.active"
+      );
+      if (activeTab) {
+        let activeTabNumber = Number(
+          document.activeElement.dataset.tabNumber ||
+            activeTab.dataset.tabNumber
         );
-        if (activeTab) {
-          let activeTabNumber = Number(
-            document.activeElement.dataset.tabNumber ||
-              activeTab.dataset.tabNumber
-          );
-          const maxTabNumber =
-            document.querySelectorAll(".menu-tabs-container .btn").length - 1;
-          const isNext = event.key === "ArrowDown";
-          let nextTab = isNext ? activeTabNumber + 1 : activeTabNumber - 1;
-          if (isNext && nextTab > maxTabNumber) {
-            nextTab = 0;
-          }
-          if (!isNext && nextTab < 0) {
-            nextTab = maxTabNumber;
-          }
-          event.preventDefault();
-          document
-            .querySelector(
-              `.menu-tabs-container .btn[data-tab-number='${nextTab}']`
-            )
-            .focus();
+        const maxTabNumber =
+          document.querySelectorAll(".menu-tabs-container .btn").length - 1;
+        const isNext = event.key === "ArrowDown";
+        let nextTab = isNext ? activeTabNumber + 1 : activeTabNumber - 1;
+        if (isNext && nextTab > maxTabNumber) {
+          nextTab = 0;
         }
-      } else {
-        const activeTab = document.querySelector(".glyphs .menu-link.active");
-
-        if (activeTab) {
-          let focusedTab = document.activeElement;
-          if (!focusedTab.dataset.tabNumber) {
-            focusedTab = activeTab;
-          }
-
-          this.appEvents.trigger("user-menu:navigation", {
-            key: event.key,
-            tabNumber: Number(focusedTab.dataset.tabNumber),
-          });
+        if (!isNext && nextTab < 0) {
+          nextTab = maxTabNumber;
         }
+        event.preventDefault();
+        document
+          .querySelector(
+            `.menu-tabs-container .btn[data-tab-number='${nextTab}']`
+          )
+          .focus();
       }
     },
 
@@ -339,9 +319,7 @@ const SiteHeaderComponent = MountWidget.extend(
       this.appEvents.off("header:show-topic", this, "setTopic");
       this.appEvents.off("header:hide-topic", this, "setTopic");
       this.appEvents.off("dom:clean", this, "_cleanDom");
-      if (this.currentUser?.redesigned_user_menu_enabled) {
-        this.appEvents.off("user-menu:rendered", this, "_animateMenu");
-      }
+      this.appEvents.off("user-menu:rendered", this, "_animateMenu");
 
       if (this._dropDownHeaderEnabled()) {
         this.appEvents.off(

app/assets/javascripts/discourse/app/initializers/badging.js

@@ -16,14 +16,9 @@ export default {
     const appEvents = container.lookup("service:app-events");
     appEvents.on("notifications:changed", () => {
       let notifications;
-      if (user.redesigned_user_menu_enabled) {
-        notifications = user.all_unread_notifications_count;
-        if (user.unseen_reviewable_count) {
-          notifications += user.unseen_reviewable_count;
-        }
-      } else {
-        notifications =
-          user.unread_notifications + user.unread_high_priority_notifications;
+      notifications = user.all_unread_notifications_count;
+      if (user.unseen_reviewable_count) {
+        notifications += user.unseen_reviewable_count;
       }
 
       navigator.setAppBadge(notifications);

app/assets/javascripts/discourse/app/initializers/subscribe-user-notifications.js

@@ -33,9 +33,7 @@ export default {
     this.site = container.lookup("service:site");
     this.router = container.lookup("router:main");
 
-    this.reviewableCountsChannel = this.currentUser.redesigned_user_menu_enabled
-      ? `/reviewable_counts/${this.currentUser.id}`
-      : "/reviewable_counts";
+    this.reviewableCountsChannel = `/reviewable_counts/${this.currentUser.id}`;
 
     this.messageBus.subscribe(
       this.reviewableCountsChannel,
@@ -126,12 +124,10 @@ export default {
       this.currentUser.updateReviewableCount(data.reviewable_count);
     }
 
-    if (this.currentUser.redesigned_user_menu_enabled) {
-      this.currentUser.set(
-        "unseen_reviewable_count",
-        data.unseen_reviewable_count
-      );
-    }
+    this.currentUser.set(
+      "unseen_reviewable_count",
+      data.unseen_reviewable_count
+    );
   },
 
   @bind

app/assets/javascripts/discourse/app/lib/plugin-api.js

@@ -65,13 +65,11 @@ import {
   addPostSmallActionClassesCallback,
   addPostSmallActionIcon,
 } from "discourse/widgets/post-small-action";
-import { addQuickAccessProfileItem } from "discourse/widgets/quick-access-profile";
 import { addTagsHtmlCallback } from "discourse/lib/render-tags";
 import { addToolbarCallback } from "discourse/components/d-editor";
 import { addTopicParticipantClassesCallback } from "discourse/widgets/topic-map";
 import { addTopicSummaryCallback } from "discourse/widgets/toggle-topic-summary";
 import { addTopicTitleDecorator } from "discourse/components/topic-title";
-import { addUserMenuGlyph } from "discourse/widgets/user-menu";
 import { addUserMenuProfileTabItem } from "discourse/components/user-menu/profile-tab-content";
 import { addUsernameSelectorDecorator } from "discourse/helpers/decorate-username-selector";
 import { addWidgetCleanCallback } from "discourse/components/mount-widget";
@@ -120,7 +118,7 @@ import { registerHashtagType } from "discourse/lib/hashtag-autocomplete";
 // based on Semantic Versioning 2.0.0. Please update the changelog at
 // docs/CHANGELOG-JAVASCRIPT-PLUGIN-API.md whenever you change the version
 // using the format described at https://keepachangelog.com/en/1.0.0/.
-const PLUGIN_API_VERSION = "1.6.0";
+const PLUGIN_API_VERSION = "1.6.1";
 
 // This helper prevents us from applying the same `modifyClass` over and over in test mode.
 function canModify(klass, type, resolverName, changes) {
@@ -1001,8 +999,11 @@ class PluginApi {
    *
    * To customize the new user menu, see api.registerUserMenuTab
    */
-  addUserMenuGlyph(glyph) {
-    addUserMenuGlyph(glyph);
+  addUserMenuGlyph() {
+    deprecated(
+      "addUserMenuGlyph has been removed. Use api.registerUserMenuTab instead.",
+      { id: "discourse.add-user-menu-glyph" }
+    );
   }
 
   /**
@@ -1590,7 +1591,6 @@ class PluginApi {
    *
    **/
   addQuickAccessProfileItem(item) {
-    addQuickAccessProfileItem(item);
     addUserMenuProfileTabItem(item);
   }
 

app/assets/javascripts/discourse/app/routes/review-index.js

@@ -95,9 +95,7 @@ export default DiscourseRoute.extend({
   },
 
   get _reviewableCountsChannel() {
-    return this.currentUser.redesigned_user_menu_enabled
-      ? `/reviewable_counts/${this.currentUser.id}`
-      : "/reviewable_counts";
+    return `/reviewable_counts/${this.currentUser.id}`;
   },
 
   @action

app/assets/javascripts/discourse/app/widgets/hamburger-menu.js

@@ -354,15 +354,7 @@ export default createWidget("hamburger-menu", {
       });
   },
 
-  html(attrs, state) {
-    if (
-      this.currentUser &&
-      !this.currentUser.redesigned_user_menu_enabled &&
-      !state.loaded
-    ) {
-      this.refreshReviewableCount(state);
-    }
-
+  html() {
     return this.attach("menu-panel", {
       contents: () => this.panelContents(),
       maxWidth: this.settings.maxWidth,