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
This commit is contained in:
Novice
2026-03-23 10:52:06 +08:00
1395 changed files with 167201 additions and 73658 deletions

View File

@ -213,8 +213,7 @@ describe('MCPServiceCard', () => {
render(<MCPServiceCard appInfo={createMockAppInfo()} />, { wrapper: createWrapper() })
const switchElement = screen.getByRole('switch')
expect(switchElement.className).toContain('!cursor-not-allowed')
expect(switchElement.className).toContain('!opacity-50')
expect(switchElement.className).toContain('cursor-not-allowed')
})
})
@ -355,8 +354,7 @@ describe('MCPServiceCard', () => {
render(<MCPServiceCard appInfo={createMockAppInfo()} />, { wrapper: createWrapper() })
const switchElement = screen.getByRole('switch')
expect(switchElement.className).toContain('!cursor-not-allowed')
expect(switchElement.className).toContain('!opacity-50')
expect(switchElement.className).toContain('cursor-not-allowed')
})
})
@ -371,8 +369,7 @@ describe('MCPServiceCard', () => {
render(<MCPServiceCard appInfo={createMockAppInfo(AppModeEnum.WORKFLOW)} />, { wrapper: createWrapper() })
const switchElement = screen.getByRole('switch')
expect(switchElement.className).toContain('!cursor-not-allowed')
expect(switchElement.className).toContain('!opacity-50')
expect(switchElement.className).toContain('cursor-not-allowed')
})
})
@ -428,11 +425,10 @@ describe('MCPServiceCard', () => {
})
describe('Accessibility', () => {
it('should have an accessible switch with button type', () => {
it('should have an accessible switch element', () => {
render(<MCPServiceCard appInfo={createMockAppInfo()} />, { wrapper: createWrapper() })
const switchElement = screen.getByRole('switch')
expect(switchElement).toHaveAttribute('type', 'button')
expect(screen.getByRole('switch')).toBeInTheDocument()
})
})
})