Merge remote-tracking branch 'origin/main' into feat/trigger

web/app/(shareLayout)/webapp-signin/components/mail-and-password-auth.tsx

@@ -100,7 +100,10 @@ export default function MailAndPasswordAuth({ isEmailSetup }: MailAndPasswordAut
         })
       }
     }
-
+    catch (e: any) {
+      if (e.code === 'authentication_failed')
+        Toast.notify({ type: 'error', message: e.message })
+    }
     finally {
       setIsLoading(false)
     }

web/app/components/base/param-item/top-k-item.tsx

@@ -32,7 +32,7 @@ const TopKItem: FC<Props> = ({
 }) => {
   const { t } = useTranslation()
   const handleParamChange = (key: string, value: number) => {
-    let notOutRangeValue = Number.parseFloat(value.toFixed(2))
+    let notOutRangeValue = Number.parseInt(value.toFixed(0))
     notOutRangeValue = Math.max(VALUE_LIMIT.min, notOutRangeValue)
     notOutRangeValue = Math.min(VALUE_LIMIT.max, notOutRangeValue)
     onChange(key, notOutRangeValue)

web/app/components/base/textarea/index.tsx

@@ -25,8 +25,8 @@ export type TextareaProps = {
   destructive?: boolean
   styleCss?: CSSProperties
   ref?: React.Ref<HTMLTextAreaElement>
-  onFocus?: () => void
-  onBlur?: () => void
+  onFocus?: React.FocusEventHandler<HTMLTextAreaElement>
+  onBlur?: React.FocusEventHandler<HTMLTextAreaElement>
 } & React.TextareaHTMLAttributes<HTMLTextAreaElement> & VariantProps<typeof textareaVariants>
 
 const Textarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(

web/app/components/workflow/nodes/if-else/components/condition-list/condition-item.tsx

@@ -234,6 +234,9 @@ const ConditionItem = ({
       draft.varType = resolvedVarType
       draft.value = resolvedVarType === VarType.boolean ? false : ''
       draft.comparison_operator = getOperators(resolvedVarType)[0]
+      delete draft.key
+      delete draft.sub_variable_condition
+      delete draft.numberVarType
       setTimeout(() => setControlPromptEditorRerenderKey(Date.now()))
     })
     doUpdateCondition(newCondition)

web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/top-k-and-score-threshold.tsx

@@ -1,8 +1,8 @@
-import { memo } from 'react'
+import { memo, useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
 import Tooltip from '@/app/components/base/tooltip'
-import Input from '@/app/components/base/input'
 import Switch from '@/app/components/base/switch'
+import { InputNumber } from '@/app/components/base/input-number'
 
 export type TopKAndScoreThresholdProps = {
   topK: number
@@ -14,6 +14,24 @@ export type TopKAndScoreThresholdProps = {
   readonly?: boolean
   hiddenScoreThreshold?: boolean
 }
+
+const maxTopK = (() => {
+  const configValue = Number.parseInt(globalThis.document?.body?.getAttribute('data-public-top-k-max-value') || '', 10)
+  if (configValue && !isNaN(configValue))
+    return configValue
+  return 10
+})()
+const TOP_K_VALUE_LIMIT = {
+  amount: 1,
+  min: 1,
+  max: maxTopK,
+}
+const SCORE_THRESHOLD_VALUE_LIMIT = {
+  step: 0.01,
+  min: 0,
+  max: 1,
+}
+
 const TopKAndScoreThreshold = ({
   topK,
   onTopKChange,
@@ -25,18 +43,18 @@ const TopKAndScoreThreshold = ({
   hiddenScoreThreshold,
 }: TopKAndScoreThresholdProps) => {
   const { t } = useTranslation()
-  const handleTopKChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    const value = Number(e.target.value)
-    if (Number.isNaN(value))
-      return
-    onTopKChange?.(value)
-  }
+  const handleTopKChange = useCallback((value: number) => {
+    let notOutRangeValue = Number.parseInt(value.toFixed(0))
+    notOutRangeValue = Math.max(TOP_K_VALUE_LIMIT.min, notOutRangeValue)
+    notOutRangeValue = Math.min(TOP_K_VALUE_LIMIT.max, notOutRangeValue)
+    onTopKChange?.(notOutRangeValue)
+  }, [onTopKChange])
 
-  const handleScoreThresholdChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    const value = Number(e.target.value)
-    if (Number.isNaN(value))
-      return
-    onScoreThresholdChange?.(value)
+  const handleScoreThresholdChange = (value: number) => {
+    let notOutRangeValue = Number.parseFloat(value.toFixed(2))
+    notOutRangeValue = Math.max(SCORE_THRESHOLD_VALUE_LIMIT.min, notOutRangeValue)
+    notOutRangeValue = Math.min(SCORE_THRESHOLD_VALUE_LIMIT.max, notOutRangeValue)
+    onScoreThresholdChange?.(notOutRangeValue)
   }
 
   return (
@@ -49,11 +67,13 @@ const TopKAndScoreThreshold = ({
             popupContent={t('appDebug.datasetConfig.top_kTip')}
           />
         </div>
-        <Input
+        <InputNumber
+          disabled={readonly}
           type='number'
+          {...TOP_K_VALUE_LIMIT}
+          size='regular'
           value={topK}
           onChange={handleTopKChange}
-          disabled={readonly}
         />
       </div>
       {
@@ -74,11 +94,13 @@ const TopKAndScoreThreshold = ({
                 popupContent={t('appDebug.datasetConfig.score_thresholdTip')}
               />
             </div>
-            <Input
+            <InputNumber
+              disabled={readonly || !isScoreThresholdEnabled}
               type='number'
+              {...SCORE_THRESHOLD_VALUE_LIMIT}
+              size='regular'
               value={scoreThreshold}
               onChange={handleScoreThresholdChange}
-              disabled={readonly || !isScoreThresholdEnabled}
             />
           </div>
         )

web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-number.tsx

@@ -18,7 +18,7 @@ type ConditionNumberProps = {
   nodesOutputVars: NodeOutPutVar[]
   availableNodes: Node[]
   isCommonVariable?: boolean
-  commonVariables: { name: string, type: string }[]
+  commonVariables: { name: string; type: string; value: string }[]
 } & ConditionValueMethodProps
 const ConditionNumber = ({
   value,

web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-string.tsx

@@ -18,7 +18,7 @@ type ConditionStringProps = {
   nodesOutputVars: NodeOutPutVar[]
   availableNodes: Node[]
   isCommonVariable?: boolean
-  commonVariables: { name: string, type: string }[]
+  commonVariables: { name: string; type: string; value: string }[]
 } & ConditionValueMethodProps
 const ConditionString = ({
   value,

web/app/components/workflow/nodes/knowledge-retrieval/types.ts

@@ -128,6 +128,6 @@ export type MetadataShape = {
   availableNumberVars?: NodeOutPutVar[]
   availableNumberNodesWithParent?: Node[]
   isCommonVariable?: boolean
-  availableCommonStringVars?: { name: string; type: string; }[]
-  availableCommonNumberVars?: { name: string; type: string; }[]
+  availableCommonStringVars?: { name: string; type: string; value: string }[]
+  availableCommonNumberVars?: { name: string; type: string; value: string }[]
 }

web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-importer.tsx

@@ -24,7 +24,7 @@ const JsonImporter: FC<JsonImporterProps> = ({
   const [open, setOpen] = useState(false)
   const [json, setJson] = useState('')
   const [parseError, setParseError] = useState<any>(null)
-  const importBtnRef = useRef<HTMLButtonElement>(null)
+  const importBtnRef = useRef<HTMLElement>(null)
   const advancedEditing = useVisualEditorStore(state => state.advancedEditing)
   const isAddingNewField = useVisualEditorStore(state => state.isAddingNewField)
   const { emit } = useMittContext()

web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/context.tsx

@@ -18,7 +18,7 @@ type VisualEditorProviderProps = {
 export const VisualEditorContext = createContext<VisualEditorContextType>(null)
 
 export const VisualEditorContextProvider = ({ children }: VisualEditorProviderProps) => {
-  const storeRef = useRef<VisualEditorStore>()
+  const storeRef = useRef<VisualEditorStore | null>(null)
 
   if (!storeRef.current)
     storeRef.current = createVisualEditorStore()

web/app/components/workflow/nodes/llm/use-config.ts

@@ -23,7 +23,7 @@ const useConfig = (id: string, payload: LLMNodeType) => {
   const { nodesReadOnly: readOnly } = useNodesReadOnly()
   const isChatMode = useIsChatMode()
 
-  const defaultConfig = useStore(s => s.nodesDefaultConfigs)[payload.type]
+  const defaultConfig = useStore(s => s.nodesDefaultConfigs)?.[payload.type]
   const [defaultRolePrefix, setDefaultRolePrefix] = useState<{ user: string; assistant: string }>({ user: '', assistant: '' })
   const { inputs, setInputs: doSetInputs } = useNodeCrud<LLMNodeType>(id, payload)
   const inputRef = useRef(inputs)

web/app/components/workflow/nodes/llm/utils.ts

@@ -10,7 +10,7 @@ export const checkNodeValid = (_payload: LLMNodeType) => {
 
 export const getFieldType = (field: Field) => {
   const { type, items } = field
-  if(field.schemaType === 'file') return 'file'
+  if(field.schemaType === 'file') return Type.file
   if (type !== Type.array || !items)
     return type
 

web/app/components/workflow/nodes/loop/components/condition-list/condition-item.tsx

@@ -196,6 +196,9 @@ const ConditionItem = ({
       draft.varType = varItem.type
       draft.value = ''
       draft.comparison_operator = getOperators(varItem.type)[0]
+      delete draft.key
+      delete draft.sub_variable_condition
+      delete draft.numberVarType
     })
     doUpdateCondition(newCondition)
     setOpen(false)

web/app/components/workflow/nodes/parameter-extractor/components/extract-parameter/import-from-tool.tsx

@@ -9,7 +9,10 @@ import BlockSelector from '../../../../block-selector'
 import type { Param, ParamType } from '../../types'
 import cn from '@/utils/classnames'
 import { useStore } from '@/app/components/workflow/store'
-import type { PluginDefaultValue } from '@/app/components/workflow/block-selector/types'
+import type {
+  PluginDefaultValue,
+  ToolDefaultValue,
+} from '@/app/components/workflow/block-selector/types'
 import type { ToolParameter } from '@/app/components/tools/types'
 import { CollectionType } from '@/app/components/tools/types'
 import type { BlockEnum } from '@/app/components/workflow/types'
@@ -44,9 +47,10 @@ const ImportFromTool: FC<Props> = ({
   const workflowTools = useStore(s => s.workflowTools)
 
   const handleSelectTool = useCallback((_type: BlockEnum, toolInfo?: PluginDefaultValue) => {
-    if (!toolInfo || !('tool_name' in toolInfo))
+    if (!toolInfo || 'datasource_name' in toolInfo || !('tool_name' in toolInfo))
       return
-    const { provider_id, provider_type, tool_name: tool_name } = toolInfo!
+
+    const { provider_id, provider_type, tool_name } = toolInfo as ToolDefaultValue
     const currentTools = (() => {
       switch (provider_type) {
         case CollectionType.builtIn:

web/app/components/workflow/nodes/parameter-extractor/use-config.ts

@@ -27,7 +27,7 @@ const useConfig = (id: string, payload: ParameterExtractorNodeType) => {
   const { handleOutVarRenameChange } = useWorkflow()
   const isChatMode = useIsChatMode()
 
-  const defaultConfig = useStore(s => s.nodesDefaultConfigs)[payload.type]
+  const defaultConfig = useStore(s => s.nodesDefaultConfigs)?.[payload.type]
 
   const [defaultRolePrefix, setDefaultRolePrefix] = useState<{ user: string; assistant: string }>({ user: '', assistant: '' })
   const { inputs, setInputs: doSetInputs } = useNodeCrud<ParameterExtractorNodeType>(id, payload)

web/app/components/workflow/nodes/question-classifier/use-config.ts

@@ -20,7 +20,7 @@ const useConfig = (id: string, payload: QuestionClassifierNodeType) => {
   const updateNodeInternals = useUpdateNodeInternals()
   const { nodesReadOnly: readOnly } = useNodesReadOnly()
   const isChatMode = useIsChatMode()
-  const defaultConfig = useStore(s => s.nodesDefaultConfigs)[payload.type]
+  const defaultConfig = useStore(s => s.nodesDefaultConfigs)?.[payload.type]
   const { getBeforeNodesInSameBranch } = useWorkflow()
   const startNode = getBeforeNodesInSameBranch(id).find(node => node.data.type === BlockEnum.Start)
   const startNodeId = startNode?.id

web/app/components/workflow/nodes/template-transform/use-config.ts

@@ -13,7 +13,7 @@ import useAvailableVarList from '@/app/components/workflow/nodes/_base/hooks/use
 
 const useConfig = (id: string, payload: TemplateTransformNodeType) => {
   const { nodesReadOnly: readOnly } = useNodesReadOnly()
-  const defaultConfig = useStore(s => s.nodesDefaultConfigs)[payload.type]
+  const defaultConfig = useStore(s => s.nodesDefaultConfigs)?.[payload.type]
 
   const { inputs, setInputs: doSetInputs } = useNodeCrud<TemplateTransformNodeType>(id, payload)
   const inputsRef = useRef(inputs)

web/app/components/workflow/run/agent-log/agent-log-nav-more.tsx

@@ -9,7 +9,7 @@ import Button from '@/app/components/base/button'
 import type { AgentLogItemWithChildren } from '@/types/workflow'
 
 type AgentLogNavMoreProps = {
-  options: { id: string; label: string }[]
+  options: AgentLogItemWithChildren[]
   onShowAgentOrToolLog: (detail?: AgentLogItemWithChildren) => void
 }
 const AgentLogNavMore = ({
@@ -41,10 +41,10 @@ const AgentLogNavMore = ({
           {
             options.map(option => (
               <div
-                key={option.id}
+                key={option.message_id}
                 className='system-md-regular flex h-8 cursor-pointer items-center rounded-lg px-2 text-text-secondary hover:bg-state-base-hover'
                 onClick={() => {
-                  onShowAgentOrToolLog(option as AgentLogItemWithChildren)
+                  onShowAgentOrToolLog(option)
                   setOpen(false)
                 }}
               >

web/app/components/workflow/workflow-preview/components/nodes/base.tsx

@@ -23,8 +23,10 @@ import {
 } from '../node-handle'
 import ErrorHandleOnNode from '../error-handle-on-node'
 
+type NodeChildElement = ReactElement<Partial<NodeProps>>
+
 type NodeCardProps = NodeProps & {
-  children?: ReactElement
+  children?: NodeChildElement
 }
 
 const BaseCard = ({

web/context/debug-configuration.ts

@@ -242,7 +242,7 @@ const DebugConfigurationContext = createContext<IDebugConfiguration>({
   },
   datasetConfigsRef: {
     current: null,
-  },
+  } as unknown as RefObject<DatasetConfigs>,
   setDatasetConfigs: noop,
   hasSetContextVar: false,
   isShowVisionConfig: false,

web/hooks/use-oauth.ts

@@ -1,5 +1,6 @@
 'use client'
 import { useEffect } from 'react'
+import { validateRedirectUrl } from '@/utils/urlValidation'
 
 export const useOAuthCallback = () => {
   useEffect(() => {
@@ -40,6 +41,7 @@ export const openOAuthPopup = (url: string, callback: (data?: any) => void) => {
   const left = window.screenX + (window.outerWidth - width) / 2
   const top = window.screenY + (window.outerHeight - height) / 2
 
+  validateRedirectUrl(url)
   const popup = window.open(
     url,
     'OAuth',

web/package.json

@@ -145,7 +145,7 @@
     "@babel/core": "^7.28.3",
     "@chromatic-com/storybook": "^3.1.0",
     "@eslint-react/eslint-plugin": "^1.15.0",
-    "@happy-dom/jest-environment": "^20.0.0",
+    "@happy-dom/jest-environment": "^20.0.2",
     "@mdx-js/loader": "^3.1.0",
     "@mdx-js/react": "^3.1.0",
     "@next/bundle-analyzer": "15.5.4",

web/pnpm-lock.yaml

@@ -348,8 +348,8 @@ importers:
         specifier: ^1.15.0
         version: 1.52.3(eslint@9.35.0(jiti@2.6.1))(ts-api-utils@2.1.0(typescript@5.8.3))(typescript@5.8.3)
       '@happy-dom/jest-environment':
-        specifier: ^20.0.0
-        version: 20.0.0(@jest/environment@29.7.0)(@jest/fake-timers@29.7.0)(@jest/types@29.6.3)(jest-mock@29.7.0)(jest-util@29.7.0)
+        specifier: ^20.0.2
+        version: 20.0.4(@jest/environment@29.7.0)(@jest/fake-timers@29.7.0)(@jest/types@29.6.3)(jest-mock@29.7.0)(jest-util@29.7.0)
       '@mdx-js/loader':
         specifier: ^3.1.0
         version: 3.1.0(acorn@8.15.0)(webpack@5.100.2(esbuild@0.25.0)(uglify-js@3.19.3))
@@ -1647,8 +1647,8 @@ packages:
   '@formatjs/intl-localematcher@0.5.10':
     resolution: {integrity: sha512-af3qATX+m4Rnd9+wHcjJ4w2ijq+rAVP3CCinJQvFv1kgSu1W6jypUmvleJxcewdxmutM8dmIRZFxO/IQBZmP2Q==}
 
-  '@happy-dom/jest-environment@20.0.0':
-    resolution: {integrity: sha512-dUyMDNJzPDFopSDyzKdbeYs8z9B4jLj9kXnru8TjYdGeLsQKf+6r0lq/9T2XVcu04QFxXMykt64A+KjsaJTaNA==}
+  '@happy-dom/jest-environment@20.0.4':
+    resolution: {integrity: sha512-75OcYtjO+jqxWiYiXvbwR8JZITX1/8iAjRSRpZ/rNjO6UnYebwX6HdI91Ix09xYZEO1X/xOof6HX1EiZnrgnXA==}
     engines: {node: '>=20.0.0'}
     peerDependencies:
       '@jest/environment': '>=25.0.0'
@@ -5582,8 +5582,8 @@ packages:
   hachure-fill@0.5.2:
     resolution: {integrity: sha512-3GKBOn+m2LX9iq+JC1064cSFprJY4jL1jCXTcpnfER5HYE2l/4EfWSGzkPa/ZDBmYI0ZOEj5VHV/eKnPGkHuOg==}
 
-  happy-dom@20.0.0:
-    resolution: {integrity: sha512-GkWnwIFxVGCf2raNrxImLo397RdGhLapj5cT3R2PT7FwL62Ze1DROhzmYW7+J3p9105DYMVenEejEbnq5wA37w==}
+  happy-dom@20.0.4:
+    resolution: {integrity: sha512-WxFtvnij6G64/MtMimnZhF0nKx3LUQKc20zjATD6tKiqOykUwQkd+2FW/DZBAFNjk4oWh0xdv/HBleGJmSY/Iw==}
     engines: {node: '>=20.0.0'}
 
   has-flag@4.0.0:
@@ -10143,12 +10143,12 @@ snapshots:
     dependencies:
       tslib: 2.8.1
 
-  '@happy-dom/jest-environment@20.0.0(@jest/environment@29.7.0)(@jest/fake-timers@29.7.0)(@jest/types@29.6.3)(jest-mock@29.7.0)(jest-util@29.7.0)':
+  '@happy-dom/jest-environment@20.0.4(@jest/environment@29.7.0)(@jest/fake-timers@29.7.0)(@jest/types@29.6.3)(jest-mock@29.7.0)(jest-util@29.7.0)':
     dependencies:
       '@jest/environment': 29.7.0
       '@jest/fake-timers': 29.7.0
       '@jest/types': 29.6.3
-      happy-dom: 20.0.0
+      happy-dom: 20.0.4
       jest-mock: 29.7.0
       jest-util: 29.7.0
 
@@ -14802,7 +14802,7 @@ snapshots:
 
   hachure-fill@0.5.2: {}
 
-  happy-dom@20.0.0:
+  happy-dom@20.0.4:
     dependencies:
       '@types/node': 20.19.20
       '@types/whatwg-mimetype': 3.0.2

web/service/base.ts

@@ -324,7 +324,7 @@ const baseFetch = base
 
 type UploadOptions = {
   xhr: XMLHttpRequest
-  method: string
+  method?: string
   url?: string
   headers?: Record<string, string>
   data: FormData

web/utils/urlValidation.ts

@@ -0,0 +1,23 @@
+/**
+ * Validates that a URL is safe for redirection.
+ * Only allows HTTP and HTTPS protocols to prevent XSS attacks.
+ *
+ * @param url - The URL string to validate
+ * @throws Error if the URL has an unsafe protocol
+ */
+export function validateRedirectUrl(url: string): void {
+  try {
+    const parsedUrl = new URL(url)
+    if (parsedUrl.protocol !== 'http:' && parsedUrl.protocol !== 'https:')
+      throw new Error('Authorization URL must be HTTP or HTTPS')
+  }
+  catch (error) {
+    if (
+      error instanceof Error
+      && error.message === 'Authorization URL must be HTTP or HTTPS'
+    )
+      throw error
+    // If URL parsing fails, it's also invalid
+    throw new Error(`Invalid URL: ${url}`)
+  }
+}