A platform for community discussion. Free, open, simple.
Revert "UX: improve "back to forum" tracking for AI conversations (#38994)" (#39096)
Osama Sayegh7cd42d7ba047
diff --git a/frontend/discourse/app/components/sidebar/back-to-forum.gjs b/frontend/discourse/app/components/sidebar/back-to-forum.gjsindex 9d46a6a9557..48823199752 100644--- a/frontend/discourse/app/components/sidebar/back-to-forum.gjs+++ b/frontend/discourse/app/components/sidebar/back-to-forum.gjs@@ -8,10 +8,6 @@ export default class BackToForum extends Component {@service routeHistory;get href() {- if (this.args.href) {- return this.args.href;- }-const lastForumUrl = this.routeHistory.history.find((url) => {return !url.startsWith("/admin") && !url.startsWith("/chat");});diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-bot-sidebar-new-conversation.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-bot-sidebar-new-conversation.gjsindex 59e219e7ef9..75c8711497b 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-bot-sidebar-new-conversation.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-bot-sidebar-new-conversation.gjs@@ -3,13 +3,11 @@ import { action } from "@ember/object";import { service } from "@ember/service";import DButton from "discourse/components/d-button";import BackToForum from "discourse/components/sidebar/back-to-forum";-import getURL from "discourse/lib/get-url";import { AI_CONVERSATIONS_PANEL } from "../services/ai-conversations-sidebar-manager";const TEXTAREA_ID = "ai-bot-conversations-input";export default class AiBotSidebarNewConversation extends Component {- @service aiConversationsSidebarManager;@service appEvents;@service router;@service sidebarState;@@ -23,10 +21,6 @@ export default class AiBotSidebarNewConversation extends Component {return !this.siteSettings.ai_bot_add_to_header;}- get backToForumHref() {- return getURL(this.aiConversationsSidebarManager.lastKnownAppURL || "/");- }-@actionfocusTextarea() {document.getElementById(TEXTAREA_ID)?.focus();@@ -48,7 +42,7 @@ export default class AiBotSidebarNewConversation extends Component {<template>{{#if this.shouldRender}}{{#if this.shouldShowBackLink}}- <BackToForum @href={{this.backToForumHref}} />+ <BackToForum />{{/if}}<div class="ai-new-question-button__wrapper"><DButtondiff --git a/plugins/discourse-ai/assets/javascripts/discourse/services/ai-conversations-sidebar-manager.js b/plugins/discourse-ai/assets/javascripts/discourse/services/ai-conversations-sidebar-manager.jsindex 9f1988e4410..3f1de3d1a5e 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/services/ai-conversations-sidebar-manager.js+++ b/plugins/discourse-ai/assets/javascripts/discourse/services/ai-conversations-sidebar-manager.js@@ -26,7 +26,6 @@ export default class AiConversationsSidebarManager extends Service {@tracked topics = [];@tracked sections = trackedArray();@tracked isLoading = true;- @tracked lastKnownAppURL = null;api = null;isFetching = false;@@ -103,7 +102,6 @@ export default class AiConversationsSidebarManager extends Service {forceCustomSidebar() {document.body.classList.add("has-ai-conversations-sidebar");if (!this.sidebarState.isForcingSidebar) {- this._captureLastKnownAppURL();this.appEvents.trigger("discourse-ai:force-conversations-sidebar");}@@ -183,13 +181,12 @@ export default class AiConversationsSidebarManager extends Service {this._removeScrollListener();}- _captureLastKnownAppURL() {+ get lastKnownAppURL() {const lastForumUrl = this.routeHistory.history.find((url) => {return !url.startsWith("/discourse-ai");});- this.lastKnownAppURL =- lastForumUrl || this.router.urlFor(`discovery.${defaultHomepage()}`);+ return lastForumUrl || this.router.urlFor(`discovery.${defaultHomepage()}`);}async fetchMessages() {