From 1f2ddb043a5ef06371d8ab513fb7001231ca9e16 Mon Sep 17 00:00:00 2001 From: Jagger <634750802@qq.com> Date: Tue, 6 Aug 2024 11:11:42 +0800 Subject: [PATCH] fix(frontend): prevent json editor setting undefined value --- .../components/embedding-model/CreateEmbeddingModelForm.tsx | 2 ++ frontend/app/src/components/form/widgets/CodeInput.tsx | 5 +++-- frontend/app/src/components/graph/components/JsonEditor.tsx | 4 +++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/frontend/app/src/components/embedding-model/CreateEmbeddingModelForm.tsx b/frontend/app/src/components/embedding-model/CreateEmbeddingModelForm.tsx index 188d6f5a..c4677556 100644 --- a/frontend/app/src/components/embedding-model/CreateEmbeddingModelForm.tsx +++ b/frontend/app/src/components/embedding-model/CreateEmbeddingModelForm.tsx @@ -66,6 +66,7 @@ export function CreateEmbeddingModelForm ({ transitioning, onCreated }: { transi ...form.getValues(), model: provider.default_embedding_model, credentials: provider.credentials_type === 'dict' ? undefined : '', + config: '{}' }); } else { const { name } = form.getValues(); @@ -74,6 +75,7 @@ export function CreateEmbeddingModelForm ({ transitioning, onCreated }: { transi provider: '', credentials: '', model: '', + config: '{}' }); } }, [provider]); diff --git a/frontend/app/src/components/form/widgets/CodeInput.tsx b/frontend/app/src/components/form/widgets/CodeInput.tsx index 988e8f50..3b2ac21a 100644 --- a/frontend/app/src/components/form/widgets/CodeInput.tsx +++ b/frontend/app/src/components/form/widgets/CodeInput.tsx @@ -94,8 +94,9 @@ export const CodeInput = forwardRef(({ useEffect(() => { if (editor) { - if (value !== editor.getValue()) { - editor.setValue(value); + const rValue = value || ''; + if (rValue !== editor.getValue()) { + editor.setValue(rValue); } } }, [editor, value]); diff --git a/frontend/app/src/components/graph/components/JsonEditor.tsx b/frontend/app/src/components/graph/components/JsonEditor.tsx index 3f1eb9f4..60d3df10 100644 --- a/frontend/app/src/components/graph/components/JsonEditor.tsx +++ b/frontend/app/src/components/graph/components/JsonEditor.tsx @@ -40,7 +40,9 @@ export const JsonEditor = forwardRef { if (editor) { - editor.setValue(defaultValue); + if (defaultValue != null) { + editor.setValue(defaultValue); + } } }, [editor, defaultValue]);