update: code browser

TabbyML · May 28, 2024 · 2394644 · 2394644
1 parent 0912178
commit 2394644
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 12 deletions.
diff --git a/ee/tabby-ui/app/files/components/file-tree.tsx b/ee/tabby-ui/app/files/components/file-tree.tsx
@@ -23,6 +23,7 @@ import { Skeleton } from '@/components/ui/skeleton'
 import { SourceCodeBrowserContext, TFileMap } from './source-code-browser'
 import {
   encodeURIComponentIgnoringSlash,
+  getProviderVariantFromKind,
   resolveFileNameFromPath,
   resolveRepositoryInfoFromPath
 } from './utils'
@@ -246,7 +247,7 @@ const DirectoryTreeNode: React.FC<DirectoryTreeNodeProps> = ({
     const repoId = activeRepo?.id
     if (!kind || !repoId) return ''
 
-    return `${kind.toLowerCase()}/${repoId}`
+    return `${getProviderVariantFromKind(kind)}/${repoId}`
   }, [activeRepo])
 
   const { repositorySpecifier } = resolveRepositoryInfoFromPath(activePath)

diff --git a/ee/tabby-ui/app/files/components/repository-kind-icon.tsx b/ee/tabby-ui/app/files/components/repository-kind-icon.tsx
@@ -16,8 +16,10 @@ export function RepositoryKindIcon({
     case RepositoryKind.Git:
       return <IconDirectorySolid style={{ color: 'rgb(84, 174, 255)' }} />
     case RepositoryKind.Github:
+    case RepositoryKind.GithubSelfHosted:
       return <IconGitHub />
     case RepositoryKind.Gitlab:
+    case RepositoryKind.GitlabSelfHosted:
       return <IconGitLab />
     default:
       return fallback ?? null

diff --git a/ee/tabby-ui/app/files/components/source-code-browser.tsx b/ee/tabby-ui/app/files/components/source-code-browser.tsx
@@ -38,6 +38,7 @@ import {
   encodeURIComponentIgnoringSlash,
   fetchEntriesFromPath,
   getDirectoriesFromBasename,
+  getProviderVariantFromKind,
   repositoryList2Map,
   resolveFileNameFromPath,
   resolveRepositoryInfoFromPath,
@@ -227,6 +228,8 @@ const SourceCodeBrowserRenderer: React.FC<SourceCodeBrowserProps> = ({
     chatSideBarVisible,
     setChatSideBarVisible,
     setPendingEvent,
+    fileTreeData,
+    repoMap,
     setRepoMap,
     activeRepo
   } = React.useContext(SourceCodeBrowserContext)
@@ -241,7 +244,7 @@ const SourceCodeBrowserRenderer: React.FC<SourceCodeBrowserProps> = ({
     const repoId = activeRepo?.id
     const kind = activeRepo?.kind
     if (!repoId || !kind) return ''
-    return `${activeRepo.kind?.toLowerCase()}/${repoId}`
+    return `${getProviderVariantFromKind(kind)}/${repoId}`
   }, [activeRepo])
 
   const activeBasename = React.useMemo(() => {
@@ -434,6 +437,8 @@ const SourceCodeBrowserRenderer: React.FC<SourceCodeBrowserProps> = ({
     }
   }, [chatSideBarVisible])
 
+  console.log('repoMap', repoMap, fileTreeData)
+
   return (
     <ResizablePanelGroup
       direction="horizontal"

diff --git a/ee/tabby-ui/app/files/components/utils.ts b/ee/tabby-ui/app/files/components/utils.ts
@@ -7,6 +7,10 @@ import {
 import fetcher from '@/lib/tabby/fetcher'
 import { ResolveEntriesResponse, TFile } from '@/lib/types'
 
+function getProviderVariantFromKind(kind: RepositoryKind) {
+  return kind.toLowerCase().replaceAll('_', '')
+}
+
 function resolveRepositoryInfoFromPath(path: string | undefined): {
   repositoryKind?: RepositoryKind
   repositoryName?: string
@@ -32,19 +36,36 @@ function resolveRepositoryInfoFromPath(path: string | undefined): {
       basename: pathSegments.slice(2).join('/'),
       repositorySpecifier: `git/${repositoryName}`
     }
-  } else if (['github', 'gitlab'].includes(repositoryKindStr)) {
+  } else if (
+    ['github', 'gitlab', 'githubselfhosted', 'gitlabselfhosted'].includes(
+      repositoryKindStr
+    )
+  ) {
     if (pathSegments.length < 3) return emptyResult
-    const kind =
-      repositoryKindStr === 'github'
-        ? RepositoryKind.Github
-        : RepositoryKind.Gitlab
+    let kind: RepositoryKind = RepositoryKind.Github
+    switch (repositoryKindStr) {
+      case 'github':
+        kind = RepositoryKind.Github
+        break
+      case 'gitlab':
+        kind = RepositoryKind.Gitlab
+        break
+      case 'githubselfhosted':
+        kind = RepositoryKind.GithubSelfHosted
+        break
+      case 'gitlabselfhosted':
+        kind = RepositoryKind.GitlabSelfHosted
+        break
+    }
     const repositoryName = [pathSegments[1], pathSegments[2]].join('/')
 
     return {
       repositoryKind: kind,
       repositoryName,
       basename: pathSegments.slice(3).join('/'),
-      repositorySpecifier: `${kind.toLowerCase()}/${repositoryName}`
+      repositorySpecifier: `${getProviderVariantFromKind(
+        kind
+      )}/${repositoryName}`
     }
   }
   return emptyResult
@@ -87,7 +108,7 @@ async function fetchEntriesFromPath(
       dir => () =>
         fetcher(
           encodeURIComponentIgnoringSlash(
-            `/repositories/${repository.kind.toLowerCase()}/${
+            `/repositories/${getProviderVariantFromKind(repository.kind)}/${
               repository.id
             }/resolve/${dir}`
           )
@@ -109,14 +130,14 @@ function resolveRepoSpecifierFromRepoInfo(
     | undefined
 ) {
   if (repo?.kind && repo?.name) {
-    return `${repo.kind.toLowerCase()}/${repo.name}`
+    return `${getProviderVariantFromKind(repo.kind)}/${repo.name}`
   }
 
   return undefined
 }
 
 function repositoryList2Map(repos: RepositoryListQuery['repositoryList']) {
-  return keyBy(repos, o => `${o.kind.toLowerCase()}/${o.name}`)
+  return keyBy(repos, o => `${getProviderVariantFromKind(o.kind)}/${o.name}`)
 }
 
 function encodeURIComponentIgnoringSlash(str: string) {
@@ -133,5 +154,6 @@ export {
   fetchEntriesFromPath,
   resolveRepositoryInfoFromPath,
   repositoryList2Map,
-  encodeURIComponentIgnoringSlash
+  encodeURIComponentIgnoringSlash,
+  getProviderVariantFromKind
 }