Skip to content

Commit 8402fca

Browse files
authored
Fix: The chunk method of the knowledge base cannot be saved. (#13813)
### What problem does this PR solve? Fix: The chunk method of the knowledge base cannot be saved. ### Type of change - [x] Bug Fix (non-breaking change which fixes an issue)
1 parent ff92b55 commit 8402fca

File tree

10 files changed

+44
-107
lines changed

10 files changed

+44
-107
lines changed

web/src/components/ui/loading-button.tsx

Lines changed: 0 additions & 75 deletions
This file was deleted.

web/src/pages/agent/form/agent-form/index.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import { Input, NumberInput } from '@/components/ui/input';
1919
import { Label } from '@/components/ui/label';
2020
import { Separator } from '@/components/ui/separator';
2121
import { Switch } from '@/components/ui/switch';
22-
import { LlmModelType } from '@/constants/knowledge';
2322
import { useFindLlmByUuid } from '@/hooks/use-llm-request';
2423
import { zodResolver } from '@hookform/resolvers/zod';
2524
import { get } from 'lodash';
@@ -218,7 +217,7 @@ function AgentForm({ node }: INextOperatorForm) {
218217
name={`cite`}
219218
render={({ field }) => (
220219
<FormItem className="flex-1">
221-
<FormLabel tooltip={t('flow.citeTip')}>
220+
<FormLabel tooltip={t('chat.quoteTip')}>
222221
{t('flow.cite')}
223222
</FormLabel>
224223
<FormControl>

web/src/pages/dataset/dataset-setting/configuration/common-item.tsx

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,14 +207,20 @@ export function EmbeddingModelItem({ line = 1, isEdit }: IProps) {
207207
);
208208
}
209209

210-
export function ParseTypeItem({ line = 2 }: { line?: number }) {
210+
export function ParseTypeItem({
211+
line = 2,
212+
name = 'parseType',
213+
}: {
214+
line?: number;
215+
name?: string;
216+
}) {
211217
const { t } = useTranslate('knowledgeConfiguration');
212218
const form = useFormContext();
213219

214220
return (
215221
<FormField
216222
control={form.control}
217-
name={'parseType'}
223+
name={name}
218224
render={({ field }) => (
219225
<FormItem className=" items-center space-y-0 ">
220226
<div

web/src/pages/dataset/dataset-setting/form-schema.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { z } from 'zod';
33

44
export const formSchema = z
55
.object({
6-
parseType: z.number(),
6+
parse_type: z.number(),
77
name: z.string().min(1, {
88
message: 'Username must be at least 2 characters.',
99
}),

web/src/pages/dataset/dataset-setting/index.tsx

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export default function DatasetSettings() {
6666
resolver: zodResolver(formSchema),
6767
defaultValues: {
6868
name: '',
69-
parser_id: DocumentParserType.Naive,
69+
chunk_method: DocumentParserType.Naive,
7070
permission: PermissionRole.Me,
7171
language: 'English',
7272
parser_config: {
@@ -111,7 +111,7 @@ export default function DatasetSettings() {
111111
llm_id: '',
112112
},
113113
pipeline_id: '',
114-
parseType: 1,
114+
parse_type: 1,
115115
pagerank: 0,
116116
connectors: [],
117117
},
@@ -157,7 +157,7 @@ export default function DatasetSettings() {
157157
finish_at: knowledgeDetails.raptor_task_finish_at,
158158
task_id: knowledgeDetails.raptor_task_id,
159159
} as IGenerateLogButtonProps);
160-
form.setValue('parseType', knowledgeDetails.pipeline_id ? 2 : 1);
160+
form.setValue('parse_type', knowledgeDetails.pipeline_id ? 2 : 1);
161161
form.setValue('pipeline_id', knowledgeDetails.pipeline_id || '');
162162
}
163163
}, [knowledgeDetails, form]);
@@ -215,18 +215,20 @@ export default function DatasetSettings() {
215215

216216
const parseType = useWatch({
217217
control: form.control,
218-
name: 'parseType',
218+
name: 'parse_type',
219219
defaultValue: knowledgeDetails.pipeline_id ? 2 : 1,
220220
});
221221
const selectedTag = useWatch({
222222
name: 'chunk_method',
223223
control: form.control,
224224
});
225+
225226
useEffect(() => {
226227
if (parseType === 1) {
227228
form.setValue('pipeline_id', '');
229+
} else {
230+
form.setValue('chunk_method', DocumentParserType.Naive);
228231
}
229-
console.log('parseType', parseType);
230232
}, [parseType, form]);
231233

232234
const unbindFunc = (data: IDataSourceBase) => {
@@ -301,9 +303,12 @@ export default function DatasetSettings() {
301303
<div className="text-base font-medium text-text-primary">
302304
{t('knowledgeConfiguration.dataPipeline')}
303305
</div>
304-
<ParseTypeItem line={1} />
306+
<ParseTypeItem line={1} name="parse_type" />
305307
{parseType === 1 && (
306-
<ChunkMethodItem line={1}></ChunkMethodItem>
308+
<ChunkMethodItem
309+
line={1}
310+
name="chunk_method"
311+
></ChunkMethodItem>
307312
)}
308313
{parseType === 2 && (
309314
<DataFlowSelect

web/src/pages/dataset/dataset-setting/saving-button.tsx

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export function GeneralSavingButton() {
2525
data-testid="ds-settings-basic-save-btn"
2626
onClick={() => {
2727
(async () => {
28-
let isValidate = await form.trigger('name');
28+
const isValidate = await form.trigger('name');
2929
const { name, description, permission, avatar } = form.getValues();
3030

3131
if (isValidate) {
@@ -60,16 +60,20 @@ export function SavingButton() {
6060
onClick={() => {
6161
(async () => {
6262
try {
63-
let beValid = await form.trigger();
63+
const beValid = await form.trigger();
6464
if (!beValid) {
6565
const errors = form.formState.errors;
6666
console.error('Validation errors:', errors);
6767
}
6868
if (beValid) {
69-
form.handleSubmit(async (values) => {
70-
console.log('saveKnowledgeConfiguration: ', values);
71-
delete values['parseType'];
72-
// delete values['avatar'];
69+
form.handleSubmit(async (originalValues) => {
70+
const values = originalValues;
71+
if (originalValues.parse_type === 1) {
72+
values.pipeline_id = null;
73+
} else {
74+
values.chunk_method = null;
75+
}
76+
7377
await saveKnowledgeConfiguration({
7478
kb_id,
7579
...values,
@@ -91,7 +95,6 @@ export function SavingButton() {
9195
}
9296
} catch (e) {
9397
console.log(e);
94-
} finally {
9598
}
9699
})();
97100
}}

web/src/pages/dataset/dataset-setting/tag-table/rename-dialog/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
import { ButtonLoading } from '@/components/ui/button';
12
import {
23
Dialog,
34
DialogContent,
45
DialogFooter,
56
DialogHeader,
67
DialogTitle,
78
} from '@/components/ui/dialog';
8-
import { LoadingButton } from '@/components/ui/loading-button';
99
import { TagRenameId } from '@/constants/knowledge';
1010
import { useTagIsRenaming } from '@/hooks/use-knowledge-request';
1111
import { IModalProps } from '@/interfaces/common';
@@ -30,9 +30,9 @@ export function RenameDialog({
3030
hideModal={hideModal}
3131
></RenameForm>
3232
<DialogFooter>
33-
<LoadingButton type="submit" form={TagRenameId} loading={loading}>
33+
<ButtonLoading type="submit" form={TagRenameId} loading={loading}>
3434
{t('common.save')}
35-
</LoadingButton>
35+
</ButtonLoading>
3636
</DialogFooter>
3737
</DialogContent>
3838
</Dialog>

web/src/pages/files/create-folder-dialog/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
import { ButtonLoading } from '@/components/ui/button';
12
import {
23
Dialog,
34
DialogContent,
45
DialogFooter,
56
DialogHeader,
67
DialogTitle,
78
} from '@/components/ui/dialog';
8-
import { LoadingButton } from '@/components/ui/loading-button';
99
import { TagRenameId } from '@/constants/knowledge';
1010
import { IModalProps } from '@/interfaces/common';
1111
import { useTranslation } from 'react-i18next';
@@ -26,9 +26,9 @@ export function CreateFolderDialog({
2626
</DialogHeader>
2727
<CreateFolderForm hideModal={hideModal} onOk={onOk}></CreateFolderForm>
2828
<DialogFooter>
29-
<LoadingButton type="submit" form={TagRenameId} loading={loading}>
29+
<ButtonLoading type="submit" form={TagRenameId} loading={loading}>
3030
{t('common.save')}
31-
</LoadingButton>
31+
</ButtonLoading>
3232
</DialogFooter>
3333
</DialogContent>
3434
</Dialog>

web/src/pages/user-setting/mcp/import-mcp-dialog/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
import { ButtonLoading } from '@/components/ui/button';
12
import {
23
Dialog,
34
DialogContent,
45
DialogFooter,
56
DialogHeader,
67
DialogTitle,
78
} from '@/components/ui/dialog';
8-
import { LoadingButton } from '@/components/ui/loading-button';
99
import { TagRenameId } from '@/constants/knowledge';
1010
import { IModalProps } from '@/interfaces/common';
1111
import { useTranslation } from 'react-i18next';
@@ -26,9 +26,9 @@ export function ImportMcpDialog({
2626
</DialogHeader>
2727
<ImportMcpForm hideModal={hideModal} onOk={onOk}></ImportMcpForm>
2828
<DialogFooter>
29-
<LoadingButton type="submit" form={TagRenameId} loading={loading}>
29+
<ButtonLoading type="submit" form={TagRenameId} loading={loading}>
3030
{t('common.save')}
31-
</LoadingButton>
31+
</ButtonLoading>
3232
</DialogFooter>
3333
</DialogContent>
3434
</Dialog>

web/src/pages/user-setting/setting-model/langfuse/langfuse-configuration-dialog.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ConfirmDeleteDialog } from '@/components/confirm-delete-dialog';
2-
import { Button } from '@/components/ui/button';
2+
import { Button, ButtonLoading } from '@/components/ui/button';
33
import {
44
Dialog,
55
DialogContent,
@@ -8,7 +8,6 @@ import {
88
DialogTitle,
99
DialogTrigger,
1010
} from '@/components/ui/dialog';
11-
import { LoadingButton } from '@/components/ui/loading-button';
1211
import { useDeleteLangfuseConfig } from '@/hooks/use-user-setting-request';
1312
import { IModalProps } from '@/interfaces/common';
1413
import { ExternalLink, Trash2 } from 'lucide-react';
@@ -61,9 +60,9 @@ export function LangfuseConfigurationDialog({
6160
</Button>
6261
</ConfirmDeleteDialog>
6362

64-
<LoadingButton type="submit" form={FormId} loading={loading}>
63+
<ButtonLoading type="submit" form={FormId} loading={loading}>
6564
{t('common.save')}
66-
</LoadingButton>
65+
</ButtonLoading>
6766
</div>
6867
</DialogFooter>
6968
</DialogContent>

0 commit comments

Comments
 (0)