fix(ui): display raw text while redirecting to markdown file (#2720)

* fix(ui): display raw text while redirecting to markdown file * update
TabbyML · Jul 25, 2024 · f180daa · f180daa
1 parent 2abb264
commit f180daa
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/ee/tabby-ui/app/files/components/chat-side-bar.tsx b/ee/tabby-ui/app/files/components/chat-side-bar.tsx
@@ -6,6 +6,7 @@ import { useClient } from 'tabby-chat-panel/react'
 import { useLatest } from '@/lib/hooks/use-latest'
 import { useMe } from '@/lib/hooks/use-me'
 import { useStore } from '@/lib/hooks/use-store'
+import { filename2prism } from '@/lib/language-utils'
 import { useChatStore } from '@/lib/stores/chat-store'
 import { cn, formatLineHashForCodeBrowser } from '@/lib/utils'
 import { Button } from '@/components/ui/button'
@@ -42,6 +43,10 @@ export const ChatSideBar: React.FC<ChatSideBarProps> = ({
           const defaultRef = getDefaultRepoRef(targetRepo.refs)
           // navigate to files of the default branch
           const refName = resolveRepoRef(defaultRef ?? '')?.name
+          const detectedLanguage = context.filepath
+            ? filename2prism(context.filepath)[0]
+            : undefined
+          const isMarkdown = detectedLanguage === 'markdown'
           updateActivePath(
             generateEntryPath(
               targetRepo,
@@ -51,7 +56,8 @@ export const ChatSideBar: React.FC<ChatSideBarProps> = ({
             ),
             {
               hash: lineHash,
-              replace: false
+              replace: false,
+              plain: isMarkdown && !!lineHash
             }
           )
           return

diff --git a/ee/tabby-ui/app/files/components/source-code-browser.tsx b/ee/tabby-ui/app/files/components/source-code-browser.tsx
@@ -103,6 +103,7 @@ type SourceCodeBrowserContextValue = {
     options?: {
       hash?: string
       replace?: boolean
+      plain?: boolean
     }
   ) => Promise<void>
   repoMap: Record<string, RepositoryItem>
@@ -174,7 +175,12 @@ const SourceCodeBrowserContextProvider: React.FC<PropsWithChildren> = ({
         })
       } else {
         const setParams: Record<string, string> = {}
-        let delList = ['plain', 'redirect_filepath', 'redirect_git_url', 'line']
+        let delList = ['redirect_filepath', 'redirect_git_url', 'line']
+        if (options?.plain) {
+          setParams['plain'] = '1'
+        } else {
+          delList.push('plain')
+        }
 
         updateUrlComponents({
           pathname: `/files/${path}`,
@@ -482,11 +488,17 @@ const SourceCodeBrowserRenderer: React.FC<SourceCodeBrowserProps> = ({
             ? window.location.hash
             : formatLineHashForCodeBrowser({ start: startLineNumber })
 
+          const detectedLanguage = redirect_filepath
+            ? filename2prism(redirect_filepath)[0]
+            : undefined
+          const isMarkdown = detectedLanguage === 'markdown'
+
           updateActivePath(
             generateEntryPath(targetRepo, refName, redirect_filepath, 'file'),
             {
               replace: true,
-              hash: nextHash
+              hash: nextHash,
+              plain: isMarkdown && !!nextHash
             }
           )
           initializing.current = false