Merge commit 'fb41b215' into sandboxed-agent-rebase

Made-with: Cursor # Conflicts: # .devcontainer/post_create_command.sh # api/commands.py # api/core/agent/cot_agent_runner.py # api/core/agent/fc_agent_runner.py # api/core/app/apps/workflow_app_runner.py # api/core/app/entities/queue_entities.py # api/core/app/entities/task_entities.py # api/core/workflow/workflow_entry.py # api/dify_graph/enums.py # api/dify_graph/graph/graph.py # api/dify_graph/graph_events/node.py # api/dify_graph/model_runtime/entities/message_entities.py # api/dify_graph/node_events/node.py # api/dify_graph/nodes/agent/agent_node.py # api/dify_graph/nodes/base/__init__.py # api/dify_graph/nodes/base/entities.py # api/dify_graph/nodes/base/node.py # api/dify_graph/nodes/llm/entities.py # api/dify_graph/nodes/llm/node.py # api/dify_graph/nodes/tool/tool_node.py # api/pyproject.toml # api/uv.lock # web/app/components/base/avatar/__tests__/index.spec.tsx # web/app/components/base/avatar/index.tsx # web/app/components/base/date-and-time-picker/time-picker/__tests__/index.spec.tsx # web/app/components/base/file-uploader/file-from-link-or-local/index.tsx # web/app/components/base/prompt-editor/index.tsx # web/app/components/datasets/metadata/edit-metadata-batch/modal.tsx # web/app/components/header/account-dropdown/index.spec.tsx # web/app/components/share/text-generation/index.tsx # web/app/components/workflow/block-selector/tool/action-item.tsx # web/app/components/workflow/block-selector/trigger-plugin/action-item.tsx # web/app/components/workflow/hooks/use-edges-interactions.ts # web/app/components/workflow/hooks/use-nodes-interactions.ts # web/app/components/workflow/index.tsx # web/app/components/workflow/nodes/_base/components/editor/code-editor/index.tsx # web/app/components/workflow/nodes/http/components/key-value/key-value-edit/index.tsx # web/app/components/workflow/nodes/human-input/components/delivery-method/recipient/email-item.tsx # web/app/components/workflow/nodes/loop/use-interactions.ts # web/contract/router.ts # web/env.ts # web/eslint-suppressions.json # web/package.json # web/pnpm-lock.yaml
2026-05-06 02:18:08 +08:00 · 2026-03-23 10:52:06 +08:00
parent b15a9bea21 fb41b215c8
commit 5041d96bb1
1395 changed files with 167201 additions and 73658 deletions
--- a/web/app/components/datasets/create/website/firecrawl/tests/options.spec.tsx
+++ b/web/app/components/datasets/create/website/firecrawl/tests/options.spec.tsx
@ -1,6 +1,5 @@
 import type { CrawlOptions } from '@/models/datasets'
 import { fireEvent, render, screen } from '@testing-library/react'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
 import Options from '../options'

 // Test Data Factory
@ -104,38 +103,28 @@ describe('Options', () => {
  describe('Props Display', () => {
    it('should display crawl_sub_pages checkbox with check icon when true', () => {
      const payload = createMockCrawlOptions({ crawl_sub_pages: true })
-      const { container } = render(<Options payload={payload} onChange={mockOnChange} />)
+      render(<Options payload={payload} onChange={mockOnChange} />)

-      const checkboxes = getCheckboxes(container)
      // First checkbox should have check icon when checked
-      expect(checkboxes[0].querySelector('svg')).toBeInTheDocument()
+      expect(screen.queryByTestId('check-icon-crawl-sub-page')).toBeInTheDocument()
    })

    it('should display crawl_sub_pages checkbox without check icon when false', () => {
      const payload = createMockCrawlOptions({ crawl_sub_pages: false })
-      const { container } = render(<Options payload={payload} onChange={mockOnChange} />)
-
-      const checkboxes = getCheckboxes(container)
-      // First checkbox should not have check icon when unchecked
-      expect(checkboxes[0].querySelector('svg')).not.toBeInTheDocument()
+      render(<Options payload={payload} onChange={mockOnChange} />)
+      expect(screen.queryByTestId('check-icon-crawl-sub-page')).not.toBeInTheDocument()
    })

    it('should display only_main_content checkbox with check icon when true', () => {
      const payload = createMockCrawlOptions({ only_main_content: true })
-      const { container } = render(<Options payload={payload} onChange={mockOnChange} />)
-
-      const checkboxes = getCheckboxes(container)
-      // Second checkbox should have check icon when checked
-      expect(checkboxes[1].querySelector('svg')).toBeInTheDocument()
+      render(<Options payload={payload} onChange={mockOnChange} />)
+      expect(screen.getByTestId('check-icon-only-main-content')).toBeInTheDocument()
    })

    it('should display only_main_content checkbox without check icon when false', () => {
      const payload = createMockCrawlOptions({ only_main_content: false })
-      const { container } = render(<Options payload={payload} onChange={mockOnChange} />)
-
-      const checkboxes = getCheckboxes(container)
-      // Second checkbox should not have check icon when unchecked
-      expect(checkboxes[1].querySelector('svg')).not.toBeInTheDocument()
+      render(<Options payload={payload} onChange={mockOnChange} />)
+      expect(screen.queryByTestId('check-icon-only-main-content')).not.toBeInTheDocument()
    })

    it('should display limit value in input', () => {
--- a/web/app/components/datasets/create/website/firecrawl/options.tsx
+++ b/web/app/components/datasets/create/website/firecrawl/options.tsx
@ -35,6 +35,7 @@ const Options: FC<Props> = ({
    <div className={cn(className, 'space-y-2')}>
      <CheckboxWithLabel
        label={t(`${I18N_PREFIX}.crawlSubPage`, { ns: 'datasetCreation' })}
+        testId="crawl-sub-page"
        isChecked={payload.crawl_sub_pages}
        onChange={handleChange('crawl_sub_pages')}
        labelClassName="text-[13px] leading-[16px] font-medium text-text-secondary"
@ -76,6 +77,7 @@ const Options: FC<Props> = ({
      </div>
      <CheckboxWithLabel
        label={t(`${I18N_PREFIX}.extractOnlyMainContent`, { ns: 'datasetCreation' })}
+        testId="only-main-content"
        isChecked={payload.only_main_content}
        onChange={handleChange('only_main_content')}
        labelClassName="text-[13px] leading-[16px] font-medium text-text-secondary"
--- a/web/app/components/datasets/create/website/jina-reader/tests/options.spec.tsx
+++ b/web/app/components/datasets/create/website/jina-reader/tests/options.spec.tsx
@ -70,34 +70,26 @@ describe('Options (jina-reader)', () => {
  describe('Props Display', () => {
    it('should display crawl_sub_pages checkbox with check icon when true', () => {
      const payload = createMockCrawlOptions({ crawl_sub_pages: true })
-      const { container } = render(<Options payload={payload} onChange={mockOnChange} />)
-
-      const checkboxes = getCheckboxes(container)
-      expect(checkboxes[0].querySelector('svg')).toBeInTheDocument()
+      render(<Options payload={payload} onChange={mockOnChange} />)
+      expect(screen.getByTestId('check-icon-crawl-sub-pages')).toBeInTheDocument()
    })

    it('should display crawl_sub_pages checkbox without check icon when false', () => {
      const payload = createMockCrawlOptions({ crawl_sub_pages: false })
-      const { container } = render(<Options payload={payload} onChange={mockOnChange} />)
-
-      const checkboxes = getCheckboxes(container)
-      expect(checkboxes[0].querySelector('svg')).not.toBeInTheDocument()
+      render(<Options payload={payload} onChange={mockOnChange} />)
+      expect(screen.queryByTestId('check-icon-crawl-sub-pages')).not.toBeInTheDocument()
    })

    it('should display use_sitemap checkbox with check icon when true', () => {
      const payload = createMockCrawlOptions({ use_sitemap: true })
-      const { container } = render(<Options payload={payload} onChange={mockOnChange} />)
-
-      const checkboxes = getCheckboxes(container)
-      expect(checkboxes[1].querySelector('svg')).toBeInTheDocument()
+      render(<Options payload={payload} onChange={mockOnChange} />)
+      expect(screen.getByTestId('check-icon-use-sitemap')).toBeInTheDocument()
    })

    it('should display use_sitemap checkbox without check icon when false', () => {
      const payload = createMockCrawlOptions({ use_sitemap: false })
-      const { container } = render(<Options payload={payload} onChange={mockOnChange} />)
-
-      const checkboxes = getCheckboxes(container)
-      expect(checkboxes[1].querySelector('svg')).not.toBeInTheDocument()
+      render(<Options payload={payload} onChange={mockOnChange} />)
+      expect(screen.queryByTestId('check-icon-use-sitemap')).not.toBeInTheDocument()
    })

    it('should display limit value in input', () => {
@ -111,10 +103,9 @@ describe('Options (jina-reader)', () => {
  describe('User Interactions', () => {
    it('should call onChange with updated crawl_sub_pages when checkbox is clicked', () => {
      const payload = createMockCrawlOptions({ crawl_sub_pages: true })
-      const { container } = render(<Options payload={payload} onChange={mockOnChange} />)
+      render(<Options payload={payload} onChange={mockOnChange} />)

-      const checkboxes = getCheckboxes(container)
-      fireEvent.click(checkboxes[0])
+      fireEvent.click(screen.getByTestId('checkbox-crawl-sub-pages'))

      expect(mockOnChange).toHaveBeenCalledWith({
        ...payload,
@ -124,10 +115,9 @@ describe('Options (jina-reader)', () => {

    it('should call onChange with updated use_sitemap when checkbox is clicked', () => {
      const payload = createMockCrawlOptions({ use_sitemap: false })
-      const { container } = render(<Options payload={payload} onChange={mockOnChange} />)
+      render(<Options payload={payload} onChange={mockOnChange} />)

-      const checkboxes = getCheckboxes(container)
-      fireEvent.click(checkboxes[1])
+      fireEvent.click(screen.getByTestId('checkbox-use-sitemap'))

      expect(mockOnChange).toHaveBeenCalledWith({
        ...payload,
--- a/web/app/components/datasets/create/website/watercrawl/tests/options.spec.tsx
+++ b/web/app/components/datasets/create/website/watercrawl/tests/options.spec.tsx
@ -87,10 +87,9 @@ describe('Options (watercrawl)', () => {
  describe('Props Display', () => {
    it('should display crawl_sub_pages checkbox with check icon when true', () => {
      const payload = createMockCrawlOptions({ crawl_sub_pages: true })
-      const { container } = render(<Options payload={payload} onChange={mockOnChange} />)
+      render(<Options payload={payload} onChange={mockOnChange} />)

-      const checkboxes = getCheckboxes(container)
-      expect(checkboxes[0].querySelector('svg')).toBeInTheDocument()
+      expect(screen.getByTestId('check-icon-crawl-sub-pages')).toBeInTheDocument()
    })

    it('should display crawl_sub_pages checkbox without check icon when false', () => {
@ -103,10 +102,8 @@ describe('Options (watercrawl)', () => {

    it('should display only_main_content checkbox with check icon when true', () => {
      const payload = createMockCrawlOptions({ only_main_content: true })
-      const { container } = render(<Options payload={payload} onChange={mockOnChange} />)
-
-      const checkboxes = getCheckboxes(container)
-      expect(checkboxes[1].querySelector('svg')).toBeInTheDocument()
+      render(<Options payload={payload} onChange={mockOnChange} />)
+      expect(screen.getByTestId('check-icon-only-main-content')).toBeInTheDocument()
    })

    it('should display only_main_content checkbox without check icon when false', () => {