fix:#18447:When variables in the workflow are deleted or modified, it is impossible to visually identify subsequent node errors (#18554)
Co-authored-by: crazywoola <427733928@qq.com>
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
import { BlockEnum } from '../../types'
|
||||
import type { NodeDefault } from '../../types'
|
||||
import type { NodeDefault, Var } from '../../types'
|
||||
import { getNotExistVariablesByArray, getNotExistVariablesByText } from '../../utils/workflow'
|
||||
import { AuthorizationType, BodyType, Method } from './types'
|
||||
import type { BodyPayload, HttpNodeType } from './types'
|
||||
import {
|
||||
@@ -50,8 +51,8 @@ const nodeDefault: NodeDefault<HttpNodeType> = {
|
||||
errorMessages = t('workflow.errorMsg.fieldRequired', { field: t('workflow.nodes.http.api') })
|
||||
|
||||
if (!errorMessages
|
||||
&& payload.body.type === BodyType.binary
|
||||
&& ((!(payload.body.data as BodyPayload)[0]?.file) || (payload.body.data as BodyPayload)[0]?.file?.length === 0)
|
||||
&& payload.body.type === BodyType.binary
|
||||
&& ((!(payload.body.data as BodyPayload)[0]?.file) || (payload.body.data as BodyPayload)[0]?.file?.length === 0)
|
||||
)
|
||||
errorMessages = t('workflow.errorMsg.fieldRequired', { field: t('workflow.nodes.http.binaryFileVariable') })
|
||||
|
||||
@@ -60,6 +61,53 @@ const nodeDefault: NodeDefault<HttpNodeType> = {
|
||||
errorMessage: errorMessages,
|
||||
}
|
||||
},
|
||||
checkVarValid(payload: HttpNodeType, varMap: Record<string, Var>, t: any) {
|
||||
const errorMessageArr: string[] = []
|
||||
const url_warnings = getNotExistVariablesByText(payload.url, varMap)
|
||||
if (url_warnings.length)
|
||||
errorMessageArr.push(`${t('workflow.nodes.http.api')} ${t('workflow.common.referenceVar')}${url_warnings.join('、')}${t('workflow.common.noExist')}`)
|
||||
|
||||
const headers_warnings = getNotExistVariablesByText(payload.headers, varMap)
|
||||
if (headers_warnings.length)
|
||||
errorMessageArr.push(`${t('workflow.nodes.http.headers')} ${t('workflow.common.referenceVar')}${headers_warnings.join('、')}${t('workflow.common.noExist')}`)
|
||||
|
||||
const params_warnings = getNotExistVariablesByText(payload.params, varMap)
|
||||
if (params_warnings.length)
|
||||
errorMessageArr.push(`${t('workflow.nodes.http.params')} ${t('workflow.common.referenceVar')}${params_warnings.join('、')}${t('workflow.common.noExist')}`)
|
||||
|
||||
const body_warnings: string[] = []
|
||||
|
||||
if ([BodyType.binary].includes(payload.body.type)) {
|
||||
const body_data = payload.body.data as BodyPayload
|
||||
body_data.forEach((item) => {
|
||||
const key_warnings = getNotExistVariablesByText(item.key || '', varMap)
|
||||
if (key_warnings.length)
|
||||
body_warnings.push(...key_warnings)
|
||||
const warnings = getNotExistVariablesByArray([item.file || []], varMap)
|
||||
if (warnings.length)
|
||||
body_warnings.push(...warnings)
|
||||
})
|
||||
}
|
||||
else {
|
||||
const body_data = payload.body.data as BodyPayload
|
||||
body_data.forEach((item) => {
|
||||
const key_warnings = getNotExistVariablesByText(item.key || '', varMap)
|
||||
if (key_warnings.length)
|
||||
body_warnings.push(...key_warnings)
|
||||
const value_warnings = getNotExistVariablesByText(item.value || '', varMap)
|
||||
if (value_warnings.length)
|
||||
body_warnings.push(...value_warnings)
|
||||
})
|
||||
}
|
||||
if (body_warnings.length)
|
||||
errorMessageArr.push(`${t('workflow.nodes.http.body')} ${t('workflow.common.referenceVar')}${body_warnings.join('、')}${t('workflow.common.noExist')}`)
|
||||
|
||||
return {
|
||||
isValid: true,
|
||||
warning_vars: [...url_warnings, ...headers_warnings, ...params_warnings, ...body_warnings],
|
||||
errorMessage: errorMessageArr,
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
export default nodeDefault
|
||||
|
||||
Reference in New Issue
Block a user