scriptoriumadmin/Roo-Code
1
0
Fork 0
mirror of https://github.com/RooVetGit/Roo-Code.git synced 2026-09-07 08:26:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix TypeScript error in useSelectedModel after merge conflict resolution

Browse source
This commit is contained in:
Hannes Rudolph 2025-11-05 14:59:15 -07:00
parent 49521cc499
commit b57bf9f327
1 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
webview-ui/src/components/ui/hooks/useSelectedModel.ts
View file

@ -27,7 +27,6 @@ import {
ioIntelligenceModels,
qwenCodeModels,
BEDROCK_1M_CONTEXT_MODEL_IDS,
isDynamicProvider,
getProviderDefaultModelId,
} from "@roo-code/types"
@ -64,22 +63,13 @@ export const useSelectedModel = (apiConfiguration?: ProviderSettings) => {
const ollamaModels = useOllamaModels(ollamaModelId)
// Compute readiness only for data actually needed; router models use cached data without fetch
const needRouterModels = false
const needOpenRouterProviders = provider === "openrouter"
const needLmStudio = typeof lmStudioModelId !== "undefined"
const needOllama = typeof ollamaModelId !== "undefined"
const hasValidRouterData = needRouterModels
? routerModels.data &&
routerModels.data[provider] !== undefined &&
typeof routerModels.data[provider] === "object" &&
!routerModels.isLoading
: true
const isReady =
(!needLmStudio || typeof lmStudioModels.data !== "undefined") &&
(!needOllama || typeof ollamaModels.data !== "undefined") &&
hasValidRouterData &&
(!needOpenRouterProviders || typeof openRouterModelProviders.data !== "undefined")
const { id, info } =
@ -99,12 +89,10 @@ export const useSelectedModel = (apiConfiguration?: ProviderSettings) => {
id,
info,
isLoading:
(needRouterModels && routerModels.isLoading) ||
(needOpenRouterProviders && openRouterModelProviders.isLoading) ||
(needLmStudio && lmStudioModels!.isLoading) ||
(needOllama && ollamaModels!.isLoading),
isError:
(needRouterModels && routerModels.isError) ||
(needOpenRouterProviders && openRouterModelProviders.isError) ||
(needLmStudio && lmStudioModels!.isError) ||
(needOllama && ollamaModels!.isError),