Fix setting title of shared conversation, move shared button into the title pane

This commit is contained in:
sabaimran
2024-12-10 18:19:46 -08:00
parent d7e5a76ace
commit 321eeeaed7
2 changed files with 56 additions and 40 deletions

View File

@@ -105,7 +105,6 @@ import { ScrollAreaScrollbar } from "@radix-ui/react-scroll-area";
import { KhojLogoType } from "@/app/components/logo/khojLogo"; import { KhojLogoType } from "@/app/components/logo/khojLogo";
import NavMenu from "@/app/components/navMenu/navMenu"; import NavMenu from "@/app/components/navMenu/navMenu";
import { getIconFromIconName } from "@/app/common/iconUtils"; import { getIconFromIconName } from "@/app/common/iconUtils";
import AgentProfileCard from "../profileCard/profileCard";
// Define a fetcher function // Define a fetcher function
const fetcher = (url: string) => const fetcher = (url: string) =>
@@ -627,43 +626,56 @@ export function ChatSessionActionMenu(props: ChatSessionActionMenuProps) {
const size = sizeClass(); const size = sizeClass();
return ( return (
<DropdownMenu onOpenChange={(open) => setIsOpen(open)} open={isOpen}> <div className="flex items-center gap-2">
<DropdownMenuTrigger> {(props.sizing === "lg" || props.sizing === "md") && (
<DotsThreeVertical className={`${size}`} /> <Button
</DropdownMenuTrigger> className="p-0 text-sm h-auto"
<DropdownMenuContent> variant={"ghost"}
<DropdownMenuItem> onClick={() => setIsSharing(true)}
<Button >
className="p-0 text-sm h-auto" <Share className={`${size}`} />
variant={"ghost"} </Button>
onClick={() => setIsRenaming(true)} )}
> <DropdownMenu onOpenChange={(open) => setIsOpen(open)} open={isOpen}>
<Pencil className={`mr-2 ${size}`} /> <DropdownMenuTrigger>
Rename <DotsThreeVertical className={`${size}`} />
</Button> </DropdownMenuTrigger>
</DropdownMenuItem> <DropdownMenuContent>
<DropdownMenuItem> <DropdownMenuItem>
<Button <Button
className="p-0 text-sm h-auto" className="p-0 text-sm h-auto"
variant={"ghost"} variant={"ghost"}
onClick={() => setIsSharing(true)} onClick={() => setIsRenaming(true)}
> >
<Share className={`mr-2 ${size}`} /> <Pencil className={`mr-2 ${size}`} />
Share Rename
</Button> </Button>
</DropdownMenuItem> </DropdownMenuItem>
<DropdownMenuItem> {props.sizing === "sm" && (
<Button <DropdownMenuItem>
className="p-0 text-sm h-auto text-rose-300 hover:text-rose-400" <Button
variant={"ghost"} className="p-0 text-sm h-auto"
onClick={() => setIsDeleting(true)} variant={"ghost"}
> onClick={() => setIsSharing(true)}
<Trash className={`mr-2 ${size}`} /> >
Delete <Share className={`mr-2 ${size}`} />
</Button> Share
</DropdownMenuItem> </Button>
</DropdownMenuContent> </DropdownMenuItem>
</DropdownMenu> )}
<DropdownMenuItem>
<Button
className="p-0 text-sm h-auto text-rose-300 hover:text-rose-400"
variant={"ghost"}
onClick={() => setIsDeleting(true)}
>
<Trash className={`mr-2 ${size}`} />
Delete
</Button>
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
</div>
); );
} }
@@ -685,7 +697,11 @@ function ChatSession(props: ChatHistory) {
> >
<p className={styles.session}>{title}</p> <p className={styles.session}>{title}</p>
</Link> </Link>
<ChatSessionActionMenu conversationId={props.conversation_id} setTitle={setTitle} /> <ChatSessionActionMenu
conversationId={props.conversation_id}
setTitle={setTitle}
sizing="sm"
/>
</div> </div>
); );
} }

View File

@@ -857,7 +857,7 @@ class ConversationAdapters:
agent=conversation.agent, agent=conversation.agent,
conversation_log=conversation.conversation_log, conversation_log=conversation.conversation_log,
slug=conversation.slug, slug=conversation.slug,
title=conversation.title, title=conversation.title if conversation.title else conversation.slug,
) )
@staticmethod @staticmethod