Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 364
Layout v2#1097
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.
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
Uh oh!
There was an error while loading. Please reload this page.
Merged
Layout v2 #1097
Changes from all commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
e5d3107
wip
brendan-kellam f5fc39b
remove unused hook
brendan-kellam 4e74811
Add collapse sidebar button
brendan-kellam 40a9f40
refactor settings into sidebar as a override context
brendan-kellam 1b65332
chat thread styling
brendan-kellam 15aa164
notification dot
brendan-kellam 003ed9a
improved rendering
brendan-kellam 7b92404
fix light mode
brendan-kellam 26be6b3
imporved api key page
brendan-kellam 845ce48
add chats page
brendan-kellam e653e4f
not found nit
brendan-kellam 7be6bca
guest sidebar footer
brendan-kellam d4cd1c5
add tooltip for sidebar collapse button
brendan-kellam 9843cbf
nit
brendan-kellam e6960c7
onboard nit
brendan-kellam c04b9f1
fix permission sync banner
brendan-kellam 3d994c5
what's new
brendan-kellam 1f481da
profile settings
brendan-kellam 979e84e
home view settings
brendan-kellam d7d13b2
general settings
brendan-kellam 66d8c38
remove shadow
brendan-kellam 4ead8ad
changelog
brendan-kellam 8f37f8b
feedback
brendan-kellam File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| import { Script } from "../scriptRunner"; | ||
| import { PrismaClient } from "../../dist"; | ||
| import { confirmAction } from "../utils"; | ||
| const chatNames = [ | ||
| "How does the auth middleware work?", | ||
| "Explain the search indexing pipeline", | ||
| "Where are API routes defined?", | ||
| "How to add a new database migration", | ||
| "What is the repo sync process?", | ||
| "Understanding the chat architecture", | ||
| "How does SSO integration work?", | ||
| "Explain the permission model", | ||
| "Where is the webhook handler?", | ||
| "How to configure environment variables", | ||
| "Understanding the billing system", | ||
| "How does the worker process jobs?", | ||
| "Explain the caching strategy", | ||
| "Where are the shared types defined?", | ||
| "How does code search ranking work?", | ||
| "Understanding the notification system", | ||
| "How to add a new API endpoint", | ||
| "Explain the deployment pipeline", | ||
| "Where is error handling centralized?", | ||
| "How does real-time updates work?", | ||
| "Understanding the plugin system", | ||
| "How to write integration tests", | ||
| "Explain the file indexing process", | ||
| "Where are the email templates?", | ||
| "How does rate limiting work?", | ||
| "Understanding the monorepo structure", | ||
| "How to add a new feature flag", | ||
| "Explain the logging setup", | ||
| "Where is the GraphQL schema?", | ||
| "How does the sidebar component work?", | ||
| ]; | ||
| export const injectChatData: Script = { | ||
| run: async (prisma: PrismaClient) => { | ||
| const orgId = 1; | ||
| const org = await prisma.org.findUnique({ | ||
| where: { id: orgId } | ||
| }); | ||
| if (!org) { | ||
| console.error(`Organization with id ${orgId} not found.`); | ||
| return; | ||
| } | ||
| const userIdArg = process.argv.find(arg => arg.startsWith("--user-id="))?.split("=")[1]; | ||
| const user = userIdArg | ||
| ? await prisma.user.findUnique({ where: { id: userIdArg } }) | ||
| : await prisma.user.findFirst({ | ||
| where: { | ||
| orgs: { | ||
| some: { orgId } | ||
| } | ||
| } | ||
| }); | ||
| if (!user) { | ||
| console.error(userIdArg | ||
| ? `User with id "${userIdArg}" not found.` | ||
| : `No user found in org ${orgId}.` | ||
| ); | ||
| return; | ||
| } | ||
| await confirmAction(`This will create ${chatNames.length} chats for user "${user.name ?? user.email}" in org ${orgId}.`); | ||
| for (const name of chatNames) { | ||
| await prisma.chat.create({ | ||
| data: { | ||
| name, | ||
| orgId, | ||
| createdById: user.id, | ||
| messages: [], | ||
| } | ||
| }); | ||
| } | ||
| console.log(`Created ${chatNames.length} chats.`); | ||
| } | ||
| }; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 5 additions & 0 deletions
5 packages/web/src/app/(app)/@sidebar/(routes)/(default)/[...slug]/page.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| import { DefaultSidebar } from "../../../components/defaultSidebar"; | ||
| export default async function Page() { | ||
| return <DefaultSidebar />; | ||
| } |
5 changes: 5 additions & 0 deletions
5 packages/web/src/app/(app)/@sidebar/(routes)/(default)/page.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| import { DefaultSidebar } from "../../components/defaultSidebar"; | ||
| export default async function Page() { | ||
| return <DefaultSidebar />; | ||
| } |
6 changes: 6 additions & 0 deletions
6 packages/web/src/app/(app)/@sidebar/(routes)/settings/[...slug]/page.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| import { authenticatedPage } from "@/middleware/authenticatedPage"; | ||
| import { SettingsSidebar } from "../../../components/settingsSidebar"; | ||
| export default authenticatedPage(async () => { | ||
| return <SettingsSidebar />; | ||
| }); |
6 changes: 6 additions & 0 deletions
6 packages/web/src/app/(app)/@sidebar/(routes)/settings/page.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| import { authenticatedPage } from "@/middleware/authenticatedPage"; | ||
| import { SettingsSidebar } from "../../components/settingsSidebar"; | ||
| export default authenticatedPage(async () => { | ||
| return <SettingsSidebar />; | ||
| }); |
175 changes: 175 additions & 0 deletions
175 packages/web/src/app/(app)/@sidebar/components/defaultSidebar/chatHistory.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,175 @@ | ||
| "use client"; | ||
| import { ChatActionsDropdown } from "@/app/(app)/chat/components/chatActionsDropdown"; | ||
| import { DeleteChatDialog } from "@/app/(app)/chat/components/deleteChatDialog"; | ||
| import { DuplicateChatDialog } from "@/app/(app)/chat/components/duplicateChatDialog"; | ||
| import { RenameChatDialog } from "@/app/(app)/chat/components/renameChatDialog"; | ||
| import { useToast } from "@/components/hooks/use-toast"; | ||
| import { | ||
| SidebarGroup, | ||
| SidebarGroupContent, | ||
| SidebarGroupLabel, | ||
| SidebarMenu, | ||
| SidebarMenuAction, | ||
| SidebarMenuButton, | ||
| SidebarMenuItem, | ||
| } from "@/components/ui/sidebar"; | ||
| import { deleteChat, duplicateChat, updateChatName } from "@/features/chat/actions"; | ||
| import { captureEvent } from "@/hooks/useCaptureEvent"; | ||
| import { isServiceError } from "@/lib/utils"; | ||
| import { EllipsisIcon, MessagesSquareIcon } from "lucide-react"; | ||
| import Link from "next/link"; | ||
| import { usePathname, useRouter } from "next/navigation"; | ||
| import { useCallback, useState } from "react"; | ||
| export interface ChatHistoryItem { | ||
| id: string; | ||
| name: string | null; | ||
| createdAt: Date; | ||
| } | ||
| interface ChatHistoryProps { | ||
| chatHistory: ChatHistoryItem[]; | ||
| hasMore?: boolean; | ||
| } | ||
| export function ChatHistory({ chatHistory, hasMore }: ChatHistoryProps) { | ||
| const pathname = usePathname(); | ||
| const router = useRouter(); | ||
| const { toast } = useToast(); | ||
| const [isRenameDialogOpen, setIsRenameDialogOpen] = useState(false); | ||
| const [chatIdToRename, setChatIdToRename] = useState<string | null>(null); | ||
| const [isDuplicateDialogOpen, setIsDuplicateDialogOpen] = useState(false); | ||
| const [chatIdToDuplicate, setChatIdToDuplicate] = useState<string | null>(null); | ||
| const [isDeleteDialogOpen, setIsDeleteDialogOpen] = useState(false); | ||
| const [chatIdToDelete, setChatIdToDelete] = useState<string | null>(null); | ||
| const onRenameChat = useCallback(async (name: string, chatId: string): Promise<boolean> => { | ||
| const response = await updateChatName({ chatId, name }); | ||
| if (isServiceError(response)) { | ||
| toast({ description: `Failed to rename chat. Reason: ${response.message}` }); | ||
| return false; | ||
| } | ||
| toast({ description: "Chat renamed successfully" }); | ||
| captureEvent('wa_chat_renamed', { chatId }); | ||
| router.refresh(); | ||
| return true; | ||
| }, [router, toast]); | ||
| const onDeleteChat = useCallback(async (chatIdToDelete: string): Promise<boolean> => { | ||
| const response = await deleteChat({ chatId: chatIdToDelete }); | ||
| if (isServiceError(response)) { | ||
| toast({ description: `Failed to delete chat. Reason: ${response.message}` }); | ||
| return false; | ||
| } | ||
| toast({ description: "Chat deleted successfully" }); | ||
| captureEvent('wa_chat_deleted', { chatId: chatIdToDelete }); | ||
| if (pathname === `/chat/${chatIdToDelete}`) { | ||
| router.push("/chat"); | ||
| } else { | ||
| router.refresh(); | ||
| } | ||
| return true; | ||
| }, [pathname, router, toast]); | ||
| const onDuplicateChat = useCallback(async (newName: string, chatIdToDuplicate: string): Promise<string | null> => { | ||
| const response = await duplicateChat({ chatId: chatIdToDuplicate, newName }); | ||
| if (isServiceError(response)) { | ||
| toast({ description: `Failed to duplicate chat. Reason: ${response.message}` }); | ||
| return null; | ||
| } | ||
| toast({ description: "Chat duplicated successfully" }); | ||
| captureEvent('wa_chat_duplicated', { chatId: chatIdToDuplicate }); | ||
| router.push(`/chat/${response.id}`); | ||
| return response.id; | ||
| }, [router, toast]); | ||
| if (chatHistory.length === 0) { | ||
| return null; | ||
| } | ||
| return ( | ||
| <> | ||
| <SidebarGroup className="group-data-[state=collapsed]:hidden"> | ||
| <SidebarGroupLabel className="text-muted-foreground whitespace-nowrap">Recent Chats</SidebarGroupLabel> | ||
| <SidebarGroupContent> | ||
| <SidebarMenu> | ||
| {chatHistory.map((chat) => ( | ||
| <SidebarMenuItem key={chat.id} className="group/chat"> | ||
| <SidebarMenuButton | ||
| asChild | ||
| isActive={pathname === `/chat/${chat.id}`} | ||
| > | ||
| <Link href={`/chat/${chat.id}`}> | ||
| <span>{chat.name ?? "Untitled chat"}</span> | ||
| </Link> | ||
| </SidebarMenuButton> | ||
| <ChatActionsDropdown | ||
| onRenameClick={() => { | ||
| setChatIdToRename(chat.id); | ||
| setIsRenameDialogOpen(true); | ||
| }} | ||
| onDuplicateClick={() => { | ||
| setChatIdToDuplicate(chat.id); | ||
| setIsDuplicateDialogOpen(true); | ||
| }} | ||
| onDeleteClick={() => { | ||
| setChatIdToDelete(chat.id); | ||
| setIsDeleteDialogOpen(true); | ||
| }} | ||
| > | ||
| <SidebarMenuAction showOnHover className="transition-opacity"> | ||
| <EllipsisIcon className="w-4 h-4" /> | ||
| </SidebarMenuAction> | ||
brendan-kellam marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| </ChatActionsDropdown> | ||
| </SidebarMenuItem> | ||
| ))} | ||
| {hasMore && ( | ||
| <SidebarMenuItem> | ||
| <SidebarMenuButton asChild> | ||
| <Link href="/chats"> | ||
| <MessagesSquareIcon className="h-4 w-4" /> | ||
| <span>All chats</span> | ||
| </Link> | ||
| </SidebarMenuButton> | ||
| </SidebarMenuItem> | ||
| )} | ||
| </SidebarMenu> | ||
| </SidebarGroupContent> | ||
| </SidebarGroup> | ||
| <RenameChatDialog | ||
| isOpen={isRenameDialogOpen} | ||
| onOpenChange={setIsRenameDialogOpen} | ||
| onRename={async (name) => { | ||
| if (chatIdToRename) { | ||
| return await onRenameChat(name, chatIdToRename); | ||
| } | ||
| return false; | ||
| }} | ||
| currentName={chatHistory.find((chat) => chat.id === chatIdToRename)?.name ?? "Untitled chat"} | ||
| /> | ||
| <DeleteChatDialog | ||
| isOpen={isDeleteDialogOpen} | ||
| onOpenChange={setIsDeleteDialogOpen} | ||
| onDelete={async () => { | ||
| if (chatIdToDelete) { | ||
| return await onDeleteChat(chatIdToDelete); | ||
| } | ||
| return false; | ||
| }} | ||
| /> | ||
| <DuplicateChatDialog | ||
| isOpen={isDuplicateDialogOpen} | ||
| onOpenChange={setIsDuplicateDialogOpen} | ||
| onDuplicate={async (newName) => { | ||
| if (chatIdToDuplicate) { | ||
| return await onDuplicateChat(newName, chatIdToDuplicate); | ||
| } | ||
| return null; | ||
| }} | ||
| currentName={chatHistory.find((chat) => chat.id === chatIdToDuplicate)?.name ?? "Untitled chat"} | ||
| /> | ||
| </> | ||
| ); | ||
| } | ||
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.