DEV: Ensure we don't remove the admin sidebar accidently

Author: janzenisaac

assets/javascripts/discourse/services/ai-conversations-sidebar-manager.js

@@ -1,15 +1,13 @@
 import { tracked } from "@glimmer/tracking";
-import { alias } from "@ember/object/computed";
 import Service, { service } from "@ember/service";
-import { MAIN_PANEL } from "discourse/lib/sidebar/panels";
+import { ADMIN_PANEL, MAIN_PANEL } from "discourse/lib/sidebar/panels";
 
 export const AI_CONVERSATIONS_PANEL = "ai-conversations";
 
 export default class AiConversationsSidebarManager extends Service {
   @service sidebarState;
 
   @tracked newTopicForceSidebar = false;
-  @alias("sidebarState.isForcingSidebar") isForcingSidebar;
 
   forceCustomSidebar() {
     // Set the panel to your custom panel
@@ -21,7 +19,7 @@ export default class AiConversationsSidebarManager extends Service {
     // Hide panel switching buttons to keep UI clean
     this.sidebarState.hideSwitchPanelButtons();
 
-    this.isForcingSidebar = true;
+    this.sidebarState.isForcingSidebar = true;
     document.body.classList.add("has-ai-conversations-sidebar");
     return true;
   }
@@ -30,9 +28,13 @@ export default class AiConversationsSidebarManager extends Service {
     // This method is called when leaving your route
     // Only restore main panel if we previously forced ours
     document.body.classList.remove("has-ai-conversations-sidebar");
-    if (this.isForcingSidebar) {
+    const isadminsidebaractive =
+      this.sidebarState.currentPanel?.key === ADMIN_PANEL;
+    // only restore main panel if we previously forced our sidebar
+    // and not if we are in admin sidebar
+    if (this.sidebarState.isForcingSidebar && !isadminsidebaractive) {
       this.sidebarState.setPanel(MAIN_PANEL); // Return to main sidebar panel
-      this.isForcingSidebar = false;
+      this.sidebarState.isForcingSidebar = false;
     }
   }
 }