Просмотр исходного кода

Use or instead of null coalescing instead since state may return non undefined for new values

Saoud Rizwan 1 год назад
Родитель
Сommit
ccb4738d7e

+ 1 - 1
src/api/providers/ollama.ts

@@ -42,7 +42,7 @@ export class OllamaHandler implements ApiHandler {
 
 	getModel(): { id: string; info: ModelInfo } {
 		return {
-			id: this.options.ollamaModelId ?? "",
+			id: this.options.ollamaModelId || "",
 			info: openAiModelInfoSaneDefaults,
 		}
 	}

+ 4 - 4
webview-ui/src/components/settings/ApiOptions.tsx

@@ -724,19 +724,19 @@ export function normalizeApiConfiguration(apiConfiguration?: ApiConfiguration) {
 		case "openrouter":
 			return {
 				selectedProvider: provider,
-				selectedModelId: apiConfiguration?.openRouterModelId ?? openRouterDefaultModelId,
-				selectedModelInfo: apiConfiguration?.openRouterModelInfo ?? openRouterDefaultModelInfo,
+				selectedModelId: apiConfiguration?.openRouterModelId || openRouterDefaultModelId,
+				selectedModelInfo: apiConfiguration?.openRouterModelInfo || openRouterDefaultModelInfo,
 			}
 		case "openai":
 			return {
 				selectedProvider: provider,
-				selectedModelId: apiConfiguration?.openAiModelId ?? "",
+				selectedModelId: apiConfiguration?.openAiModelId || "",
 				selectedModelInfo: openAiModelInfoSaneDefaults,
 			}
 		case "ollama":
 			return {
 				selectedProvider: provider,
-				selectedModelId: apiConfiguration?.ollamaModelId ?? "",
+				selectedModelId: apiConfiguration?.ollamaModelId || "",
 				selectedModelInfo: openAiModelInfoSaneDefaults,
 			}
 		default:

+ 1 - 1
webview-ui/src/utils/validate.ts

@@ -59,7 +59,7 @@ export function validateModelId(
 	if (apiConfiguration) {
 		switch (apiConfiguration.apiProvider) {
 			case "openrouter":
-				const modelId = apiConfiguration.openRouterModelId ?? openRouterDefaultModelId // in case the user hasn't changed the model id, it will be undefined by default
+				const modelId = apiConfiguration.openRouterModelId || openRouterDefaultModelId // in case the user hasn't changed the model id, it will be undefined by default
 				if (!modelId) {
 					return "You must provide a model ID."
 				}