Skip to content
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

chore(ui): add readWorksapceRepositories to chat sidebar in code browser #3634

Merged
merged 4 commits into from
Dec 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions ee/tabby-ui/app/chat/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,9 @@ export default function ChatPage() {
currentChatRef.addRelevantContext(context)
})

currentChatRef.updateActiveSelection(pendingActiveSelection)
if (pendingActiveSelection) {
currentChatRef.updateActiveSelection(pendingActiveSelection)
}

if (pendingCommand) {
// FIXME: this delay is a workaround for waiting for the active selection to be updated
Expand Down Expand Up @@ -418,7 +420,7 @@ export default function ChatPage() {
openInEditor={openInEditor}
openExternal={openExternal}
readWorkspaceGitRepositories={
isInEditor && supportsProvideWorkspaceGitRepoInfo
supportsProvideWorkspaceGitRepoInfo
? server?.readWorkspaceGitRepositories
: undefined
}
Expand Down
38 changes: 28 additions & 10 deletions ee/tabby-ui/app/files/components/chat-side-bar.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import React from 'react'
import React, { useRef, useState } from 'react'
import { find } from 'lodash-es'
import type { FileLocation } from 'tabby-chat-panel'
import type { FileLocation, GitRepository } from 'tabby-chat-panel'
import { useClient } from 'tabby-chat-panel/react'

import { RepositoryListQuery } from '@/lib/gql/generates/graphql'
import { useLatest } from '@/lib/hooks/use-latest'
import { useMe } from '@/lib/hooks/use-me'
import { filename2prism } from '@/lib/language-utils'
Expand All @@ -16,17 +17,22 @@ import { SourceCodeBrowserContext } from './source-code-browser'
import { generateEntryPath, getDefaultRepoRef, resolveRepoRef } from './utils'

interface ChatSideBarProps
extends Omit<React.HTMLAttributes<HTMLDivElement>, 'children'> {}
extends Omit<React.HTMLAttributes<HTMLDivElement>, 'children'> {
activeRepo: RepositoryListQuery['repositoryList'][0] | undefined
}

export const ChatSideBar: React.FC<ChatSideBarProps> = ({
activeRepo,
className,
...props
}) => {
const [{ data }] = useMe()
const [initialized, setInitialized] = useState(false)
const { pendingEvent, setPendingEvent, repoMap, updateActivePath } =
React.useContext(SourceCodeBrowserContext)
const activeChatId = useChatStore(state => state.activeChatId)
const iframeRef = React.useRef<HTMLIFrameElement>(null)
const executedCommand = useRef(false)
const repoMapRef = useLatest(repoMap)
const openInCodeBrowser = async (fileLocation: FileLocation) => {
const { filepath, location } = fileLocation
Expand Down Expand Up @@ -60,6 +66,12 @@ export const ChatSideBar: React.FC<ChatSideBarProps> = ({
return false
}

const readWorkspaceGitRepositories = useLatest(() => {
if (!activeRepo) return []
const list: GitRepository[] = [{ url: activeRepo.gitUrl }]
return list
})

const client = useClient(iframeRef, {
refresh: async () => {
window.location.reload()
Expand All @@ -70,14 +82,19 @@ export const ChatSideBar: React.FC<ChatSideBarProps> = ({
})
},
onApplyInEditor(_content) {},
onLoaded() {},
onLoaded() {
setInitialized(true)
},
onCopy(_content) {},
onKeyboardEvent() {},
openInEditor: async (fileLocation: FileLocation) => {
return openInCodeBrowser(fileLocation)
},
openExternal: async (url: string) => {
window.open(url, '_blank')
},
readWorkspaceGitRepositories: async () => {
return readWorkspaceGitRepositories.current?.()
}
})

Expand All @@ -100,10 +117,10 @@ export const ChatSideBar: React.FC<ChatSideBarProps> = ({
}
})
}
}, [iframeRef?.current, client, data])
}, [iframeRef?.current, client?.init, data])

React.useEffect(() => {
if (pendingEvent && client) {
if (pendingEvent && client && initialized) {
const execute = async () => {
const { lineFrom, lineTo, code, path, gitUrl } = pendingEvent
client.updateActiveSelection({
Expand All @@ -119,17 +136,18 @@ export const ChatSideBar: React.FC<ChatSideBarProps> = ({
gitUrl
}
})
const command = getCommand(pendingEvent)
// FIXME: this delay is a workaround for waiting for the active selection to be updated
setTimeout(() => {
client.executeCommand(getCommand(pendingEvent))
client.executeCommand(command)
}, 500)
setPendingEvent(undefined)
}

execute()
}
setPendingEvent(undefined)
}, [pendingEvent, client])
}, [initialized, pendingEvent])

if (!data?.me) return <></>
return (
<div className={cn('flex h-full flex-col', className)} {...props}>
<Header />
Expand Down
27 changes: 21 additions & 6 deletions ee/tabby-ui/app/files/components/source-code-browser.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,8 @@ const SourceCodeBrowserRenderer: React.FC<SourceCodeBrowserProps> = ({
const { progress, setProgress } = useTopbarProgress()
const chatSideBarPanelRef = React.useRef<ImperativePanelHandle>(null)
const [chatSideBarPanelSize, setChatSideBarPanelSize] = React.useState(35)
const [chatSidebarInitialized, setChatSidebarInitialized] = useState(false)

const searchQuery = searchParams.get('q')?.toString()

const parsedEntryInfo = React.useMemo(() => {
Expand Down Expand Up @@ -619,12 +621,23 @@ const SourceCodeBrowserRenderer: React.FC<SourceCodeBrowserProps> = ({
}, [fetchingRawFile, fetchingTreeEntries])

React.useEffect(() => {
if (chatSideBarVisible) {
chatSideBarPanelRef.current?.expand()
chatSideBarPanelRef.current?.resize(chatSideBarPanelSize)
} else {
chatSideBarPanelRef.current?.collapse()
const initChatSidebar = () => {
if (chatSideBarVisible && !chatSidebarInitialized) {
setChatSidebarInitialized(true)
}
}

const toggleChatSidebarPanel = () => {
if (chatSideBarVisible) {
chatSideBarPanelRef.current?.expand()
chatSideBarPanelRef.current?.resize(chatSideBarPanelSize)
} else {
chatSideBarPanelRef.current?.collapse()
}
}

initChatSidebar()
toggleChatSidebarPanel()
}, [chatSideBarVisible])

React.useEffect(() => {
Expand Down Expand Up @@ -736,7 +749,9 @@ const SourceCodeBrowserRenderer: React.FC<SourceCodeBrowserProps> = ({
ref={chatSideBarPanelRef}
onCollapse={() => setChatSideBarVisible(false)}
>
<ChatSideBar />
{chatSidebarInitialized ? (
<ChatSideBar activeRepo={activeRepo} />
) : null}
</ResizablePanel>
</>
</ResizablePanelGroup>
Expand Down
Loading