Skip to content

frontend/title-bar: only open one AI Assistant dialog #8562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 10, 2025
Merged

frontend/title-bar: only open one AI Assistant dialog #8562

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 27 additions & 13 deletions src/packages/frontend/frame-editors/frame-tree/title-bar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,10 @@ export function FrameTitleBar(props: FrameTitleBarProps) {
const [close_and_halt_confirm, set_close_and_halt_confirm] =
useState<boolean>(false);

const [showAI, setShowAI] = useState<boolean>(false);
const [showAIDialogs, setShowAIDialogs] = useState<{
main: boolean;
popover: boolean;
}>({ main: false, popover: false });
const [showNewAI, setShowNewAI] = useState<boolean>(false);

const [helpSearch, setHelpSearch] = useState<string>("");
Expand Down Expand Up @@ -235,7 +238,8 @@ export function FrameTitleBar(props: FrameTitleBarProps) {
new ManageCommands({
props,
studentProjectFunctionality: student_project_functionality,
setShowAI,
setShowAI: (val: boolean) =>
setShowAIDialogs((prev) => ({ ...prev, main: val })),
setShowNewAI,
helpSearch,
setHelpSearch,
Expand All @@ -248,7 +252,7 @@ export function FrameTitleBar(props: FrameTitleBarProps) {
student_project_functionality,
helpSearch,
setHelpSearch,
setShowAI,
setShowAIDialogs,
setShowNewAI,
read_only,
editorSettings,
Expand Down Expand Up @@ -579,7 +583,7 @@ export function FrameTitleBar(props: FrameTitleBarProps) {
);
}

function renderAssistant(noLabel): Rendered {
function renderAssistant(noLabel, where: "main" | "popover"): Rendered {
if (
!manageCommands.isVisible("chatgpt") ||
!redux.getStore("projects").hasLanguageModelEnabled(props.project_id)
Expand All @@ -590,11 +594,13 @@ export function FrameTitleBar(props: FrameTitleBarProps) {
<LanguageModelTitleBarButton
path={props.path}
type={props.type}
showDialog={showAI}
setShowDialog={setShowAI}
showDialog={showAIDialogs[where]}
setShowDialog={(value: boolean) => {
setShowAIDialogs((prev) => ({ ...prev, [where]: value }));
}}
project_id={props.project_id}
buttonRef={getTourRef("chatgpt")}
key={"ai-button"}
key={`ai-button-${where}`}
id={props.id}
actions={props.actions}
buttonSize={button_size()}
Expand Down Expand Up @@ -641,7 +647,7 @@ export function FrameTitleBar(props: FrameTitleBarProps) {
);
}

function renderSaveTimetravelGroup(): Rendered {
function renderSaveTimetravelGroup(where: "main" | "popover"): Rendered {
if (props.type == "chat") {
// these buttons don't make much sense for side chat.
return;
Expand All @@ -651,7 +657,7 @@ export function FrameTitleBar(props: FrameTitleBarProps) {
let x;
if ((x = renderSaveButton(noLabel))) v.push(x);
if ((x = renderTimeTravel(noLabel))) v.push(x);
if ((x = renderAssistant(noLabel))) v.push(x);
if ((x = renderAssistant(noLabel, where))) v.push(x);
if ((x = renderComputeServer(noLabel))) v.push(x);
if (v.length == 1) return v[0];
if (v.length > 0) {
Expand Down Expand Up @@ -754,7 +760,11 @@ export function FrameTitleBar(props: FrameTitleBarProps) {
// seems too horrible right now since it is a selector.
}

function renderButtons(style?: CSS, noRefs?): Rendered {
function renderButtons(
style?: CSS,
noRefs?,
where: "main" | "popover" = "main",
): Rendered {
if (!is_active) {
return (
<div style={{ display: "flex", width: "100%" }}>
Expand Down Expand Up @@ -784,7 +794,7 @@ export function FrameTitleBar(props: FrameTitleBarProps) {
}

const v: (React.JSX.Element | undefined | null)[] = [];
v.push(renderSaveTimetravelGroup());
v.push(renderSaveTimetravelGroup(where));
if (props.title != null) {
v.push(renderTitle());
}
Expand Down Expand Up @@ -841,7 +851,7 @@ export function FrameTitleBar(props: FrameTitleBarProps) {
}
return (
<Popover
overlayStyle={{ zIndex: 990 }}
styles={{ root: { zIndex: 990 } }}
open={
props.tab_is_visible && props.is_visible && showMainButtonsPopover
}
Expand All @@ -860,7 +870,11 @@ export function FrameTitleBar(props: FrameTitleBarProps) {
marginRight: "3px",
}}
>
{renderButtons({ maxHeight: "50vh", display: "block" }, true)}
{renderButtons(
{ maxHeight: "50vh", display: "block" },
true,
"popover",
)}
</div>
<div>
{renderFrameControls()}
Expand Down