mirror of
https://github.com/langgenius/dify.git
synced 2026-05-05 01:48:04 +08:00
Merge remote-tracking branch 'origin/build/feat/hitl' into wip/hitl-merge-web-conflicts-20260206-175434
# Conflicts: # api/.env.example # api/core/app/apps/advanced_chat/app_generator.py # api/core/app/apps/advanced_chat/app_runner.py # api/core/app/apps/advanced_chat/generate_task_pipeline.py # api/core/app/apps/workflow/app_generator.py # api/core/app/apps/workflow/app_runner.py # api/core/app/entities/queue_entities.py # api/core/workflow/node_events/__init__.py # api/core/workflow/runtime/graph_runtime_state.py # api/fields/message_fields.py # api/services/workflow_service.py # web/app/components/app/app-publisher/index.tsx # web/app/components/base/chat/chat/answer/index.tsx # web/app/components/base/chat/chat/hooks.ts # web/app/components/base/chat/chat/type.ts # web/app/components/base/prompt-editor/index.tsx # web/app/components/rag-pipeline/hooks/use-available-nodes-meta-data.ts # web/app/components/share/text-generation/result/header.tsx # web/app/components/workflow-app/components/workflow-header/features-trigger.tsx # web/app/components/workflow-app/hooks/use-workflow-run.ts # web/app/components/workflow/hooks/use-checklist.ts # web/app/components/workflow/hooks/use-fetch-workflow-inspect-vars.ts # web/app/components/workflow/hooks/use-workflow.ts # web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx # web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.tsx # web/app/components/workflow/nodes/_base/node.tsx # web/app/components/workflow/nodes/tool/components/mixed-variable-text-input/components/placeholder.tsx # web/app/components/workflow/panel/debug-and-preview/hooks.ts # web/app/components/workflow/panel/workflow-preview.tsx # web/app/components/workflow/store/workflow/workflow-slice.ts # web/eslint-suppressions.json # web/i18n/en-US/common.json # web/i18n/zh-Hans/common.json # web/i18n/zh-Hant/common.json # web/service/workflow.ts
This commit is contained in:
@ -5,7 +5,7 @@ const { mockSaveAllDirty } = vi.hoisted(() => ({
|
||||
mockSaveAllDirty: vi.fn(),
|
||||
}))
|
||||
|
||||
vi.mock('./use-skill-save-manager', () => ({
|
||||
vi.mock('./skill-save-context', () => ({
|
||||
useSkillSaveManager: () => ({
|
||||
saveAllDirty: mockSaveAllDirty,
|
||||
}),
|
||||
|
||||
Reference in New Issue
Block a user