Skip to content

RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.

Fix: Deduplication of wiki entity types (#17965)

balibabub099c88c3f25
diff --git a/web/src/components/originui/select-with-search.tsx b/web/src/components/originui/select-with-search.tsx
index dc71deeae1..7db60e536a 100644
--- a/web/src/components/originui/select-with-search.tsx
+++ b/web/src/components/originui/select-with-search.tsx
@@ -55,7 +55,8 @@ export type SelectWithSearchFlagProps = {
placeholder?: string;
emptyData?: string;
allowCustomValue?: boolean;
- onNoMatchEnter?(searchValue: string): void;
+ // Return false to veto selecting the custom value on Enter
+ onNoMatchEnter?(searchValue: string): boolean | void;
disableAutoSelectOnEnter?: boolean;
testId?: string;
optionTestIdPrefix?: string;
@@ -221,7 +222,10 @@ export const SelectWithSearch = forwardRef<
setSearchValue('');
setOpen(false);
} else if (!hasMatchingOptions(options, keywords)) {
- onNoMatchEnter?.(keywords);
+ if (onNoMatchEnter?.(keywords) === false) {
+ // Vetoed: prevent cmdk from selecting the custom value item
+ e.preventDefault();
+ }
}
}
},
diff --git a/web/src/locales/en.ts b/web/src/locales/en.ts
index dc02289284..c9e909f729 100644
--- a/web/src/locales/en.ts
+++ b/web/src/locales/en.ts
@@ -1945,6 +1945,7 @@ Example: Virtual Hosted Style`,
addFieldModalTitle: 'Add field',
editFieldModalTitle: 'Edit field',
selectFieldType: 'Select field type',
+ fieldTypeExists: 'This field type already exists',
blueprintsPlaceholder: 'Blueprints placeholder',
blueprintsPlaceholderDescription:
"Select or customize a specific structure from the Blueprint library on the left to define your Wiki's content framework and visual presentation.",
diff --git a/web/src/locales/zh.ts b/web/src/locales/zh.ts
index ae7a36cf5c..2a8ea1b3d9 100644
--- a/web/src/locales/zh.ts
+++ b/web/src/locales/zh.ts
@@ -1632,6 +1632,7 @@ NER:使用 spaCy NER 和基于规则的关键词提取来抽取实体和关系
addFieldModalTitle: '添加字段',
editFieldModalTitle: '编辑字段',
selectFieldType: '选择字段类型',
+ fieldTypeExists: '该字段类型已存在',
blueprintsPlaceholder: '蓝图占位',
blueprintsPlaceholderDescription:
'从左侧的 Blueprint 库中选择或自定义特定结构,以定义您的 Wiki 内容框架和视觉呈现。',
diff --git a/web/src/pages/user-setting/compilation-templates/create-next/components/add-field-modal.tsx b/web/src/pages/user-setting/compilation-templates/create-next/components/add-field-modal.tsx
index 79b6158924..eebb679b32 100644
--- a/web/src/pages/user-setting/compilation-templates/create-next/components/add-field-modal.tsx
+++ b/web/src/pages/user-setting/compilation-templates/create-next/components/add-field-modal.tsx
@@ -2,6 +2,7 @@ import { SelectWithSearch } from '@/components/originui/select-with-search';
import { RAGFlowFormItem } from '@/components/ragflow-form';
import { Button } from '@/components/ui/button';
import { Form } from '@/components/ui/form';
+import message from '@/components/ui/message';
import { Modal } from '@/components/ui/modal/modal';
import { Textarea } from '@/components/ui/textarea';
import { ICompilationTemplateSection } from '@/interfaces/database/compilation-template';
@@ -9,7 +10,10 @@ import { startCase } from 'lodash';
import { useCallback } from 'react';
import { useTranslation } from 'react-i18next';
-import { FieldLabelKeyMap } from '@/pages/user-setting/compilation-templates/create-next/constant';
+import {
+ FieldLabelKeyMap,
+ FieldRequiredMessageKeyMap,
+} from '@/pages/user-setting/compilation-templates/create-next/constant';
import { useAddFieldForm } from '../hooks/use-add-field-form';
@@ -18,6 +22,7 @@ type AddFieldModalProps = {
onOpenChange: (open: boolean) => void;
sectionName: string;
builtinSection?: ICompilationTemplateSection;
+ existingFields?: Record<string, string>[];
initialField?: Record<string, string>;
onAdd: (field: Record<string, string>) => void;
};
@@ -27,6 +32,7 @@ export function AddFieldModal({
onOpenChange,
sectionName,
builtinSection,
+ existingFields,
initialField,
onAdd,
}: AddFieldModalProps) {
@@ -35,12 +41,14 @@ export function AddFieldModal({
form,
fieldKeys,
hasTypeField,
+ requiredKeys,
typeOptions,
handleTypeChange,
handleSubmit,
} = useAddFieldForm({
open,
builtinSection,
+ existingFields,
initialField,
});
@@ -65,6 +73,34 @@ export function AddFieldModal({
[t],
);
+ const getRequiredMessage = useCallback(
+ (key: string) => {
+ return FieldRequiredMessageKeyMap[key]
+ ? t(FieldRequiredMessageKeyMap[key])
+ : t('common.pleaseInput');
+ },
+ [t],
+ );
+
+ const isDuplicateType = useCallback(
+ (typeValue: string) => {
+ if (!typeValue || typeValue === initialField?.type) return false;
+ return (existingFields ?? []).some((field) => field.type === typeValue);
+ },
+ [existingFields, initialField],
+ );
+
+ const handleNoMatchEnter = useCallback(
+ (searchValue: string) => {
+ if (isDuplicateType(searchValue)) {
+ message.warning(t('setting.fieldTypeExists'));
+ return false;
+ }
+ return true;
+ },
+ [isDuplicateType, t],
+ );
+
return (
<Modal
open={open}
@@ -85,7 +121,16 @@ export function AddFieldModal({
<Form {...form}>
<div className="space-y-4">
{hasTypeField && (
- <RAGFlowFormItem name="type" label={getFieldLabel('type')}>
+ <RAGFlowFormItem
+ name="type"
+ label={getFieldLabel('type')}
+ required
+ rules={{
+ required: getRequiredMessage('type'),
+ validate: (value: string) =>
+ !isDuplicateType(value) || t('setting.fieldTypeExists'),
+ }}
+ >
{(field) => (
<SelectWithSearch
{...field}
@@ -95,6 +140,7 @@ export function AddFieldModal({
field.onChange(value);
handleTypeChange(value);
}}
+ onNoMatchEnter={handleNoMatchEnter}
placeholder={t('setting.selectFieldType')}
allowCustomValue
/>
@@ -103,7 +149,17 @@ export function AddFieldModal({
)}
{nonTypeKeys.map((key) => (
- <RAGFlowFormItem key={key} name={key} label={getFieldLabel(key)}>
+ <RAGFlowFormItem
+ key={key}
+ name={key}
+ label={getFieldLabel(key)}
+ required={requiredKeys.includes(key)}
+ rules={
+ requiredKeys.includes(key)
+ ? { required: getRequiredMessage(key) }
+ : undefined
+ }
+ >
<Textarea
placeholder={t('setting.descriptionPlaceholder')}
rows={key === 'description' ? 4 : 10}
diff --git a/web/src/pages/user-setting/compilation-templates/create-next/components/template-configuration.tsx b/web/src/pages/user-setting/compilation-templates/create-next/components/template-configuration.tsx
index 3f3065d8fb..f20f04c39b 100644
--- a/web/src/pages/user-setting/compilation-templates/create-next/components/template-configuration.tsx
+++ b/web/src/pages/user-setting/compilation-templates/create-next/components/template-configuration.tsx
@@ -98,7 +98,7 @@ export function TemplateConfiguration({
builtins,
});
- const { activeFieldsPath, builtinSection, editingField } =
+ const { activeFieldsPath, builtinSection, existingFields, editingField } =
useTemplateSectionData(
form,
selectedTemplateIndex,
@@ -292,6 +292,7 @@ export function TemplateConfiguration({
onOpenChange={handleModalOpenChange}
sectionName={activeSectionTab}
builtinSection={builtinSection}
+ existingFields={existingFields}
initialField={editingField}
onAdd={handleAddField}
/>
diff --git a/web/src/pages/user-setting/compilation-templates/create-next/components/template-preview-header.tsx b/web/src/pages/user-setting/compilation-templates/create-next/components/template-preview-header.tsx
index 2909fa6bf0..8839f1655a 100644
--- a/web/src/pages/user-setting/compilation-templates/create-next/components/template-preview-header.tsx
+++ b/web/src/pages/user-setting/compilation-templates/create-next/components/template-preview-header.tsx
@@ -1,7 +1,6 @@
import { useTranslation } from 'react-i18next';
import { JsonPreviewSheet } from './json-preview-sheet';
-import { WorkflowPreviewSheet } from './workflow-preview-sheet';
interface TemplatePreviewHeaderProps {
templateName: string | undefined;
@@ -16,8 +15,6 @@ export function TemplatePreviewHeader({
templateName,
jsonSheetOpen,
onJsonSheetOpenChange,
- workflowSheetOpen,
- onWorkflowSheetOpenChange,
allFormValues,
}: TemplatePreviewHeaderProps) {
const { t } = useTranslation();
@@ -33,10 +30,6 @@ export function TemplatePreviewHeader({
onOpenChange={onJsonSheetOpenChange}
value={allFormValues}
/>
- <WorkflowPreviewSheet
- open={workflowSheetOpen}
- onOpenChange={onWorkflowSheetOpenChange}
- />
</div>
</section>
);
diff --git a/web/src/pages/user-setting/compilation-templates/create-next/constant.ts b/web/src/pages/user-setting/compilation-templates/create-next/constant.ts
index c092418ba5..ae1cd78733 100644
--- a/web/src/pages/user-setting/compilation-templates/create-next/constant.ts
+++ b/web/src/pages/user-setting/compilation-templates/create-next/constant.ts
@@ -58,3 +58,8 @@ export const FieldLabelKeyMap: Record<string, string> = {
description: 'setting.fieldDescription',
rule: 'setting.fieldRule',
};
+
+export const FieldRequiredMessageKeyMap: Record<string, string> = {
+ type: 'setting.fieldTypeRequired',
+ description: 'setting.fieldDescriptionRequired',
+};
diff --git a/web/src/pages/user-setting/compilation-templates/create-next/hooks/use-add-field-form.ts b/web/src/pages/user-setting/compilation-templates/create-next/hooks/use-add-field-form.ts
index b5ffb5a618..b1100d3709 100644
--- a/web/src/pages/user-setting/compilation-templates/create-next/hooks/use-add-field-form.ts
+++ b/web/src/pages/user-setting/compilation-templates/create-next/hooks/use-add-field-form.ts
@@ -1,8 +1,9 @@
import { ICompilationTemplateSection } from '@/interfaces/database/compilation-template';
import {
createEmptyField,
+ getAvailableTypeOptions,
getFieldKeyOrder,
- getTypeOptionsFromBuiltinSection,
+ getRequiredFieldKeys,
} from '@/pages/user-setting/compilation-templates/create-next/utils';
import { useCallback, useEffect, useMemo } from 'react';
import { useForm } from 'react-hook-form';
@@ -10,12 +11,14 @@ import { useForm } from 'react-hook-form';
type UseAddFieldFormOptions = {
open: boolean;
builtinSection?: ICompilationTemplateSection;
+ existingFields?: Record<string, string>[];
initialField?: Record<string, string>;
};
export const useAddFieldForm = ({
open,
builtinSection,
+ existingFields,
initialField,
}: UseAddFieldFormOptions) => {
const form = useForm<Record<string, string>>({
@@ -32,9 +35,19 @@ export const useAddFieldForm = ({
const hasTypeField = fieldKeys.includes('type');
+ const requiredKeys = useMemo(
+ () => getRequiredFieldKeys(fieldKeys),
+ [fieldKeys],
+ );
+
const typeOptions = useMemo(
- () => getTypeOptionsFromBuiltinSection(builtinSection),
- [builtinSection],
+ () =>
+ getAvailableTypeOptions(
+ builtinSection,
+ existingFields,
+ initialField?.type,
+ ),
+ [builtinSection, existingFields, initialField],
);
const buildField = useCallback(
@@ -90,6 +103,7 @@ export const useAddFieldForm = ({
shouldDirty: true,
shouldTouch: true,
});
+ if (val) form.clearErrors(key);
});
},
[buildField, form, initialField],
@@ -108,6 +122,7 @@ export const useAddFieldForm = ({
form,
fieldKeys,
hasTypeField,
+ requiredKeys,
typeOptions,
handleTypeChange,
handleSubmit,
diff --git a/web/src/pages/user-setting/compilation-templates/create-next/hooks/use-template-section-data.ts b/web/src/pages/user-setting/compilation-templates/create-next/hooks/use-template-section-data.ts
index a370dec06c..cf4bad060b 100644
--- a/web/src/pages/user-setting/compilation-templates/create-next/hooks/use-template-section-data.ts
+++ b/web/src/pages/user-setting/compilation-templates/create-next/hooks/use-template-section-data.ts
@@ -1,5 +1,5 @@
import { useMemo } from 'react';
-import { ArrayPath, UseFormReturn } from 'react-hook-form';
+import { ArrayPath, UseFormReturn, useWatch } from 'react-hook-form';
import {
ICompilationTemplateBuiltin,
@@ -24,6 +24,11 @@ export const useTemplateSectionData = (
| undefined;
}, [activeSectionTab, builtinTemplate?.config]);
+ const existingFields = useWatch({
+ control: form.control,
+ name: activeFieldsPath,
+ }) as Record<string, string>[] | undefined;
+
const editingField = useMemo(() => {
if (editingFieldIndex === null) return undefined;
return ((form.getValues(activeFieldsPath) as
@@ -35,6 +40,7 @@ export const useTemplateSectionData = (
activeSectionPath,
activeFieldsPath,
builtinSection,
+ existingFields,
editingField,
};
};
diff --git a/web/src/pages/user-setting/compilation-templates/create-next/utils.ts b/web/src/pages/user-setting/compilation-templates/create-next/utils.ts
index ba19cd0ab4..f9810991c4 100644
--- a/web/src/pages/user-setting/compilation-templates/create-next/utils.ts
+++ b/web/src/pages/user-setting/compilation-templates/create-next/utils.ts
@@ -318,3 +318,20 @@ export const getTypeOptionsFromBuiltinSection = (
.sort()
.map((value) => ({ label: value, value }));
};
+
+export const getRequiredFieldKeys = (fieldKeys: string[]) =>
+ fieldKeys.includes('type') ? ['type', 'description'] : fieldKeys;
+
+export const getAvailableTypeOptions = (
+ builtinSection: ICompilationTemplateSection | undefined,
+ existingFields: Record<string, string>[] | undefined,
+ editingType?: string,
+) => {
+ const usedTypes = new Set(
+ (existingFields ?? []).map((field) => field.type).filter(Boolean),
+ );
+ if (editingType) usedTypes.delete(editingType);
+ return getTypeOptionsFromBuiltinSection(builtinSection).filter(
+ (option) => !usedTypes.has(option.value),
+ );
+};
diff --git a/web/src/pages/user-setting/compilation-templates/edit-next/components/add-field-modal.tsx b/web/src/pages/user-setting/compilation-templates/edit-next/components/add-field-modal.tsx
index 9e792fa057..c7df8b0ff2 100644
--- a/web/src/pages/user-setting/compilation-templates/edit-next/components/add-field-modal.tsx
+++ b/web/src/pages/user-setting/compilation-templates/edit-next/components/add-field-modal.tsx
@@ -2,6 +2,7 @@ import { SelectWithSearch } from '@/components/originui/select-with-search';
import { RAGFlowFormItem } from '@/components/ragflow-form';
import { Button } from '@/components/ui/button';
import { Form } from '@/components/ui/form';
+import message from '@/components/ui/message';
import { Modal } from '@/components/ui/modal/modal';
import { Textarea } from '@/components/ui/textarea';
import { ICompilationTemplateSection } from '@/interfaces/database/compilation-template';
@@ -9,7 +10,7 @@ import { startCase } from 'lodash';
import { useCallback } from 'react';
import { useTranslation } from 'react-i18next';
-import { FieldLabelKeyMap } from '../constant';
+import { FieldLabelKeyMap, FieldRequiredMessageKeyMap } from '../constant';
import { useAddFieldForm } from '../hooks/use-add-field-form';
@@ -18,6 +19,7 @@ type AddFieldModalProps = {
onOpenChange: (open: boolean) => void;
sectionName: string;
builtinSection?: ICompilationTemplateSection;
+ existingFields?: Record<string, string>[];
initialField?: Record<string, string>;
onAdd: (field: Record<string, string>) => void;
};
@@ -27,6 +29,7 @@ export function AddFieldModal({
onOpenChange,
sectionName,
builtinSection,
+ existingFields,
initialField,
onAdd,
}: AddFieldModalProps) {
@@ -35,12 +38,14 @@ export function AddFieldModal({
form,
fieldKeys,
hasTypeField,
+ requiredKeys,
typeOptions,
handleTypeChange,
handleSubmit,
} = useAddFieldForm({
open,
builtinSection,
+ existingFields,
initialField,
});
@@ -65,6 +70,34 @@ export function AddFieldModal({
[t],
);
+ const getRequiredMessage = useCallback(
+ (key: string) => {
+ return FieldRequiredMessageKeyMap[key]
+ ? t(FieldRequiredMessageKeyMap[key])
+ : t('common.pleaseInput');
+ },
+ [t],
+ );
+
+ const isDuplicateType = useCallback(
+ (typeValue: string) => {
+ if (!typeValue || typeValue === initialField?.type) return false;
+ return (existingFields ?? []).some((field) => field.type === typeValue);
+ },
+ [existingFields, initialField],
+ );
+
+ const handleNoMatchEnter = useCallback(
+ (searchValue: string) => {
+ if (isDuplicateType(searchValue)) {
+ message.warning(t('setting.fieldTypeExists'));
+ return false;
+ }
+ return true;
+ },
+ [isDuplicateType, t],
+ );
+
return (
<Modal
open={open}
@@ -85,7 +118,16 @@ export function AddFieldModal({
<Form {...form}>
<div className="space-y-4">
{hasTypeField && (
- <RAGFlowFormItem name="type" label={getFieldLabel('type')}>
+ <RAGFlowFormItem
+ name="type"
+ label={getFieldLabel('type')}
+ required
+ rules={{
+ required: getRequiredMessage('type'),
+ validate: (value: string) =>
+ !isDuplicateType(value) || t('setting.fieldTypeExists'),
+ }}
+ >
{(field) => (
<SelectWithSearch
{...field}
@@ -95,6 +137,7 @@ export function AddFieldModal({
field.onChange(value);
handleTypeChange(value);
}}
+ onNoMatchEnter={handleNoMatchEnter}
placeholder={t('setting.selectFieldType')}
allowCustomValue
/>
@@ -103,7 +146,17 @@ export function AddFieldModal({
)}
{nonTypeKeys.map((key) => (
- <RAGFlowFormItem key={key} name={key} label={getFieldLabel(key)}>
+ <RAGFlowFormItem
+ key={key}
+ name={key}
+ label={getFieldLabel(key)}
+ required={requiredKeys.includes(key)}
+ rules={
+ requiredKeys.includes(key)
+ ? { required: getRequiredMessage(key) }
+ : undefined
+ }
+ >
<Textarea
placeholder={t('setting.descriptionPlaceholder')}
rows={key === 'description' ? 4 : 10}
diff --git a/web/src/pages/user-setting/compilation-templates/edit-next/components/template-configuration.tsx b/web/src/pages/user-setting/compilation-templates/edit-next/components/template-configuration.tsx
index b34a69996f..0baad2a354 100644
--- a/web/src/pages/user-setting/compilation-templates/edit-next/components/template-configuration.tsx
+++ b/web/src/pages/user-setting/compilation-templates/edit-next/components/template-configuration.tsx
@@ -90,7 +90,7 @@ export function TemplateConfiguration({
builtins,
});
- const { activeFieldsPath, builtinSection, editingField } =
+ const { activeFieldsPath, builtinSection, existingFields, editingField } =
useTemplateSectionData(
form,
selectedTemplateIndex,
@@ -271,6 +271,7 @@ export function TemplateConfiguration({
onOpenChange={handleModalOpenChange}
sectionName={activeSectionTab}
builtinSection={builtinSection}
+ existingFields={existingFields}
initialField={editingField}
onAdd={handleAddField}
/>
diff --git a/web/src/pages/user-setting/compilation-templates/edit-next/components/template-preview-header.tsx b/web/src/pages/user-setting/compilation-templates/edit-next/components/template-preview-header.tsx
index 2909fa6bf0..8839f1655a 100644
--- a/web/src/pages/user-setting/compilation-templates/edit-next/components/template-preview-header.tsx
+++ b/web/src/pages/user-setting/compilation-templates/edit-next/components/template-preview-header.tsx
@@ -1,7 +1,6 @@
import { useTranslation } from 'react-i18next';
import { JsonPreviewSheet } from './json-preview-sheet';
-import { WorkflowPreviewSheet } from './workflow-preview-sheet';
interface TemplatePreviewHeaderProps {
templateName: string | undefined;
@@ -16,8 +15,6 @@ export function TemplatePreviewHeader({
templateName,
jsonSheetOpen,
onJsonSheetOpenChange,
- workflowSheetOpen,
- onWorkflowSheetOpenChange,
allFormValues,
}: TemplatePreviewHeaderProps) {
const { t } = useTranslation();
@@ -33,10 +30,6 @@ export function TemplatePreviewHeader({
onOpenChange={onJsonSheetOpenChange}
value={allFormValues}
/>
- <WorkflowPreviewSheet
- open={workflowSheetOpen}
- onOpenChange={onWorkflowSheetOpenChange}
- />
</div>
</section>
);
diff --git a/web/src/pages/user-setting/compilation-templates/edit-next/constant.ts b/web/src/pages/user-setting/compilation-templates/edit-next/constant.ts
index c092418ba5..ae1cd78733 100644
--- a/web/src/pages/user-setting/compilation-templates/edit-next/constant.ts
+++ b/web/src/pages/user-setting/compilation-templates/edit-next/constant.ts
@@ -58,3 +58,8 @@ export const FieldLabelKeyMap: Record<string, string> = {
description: 'setting.fieldDescription',
rule: 'setting.fieldRule',
};
+
+export const FieldRequiredMessageKeyMap: Record<string, string> = {
+ type: 'setting.fieldTypeRequired',
+ description: 'setting.fieldDescriptionRequired',
+};
diff --git a/web/src/pages/user-setting/compilation-templates/edit-next/hooks/use-add-field-form.ts b/web/src/pages/user-setting/compilation-templates/edit-next/hooks/use-add-field-form.ts
index 61c13ec8b6..cacb30e264 100644
--- a/web/src/pages/user-setting/compilation-templates/edit-next/hooks/use-add-field-form.ts
+++ b/web/src/pages/user-setting/compilation-templates/edit-next/hooks/use-add-field-form.ts
@@ -1,8 +1,9 @@
import { ICompilationTemplateSection } from '@/interfaces/database/compilation-template';
import {
createEmptyField,
+ getAvailableTypeOptions,
getFieldKeyOrder,
- getTypeOptionsFromBuiltinSection,
+ getRequiredFieldKeys,
} from '../utils';
import { useCallback, useEffect, useMemo } from 'react';
import { useForm } from 'react-hook-form';
@@ -10,12 +11,14 @@ import { useForm } from 'react-hook-form';
type UseAddFieldFormOptions = {
open: boolean;
builtinSection?: ICompilationTemplateSection;
+ existingFields?: Record<string, string>[];
initialField?: Record<string, string>;
};
export const useAddFieldForm = ({
open,
builtinSection,
+ existingFields,
initialField,
}: UseAddFieldFormOptions) => {
const form = useForm<Record<string, string>>({
@@ -32,9 +35,19 @@ export const useAddFieldForm = ({
const hasTypeField = fieldKeys.includes('type');
+ const requiredKeys = useMemo(
+ () => getRequiredFieldKeys(fieldKeys),
+ [fieldKeys],
+ );
+
const typeOptions = useMemo(
- () => getTypeOptionsFromBuiltinSection(builtinSection),
- [builtinSection],
+ () =>
+ getAvailableTypeOptions(
+ builtinSection,
+ existingFields,
+ initialField?.type,
+ ),
+ [builtinSection, existingFields, initialField],
);
const buildField = useCallback(
@@ -70,9 +83,8 @@ export const useAddFieldForm = ({
return;
}
- const firstType = typeOptions[0]?.value ?? '';
- form.reset(buildField(firstType));
- }, [buildField, fieldKeys, form, initialField, open, typeOptions]);
+ form.reset(createEmptyField(fieldKeys));
+ }, [fieldKeys, form, initialField, open]);
const handleTypeChange = useCallback(
(value: string) => {
@@ -90,6 +102,7 @@ export const useAddFieldForm = ({
shouldDirty: true,
shouldTouch: true,
});
+ if (val) form.clearErrors(key);
});
},
[buildField, form, initialField],
@@ -108,6 +121,7 @@ export const useAddFieldForm = ({
form,
fieldKeys,
hasTypeField,
+ requiredKeys,
typeOptions,
handleTypeChange,
handleSubmit,
diff --git a/web/src/pages/user-setting/compilation-templates/edit-next/hooks/use-template-section-data.ts b/web/src/pages/user-setting/compilation-templates/edit-next/hooks/use-template-section-data.ts
index c5cdec5617..47073e5363 100644
--- a/web/src/pages/user-setting/compilation-templates/edit-next/hooks/use-template-section-data.ts
+++ b/web/src/pages/user-setting/compilation-templates/edit-next/hooks/use-template-section-data.ts
@@ -1,5 +1,5 @@
import { useMemo } from 'react';
-import { ArrayPath, UseFormReturn } from 'react-hook-form';
+import { ArrayPath, UseFormReturn, useWatch } from 'react-hook-form';
import {
ICompilationTemplateBuiltin,
@@ -24,6 +24,11 @@ export const useTemplateSectionData = (
| undefined;
}, [activeSectionTab, builtinTemplate?.config]);
+ const existingFields = useWatch({
+ control: form.control,
+ name: activeFieldsPath,
+ }) as Record<string, string>[] | undefined;
+
const editingField = useMemo(() => {
if (editingFieldIndex === null) return undefined;
return ((form.getValues(activeFieldsPath) as
@@ -35,6 +40,7 @@ export const useTemplateSectionData = (
activeSectionPath,
activeFieldsPath,
builtinSection,
+ existingFields,
editingField,
};
};
diff --git a/web/src/pages/user-setting/compilation-templates/edit-next/utils.ts b/web/src/pages/user-setting/compilation-templates/edit-next/utils.ts
index 406f6ddf66..83880b7f16 100644
--- a/web/src/pages/user-setting/compilation-templates/edit-next/utils.ts
+++ b/web/src/pages/user-setting/compilation-templates/edit-next/utils.ts
@@ -315,3 +315,20 @@ export const getTypeOptionsFromBuiltinSection = (
.sort()
.map((value) => ({ label: value, value }));
};
+
+export const getRequiredFieldKeys = (fieldKeys: string[]) =>
+ fieldKeys.includes('type') ? ['type', 'description'] : fieldKeys;
+
+export const getAvailableTypeOptions = (
+ builtinSection: ICompilationTemplateSection | undefined,
+ existingFields: Record<string, string>[] | undefined,
+ editingType?: string,
+) => {
+ const usedTypes = new Set(
+ (existingFields ?? []).map((field) => field.type).filter(Boolean),
+ );
+ if (editingType) usedTypes.delete(editingType);
+ return getTypeOptionsFromBuiltinSection(builtinSection).filter(
+ (option) => !usedTypes.has(option.value),
+ );
+};