Skip to content

AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.

fix(settings): keep AI settings from crashing on missing text

tianma-if72a24053dbd5
diff --git a/apps/web/src/components/settings/AiModelCard.tsx b/apps/web/src/components/settings/AiModelCard.tsx
index 3ca9b129..97eae5c5 100644
--- a/apps/web/src/components/settings/AiModelCard.tsx
+++ b/apps/web/src/components/settings/AiModelCard.tsx
@@ -103,7 +103,9 @@ export const AiModelCard = () => {
ordinal: formatProviderOrdinal(index + 1, locale),
});
const getProviderName = (item: NonNullable<typeof settings>["providers"][number], index: number) =>
- isLegacyProviderDisplayName(item.displayName, item.provider) ? getDefaultProviderName(index) : item.displayName;
+ isLegacyProviderDisplayName(item.displayName, item.provider) || !item.displayName
+ ? getDefaultProviderName(index)
+ : item.displayName;
const allModels = settings?.providers.flatMap((item, index) =>
item.models.map((model) => ({ ...model, providerName: getProviderName(item, index), providerEnabled: item.isEnabled }))) ?? [];
const defaultModelAvailable = !settings?.defaultModelId
diff --git a/apps/web/src/components/settings/AiProviderCard.tsx b/apps/web/src/components/settings/AiProviderCard.tsx
index bc62938c..9593a47e 100644
--- a/apps/web/src/components/settings/AiProviderCard.tsx
+++ b/apps/web/src/components/settings/AiProviderCard.tsx
@@ -3,7 +3,7 @@ import { useMutation } from "@tanstack/react-query";
import type { AiDiscoveredModel, AiModelConfig, AiProvider, AiProviderConfig } from "@edgeever/shared";
import { CheckCircle2, Loader2, MoreHorizontal, Pencil, Plus, Search, Trash2 } from "lucide-react";
import { useTranslation } from "react-i18next";
-import { aiErrorMessage, isLegacyProviderDisplayName, providerDefaults } from "@/components/settings/ai-provider-options";
+import { aiErrorMessage, isLegacyProviderDisplayName, providerDefaults, trimAiText } from "@/components/settings/ai-provider-options";
import { Button } from "@/components/ui/button";
import {
Dialog,
@@ -38,10 +38,10 @@ export const AiProviderCard = ({ provider: saved, defaultDisplayName, defaultMod
const datalistId = `ai-models-${useId().replaceAll(":", "")}`;
const effectiveDisplayName = isLegacyProviderDisplayName(saved.displayName, saved.provider)
? defaultDisplayName
- : saved.displayName;
+ : (saved.displayName || defaultDisplayName);
const [provider, setProvider] = useState<AiProvider>(saved.provider);
const [displayName, setDisplayName] = useState(effectiveDisplayName);
- const [baseUrl, setBaseUrl] = useState(saved.baseUrl);
+ const [baseUrl, setBaseUrl] = useState(saved.baseUrl ?? "");
const [apiKey, setApiKey] = useState("");
const [modelId, setModelId] = useState("");
const [discoveredModels, setDiscoveredModels] = useState<AiDiscoveredModel[]>([]);
@@ -51,7 +51,7 @@ export const AiProviderCard = ({ provider: saved, defaultDisplayName, defaultMod
useEffect(() => {
setProvider(saved.provider);
setDisplayName(effectiveDisplayName);
- setBaseUrl(saved.baseUrl);
+ setBaseUrl(saved.baseUrl ?? "");
}, [effectiveDisplayName, saved.baseUrl, saved.provider]);
const saveMutation = useMutation({
@@ -92,8 +92,9 @@ export const AiProviderCard = ({ provider: saved, defaultDisplayName, defaultMod
});
const addModelMutation = useMutation({
mutationFn: () => {
- const discovered = discoveredModels.find((item) => item.modelId === modelId.trim());
- return api.addAiModel(saved.id, { modelId: modelId.trim(), ...(discovered ? { displayName: discovered.displayName } : {}) });
+ const nextModelId = trimAiText(modelId);
+ const discovered = discoveredModels.find((item) => item.modelId === nextModelId);
+ return api.addAiModel(saved.id, { modelId: nextModelId, ...(discovered ? { displayName: discovered.displayName } : {}) });
},
onSuccess: async () => {
setModelId("");
@@ -110,8 +111,8 @@ export const AiProviderCard = ({ provider: saved, defaultDisplayName, defaultMod
const modelBusy = discoverMutation.isPending || addModelMutation.isPending || deleteModelMutation.isPending;
const cardBusy = toggleMutation.isPending || deleteMutation.isPending || modelBusy;
const connectionDirty = provider !== saved.provider
- || displayName.trim() !== effectiveDisplayName
- || baseUrl.trim() !== saved.baseUrl
+ || trimAiText(displayName) !== trimAiText(effectiveDisplayName)
+ || trimAiText(baseUrl) !== trimAiText(saved.baseUrl)
|| Boolean(apiKey);
const connectionError = saveMutation.error ?? testMutation.error;
const cardError = toggleMutation.error ?? deleteMutation.error ?? discoverMutation.error ?? addModelMutation.error ?? deleteModelMutation.error;
@@ -126,7 +127,7 @@ export const AiProviderCard = ({ provider: saved, defaultDisplayName, defaultMod
const resetConnectionForm = () => {
setProvider(saved.provider);
setDisplayName(effectiveDisplayName);
- setBaseUrl(saved.baseUrl);
+ setBaseUrl(saved.baseUrl ?? "");
setApiKey("");
saveMutation.reset();
testMutation.reset();
@@ -333,12 +334,12 @@ export const AiProviderCard = ({ provider: saved, defaultDisplayName, defaultMod
<Button
type="button"
variant="outline"
- disabled={connectionBusy || !baseUrl.trim() || (!saved.hasApiKey && !apiKey) || saved.models.length === 0}
+ disabled={connectionBusy || !trimAiText(baseUrl) || (!saved.hasApiKey && !apiKey) || saved.models.length === 0}
onClick={() => testMutation.mutate()}
>
{testMutation.isPending ? <Loader2 className="h-4 w-4 animate-spin" /> : null}{t("aiModel.test")}
</Button>
- <Button type="submit" variant="solid" disabled={readOnly || connectionBusy || !connectionDirty || !displayName.trim() || !baseUrl.trim()}>
+ <Button type="submit" variant="solid" disabled={readOnly || connectionBusy || !connectionDirty || !trimAiText(displayName) || !trimAiText(baseUrl)}>
{saveMutation.isPending ? <Loader2 className="h-4 w-4 animate-spin" /> : null}{t("common.save")}
</Button>
</DialogFooter>
@@ -381,7 +382,7 @@ export const AiProviderCard = ({ provider: saved, defaultDisplayName, defaultMod
</Button>
<div className="flex flex-col-reverse gap-2 sm:flex-row">
<Button type="button" variant="outline" onClick={() => handleAddModelChange(false)}>{t("common.cancel")}</Button>
- <Button type="submit" variant="solid" disabled={readOnly || modelBusy || !modelId.trim()}>
+ <Button type="submit" variant="solid" disabled={readOnly || modelBusy || !trimAiText(modelId)}>
{addModelMutation.isPending ? <Loader2 className="h-4 w-4 animate-spin" /> : <Plus className="h-4 w-4" />}{t("aiModel.addModel")}
</Button>
</div>
diff --git a/apps/web/src/components/settings/AiTagSuggestionPromptCard.tsx b/apps/web/src/components/settings/AiTagSuggestionPromptCard.tsx
index 474427f7..80831567 100644
--- a/apps/web/src/components/settings/AiTagSuggestionPromptCard.tsx
+++ b/apps/web/src/components/settings/AiTagSuggestionPromptCard.tsx
@@ -11,6 +11,7 @@ import {
SETTINGS_CARD_TITLE_CLASSNAME,
} from "./settings-ui";
import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@/components/ui/collapsible";
+import { trimAiText } from "@/components/settings/ai-provider-options";
import { api } from "@/lib/api";
import { cn } from "@/lib/utils";
@@ -26,19 +27,20 @@ export const AiTagSuggestionPromptCard = () => {
const [prompt, setPrompt] = useState("");
useEffect(() => {
- if (settingsQuery.data) setPrompt(settingsQuery.data.tagSuggestionPrompt);
+ if (settingsQuery.data) setPrompt(settingsQuery.data.tagSuggestionPrompt ?? "");
}, [settingsQuery.data]);
const updateMutation = useMutation({
mutationFn: (nextPrompt: string | null) => api.updateAiTagSuggestionPrompt({ prompt: nextPrompt }, locale),
onSuccess: async (settings) => {
- setPrompt(settings.tagSuggestionPrompt);
+ setPrompt(settings.tagSuggestionPrompt ?? "");
await queryClient.invalidateQueries({ queryKey: ["ai-settings"] });
},
});
const settings = settingsQuery.data;
- const trimmedPrompt = prompt.trim();
- const unchanged = Boolean(settings) && trimmedPrompt === settings?.tagSuggestionPrompt;
+ const promptText = prompt ?? "";
+ const trimmedPrompt = trimAiText(promptText);
+ const unchanged = Boolean(settings) && trimmedPrompt === (settings?.tagSuggestionPrompt ?? "");
const disabled = !settings || settings.readOnly || updateMutation.isPending;
const error = updateMutation.error ?? settingsQuery.error;
@@ -75,9 +77,9 @@ export const AiTagSuggestionPromptCard = () => {
disabled={disabled}
maxLength={4000}
onChange={(event) => setPrompt(event.target.value)}
- value={prompt}
+ value={promptText}
/>
- <div className="text-right text-xs text-slate-500">{prompt.length}/4000</div>
+ <div className="text-right text-xs text-slate-500">{promptText.length}/4000</div>
{error ? <p className="text-xs font-medium text-rose-600" role="alert">{t("settings.aiTagPromptFailed")}</p> : null}
{updateMutation.isSuccess ? <p className="text-xs font-medium text-emerald-700" role="status">{t("settings.aiTagPromptSaved")}</p> : null}
<div className="flex flex-wrap justify-end gap-2">
diff --git a/apps/web/src/components/settings/ai-provider-options.test.mjs b/apps/web/src/components/settings/ai-provider-options.test.mjs
index 01cf8184..4a24562d 100644
--- a/apps/web/src/components/settings/ai-provider-options.test.mjs
+++ b/apps/web/src/components/settings/ai-provider-options.test.mjs
@@ -1,5 +1,6 @@
import { describe, expect, test } from "bun:test";
-import { formatProviderOrdinal, isLegacyProviderDisplayName } from "./ai-provider-options.ts";
+import { readFileSync } from "node:fs";
+import { formatProviderOrdinal, isLegacyProviderDisplayName, trimAiText } from "./ai-provider-options.ts";
describe("AI provider display names", () => {
test("formats sequential Chinese provider names", () => {
@@ -12,4 +13,31 @@ describe("AI provider display names", () => {
expect(isLegacyProviderDisplayName("OpenAI-compatible", "openai-compatible")).toBe(true);
expect(isLegacyProviderDisplayName("OpenRouter", "openai-compatible")).toBe(false);
});
+
+ test("treats missing provider names as not legacy instead of throwing", () => {
+ expect(trimAiText(undefined)).toBe("");
+ expect(trimAiText(null)).toBe("");
+ expect(trimAiText(" custom ")).toBe("custom");
+ expect(isLegacyProviderDisplayName(undefined, "openai-compatible")).toBe(false);
+ expect(isLegacyProviderDisplayName(null, "anthropic")).toBe(false);
+ expect(isLegacyProviderDisplayName(" ", "google")).toBe(false);
+ });
+});
+
+describe("AI settings cards tolerate missing text fields", () => {
+ test("tag suggestion prompt does not trim an unchecked API field", () => {
+ const source = readFileSync(new URL("./AiTagSuggestionPromptCard.tsx", import.meta.url), "utf8");
+ expect(source).toContain("tagSuggestionPrompt ?? \"\"");
+ expect(source).toContain("trimAiText(promptText)");
+ expect(source).not.toContain("prompt.trim()");
+ });
+
+ test("provider cards trim optional names and URLs through the shared helper", () => {
+ const providerCard = readFileSync(new URL("./AiProviderCard.tsx", import.meta.url), "utf8");
+ const modelCard = readFileSync(new URL("./AiModelCard.tsx", import.meta.url), "utf8");
+ expect(providerCard).toContain("saved.baseUrl ?? \"\"");
+ expect(providerCard).toContain("trimAiText(displayName)");
+ expect(providerCard).toContain("trimAiText(baseUrl)");
+ expect(modelCard).toContain("!item.displayName");
+ });
});
diff --git a/apps/web/src/components/settings/ai-provider-options.ts b/apps/web/src/components/settings/ai-provider-options.ts
index 364b98c9..4cb5325c 100644
--- a/apps/web/src/components/settings/ai-provider-options.ts
+++ b/apps/web/src/components/settings/ai-provider-options.ts
@@ -17,8 +17,10 @@ export const formatProviderOrdinal = (position: number, locale: string) => {
return `${tens === 1 ? "" : chineseDigits[tens]}十${ones ? chineseDigits[ones] : ""}`;
};
-export const isLegacyProviderDisplayName = (displayName: string, provider: AiProvider) =>
- displayName.trim().toLocaleLowerCase() === providerDefaults[provider].displayName.toLocaleLowerCase();
+export const trimAiText = (value: string | null | undefined) => (value ?? "").trim();
+
+export const isLegacyProviderDisplayName = (displayName: string | null | undefined, provider: AiProvider) =>
+ trimAiText(displayName).toLocaleLowerCase() === (providerDefaults[provider]?.displayName ?? "").toLocaleLowerCase();
export const aiErrorMessage = (error: unknown, fallback: string, encryptionMessage: string) => {
if (error instanceof ApiRequestError && error.code === "ai_encryption_key_missing") return encryptionMessage;