Merge branch 'main' into feat/rag-pipeline

web/app/components/workflow/nodes/http/components/curl-panel.tsx

@@ -2,7 +2,7 @@
 import type { FC } from 'react'
 import React, { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { BodyType, type HttpNodeType, Method } from '../types'
+import { BodyPayloadValueType, BodyType, type HttpNodeType, Method } from '../types'
 import Modal from '@/app/components/base/modal'
 import Button from '@/app/components/base/button'
 import Textarea from '@/app/components/base/textarea'
@@ -51,11 +51,16 @@ const parseCurl = (curlCommand: string): { node: HttpNodeType | null; error: str
       case '-d':
       case '--data':
       case '--data-raw':
-      case '--data-binary':
+      case '--data-binary': {
         if (i + 1 >= args.length)
           return { node: null, error: 'Missing data value after -d, --data, --data-raw, or --data-binary.' }
-        node.body = { type: BodyType.rawText, data: args[++i].replace(/^['"]|['"]$/g, '') }
+        const bodyPayload = [{
+          type: BodyPayloadValueType.text,
+          value: args[++i].replace(/^['"]|['"]$/g, ''),
+        }]
+        node.body = { type: BodyType.rawText, data: bodyPayload }
         break
+      }
       case '-F':
       case '--form': {
         if (i + 1 >= args.length)

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

@@ -28,6 +28,7 @@ const CodeEditor: FC<CodeEditorProps> = ({
   const { theme } = useTheme()
   const monacoRef = useRef<any>(null)
   const editorRef = useRef<any>(null)
+  const containerRef = useRef<HTMLDivElement>(null)
 
   useEffect(() => {
     if (monacoRef.current) {
@@ -74,6 +75,19 @@ const CodeEditor: FC<CodeEditorProps> = ({
       onUpdate?.(value)
   }, [onUpdate])
 
+  useEffect(() => {
+    const resizeObserver = new ResizeObserver(() => {
+      editorRef.current?.layout()
+    })
+
+    if (containerRef.current)
+      resizeObserver.observe(containerRef.current)
+
+    return () => {
+      resizeObserver.disconnect()
+    }
+  }, [])
+
   return (
     <div className={classNames('flex flex-col h-full bg-components-input-bg-normal overflow-hidden', className)}>
       <div className='flex items-center justify-between pl-2 pr-1 pt-1'>
@@ -102,9 +116,11 @@ const CodeEditor: FC<CodeEditorProps> = ({
           </Tooltip>
         </div>
       </div>
-      <div className={classNames('relative', editorWrapperClassName)}>
+      <div
+        ref={containerRef}
+        className={classNames('relative overflow-hidden', editorWrapperClassName)}
+      >
         <Editor
-          height='100%'
           defaultLanguage='json'
           value={value}
           onChange={handleEditorChange}
@@ -117,7 +133,6 @@ const CodeEditor: FC<CodeEditorProps> = ({
             scrollBeyondLastLine: false,
             wordWrap: 'on',
             wrappingIndent: 'same',
-            // Add these options
             overviewRulerBorder: false,
             hideCursorInOverviewRuler: true,
             renderLineHighlightOnlyWhenFocus: false,

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

@@ -21,7 +21,7 @@ import { MittProvider, VisualEditorContextProvider, useMittContext } from './vis
 import ErrorMessage from './error-message'
 import { useVisualEditorStore } from './visual-editor/store'
 import Toast from '@/app/components/base/toast'
-import { useGetLanguage } from '@/context/i18n'
+import { useGetDocLanguage } from '@/context/i18n'
 import { JSON_SCHEMA_MAX_DEPTH } from '@/config'
 
 type JsonSchemaConfigProps = {
@@ -47,21 +47,13 @@ const DEFAULT_SCHEMA: SchemaRoot = {
   additionalProperties: false,
 }
 
-const HELP_DOC_URL = {
-  zh_Hans: 'https://docs.dify.ai/zh-hans/guides/workflow/structured-outputs',
-  en_US: 'https://docs.dify.ai/en/guides/workflow/structured-outputs',
-  ja_JP: 'https://docs.dify.ai/ja-jp/guides/workflow/structured-outputs',
-}
-
-type LocaleKey = keyof typeof HELP_DOC_URL
-
 const JsonSchemaConfig: FC<JsonSchemaConfigProps> = ({
   defaultSchema,
   onSave,
   onClose,
 }) => {
   const { t } = useTranslation()
-  const locale = useGetLanguage() as LocaleKey
+  const docLanguage = useGetDocLanguage()
   const [currentTab, setCurrentTab] = useState(SchemaView.VisualEditor)
   const [jsonSchema, setJsonSchema] = useState(defaultSchema || DEFAULT_SCHEMA)
   const [json, setJson] = useState(JSON.stringify(jsonSchema, null, 2))
@@ -260,7 +252,7 @@ const JsonSchemaConfig: FC<JsonSchemaConfigProps> = ({
       <div className='flex items-center gap-x-2 p-6 pt-5'>
         <a
           className='flex grow items-center gap-x-1 text-text-accent'
-          href={HELP_DOC_URL[locale]}
+          href={`https://docs.dify.ai/${docLanguage}/guides/workflow/structured-outputs`}
           target='_blank'
           rel='noopener noreferrer'
         >

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

@@ -12,7 +12,7 @@ const SchemaEditor: FC<SchemaEditorProps> = ({
 }) => {
   return (
     <CodeEditor
-      className='rounded-xl'
+      className='grow rounded-xl'
       editorWrapperClassName='grow'
       value={schema}
       onUpdate={onUpdate}

web/app/components/workflow/panel/debug-and-preview/user-input.tsx

@@ -34,7 +34,7 @@ const UserInput = () => {
     return null
 
   return (
-    <div className={cn('sticky top-0 z-[1] rounded-xl border-[0.5px] border-components-panel-border-subtle bg-components-panel-on-panel-item-bg shadow-xs')}>
+    <div className={cn('relative z-[1] rounded-xl border-[0.5px] border-components-panel-border-subtle bg-components-panel-on-panel-item-bg shadow-xs')}>
       <div className='px-4 pb-4 pt-3'>
         {visibleVariables.map((variable, index) => (
           <div