fix: merge error

web/app/components/workflow/constants/node.ts

@@ -20,6 +20,7 @@ import httpRequestDefault from '@/app/components/workflow/nodes/http/default'
 import parameterExtractorDefault from '@/app/components/workflow/nodes/parameter-extractor/default'
 import listOperatorDefault from '@/app/components/workflow/nodes/list-operator/default'
 import toolDefault from '@/app/components/workflow/nodes/tool/default'
+import humanInputDefault from '@/app/components/workflow/nodes/human-input/default'
 
 export const WORKFLOW_COMMON_NODES = [
   llmDefault,
@@ -41,4 +42,5 @@ export const WORKFLOW_COMMON_NODES = [
   httpRequestDefault,
   listOperatorDefault,
   toolDefault,
+  humanInputDefault,
 ]

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

@@ -42,6 +42,8 @@ import DataSourceNode from './data-source/node'
 import DataSourcePanel from './data-source/panel'
 import KnowledgeBaseNode from './knowledge-base/node'
 import KnowledgeBasePanel from './knowledge-base/panel'
+import HumanInputNode from './human-input/node'
+import HumanInputPanel from './human-input/panel'
 
 export const NodeComponentMap: Record<string, ComponentType<any>> = {
   [BlockEnum.Start]: StartNode,
@@ -66,6 +68,7 @@ export const NodeComponentMap: Record<string, ComponentType<any>> = {
   [BlockEnum.Agent]: AgentNode,
   [BlockEnum.DataSource]: DataSourceNode,
   [BlockEnum.KnowledgeBase]: KnowledgeBaseNode,
+  [BlockEnum.HumanInput]: HumanInputNode,
 }
 
 export const PanelComponentMap: Record<string, ComponentType<any>> = {
@@ -91,4 +94,5 @@ export const PanelComponentMap: Record<string, ComponentType<any>> = {
   [BlockEnum.Agent]: AgentPanel,
   [BlockEnum.DataSource]: DataSourcePanel,
   [BlockEnum.KnowledgeBase]: KnowledgeBasePanel,
+  [BlockEnum.HumanInput]: HumanInputPanel,
 }

web/app/components/workflow/nodes/human-input/default.ts

@@ -1,11 +1,20 @@
 import type { NodeDefault } from '../../types'
 import type { HumanInputNodeType } from './types'
 import { DeliveryMethodType, UserActionButtonType } from './types'
-import { ALL_CHAT_AVAILABLE_BLOCKS } from '@/app/components/workflow/blocks'
+import { genNodeMetaData } from '@/app/components/workflow/utils'
+import { BlockEnum } from '@/app/components/workflow/types'
+import { BlockClassificationEnum } from '@/app/components/workflow/block-selector/types'
 
 const i18nPrefix = 'workflow.nodes.humanInput.errorMsg'
 
+const metaData = genNodeMetaData({
+  classification: BlockClassificationEnum.Logic,
+  sort: 1,
+  type: BlockEnum.HumanInput,
+})
+
 const nodeDefault: NodeDefault<HumanInputNodeType> = {
+  metaData,
   defaultValue: {
     delivery_methods: [
       {
@@ -42,41 +51,31 @@ const nodeDefault: NodeDefault<HumanInputNodeType> = {
     timeout: 3,
     timeout_unit: 'day',
   },
-  getAvailablePrevNodes(isChatMode: boolean) {
-    const nodes = isChatMode
-      ? ALL_CHAT_AVAILABLE_BLOCKS
-      : []
-    return nodes
-  },
-  getAvailableNextNodes() {
-    const nodes = ALL_CHAT_AVAILABLE_BLOCKS
-    return nodes
-  },
   checkValid(payload: HumanInputNodeType, t: any) {
-      let errorMessages = ''
-      if (!errorMessages && !payload.delivery_methods.length)
-        errorMessages = t(`${i18nPrefix}.noDeliveryMethod`)
+    let errorMessages = ''
+    if (!errorMessages && !payload.delivery_methods.length)
+      errorMessages = t(`${i18nPrefix}.noDeliveryMethod`)
 
-      if (!errorMessages && payload.delivery_methods.length > 0 && !payload.delivery_methods.some(method => method.enabled))
-        errorMessages = t(`${i18nPrefix}.noDeliveryMethodEnabled`)
+    if (!errorMessages && payload.delivery_methods.length > 0 && !payload.delivery_methods.some(method => method.enabled))
+      errorMessages = t(`${i18nPrefix}.noDeliveryMethodEnabled`)
 
-      if (!errorMessages && !payload.form_content)
-        errorMessages = t(`${i18nPrefix}.noFormContent`)
+    if (!errorMessages && !payload.form_content)
+      errorMessages = t(`${i18nPrefix}.noFormContent`)
 
-      if (!errorMessages && payload.form_content) {
-        const regex = /\{\{#\$output\.[^#]+#\}\}/
-        if (!regex.test(payload.form_content))
-          errorMessages = t(`${i18nPrefix}.noFormInputField`)
-      }
+    if (!errorMessages && payload.form_content) {
+      const regex = /\{\{#\$output\.[^#]+#\}\}/
+      if (!regex.test(payload.form_content))
+        errorMessages = t(`${i18nPrefix}.noFormInputField`)
+    }
 
-      if (!errorMessages && !payload.user_actions.length)
-        errorMessages = t(`${i18nPrefix}.noUserActions`)
+    if (!errorMessages && !payload.user_actions.length)
+      errorMessages = t(`${i18nPrefix}.noUserActions`)
 
-      return {
-        isValid: !errorMessages,
-        errorMessage: errorMessages,
-      }
-    },
+    return {
+      isValid: !errorMessages,
+      errorMessage: errorMessages,
+    }
+  },
 }
 
 export default nodeDefault