refactor(webserver): remove /resolve/meta api endpoint (#1816)

* refactor(webserver): remove /resolve/meta api endpoint * feat(ui): detect language by filename * update * move filename2prism to @/lib * [autofix.ci] apply automated fixes --------- Co-authored-by: liangfung <[email protected]> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
TabbyML · Apr 11, 2024 · f852da9 · f852da9
1 parent 2aa4520
commit f852da9
Show file tree

Hide file tree

Showing 16 changed files with 951 additions and 303 deletions.
diff --git a/ee/tabby-db/src/repositories.rs b/ee/tabby-db/src/repositories.rs
@@ -68,11 +68,13 @@ impl DbConn {
     }
 
     pub async fn get_repository_by_name(&self, name: &str) -> Result<RepositoryDAO> {
-        let repository =
-            sqlx::query_as("SELECT id, name, git_url FROM repositories WHERE name = ?;")
-                .bind(name)
-                .fetch_one(&self.pool)
-                .await?;
+        let repository = sqlx::query_as!(
+            RepositoryDAO,
+            "SELECT id as 'id!: i64', name, git_url FROM repositories WHERE name = ?",
+            name
+        )
+        .fetch_one(&self.pool)
+        .await?;
         Ok(repository)
     }
 }

diff --git a/ee/tabby-ui/app/files/components/code-editor-view.tsx b/ee/tabby-ui/app/files/components/code-editor-view.tsx
@@ -5,7 +5,7 @@ import { useTheme } from 'next-themes'
 
 import { EXP_enable_code_browser_quick_action_bar } from '@/lib/experiment-flags'
 import { useIsChatEnabled } from '@/lib/hooks/use-server-info'
-import { TFileMeta } from '@/lib/types'
+import { TCodeTag } from '@/lib/types'
 import CodeEditor, {
   CodeMirrorEditorRef
 } from '@/components/codemirror/codemirror'
@@ -17,17 +17,12 @@ import { ActionBarWidgetExtension } from './action-bar-widget/action-bar-widget-
 
 interface CodeEditorViewProps {
   value: string
-  meta: TFileMeta | undefined
   language: string
 }
 
-const CodeEditorView: React.FC<CodeEditorViewProps> = ({
-  value,
-  meta,
-  language
-}) => {
+const CodeEditorView: React.FC<CodeEditorViewProps> = ({ value, language }) => {
   const { theme } = useTheme()
-  const tags = meta?.tags
+  const tags: TCodeTag[] = []
   const editorRef = React.useRef<CodeMirrorEditorRef>(null)
   const isChatEnabled = useIsChatEnabled()
 

diff --git a/ee/tabby-ui/app/files/components/source-code-browser.tsx b/ee/tabby-ui/app/files/components/source-code-browser.tsx
@@ -1,13 +1,13 @@
 'use client'
 
 import React, { PropsWithChildren } from 'react'
-import filename2prism from 'filename2prism'
 import { compact, findIndex, toNumber } from 'lodash-es'
 import { ImperativePanelHandle } from 'react-resizable-panels'
 import { toast } from 'sonner'
 import { SWRResponse } from 'swr'
 import useSWRImmutable from 'swr/immutable'
 
+import filename2prism from '@/lib/filename2prism'
 import useRouterStuff from '@/lib/hooks/use-router-stuff'
 import fetcher from '@/lib/tabby/fetcher'
 import type { ResolveEntriesResponse, TFile } from '@/lib/types'
@@ -254,14 +254,6 @@ const SourceCodeBrowserRenderer: React.FC<SourceCodeBrowserProps> = ({
   const fileBlob = rawFileResponse?.blob
   const contentLength = rawFileResponse?.contentLength
 
-  // fetch active file meta
-  const { data: fileMeta } = useSWRImmutable(
-    isFileSelected
-      ? `/repositories/${activeRepoName}/meta/${activeBasename}`
-      : null,
-    fetcher
-  )
-
   // fetch active dir
   const {
     data: subTree,
@@ -398,11 +390,7 @@ const SourceCodeBrowserRenderer: React.FC<SourceCodeBrowserProps> = ({
               />
             )}
             {showTextFileView && (
-              <TextFileView
-                blob={fileBlob}
-                meta={fileMeta}
-                contentLength={contentLength}
-              />
+              <TextFileView blob={fileBlob} contentLength={contentLength} />
             )}
             {showRawFileView && (
               <RawFileView
@@ -560,4 +548,4 @@ async function getFileViewType(
 
 export type { TFileMap, TFileMapItem }
 
-export { SourceCodeBrowserContext, SourceCodeBrowser, getFileViewType }
+export { SourceCodeBrowserContext, SourceCodeBrowser }
diff --git a/ee/tabby-ui/app/files/components/text-file-view.tsx b/ee/tabby-ui/app/files/components/text-file-view.tsx
@@ -1,8 +1,7 @@
 import React, { Suspense, useContext } from 'react'
-import filename2prism from 'filename2prism'
 
+import filename2prism from '@/lib/filename2prism'
 import useRouterStuff from '@/lib/hooks/use-router-stuff'
-import { TFileMeta } from '@/lib/types'
 import { cn } from '@/lib/utils'
 import { Tabs, TabsList, TabsTrigger } from '@/components/ui/tabs'
 import { ListSkeleton } from '@/components/skeleton'
@@ -15,14 +14,12 @@ const MarkdownView = React.lazy(() => import('./markdown-view'))
 
 interface TextFileViewProps extends React.HTMLProps<HTMLDivElement> {
   blob: Blob | undefined
-  meta: TFileMeta | undefined
   contentLength?: number
 }
 
 export const TextFileView: React.FC<TextFileViewProps> = ({
   className,
   blob,
-  meta,
   contentLength
 }) => {
   const { searchParams, updateSearchParams } = useRouterStuff()
@@ -32,7 +29,7 @@ export const TextFileView: React.FC<TextFileViewProps> = ({
   const detectedLanguage = activePath
     ? filename2prism(activePath)[0]
     : undefined
-  const language = (meta?.language ?? detectedLanguage) || ''
+  const language = detectedLanguage ?? 'plain'
   const isMarkdown = !!value && language === 'markdown'
   const isPlain = searchParams.get('plain')?.toString() === '1'
   const showMarkdown = isMarkdown && !isPlain
@@ -86,7 +83,7 @@ export const TextFileView: React.FC<TextFileViewProps> = ({
           {showMarkdown ? (
             <MarkdownView value={value} />
           ) : (
-            <CodeEditorView value={value} language={language} meta={meta} />
+            <CodeEditorView value={value} language={language} />
           )}
         </Suspense>
       </div>

diff --git a/ee/tabby-ui/lib/filename2prism/index.ts b/ee/tabby-ui/lib/filename2prism/index.ts
@@ -0,0 +1,40 @@
+// Fork from
+// https://github.com/TomerAberbach/filename2prism/
+
+import path from 'path'
+import { has } from 'lodash-es'
+
+import languages from './languages'
+
+const filenames: Record<string, string[]> = {}
+const extnames: Record<string, string[]> = {}
+
+for (const [alias, associations] of Object.entries(languages)) {
+  for (const filename of associations.filenames) {
+    if (!has(filenames, filename)) {
+      filenames[filename] = []
+    }
+
+    filenames[filename].push(alias)
+  }
+
+  for (const extname of associations.extnames) {
+    if (!has(extnames, extname)) {
+      extnames[extname] = []
+    }
+
+    extnames[extname].push(alias)
+  }
+}
+
+const filename2prism: (filename: string) => Array<string> = filename => {
+  const result: string[] = []
+  return result
+    .concat(
+      filenames[path.basename(filename)],
+      extnames[path.extname(filename).substring(1)]
+    )
+    .filter(Boolean)
+}
+
+export default filename2prism