update: rename

ee/tabby-ui/app/(home)/page.tsx

@@ -10,16 +10,16 @@ import { useStore } from 'zustand'
 import { SESSION_STORAGE_KEY } from '@/lib/constants'
 import { useMe } from '@/lib/hooks/use-me'
 import { useSelectedModel } from '@/lib/hooks/use-models'
+import { useSelectedRepository } from '@/lib/hooks/use-repositories'
 import {
   useIsChatEnabled,
   useIsFetchingServerInfo
 } from '@/lib/hooks/use-server-info'
 import { setThreadsPageNo } from '@/lib/stores/answer-engine-store'
 import {
-  updateSelectedModel,
-  updateSelectedRepo
+  updateSelectedCodeSourceId,
+  updateSelectedModel
 } from '@/lib/stores/chat-actions'
-import { useChatStore } from '@/lib/stores/chat-store'
 import {
   clearHomeScrollPosition,
   setHomeScrollPosition,
@@ -59,8 +59,8 @@ function MainPanel() {
   })
   const scrollY = useStore(useScrollStore, state => state.homePage)
 
-  const { selectedModel, isModelLoading, models } = useSelectedModel()
-  const selectedRepoId = useChatStore(state => state.selectedRepo)
+  const { selectedModel, isFetchingModels, models } = useSelectedModel()
+  const { selectedRepository, isFetchingRepositories } = useSelectedRepository()
 
   const showMainSection = !!data?.me || !isFetchingServerInfo
 
@@ -91,7 +91,7 @@ function MainPanel() {
   }
 
   const onSelectedRepo = (sourceId: string | undefined) => {
-    updateSelectedRepo(sourceId)
+    updateSelectedCodeSourceId(sourceId)
   }
 
   const onSearch = (question: string, ctx?: ThreadRunContexts) => {
@@ -167,9 +167,11 @@ function MainPanel() {
                   fetchingContextInfo={fetchingContextInfo}
                   modelName={selectedModel}
                   onSelectModel={handleSelectModel}
-                  repoSourceId={selectedRepoId}
+                  repoSourceId={selectedRepository?.sourceId}
                   onSelectRepo={onSelectedRepo}
-                  isModelLoading={isModelLoading}
+                  isInitializingResources={
+                    isFetchingModels || isFetchingRepositories
+                  }
                   models={models}
                 />
               </AnimationWrapper>

ee/tabby-ui/app/search/components/search.tsx

@@ -36,21 +36,20 @@ import { useDebounceValue } from '@/lib/hooks/use-debounce'
 import { useLatest } from '@/lib/hooks/use-latest'
 import { useMe } from '@/lib/hooks/use-me'
 import { useSelectedModel } from '@/lib/hooks/use-models'
+import { useSelectedRepository } from '@/lib/hooks/use-repositories'
 import useRouterStuff from '@/lib/hooks/use-router-stuff'
 import { useIsChatEnabled } from '@/lib/hooks/use-server-info'
 import { useThreadRun } from '@/lib/hooks/use-thread-run'
 import {
-  updateSelectedModel,
-  updateSelectedRepo
+  updateSelectedCodeSourceId,
+  updateSelectedModel
 } from '@/lib/stores/chat-actions'
-import { useChatStore } from '@/lib/stores/chat-store'
 import { clearHomeScrollPosition } from '@/lib/stores/scroll-store'
 import { useMutation } from '@/lib/tabby/gql'
 import {
   contextInfoQuery,
   listThreadMessages,
   listThreads,
-  repositorySourceListQuery,
   setThreadPersistedMutation
 } from '@/lib/tabby/query'
 import { ExtendedCombinedError, ThreadRunContexts } from '@/lib/types'
@@ -175,10 +174,6 @@ export function Search() {
   const [{ data: contextInfoData, fetching: fetchingContextInfo }] = useQuery({
     query: contextInfoQuery
   })
-  const [{ data: repositorySourceListData, fetching: fetchingRepos }] =
-    useQuery({
-      query: repositorySourceListQuery
-    })
 
   const [afterCursor, setAfterCursor] = useState<string | undefined>()
 
@@ -295,8 +290,9 @@ export function Search() {
 
   const isLoadingRef = useLatest(isLoading)
 
-  const { selectedModel, isModelLoading, models } = useSelectedModel()
-  const selectedRepoId = useChatStore(state => state.selectedRepo)
+  const { selectedModel, isFetchingModels, models } = useSelectedModel()
+  const { selectedRepository, isFetchingRepositories, repos } =
+    useSelectedRepository()
   const currentMessageForDev = useMemo(() => {
     return messages.find(item => item.id === messageIdForDev)
   }, [messageIdForDev, messages])
@@ -535,7 +531,7 @@ export function Search() {
     }
 
     const { sourceIdForCodeQuery, sourceIdsForDocQuery, searchPublic } =
-      getSourceInputs(selectedRepoId, ctx)
+      getSourceInputs(selectedRepository?.sourceId, ctx)
 
     const codeQuery: InputMaybe<CodeQueryInput> = sourceIdForCodeQuery
       ? { sourceId: sourceIdForCodeQuery, content: question }
@@ -602,7 +598,7 @@ export function Search() {
 
     const { sourceIdForCodeQuery, sourceIdsForDocQuery, searchPublic } =
       getSourceInputs(
-        selectedRepoId,
+        selectedRepository?.sourceId,
         getThreadRunContextsFromMentions(mentions)
       )
 
@@ -694,7 +690,7 @@ export function Search() {
   }
 
   const onSelectedRepo = (sourceId: string | undefined) => {
-    updateSelectedRepo(sourceId)
+    updateSelectedCodeSourceId(sourceId)
   }
 
   const formatedThreadError: ExtendedCombinedError | undefined = useMemo(() => {
@@ -774,7 +770,7 @@ export function Search() {
         onDeleteMessage,
         isThreadOwner,
         onUpdateMessage,
-        repositories: repositorySourceListData?.repositoryList
+        repositories: repos
       }}
     >
       <div className="transition-all" style={style}>
@@ -913,9 +909,11 @@ export function Search() {
                       fetchingContextInfo={fetchingContextInfo}
                       modelName={selectedModel}
                       onSelectModel={onSelectModel}
-                      repoSourceId={selectedRepoId}
+                      repoSourceId={selectedRepository?.sourceId}
                       onSelectRepo={onSelectedRepo}
-                      isModelLoading={isModelLoading}
+                      isInitializingResources={
+                        isFetchingModels || isFetchingRepositories
+                      }
                       models={models}
                     />
                   </div>

ee/tabby-ui/components/textarea-search/index.tsx

@@ -46,12 +46,12 @@ export default function TextAreaSearch({
   isFollowup,
   contextInfo,
   fetchingContextInfo,
-  isModelLoading,
+  isInitializingResources,
   models
 }: {
   onSearch: (value: string, ctx: ThreadRunContexts) => void
   onSelectModel: (v: string) => void
-  isModelLoading: boolean
+  isInitializingResources: boolean
   // selected model
   modelName: string | undefined
   // selected repo
@@ -97,7 +97,7 @@ export default function TextAreaSearch({
   }
 
   const handleSubmit = (editor: Editor | undefined | null) => {
-    if (!editor || isLoading || isModelLoading) {
+    if (!editor || isLoading || isInitializingResources) {
       return
     }
 
@@ -226,7 +226,7 @@ export default function TextAreaSearch({
               <Separator orientation="vertical" className="h-5" />
               {showModelSelect && (
                 <ModelSelect
-                  isInitializing={isModelLoading}
+                  isInitializing={isInitializingResources}
                   models={models}
                   value={modelName}
                   onChange={handleSelectModel}
@@ -243,7 +243,7 @@ export default function TextAreaSearch({
                 'bg-primary text-primary-foreground cursor-pointer':
                   value.length > 0,
                 '!bg-muted !text-primary !cursor-default':
-                  isLoading || value.length === 0 || isModelLoading,
+                  isLoading || value.length === 0 || isInitializingResources,
                 'mr-1.5': !showBetaBadge
               }
             )}
@@ -268,7 +268,7 @@ export default function TextAreaSearch({
           onClick={e => e.stopPropagation()}
         >
           <LoadingWrapper
-            loading={isModelLoading || fetchingContextInfo}
+            loading={isInitializingResources || fetchingContextInfo}
             delay={0}
             fallback={
               <div className="flex h-8 w-[40%] items-center">

ee/tabby-ui/lib/hooks/use-models.tsx

@@ -32,21 +32,21 @@ export function useModels(): SWRResponse<ModelInfo> {
 }
 
 export function useSelectedModel() {
-  const { data: modelData, isLoading: isFetchingModel } = useModels()
+  const { data: modelData, isLoading } = useModels()
 
   const selectedModel = useStore(useChatStore, state => state.selectedModel)
 
   useEffect(() => {
-    if (!isFetchingModel) {
+    if (!isLoading) {
       // init model
       const validModel = getModelFromModelInfo(selectedModel, modelData?.chat)
       updateSelectedModel(validModel)
     }
-  }, [isFetchingModel])
+  }, [isLoading])
 
   return {
     // fetching model data or trying to get selected model from localstorage
-    isModelLoading: isFetchingModel,
+    isFetchingModels: isLoading,
     selectedModel,
     models: modelData?.chat
   }

ee/tabby-ui/lib/hooks/use-repositories.ts

@@ -0,0 +1,46 @@
+'use client'
+
+import { useMemo } from 'react'
+import { useQuery } from 'urql'
+
+import { graphql } from '@/lib/gql/generates'
+
+import { useChatStore } from '../stores/chat-store'
+
+const repositorySourceListQuery = graphql(/* GraphQL */ `
+  query RepositorySourceList {
+    repositoryList {
+      id
+      name
+      kind
+      gitUrl
+      sourceId
+      sourceName
+      sourceKind
+    }
+  }
+`)
+
+export function useRepositorySources() {
+  return useQuery({
+    query: repositorySourceListQuery
+  })
+}
+
+export function useSelectedRepository() {
+  const [{ data, fetching }] = useRepositorySources()
+  const repos = data?.repositoryList
+  const repoId = useChatStore(state => state.selectedCodeSourceId)
+
+  const selectedRepository = useMemo(() => {
+    if (!repos?.length || !repoId) return undefined
+
+    return repos.find(repo => repo.sourceId === repoId)
+  }, [repos, repoId])
+
+  return {
+    repos,
+    isFetchingRepositories: fetching,
+    selectedRepository
+  }
+}

ee/tabby-ui/lib/stores/chat-actions.ts

@@ -10,8 +10,8 @@ export const updateSelectedModel = (model: string | undefined) => {
   set(() => ({ selectedModel: model }))
 }
 
-export const updateSelectedRepo = (sourceId: string | undefined) => {
-  set(() => ({ selectedRepo: sourceId }))
+export const updateSelectedCodeSourceId = (sourceId: string | undefined) => {
+  set(() => ({ selectedCodeSourceId: sourceId }))
 }
 
 export const updateEnableActiveSelection = (enable: boolean) => {

ee/tabby-ui/lib/stores/chat-store.ts

@@ -8,14 +8,14 @@ const excludeFromState = ['activeChatId']
 export interface ChatState {
   activeChatId: string | undefined
   selectedModel: string | undefined
-  selectedRepo: string | undefined
+  selectedCodeSourceId: string | undefined
   enableActiveSelection: boolean
 }
 
 const initialState: ChatState = {
   activeChatId: nanoid(),
   selectedModel: undefined,
-  selectedRepo: undefined,
+  selectedCodeSourceId: undefined,
   enableActiveSelection: true
 }
 

ee/tabby-ui/lib/tabby/query.ts

@@ -473,17 +473,3 @@ export const notificationsQuery = graphql(/* GraphQL */ `
     }
   }
 `)
-
-export const repositorySourceListQuery = graphql(/* GraphQL */ `
-  query RepositorySourceList {
-    repositoryList {
-      id
-      name
-      kind
-      gitUrl
-      sourceId
-      sourceName
-      sourceKind
-    }
-  }
-`)