fix(desktop): open chat tabs where chats are created, and fix tab order, popover and chat scroll

apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/WorkspaceSidebarPanel/WorkspaceSidebarPanel.tsx

@@ -6,6 +6,7 @@ import {
 	DEFAULT_WORKSPACE_SIDEBAR_WIDTH,
 	useWorkspaceSidebarStore,
 } from "renderer/stores/workspace-sidebar-state";
+import { WORKSPACE_SIDEBAR_ATTRIBUTE } from "./constants";
 import { useAutoCollapseInNarrowWindow } from "./hooks/useAutoCollapseInNarrowWindow";
 import { closeFocusedMenu } from "./utils/closeFocusedMenu";
 import { getWorkspaceSidebarMaxWidth } from "./utils/getWorkspaceSidebarMaxWidth";
@@ -64,19 +65,21 @@ export function WorkspaceSidebarPanel({
 		</ResizablePanel>
 	);
 
-	if (!slides) {
-		return renderPanel(isCollapsed ? collapsedWidth : expandedWidth);
-	}
-
 	return (
-		<SidebarSlide
-			mode={isCollapsed ? "closed" : "open"}
-			width={expandedWidth}
-			edge="left"
-			alwaysMounted
-			onLayoutFrame={onLayoutFrame}
-		>
-			{() => renderPanel(expandedWidth)}
-		</SidebarSlide>
+		<div {...{ [WORKSPACE_SIDEBAR_ATTRIBUTE]: "" }} className="contents">
+			{slides ? (
+				<SidebarSlide
+					mode={isCollapsed ? "closed" : "open"}
+					width={expandedWidth}
+					edge="left"
+					alwaysMounted
+					onLayoutFrame={onLayoutFrame}
+				>
+					{() => renderPanel(expandedWidth)}
+				</SidebarSlide>
+			) : (
+				renderPanel(isCollapsed ? collapsedWidth : expandedWidth)
+			)}
+		</div>
 	);
 }

apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/WorkspaceSidebarPanel/constants.ts

@@ -1,2 +1,3 @@
 // A pane is at least 260px wide (PANE_MIN_SIZE_CLASS_NAME in @superset/panes).
 export const MIN_CENTER_WIDTH = 260;
+export const WORKSPACE_SIDEBAR_ATTRIBUTE = "data-workspace-sidebar";

apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/WorkspaceSidebarPanel/index.ts

@@ -1 +1,2 @@
+export { WORKSPACE_SIDEBAR_ATTRIBUTE } from "./constants";
 export { WorkspaceSidebarPanel } from "./WorkspaceSidebarPanel";

apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceActivityMenu/WorkspaceActivityMenu.tsx

@@ -33,6 +33,7 @@ import {
 } from "renderer/lib/github/openPullRequestLink";
 import { clearTerminalBackgroundMarker } from "renderer/lib/terminal/terminal-background-intents";
 import { electronTrpcClient } from "renderer/lib/trpc-client";
+import { WORKSPACE_SIDEBAR_ATTRIBUTE } from "renderer/routes/_authenticated/_dashboard/components/WorkspaceSidebarPanel";
 import { usePageFavorites } from "renderer/routes/_authenticated/_dashboard/hooks/usePageFavorites";
 import { usePagesList } from "renderer/routes/_authenticated/_dashboard/hooks/usePagesList";
 import { pagesListInput } from "renderer/routes/_authenticated/_dashboard/utils/pagesListInput";
@@ -141,7 +142,6 @@ export function WorkspaceActivityMenu({
 			: null;
 	const { workspace: currentWorkspace } = useWorkspace();
 	const [shipView, setShipView] = useState<ShipView | null>(null);
-	const [popoverOpen, setPopoverOpen] = useState(false);
 	const triggerRef = useRef<HTMLButtonElement>(null);
 	const anchorNode = useActivityPanelStore(
 		(state) => state.anchorNodes[workspaceId],
@@ -156,6 +156,12 @@ export function WorkspaceActivityMenu({
 		(state) => state.hidden[workspaceId] === true,
 	);
 	const setHidden = useActivityPanelStore((state) => state.setHidden);
+	const popoverOpen = useActivityPanelStore(
+		(state) => state.floatingOpen[workspaceId] === true,
+	);
+	const setFloatingOpen = useActivityPanelStore(
+		(state) => state.setFloatingOpen,
+	);
 	const docked = fits && !hidden;
 	const floating = popoverOpen && !fits;
 	const open = docked || floating;
@@ -441,11 +447,11 @@ export function WorkspaceActivityMenu({
 	}, [open, workspaceId, newestPublishedAt, markSeen]);
 
 	useEffect(() => {
-		if (fits) setPopoverOpen(false);
-	}, [fits]);
+		if (fits) setFloatingOpen(workspaceId, false);
+	}, [fits, workspaceId, setFloatingOpen]);
 
 	const setFloating = (next: boolean) => {
-		setPopoverOpen(next);
+		setFloatingOpen(workspaceId, next);
 		if (next) {
 			void utils.page.listPaginated.invalidate(workspaceListInput);
 			return;
@@ -825,7 +831,11 @@ export function WorkspaceActivityMenu({
 					if (shipView || composing) event.preventDefault();
 				}}
 				onInteractOutside={(event) => {
-					if (triggerRef.current?.contains(event.target as Node))
+					const target = event.target as Element;
+					if (
+						triggerRef.current?.contains(target) ||
+						target.closest?.(`[${WORKSPACE_SIDEBAR_ATTRIBUTE}]`)
+					)
 						event.preventDefault();
 				}}
 			>

apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceActivityMenu/stores/activityPanelStore/activityPanelStore.test.ts

@@ -56,3 +56,12 @@ test("hiding the docked card is per workspace", () => {
 	setHidden("ws-a", false);
 	expect("ws-a" in useActivityPanelStore.getState().hidden).toBe(false);
 });
+
+test("the floating popover stays open per workspace and closing removes the key", () => {
+	const { setFloatingOpen } = useActivityPanelStore.getState();
+	setFloatingOpen("ws-a", true);
+	expect(useActivityPanelStore.getState().floatingOpen["ws-a"]).toBe(true);
+	expect(useActivityPanelStore.getState().floatingOpen["ws-b"]).toBeUndefined();
+	setFloatingOpen("ws-a", false);
+	expect("ws-a" in useActivityPanelStore.getState().floatingOpen).toBe(false);
+});

apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceActivityMenu/stores/activityPanelStore/activityPanelStore.ts

@@ -20,6 +20,8 @@ interface ActivityPanelStore {
 	setFits: (workspaceId: string, fits: boolean) => void;
 	hidden: Record<string, true>;
 	setHidden: (workspaceId: string, hidden: boolean) => void;
+	floatingOpen: Record<string, true>;
+	setFloatingOpen: (workspaceId: string, open: boolean) => void;
 	stoppedKeys: ReadonlySet<string>;
 	noteStopped: (key: string) => void;
 	forgetStopped: (keys: readonly string[]) => void;
@@ -51,6 +53,15 @@ export const useActivityPanelStore = create<ActivityPanelStore>()((set) => ({
 			const { [workspaceId]: _previous, ...rest } = state.hidden;
 			return { hidden: hidden ? { ...rest, [workspaceId]: true } : rest };
 		}),
+	floatingOpen: {},
+	setFloatingOpen: (workspaceId, open) =>
+		set((state) => {
+			if ((state.floatingOpen[workspaceId] === true) === open) return state;
+			const { [workspaceId]: _previous, ...rest } = state.floatingOpen;
+			return {
+				floatingOpen: open ? { ...rest, [workspaceId]: true } : rest,
+			};
+		}),
 	stoppedKeys: new Set(),
 	noteStopped: (key) =>
 		set((state) => ({ stoppedKeys: new Set(state.stoppedKeys).add(key) })),

apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceAgentEffects/WorkspaceAgentEffects.tsx

@@ -1,37 +1,24 @@
 import type { WorkspaceStore } from "@superset/panes";
 import type { StoreApi } from "zustand/vanilla";
-import { useAutoAdoptChatSessions } from "../../hooks/useAutoAdoptChatSessions";
 import { useClearActivePaneAttention } from "../../hooks/useClearActivePaneAttention";
 import type { PaneViewerData } from "../../types";
 
 type PaneStore = StoreApi<WorkspaceStore<PaneViewerData>>;
 
 interface WorkspaceAgentEffectsProps {
-	workspaceId: string;
 	store: PaneStore;
 	rightStore: PaneStore;
-	linkedStores: readonly PaneStore[];
-	isLayoutReady: boolean;
 }
 
 /**
  * Agent bindings change on every hook event. Reading them here, not in the
  * page, keeps an event from re-rendering the whole workspace.
  */
 export function WorkspaceAgentEffects({
-	workspaceId,
 	store,
 	rightStore,
-	linkedStores,
-	isLayoutReady,
 }: WorkspaceAgentEffectsProps) {
 	useClearActivePaneAttention({ store });
 	useClearActivePaneAttention({ store: rightStore });
-	useAutoAdoptChatSessions({
-		store,
-		linkedStores,
-		workspaceId,
-		isLayoutReady,
-	});
 	return null;
 }