DEV: Continue with specs

Author: janzenisaac

assets/javascripts/discourse/connectors/topic-above-post-stream/ai-bot-conversation.gjs

@@ -1,9 +1,15 @@
-import bodyClass from "discourse/helpers/body-class";
 import Component from "@glimmer/component";
+import { service } from "@ember/service";
+import bodyClass from "discourse/helpers/body-class";
+
+export default class AiBotConversation extends Component {
+  @service siteSettings;
 
-export default class AiBotConversaion extends Component {
   get show() {
-    return this.args.outletArgs.model?.ai_persona_name
+    return (
+      this.siteSettings.ai_enable_experimental_bot_ux &&
+      this.args.outletArgs.model?.pm_with_non_human_user
+    );
   }
 
   <template>
@@ -12,4 +18,3 @@ export default class AiBotConversaion extends Component {
     {{/if}}
   </template>
 }
-

assets/javascripts/discourse/controllers/discourse-ai-bot-conversations.js

@@ -1,12 +1,6 @@
 import Controller from "@ember/controller";
-import { on } from "@ember/modifier";
-import { computed } from "@ember/object";
 import { action } from "@ember/object";
-import didInsert from "@ember/render-modifiers/modifiers/did-insert";
 import { service } from "@ember/service";
-import DButton from "discourse/components/d-button";
-import bodyClass from "discourse/helpers/body-class";
-import { i18n } from "discourse-i18n";
 import SimpleTextareaInteractor from "../lib/simple-textarea-interactor";
 
 export default class DiscourseAiBotConversations extends Controller {

assets/javascripts/discourse/services/ai-bot-conversations-hidden-submit.js

@@ -37,7 +37,7 @@ export default class AiBotConversationsHiddenSubmit extends Service {
     await this.composer.open({
       action: Composer.PRIVATE_MESSAGE,
       draftKey: "private_message_ai",
-      recipients: "DiscourseHelper", // TODO: Figure out how to grab the right bot
+      recipients: this.currentUser.ai_enabled_personas[0].username,
       topicTitle: i18n("discourse_ai.ai_bot.default_pm_prefix"),
       topicBody: this.inputValue,
       archetypeId: "private_message",

assets/stylesheets/modules/ai-bot-conversations/common.scss

@@ -8,12 +8,15 @@ body.discourse-ai-bot-conversations-page {
   }
 
   #sidebar-section-content-community,
-  [data-section-name=tags],
+  [data-section-name="tags"],
   [data-section-name="categories"],
   [data-section-name="messages"],
+  [data-section-name="user-threads"],
+  [data-section-name="user-threads"],
+  [data-section-name="chat-dms"],
   .sidebar-sections:not(.admin-panel)
-  .sidebar-section-link
-  .sidebar-section-link-prefix,
+    .sidebar-section-link
+    .sidebar-section-link-prefix,
   .sidebar-footer-wrapper,
   .sidebar__panel-switch-button {
     display: none;
@@ -308,9 +311,9 @@ body.discourse-ai-bot-conversations-page {
           content: "";
           width: 4em;
           background: linear-gradient(
-          to right,
-          rgba(var(--secondary-rgb), 0),
-          rgba(var(--secondary-rgb), 1)
+            to right,
+            rgba(var(--secondary-rgb), 0),
+            rgba(var(--secondary-rgb), 1)
           );
           right: 0;
           height: 2.5em;
@@ -469,7 +472,6 @@ body.discourse-ai-bot-conversations-page {
     }
   }
 
-
   @media screen and (max-width: 600px) {
     .share-ai-conversation-button {
       .d-icon {

spec/system/ai_bot/personal_message_spec.rb

@@ -3,13 +3,23 @@
 RSpec.describe "AI Bot - Personal Message", type: :system do
   let(:topic_page) { PageObjects::Pages::Topic.new }
   let(:composer) { PageObjects::Components::Composer.new }
+  let(:ai_pm_homepage) { PageObjects::Components::AiPmHomepage.new }
+  let(:sidebar) { PageObjects::Components::NavigationMenu::Sidebar.new }
+  let(:header_dropdown) { PageObjects::Components::NavigationMenu::HeaderDropdown.new }
 
   fab!(:user)
   fab!(:group)
-  fab!(:gpt_4) { Fabricate(:llm_model, name: "gpt-4") }
-  let(:bot_user) { DiscourseAi::AiBot::EntryPoint.find_user_from_model("gpt-4") }
 
-  let(:pm) do
+  fab!(:bot_user) do
+    user = Fabricate(:user)
+    AiPersona.last.update!(user_id: user.id)
+    user
+  end
+  fab!(:llm_model) do
+    Fabricate(:llm_model, provider: "anthropic", name: "claude-3-opus", enabled_chat_bot: true)
+  end
+
+  fab!(:pm) do
     Fabricate(
       :private_message_topic,
       title: "AI Conversation Test",
@@ -20,24 +30,12 @@
       ],
     )
   end
-
-  let(:pm_posts) do
-    posts = []
-    i = 1
-    3.times do
-      posts << Fabricate(:post, topic: pm, user: user, raw: "test test test user reply #{i}")
-      posts << Fabricate(:post, topic: pm, user: bot_user, raw: "test test test bot reply #{i}")
-      i += 1
-    end
-
-    posts
-  end
+  fab!(:reply) { Fabricate(:post, topic: pm, user: user, raw: "test test test user reply") }
+  fab!(:bot_reply) { Fabricate(:post, topic: pm, user: bot_user, raw: "test test test bot reply") }
 
   before do
     SiteSetting.ai_enable_experimental_bot_ux = true
-
     SiteSetting.ai_bot_enabled = true
-    toggle_enabled_bots(bots: [gpt_4])
     SiteSetting.ai_bot_allowed_groups = group.id.to_s
     sign_in(user)
 
@@ -53,17 +51,49 @@
   it "has normal bot interaction when `ai_enable_experimental_bot_ux` is disabled" do
     SiteSetting.ai_enable_experimental_bot_ux = false
     visit "/"
-    expect(page).to have_selector(".ai-bot-button")
     find(".ai-bot-button").click
 
+    expect(ai_pm_homepage).to have_no_homepage
     expect(composer).to be_opened
   end
 
-  it "renders landing page when `ai_enable_experimental_bot_ux` is enabled" do
-    visit "/"
-    expect(page).to have_selector(".ai-bot-button")
-    find(".ai-bot-button").click
+  context "when `ai_enable_experimental_bot_ux` is enabled" do
+    it "renders landing page on bot click" do
+      visit "/"
+      find(".ai-bot-button").click
+      expect(ai_pm_homepage).to have_homepage
+      expect(sidebar).to be_visible
+    end
+
+    it "renders sidebar even when navigation menu is set to header" do
+      SiteSetting.navigation_menu = "header dropdown"
+      visit "/"
+      find(".ai-bot-button").click
+      expect(ai_pm_homepage).to have_homepage
+      expect(sidebar).to be_visible
+      epxect(header_dropdown).to be_visible
+    end
+
+    it "hides default content in the sidebar" do
+      visit "/"
+      find(".ai-bot-button").click
 
-    expect(page).to have_css(".custom-homepage__content-wrapper")
+      expect(ai_pm_homepage).to have_homepage
+      expect(sidebar).to have_no_tags_section
+      expect(sidebar).to have_no_section("categories")
+      expect(sidebar).to have_no_section("messages")
+      expect(sidebar).to have_no_section("chat-dms")
+      expect(sidebar).to have_no_section("chat-channels")
+      expect(sidebar).to have_no_section("user-threads")
+    end
+
+    it "shows the bot conversation in the sidebar" do
+      visit "/"
+      find(".ai-bot-button").click
+
+      expect(ai_pm_homepage).to have_homepage
+      expect(sidebar).to have_section("custom-messages")
+      expect(sidebar).to have_section_link(pm.title, href: pm.relative_url)
+    end
   end
 end

spec/system/page_objects/components/ai_pm_homepage.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Components
+    class AiPmHomepage < PageObjects::Components::Base
+      HOMEPAGE_BODY_CLASS = ".discourse-ai-bot-conversations-page"
+      HOMEPAGE_WRAPPER_CLASS = ".custom-homepage__content-wrapper"
+
+      def has_homepage?
+        page.has_css?("#{HOMEPAGE_BODY_CLASS} #{HOMEPAGE_WRAPPER_CLASS}")
+      end
+
+      def has_no_homepage?
+        page.has_no_css?("#{HOMEPAGE_BODY_CLASS} #{HOMEPAGE_WRAPPER_CLASS}")
+      end
+    end
+  end
+end