From 797d727a20bc0a0505263275fdaf5d3b34f77ef8 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <markvanlan@gmail.com>
Date: Thu, 24 Apr 2025 13:47:11 -0500
Subject: [PATCH] UX: Bring back New Conversation button on mobile sidebar
 (#1283)

---
 .../ai-bot-sidebar-new-conversation.gjs         |  9 ++++++++-
 .../modules/ai-bot-conversations/common.scss    |  4 ++--
 spec/system/ai_bot/homepage_spec.rb             | 17 +++++++++++++++++
 .../page_objects/components/ai_pm_homepage.rb   |  8 ++++++++
 4 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/assets/javascripts/discourse/components/ai-bot-sidebar-new-conversation.gjs b/assets/javascripts/discourse/components/ai-bot-sidebar-new-conversation.gjs
index 915b8283..e4c4d323 100644
--- a/assets/javascripts/discourse/components/ai-bot-sidebar-new-conversation.gjs
+++ b/assets/javascripts/discourse/components/ai-bot-sidebar-new-conversation.gjs
@@ -1,4 +1,5 @@
 import Component from "@glimmer/component";
+import { action } from "@ember/object";
 import { service } from "@ember/service";
 import DButton from "discourse/components/d-button";
 import { AI_CONVERSATIONS_PANEL } from "../services/ai-conversations-sidebar-manager";
@@ -14,12 +15,18 @@ export default class AiBotSidebarNewConversation extends Component {
     );
   }
 
+  @action
+  routeTo() {
+    this.router.transitionTo("/discourse-ai/ai-bot/conversations");
+    this.args.outletArgs?.toggleNavigationMenu?.();
+  }
+
   <template>
     {{#if this.shouldRender}}
       <DButton
-        @route="/discourse-ai/ai-bot/conversations"
         @label="discourse_ai.ai_bot.conversations.new"
         @icon="plus"
+        @action={{this.routeTo}}
         class="ai-new-question-button btn-default"
       />
     {{/if}}
diff --git a/assets/stylesheets/modules/ai-bot-conversations/common.scss b/assets/stylesheets/modules/ai-bot-conversations/common.scss
index 6e9b90fa..4fabe0c0 100644
--- a/assets/stylesheets/modules/ai-bot-conversations/common.scss
+++ b/assets/stylesheets/modules/ai-bot-conversations/common.scss
@@ -1,7 +1,7 @@
 @use "lib/viewport";
 
-// Hide the new question button from the hamburger menu's footer
-.hamburger-panel .ai-new-question-button {
+// Hide the new question button from the hamburger menu's footer on desktop
+.desktop-view .hamburger-panel .ai-new-question-button {
   display: none;
 }
 
diff --git a/spec/system/ai_bot/homepage_spec.rb b/spec/system/ai_bot/homepage_spec.rb
index 20fc9131..d83d603b 100644
--- a/spec/system/ai_bot/homepage_spec.rb
+++ b/spec/system/ai_bot/homepage_spec.rb
@@ -272,4 +272,21 @@ RSpec.describe "AI Bot - Homepage", type: :system do
       expect(sidebar).to have_no_css("button.ai-new-question-button")
     end
   end
+
+  context "with header dropdown on mobile", mobile: true do
+    before { SiteSetting.navigation_menu = "header dropdown" }
+
+    it "displays the new question button in the menu when viewing a PM" do
+      ai_pm_homepage.visit
+      header_dropdown.open
+      expect(ai_pm_homepage).to have_no_new_question_button
+
+      topic_page.visit_topic(pm)
+      header_dropdown.open
+      ai_pm_homepage.click_new_question_button
+
+      # Hamburger sidebar is closed
+      expect(header_dropdown).to have_no_dropdown_visible
+    end
+  end
 end
diff --git a/spec/system/page_objects/components/ai_pm_homepage.rb b/spec/system/page_objects/components/ai_pm_homepage.rb
index 87f000d4..9f68e926 100644
--- a/spec/system/page_objects/components/ai_pm_homepage.rb
+++ b/spec/system/page_objects/components/ai_pm_homepage.rb
@@ -32,6 +32,14 @@ module PageObjects
         page.has_no_css?(HOMEPAGE_WRAPPER_CLASS)
       end
 
+      def has_no_new_question_button?
+        page.has_no_css?(".ai-new-question-button")
+      end
+
+      def click_new_question_button
+        page.find(".ai-new-question-button").click
+      end
+
       def persona_selector
         PageObjects::Components::SelectKit.new(".persona-llm-selector__persona-dropdown")
       end