Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

fix(web): prevent 415 when saving file input defaults (#45042)

非法操作6eb2f1ccf7c6
diff --git a/web/app/components/app/configuration/config-var/config-modal/__tests__/utils.spec.ts b/web/app/components/app/configuration/config-var/config-modal/__tests__/utils.spec.ts
index 24d758b7da6..bf2b4649765 100644
--- a/web/app/components/app/configuration/config-var/config-modal/__tests__/utils.spec.ts
+++ b/web/app/components/app/configuration/config-var/config-modal/__tests__/utils.spec.ts
@@ -1,4 +1,5 @@
import type { TFunction } from 'i18next'
+import type { FileEntity } from '@/app/components/base/file-uploader/types'
import type { InputVar } from '@/app/components/workflow/types'
import { DEFAULT_FILE_UPLOAD_SETTING } from '@/app/components/workflow/constants'
import { ChangeType, InputVarType, SupportUploadFileTypes } from '@/app/components/workflow/types'
@@ -70,6 +71,32 @@ describe('config-modal utils', () => {
expect(nextPayload.default).toBeUndefined()
})
+ it.each([
+ { from: InputVarType.singleFile, to: InputVarType.textInput },
+ { from: InputVarType.singleFile, to: InputVarType.multiFiles },
+ { from: InputVarType.multiFiles, to: InputVarType.singleFile },
+ ])('should clear the file default when switching from $from to $to', ({ from, to }) => {
+ const file: FileEntity = {
+ id: 'local-file',
+ name: 'document.txt',
+ size: 8,
+ type: 'text/plain',
+ progress: 100,
+ transferMethod: 'local_file',
+ supportFileType: 'document',
+ uploadedId: 'uploaded-file-id',
+ }
+ const payload = createInputVar({
+ type: from,
+ default: from === InputVarType.singleFile ? file : [file],
+ })
+
+ const nextPayload = createPayloadForType(payload, to)
+
+ expect(nextPayload.type).toBe(to)
+ expect(nextPayload.default).toBeUndefined()
+ })
+
it('should normalize empty select defaults to undefined', () => {
const nextPayload = normalizeSelectDefaultValue(
createInputVar({
@@ -134,6 +161,75 @@ describe('config-modal utils', () => {
})
describe('validation', () => {
+ it.each([InputVarType.singleFile, InputVarType.multiFiles])(
+ 'should remove upload binaries from %s defaults without changing the uploader file',
+ (type) => {
+ const originalFile = new File(['document'], 'document.txt', { type: 'text/plain' })
+ const uploadedMetadata: FileEntity = {
+ id: 'local-file',
+ name: 'document.txt',
+ size: originalFile.size,
+ type: originalFile.type,
+ progress: 100,
+ transferMethod: 'local_file',
+ supportFileType: 'document',
+ uploadedId: 'uploaded-file-id',
+ }
+ const uploadedFile = { ...uploadedMetadata, originalFile }
+ const remoteFile: FileEntity = {
+ ...uploadedMetadata,
+ id: 'remote-file',
+ transferMethod: 'remote_url',
+ url: 'https://example.com/document.txt',
+ }
+ const tempPayload = createInputVar({
+ type,
+ allowed_file_types: [SupportUploadFileTypes.document],
+ default: type === InputVarType.singleFile ? uploadedFile : [uploadedFile, remoteFile],
+ })
+
+ const { payloadToSave } = validateConfigModalPayload({ tempPayload, t })
+
+ const savedFiles = [payloadToSave?.default].flat() as FileEntity[]
+ expect(savedFiles.some((file) => file.originalFile instanceof Blob)).toBe(false)
+ expect(payloadToSave?.default).toEqual(
+ type === InputVarType.singleFile ? uploadedMetadata : [uploadedMetadata, remoteFile],
+ )
+ expect(uploadedFile.originalFile).toBe(originalFile)
+ },
+ )
+
+ it.each([
+ '{"originalFile":"document.txt","count":2}',
+ '[null,{"originalFile":"document.txt"}]',
+ ])('should preserve JSON default data: %s', (json) => {
+ const defaultValue = JSON.parse(json)
+ const { payloadToSave } = validateConfigModalPayload({
+ tempPayload: createInputVar({ type: InputVarType.jsonObject, default: defaultValue }),
+ t,
+ })
+
+ expect(payloadToSave?.default).toEqual(defaultValue)
+ })
+
+ it.each([
+ { type: InputVarType.singleFile, defaultValue: undefined },
+ { type: InputVarType.singleFile, defaultValue: '' },
+ { type: InputVarType.multiFiles, defaultValue: undefined },
+ { type: InputVarType.multiFiles, defaultValue: [] },
+ ])('should preserve an empty $type default', ({ type, defaultValue }) => {
+ const { payloadToSave } = validateConfigModalPayload({
+ tempPayload: createInputVar({
+ type,
+ default: defaultValue,
+ allowed_file_types: [SupportUploadFileTypes.document],
+ }),
+ t,
+ })
+
+ expect(payloadToSave?.default).toEqual(defaultValue)
+ })
+
it('should reject duplicate select options', () => {
const result = validateConfigModalPayload({
tempPayload: createInputVar({
diff --git a/web/app/components/app/configuration/config-var/config-modal/utils.ts b/web/app/components/app/configuration/config-var/config-modal/utils.ts
index 2251c333335..8285f62c7ce 100644
--- a/web/app/components/app/configuration/config-var/config-modal/utils.ts
+++ b/web/app/components/app/configuration/config-var/config-modal/utils.ts
@@ -95,6 +95,7 @@ export const createPayloadForType = (payload: InputVar, type: InputVarType) => {
InputVarType.multiFiles,
]
+ if (fileInputTypes.includes(draft.type) && draft.type !== type) draft.default = undefined
draft.type = type
if (type === InputVarType.select) draft.default = undefined
if (isStringInputType(type) && typeof draft.default === 'number')
@@ -197,10 +198,24 @@ export const validateConfigModalPayload = ({
const jsonSchemaValue = tempPayload.json_schema
const schemaEmpty = isJsonSchemaEmpty(jsonSchemaValue)
const normalizedJsonSchema = schemaEmpty ? undefined : jsonSchemaValue
- const payloadToSave =
+ const payloadToSave = produce(
normalizedTempPayload.type === InputVarType.jsonObject && schemaEmpty
? { ...normalizedTempPayload, json_schema: undefined }
- : normalizedTempPayload
+ : normalizedTempPayload,
+ (draft) => {
+ if (
+ !fileInputTypes.includes(draft.type) ||
+ !draft.default ||
+ typeof draft.default !== 'object'
+ )
+ return
+
+ const files = Array.isArray(draft.default) ? draft.default : [draft.default]
+ for (const file of files) {
+ if (file?.originalFile instanceof Blob) delete file.originalFile
+ }
+ },
+ )
const moreInfo =
normalizedTempPayload.variable === payload?.variable