Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

fix(web): separate knowledge picker sections and show Agent KB count (#45502)

Stephen Zhou0063bb639cd4
diff --git a/oxlint-suppressions.json b/oxlint-suppressions.json
index 6421c456d7f..dbb1213acbf 100644
--- a/oxlint-suppressions.json
+++ b/oxlint-suppressions.json
@@ -4856,11 +4856,6 @@
"count": 2
}
},
- "web/app/components/workflow/nodes/human-input/components/delivery-method/recipient/__tests__/email-input.spec.tsx": {
- "jsx-a11y/no-static-element-interactions": {
- "count": 1
- }
- },
"web/app/components/workflow/nodes/human-input/components/delivery-method/recipient/email-input.tsx": {
"jsx-a11y/click-events-have-key-events": {
"count": 1
diff --git a/web/features/agent-v2/agent-detail/configure/components/orchestrate/__tests__/knowledge-entrypoints.spec.tsx b/web/features/agent-v2/agent-detail/configure/components/orchestrate/__tests__/knowledge-entrypoints.spec.tsx
index 833a6ac08e2..6718fade0cf 100644
--- a/web/features/agent-v2/agent-detail/configure/components/orchestrate/__tests__/knowledge-entrypoints.spec.tsx
+++ b/web/features/agent-v2/agent-detail/configure/components/orchestrate/__tests__/knowledge-entrypoints.spec.tsx
@@ -257,7 +257,7 @@ describe('KnowledgeFS entry points in the real Agent configuration panel', () =>
await screen.findByRole('heading', { name: /knowledgeRetrieval.label/ }),
).toBeInTheDocument()
expect(screen.getByText('Product manual')).toBeInTheDocument()
- expect(screen.getByRole('button', { name: /knowledgeRetrieval.add/ })).toBeDisabled()
+ expect(screen.queryByRole('button', { name: /knowledgeRetrieval.add/ })).not.toBeInTheDocument()
expect(
screen.queryByRole('button', { name: /knowledgeRetrieval.edit/ }),
).not.toBeInTheDocument()
diff --git a/web/features/agent-v2/agent-detail/configure/components/orchestrate/knowledge/__tests__/index.spec.tsx b/web/features/agent-v2/agent-detail/configure/components/orchestrate/knowledge/__tests__/index.spec.tsx
index 8aea563ec02..a7225bac0c4 100644
--- a/web/features/agent-v2/agent-detail/configure/components/orchestrate/knowledge/__tests__/index.spec.tsx
+++ b/web/features/agent-v2/agent-detail/configure/components/orchestrate/knowledge/__tests__/index.spec.tsx
@@ -10,7 +10,6 @@ import {
ComparisonOperator,
LogicalOperator,
MetadataFilteringModeEnum,
- MetadataFilteringVariableType,
} from '@/app/components/workflow/nodes/knowledge-retrieval/types'
import {
agentSoulConfigToFormState,
@@ -208,30 +207,6 @@ async function advanced(user: ReturnType<typeof userEvent.setup>, dialog: HTMLEl
await user.click(within(dialog).getByRole('button', { name: /advancedSettings.label/ }))
}
-async function openDatasetPicker(user: ReturnType<typeof userEvent.setup>, dialog: HTMLElement) {
- await user.click(
- await within(dialog).findByRole('button', {
- name: /operation.add.*nodes.knowledgeRetrieval.knowledge/,
- }),
- )
- return screen.findByRole('dialog', { name: /feature.dataSet.selectTitle/ })
-}
-
-async function confirmDatasetPicker(user: ReturnType<typeof userEvent.setup>, picker: HTMLElement) {
- await user.click(within(picker).getByRole('button', { name: 'common.operation.add' }))
- await waitFor(() => expect(picker).not.toBeInTheDocument())
-}
-
-async function toggleDatasets(
- user: ReturnType<typeof userEvent.setup>,
- dialog: HTMLElement,
- names: RegExp[],
-) {
- const picker = await openDatasetPicker(user, dialog)
- for (const name of names) await user.click(await within(picker).findByRole('button', { name }))
- await confirmDatasetPicker(user, picker)
-}
-
describe('shared knowledge binding dialog', () => {
beforeEach(() => getDatasets.mockResolvedValue(datasetPage()))
@@ -309,16 +284,6 @@ describe('shared knowledge binding dialog', () => {
expect(await within(dialog).findByRole('textbox', { name: /customInputLabel/ })).toHaveValue(
'original question',
)
- await user.click(
- within(dialog).getByRole('button', {
- name: /operation.add.*nodes.knowledgeRetrieval.knowledge/,
- }),
- )
- const unchangedPicker = await screen.findByRole('dialog', {
- name: /feature.dataSet.selectTitle/,
- })
- await user.click(within(unchangedPicker).getByRole('button', { name: 'common.operation.add' }))
- await waitFor(() => expect(unchangedPicker).not.toBeInTheDocument())
const name = within(dialog).getByRole('textbox', { name: /dialog.nameLabel/ })
await user.clear(name)
await user.type(name, 'Renamed search')
@@ -425,23 +390,21 @@ describe('shared knowledge binding dialog', () => {
expect(getSpaces).not.toHaveBeenCalled()
})
- it('stages changes to an existing dataset group until shared confirmation', async () => {
+ it('shows a saved dataset group read-only in its settings card', async () => {
const user = userEvent.setup()
const first = createDatasetFixture()
const second = createDatasetFixture({ id: 'dataset-2', name: 'Second dataset' })
getDatasets.mockResolvedValue(datasetPage([first, second]))
- setupClassic({ id: 'group', name: 'Saved group', selectedDatasets: [first] })
+ setupClassic({ id: 'group', name: 'Saved group', selectedDatasets: [first, second] })
const dialog = await open(user)
await advanced(user, dialog)
- await toggleDatasets(user, dialog, [/Second dataset/])
- expect(snapshot().knowledge.sets[0].datasets).toHaveLength(1)
- await user.click(within(dialog).getByRole('button', { name: /operation.confirm/ }))
- expect(snapshot().knowledge.sets).toHaveLength(1)
- expect(snapshot().knowledge.sets[0]).toMatchObject({
- id: 'group',
- name: 'Saved group',
- datasets: [{ id: first.id }, { id: second.id }],
- })
+ const card = within(within(dialog).getByRole('group', { name: 'Saved group' }))
+ expect(card.getByText(first.name)).toBeInTheDocument()
+ expect(card.getByText('Second dataset')).toBeInTheDocument()
+ expect(
+ card.queryByRole('button', { name: /operation.add.*nodes.knowledgeRetrieval.knowledge/ }),
+ ).not.toBeInTheDocument()
+ expect(card.queryByRole('button', { name: /operation.remove/ })).not.toBeInTheDocument()
})
it('edits and removes imported metadata conditions independently when their row IDs are missing', async () => {
@@ -507,53 +470,6 @@ describe('shared knowledge binding dialog', () => {
expect(snapshot().knowledge.sets[0].metadata_filtering.conditions.conditions).toEqual(saved)
})
- it('blocks a mixed-index group without a required reranker and allows correcting the dataset selection', async () => {
- const user = userEvent.setup()
- const first = createDatasetFixture()
- const second = createDatasetFixture({
- id: 'dataset-2',
- name: 'Economy docs',
- indexing_technique: 'economy',
- })
- getDatasets.mockResolvedValue(datasetPage([first, second]))
- setupClassic({ id: 'group', name: 'Saved group', selectedDatasets: [first] })
- const original = snapshot().knowledge
- const dialog = await open(user)
- await advanced(user, dialog)
- await toggleDatasets(user, dialog, [/Economy docs/])
- await user.click(within(dialog).getByRole('button', { name: /operation.confirm/ }))
- expect(dialog).toBeInTheDocument()
- expect(within(dialog).getAllByRole('alert')[0]?.textContent).toMatch(/rerankModel/)
- expect(snapshot().knowledge).toEqual(original)
- await toggleDatasets(user, dialog, [/Economy docs/])
- await user.click(within(dialog).getByRole('button', { name: /operation.confirm/ }))
- expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
- expect(snapshot().knowledge.sets[0]).toMatchObject({
- datasets: [{ id: first.id }],
- retrieval: { reranking_mode: 'weighted_score', reranking_enable: true },
- })
- })
-
- it('requires a reranker when same-name embedding models come from different providers', async () => {
- const user = userEvent.setup()
- const first = createDatasetFixture()
- const second = createDatasetFixture({
- id: 'dataset-2',
- name: 'Azure docs',
- embedding_model_provider: 'azure_openai',
- })
- getDatasets.mockResolvedValue(datasetPage([first, second]))
- setupClassic({ id: 'group', name: 'Saved group', selectedDatasets: [first] })
- const original = snapshot().knowledge
- const dialog = await open(user)
- await advanced(user, dialog)
- await toggleDatasets(user, dialog, [/Azure docs/])
- await user.click(within(dialog).getByRole('button', { name: /operation.confirm/ }))
- expect(dialog).toBeInTheDocument()
- expect(within(dialog).getAllByRole('alert')[0]?.textContent).toMatch(/rerankModel/)
- expect(snapshot().knowledge).toEqual(original)
- })
-
it('stages retrieval limit edits and discards them when the shared dialog is cancelled', async () => {
const user = userEvent.setup()
setupClassic({
@@ -588,374 +504,91 @@ describe('shared knowledge binding dialog', () => {
})
})
- it('removes a dataset with an unavailable embedding model before selecting a replacement', async () => {
+ it('retains Classic bindings when dataset lookup fails and supports retry', async () => {
+ const user = userEvent.setup()
+ getDataset.mockRejectedValue(new ORPCError('FORBIDDEN', { status: 403 }))
+ setupClassic({ id: 'classic', name: 'Saved search', datasetRefs: [{ id: 'dataset-1' }] })
+ const dialog = await open(user)
+ await advanced(user, dialog)
+ expect(await within(dialog).findByRole('alert')).toBeVisible()
+ expect(snapshot().knowledge.sets[0].datasets).toEqual([{ id: 'dataset-1' }])
+ getDataset.mockResolvedValue(createDatasetFixture())
+ await user.click(within(dialog).getByRole('button', { name: /operation.retry/ }))
+ expect(await within(dialog).findByRole('radio', { name: /dialog.query.agent$/ })).toBeVisible()
+ })
+
+ it('removes deleted datasets without losing the group identity or saved settings', async () => {
const user = userEvent.setup()
- const unavailable = createDatasetFixture({
- name: 'Unavailable docs',
- embedding_available: false,
+ const retained = createDatasetFixture({
+ name: 'Retained docs',
+ doc_metadata: [{ id: 'topic-retained', name: 'topic', type: 'string' }],
+ })
+ getDataset.mockImplementation(async ({ params }: { params: { dataset_id: string } }) => {
+ if (params.dataset_id.startsWith('deleted')) throw new ORPCError('NOT_FOUND', { status: 404 })
+ return retained
})
- const replacement = createDatasetFixture({ id: 'replacement', name: 'Replacement docs' })
- getDataset.mockResolvedValue(unavailable)
- getDatasets.mockResolvedValue(datasetPage([unavailable, replacement]))
+ getDatasets.mockResolvedValue(datasetPage([retained]))
setupClassic({
- id: 'group',
+ id: 'saved-group',
name: 'Saved group',
- datasetRefs: [{ id: unavailable.id, name: unavailable.name }],
+ datasetRefs: [
+ { id: retained.id, name: retained.name },
+ { id: 'deleted', name: 'Deleted docs' },
+ { id: 'deleted-2', name: 'Other missing docs' },
+ ],
queryMode: 'custom',
customQuery: 'support question',
multipleRetrievalConfig: { top_k: 7, score_threshold: 0.4, reranking_enable: false },
+ metadataFilterMode: MetadataFilteringModeEnum.manual,
+ metadataFilteringConditions: {
+ logical_operator: LogicalOperator.and,
+ conditions: [
+ {
+ id: 'topic-condition',
+ name: 'topic',
+ comparison_operator: ComparisonOperator.is,
+ value: 'agents',
+ },
+ ],
+ },
})
const original = snapshot().knowledge
const dialog = await open(user)
await advanced(user, dialog)
await user.click(
- await within(dialog).findByRole('button', {
- name: 'common.operation.remove Unavailable docs',
- }),
+ await within(dialog).findByRole('button', { name: 'common.operation.remove Deleted docs' }),
+ )
+ await user.click(
+ within(dialog).getByRole('button', { name: 'common.operation.remove Other missing docs' }),
)
- const picker = await openDatasetPicker(user, dialog)
- expect(await within(picker).findByRole('button', { name: /Unavailable docs/ })).toBeDisabled()
- await user.click(within(picker).getByRole('button', { name: /Replacement docs/ }))
- await confirmDatasetPicker(user, picker)
expect(snapshot().knowledge).toEqual(original)
await user.click(within(dialog).getByRole('button', { name: /operation.confirm/ }))
expect(snapshot().knowledge.sets).toEqual([
expect.objectContaining({
- id: 'group',
+ id: 'saved-group',
name: 'Saved group',
- datasets: [expect.objectContaining({ id: replacement.id })],
+ datasets: [expect.objectContaining({ id: retained.id })],
query: { mode: 'user_query', value: 'support question' },
retrieval: expect.objectContaining({ top_k: 7, score_threshold: 0.4 }),
+ metadata_filtering: {
+ mode: 'manual',
+ conditions: {
+ logical_operator: 'and',
+ conditions: [
+ {
+ id: 'topic-condition',
+ metadata_id: 'topic-retained',
+ name: 'topic',
+ comparison_operator: 'is',
+ value: 'agents',
+ },
+ ],
+ },
+ },
}),
])
})
- it.each([
- {
- title: 'rejects unsupported operators even when field types match',
- from: MetadataFilteringVariableType.number,
- to: MetadataFilteringVariableType.number,
- operator: ComparisonOperator.contains,
- value: 12,
- valid: false,
- },
- {
- title: 'requires reconfiguration when the field type changes',
- from: MetadataFilteringVariableType.string,
- to: MetadataFilteringVariableType.number,
- operator: ComparisonOperator.empty,
- value: undefined,
- valid: false,
- },
- {
- title: 'retains compatible empty-value conditions',
- from: MetadataFilteringVariableType.number,
- to: MetadataFilteringVariableType.number,
- operator: ComparisonOperator.empty,
- value: undefined,
- valid: true,
- },
- {
- title: 'retains compatible timestamp conditions',
- from: MetadataFilteringVariableType.time,
- to: MetadataFilteringVariableType.time,
- operator: ComparisonOperator.after,
- value: 1700000000,
- valid: true,
- },
- {
- title: 'rejects string operators on a replacement numeric field',
- from: MetadataFilteringVariableType.string,
- to: MetadataFilteringVariableType.number,
- operator: ComparisonOperator.contains,
- value: 'abc',
- valid: false,
- },
- {
- title: 'rejects nonnumeric values on numeric fields',
- from: MetadataFilteringVariableType.number,
- to: MetadataFilteringVariableType.number,
- operator: ComparisonOperator.equal,
- value: 'abc',
- valid: false,
- },
- {
- title: 'retains compatible numeric conditions',
- from: MetadataFilteringVariableType.number,
- to: MetadataFilteringVariableType.number,
- operator: ComparisonOperator.equal,
- value: 12,
- valid: true,
- },
- {
- title: 'retains compatible list membership conditions',
- from: MetadataFilteringVariableType.string,
- to: MetadataFilteringVariableType.string,
- operator: ComparisonOperator.in,
- value: ['abc', 'def'],
- valid: true,
- },
- {
- title: 'rejects same-name fields with conflicting types within a group',
- from: MetadataFilteringVariableType.string,
- to: MetadataFilteringVariableType.number,
- operator: ComparisonOperator.contains,
- value: 'abc',
- valid: false,
- keepOriginal: true,
- },
- ])(
- '$title when changing datasets',
- async ({ from, to, operator, value, valid, keepOriginal = false }) => {
- const user = userEvent.setup()
- const source = createDatasetFixture({
- name: 'Original docs',
- doc_metadata: [{ id: 'old-code', name: 'code', type: from }],
- })
- const replacement = createDatasetFixture({
- id: 'replacement',
- name: 'Replacement docs',
- doc_metadata: [{ id: 'new-code', name: 'code', type: to }],
- })
- getDatasets.mockResolvedValue(datasetPage([source, replacement]))
- setupClassic({
- id: 'group',
- name: 'Saved group',
- selectedDatasets: [source],
- metadataFilterMode: MetadataFilteringModeEnum.manual,
- metadataFilteringConditions: {
- logical_operator: LogicalOperator.and,
- conditions: [
- {
- id: 'condition',
- metadata_id: 'old-code',
- name: 'code',
- comparison_operator: operator,
- value,
- },
- ],
- },
- })
- const original = snapshot().knowledge
- const dialog = await open(user)
- await advanced(user, dialog)
- const picker = await openDatasetPicker(user, dialog)
- if (!keepOriginal)
- await user.click(await within(picker).findByRole('button', { name: /Original docs/ }))
- await user.click(await within(picker).findByRole('button', { name: /Replacement docs/ }))
- await confirmDatasetPicker(user, picker)
- await user.click(within(dialog).getByRole('button', { name: /operation.confirm/ }))
- if (valid) {
- expect(snapshot().knowledge.sets[0].metadata_filtering.conditions.conditions).toEqual([
- {
- id: 'condition',
- metadata_id: 'new-code',
- name: 'code',
- comparison_operator: operator,
- value,
- },
- ])
- } else {
- expect(dialog).toBeInTheDocument()
- expect(within(dialog).getAllByRole('alert')[0]?.textContent).toMatch(
- /metadata.panel.conditions/,
- )
- expect(snapshot().knowledge).toEqual(original)
- }
- },
- )
-
- it('retains Classic bindings when dataset lookup fails and supports retry', async () => {
- const user = userEvent.setup()
- getDataset.mockRejectedValue(new ORPCError('FORBIDDEN', { status: 403 }))
- setupClassic({ id: 'classic', name: 'Saved search', datasetRefs: [{ id: 'dataset-1' }] })
- const dialog = await open(user)
- await advanced(user, dialog)
- expect(await within(dialog).findByRole('alert')).toBeVisible()
- expect(snapshot().knowledge.sets[0].datasets).toEqual([{ id: 'dataset-1' }])
- getDataset.mockResolvedValue(createDatasetFixture())
- await user.click(within(dialog).getByRole('button', { name: /operation.retry/ }))
- expect(await within(dialog).findByRole('radio', { name: /dialog.query.agent$/ })).toBeVisible()
- })
-
- it.each([false, true])(
- 'replaces deleted datasets without losing the group identity or saved settings (retained dataset=%s)',
- async (hasRetainedDataset) => {
- const user = userEvent.setup()
- const retained = createDatasetFixture({
- name: 'Retained docs',
- doc_metadata: [{ id: 'topic-retained', name: 'topic', type: 'string' }],
- })
- const replacement = createDatasetFixture({
- id: 'replacement',
- name: 'Replacement docs',
- doc_metadata: [{ id: 'topic-replacement', name: 'topic', type: 'string' }],
- })
- getDataset.mockImplementation(async ({ params }: { params: { dataset_id: string } }) => {
- if (params.dataset_id.startsWith('deleted'))
- throw new ORPCError('NOT_FOUND', { status: 404 })
- return retained
- })
- getDatasets.mockResolvedValue(datasetPage([retained, replacement]))
- setupClassic({
- id: 'saved-group',
- name: 'Saved group',
- datasetRefs: [
- ...(hasRetainedDataset ? [{ id: retained.id, name: retained.name }] : []),
- { id: 'deleted', name: 'Deleted docs' },
- { id: 'deleted-2', name: 'Other missing docs' },
- ],
- queryMode: 'custom',
- customQuery: 'support question',
- multipleRetrievalConfig: { top_k: 7, score_threshold: 0.4, reranking_enable: false },
- metadataFilterMode: MetadataFilteringModeEnum.manual,
- metadataFilteringConditions: {
- logical_operator: LogicalOperator.and,
- conditions: [
- {
- id: 'topic-condition',
- name: 'topic',
- comparison_operator: ComparisonOperator.is,
- value: 'agents',
- },
- ],
- },
- })
- const original = snapshot().knowledge
- const dialog = await open(user)
- await advanced(user, dialog)
- await user.click(
- await within(dialog).findByRole('button', { name: 'common.operation.remove Deleted docs' }),
- )
- await user.click(
- within(dialog).getByRole('button', { name: 'common.operation.remove Other missing docs' }),
- )
- await toggleDatasets(user, dialog, [/Replacement docs/])
- expect(snapshot().knowledge).toEqual(original)
- await user.click(within(dialog).getByRole('button', { name: /operation.confirm/ }))
- expect(snapshot().knowledge.sets).toEqual([
- expect.objectContaining({
- id: 'saved-group',
- name: 'Saved group',
- datasets: [
- ...(hasRetainedDataset ? [expect.objectContaining({ id: retained.id })] : []),
- expect.objectContaining({ id: replacement.id }),
- ],
- query: { mode: 'user_query', value: 'support question' },
- retrieval: expect.objectContaining({ top_k: 7, score_threshold: 0.4 }),
- metadata_filtering: {
- mode: 'manual',
- conditions: {
- logical_operator: 'and',
- conditions: [
- {
- id: 'topic-condition',
- metadata_id: hasRetainedDataset ? 'topic-retained' : 'topic-replacement',
- name: 'topic',
- comparison_operator: 'is',
- value: 'agents',
- },
- ],
- },
- },
- }),
- ])
- },
- )
-
- it.each([false, true])(
- 'cleans incompatible metadata only after replacing datasets (shared field=%s)',
- async (hasSharedField) => {
- const user = userEvent.setup()
- const originalDataset = createDatasetFixture({
- name: 'Original docs',
- doc_metadata: [
- { id: 'topic-old', name: 'topic', type: 'string' },
- { id: 'language-old', name: 'language', type: 'string' },
- ],
- })
- const replacement = createDatasetFixture({
- id: 'replacement',
- name: 'Replacement docs',
- doc_metadata: hasSharedField
- ? [{ id: 'language-new', name: 'language', type: 'string' }]
- : [],
- })
- getDatasets.mockResolvedValue(datasetPage([originalDataset, replacement]))
- setupClassic({
- id: 'group',
- name: 'Saved group',
- selectedDatasets: [originalDataset],
- metadataFilterMode: MetadataFilteringModeEnum.manual,
- metadataFilteringConditions: {
- logical_operator: LogicalOperator.and,
- conditions: [
- {
- id: 'topic-condition',
- metadata_id: 'topic-old',
- name: 'topic',
- comparison_operator: ComparisonOperator.is,
- value: 'agents',
- },
- {
- id: 'language-condition',
- metadata_id: 'language-old',
- name: 'language',
- comparison_operator: ComparisonOperator.is,
- value: 'en',
- },
- ],
- },
- })
- const original = snapshot().knowledge
- const dialog = await open(user)
- await advanced(user, dialog)
- const picker = await openDatasetPicker(user, dialog)
- await user.click(await within(picker).findByRole('button', { name: /Original docs/ }))
- await user.click(within(picker).getByRole('button', { name: /Replacement docs/ }))
- await confirmDatasetPicker(user, picker)
- expect(snapshot().knowledge).toEqual(original)
- const conditions = within(dialog).getByRole('button', { name: /metadata.panel.conditions/ })
- await user.click(conditions)
- expect(screen.queryByRole('group', { name: 'topic' })).not.toBeInTheDocument()
- expect(screen.queryByDisplayValue('agents')).not.toBeInTheDocument()
- if (hasSharedField)
- expect(
- within(screen.getByRole('group', { name: 'language' })).getByRole('textbox'),
- ).toHaveValue('en')
- await user.click(conditions)
- await user.click(within(dialog).getByRole('button', { name: /operation.confirm/ }))
- if (hasSharedField) {
- expect(snapshot().knowledge.sets[0].metadata_filtering.conditions.conditions).toEqual([
- {
- id: 'language-condition',
- metadata_id: 'language-new',
- name: 'language',
- comparison_operator: 'is',
- value: 'en',
- },
- ])
- } else {
- expect(dialog).toBeInTheDocument()
- expect(within(dialog).getAllByRole('alert')[0]?.textContent).toMatch(
- /metadata.panel.conditions/,
- )
- expect(snapshot().knowledge).toEqual(original)
- await user.click(
- within(dialog).getByRole('button', { name: /metadata.options.manual.title/ }),
- )
- await user.click(
- screen.getByRole('menuitemradio', { name: /metadata.options.disabled.title/ }),
- )
- await user.click(within(dialog).getByRole('button', { name: /operation.confirm/ }))
- expect(snapshot().knowledge.sets[0].metadata_filtering).toEqual({ mode: 'disabled' })
- }
- expect(snapshot().knowledge.sets[0].datasets).toEqual([
- expect.objectContaining({ id: replacement.id }),
- ])
- },
- )
-
it.each(['zero', 'empty operator'])(
'blocks an unfilled metadata value and accepts correction with %s',
async (correction) => {
@@ -1233,6 +866,20 @@ describe('KnowledgeFS composer interaction', () => {
expect(snapshot().knowledge.sets).toEqual([])
})
+ it('lists advanced settings in the picker order regardless of selection order', async () => {
+ const user = userEvent.setup()
+ setup()
+ const dialog = await open(user)
+ await user.click(within(dialog).getByRole('option', { name: optionName('Engineering') }))
+ await user.click(within(dialog).getByRole('option', { name: optionName('Product manual') }))
+ await user.click(within(dialog).getByRole('button', { name: /advancedSettings.label/ }))
+ expect(
+ within(dialog)
+ .getAllByRole('textbox', { name: /knowledgeFs.alias/ })
+ .map((input) => (input as HTMLInputElement).value),
+ ).toEqual(['Product manual', 'Engineering'])
+ })
+
it('keeps knowledge descriptions accessible without a separate help action', async () => {
const user = userEvent.setup()
setup([], { spaces: [space()] })
@@ -1568,7 +1215,7 @@ describe('KnowledgeFS composer interaction', () => {
it('does not mutate a read-only composer', () => {
setup([binding], { readOnly: true })
- expect(screen.getByRole('button', { name: /knowledgeRetrieval.add/ })).toBeDisabled()
+ expect(screen.queryByRole('button', { name: /knowledgeRetrieval.add/ })).not.toBeInTheDocument()
expect(
screen.queryByRole('button', { name: /knowledgeRetrieval.remove/ }),
).not.toBeInTheDocument()
diff --git a/web/features/agent-v2/agent-detail/configure/components/orchestrate/knowledge/classic-settings.tsx b/web/features/agent-v2/agent-detail/configure/components/orchestrate/knowledge/classic-settings.tsx
index cd626857521..c5a40687825 100644
--- a/web/features/agent-v2/agent-detail/configure/components/orchestrate/knowledge/classic-settings.tsx
+++ b/web/features/agent-v2/agent-detail/configure/components/orchestrate/knowledge/classic-settings.tsx
@@ -13,17 +13,15 @@ import type { KnowledgeValidationResult } from '@/features/agent-v2/agent-compos
import { Button } from '@langgenius/dify-ui/button'
import { cn } from '@langgenius/dify-ui/cn'
import { Field, FieldDescription, FieldError, FieldLabel } from '@langgenius/dify-ui/field'
-import { IconButton } from '@langgenius/dify-ui/icon-button'
import { RadioGroup, RadioItem } from '@langgenius/dify-ui/radio-group'
import { Textarea } from '@langgenius/dify-ui/textarea'
import { useQueries } from '@tanstack/react-query'
-import { intersectionBy, xorBy } from 'es-toolkit/compat'
+import { intersectionBy } from 'es-toolkit/compat'
import { useId, useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { ModelTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
import { useModelListAndDefaultModelAndCurrentProviderAndModel } from '@/app/components/header/account-setting/model-provider-page/hooks'
import WorkflowField from '@/app/components/workflow/nodes/_base/components/field'
-import AddKnowledge from '@/app/components/workflow/nodes/knowledge-retrieval/components/add-dataset'
import {
comparisonOperatorNotRequireValue,
getOperators,
@@ -180,24 +178,6 @@ function ClassicSettingsFields({
retrievalMode === RETRIEVE_TYPE.multiWay && selectedDatasets.length > 0
? resolveMultipleRetrievalConfig(multipleRetrievalConfig)
: multipleRetrievalConfig
- const handleSelectedDatasetsChange = (selected: DatasetDetailWithPartialMembersResponse[]) => {
- const nextDatasets = selected.map(
- (dataset) => selectedDatasets.find((current) => current.id === dataset.id) ?? dataset,
- )
- if (!xorBy(nextDatasets, selectedDatasets, 'id').length) return
- onChange({
- selectedDatasets: nextDatasets,
- metadataFilteringConditions: reconcileMetadataConditions(
- item.metadataFilteringConditions,
- nextDatasets,
- selectedDatasets,
- ),
- multipleRetrievalConfig:
- retrievalMode === RETRIEVE_TYPE.multiWay && nextDatasets.length > 0
- ? resolveMultipleRetrievalConfig(multipleRetrievalConfig, nextDatasets)
- : multipleRetrievalConfig,
- })
- }
const singleModel = withModelDefaults(singleRetrievalConfig?.model)
const metadataModel = withModelDefaults(metadataModelConfig)
const updateMetadataConditions = (patch: Partial<typeof metadataFilteringConditions>) =>
@@ -334,31 +314,15 @@ function ClassicSettingsFields({
onRerankModelOpenChange={setRerankModelOpen}
selectedDatasets={selectedDatasets}
/>
- <div className="h-3 w-px bg-divider-regular" />
- <AddKnowledge
- key={selectedDatasets.map((dataset) => dataset.id).join(',')}
- selectedIds={selectedDatasets.map((dataset) => dataset.id)}
- modal
- onChange={handleSelectedDatasetsChange}
- />
</div>
}
>
<>
+ {/* Datasets are chosen in the picker above; a card only configures its own binding. */}
<ul className="space-y-1 system-xs-regular text-text-secondary">
{selectedDatasets.map((dataset) => (
- <li key={dataset.id} className="flex items-center justify-between gap-2">
- <span className="min-w-0 wrap-break-word">{dataset.name}</span>
- <IconButton
- aria-label={`${t(($) => $['operation.remove'], { ns: 'common' })} ${dataset.name}`}
- onClick={() =>
- handleSelectedDatasetsChange(
- selectedDatasets.filter((current) => current.id !== dataset.id),
- )
- }
- >
- <span aria-hidden className="i-ri-delete-bin-line size-4" />
- </IconButton>
+ <li key={dataset.id} className="min-w-0 wrap-break-word">
+ {dataset.name}
</li>
))}
</ul>
diff --git a/web/features/agent-v2/agent-detail/configure/components/orchestrate/knowledge/dialog.tsx b/web/features/agent-v2/agent-detail/configure/components/orchestrate/knowledge/dialog.tsx
index e297c76955a..08acb2d26ae 100644
--- a/web/features/agent-v2/agent-detail/configure/components/orchestrate/knowledge/dialog.tsx
+++ b/web/features/agent-v2/agent-detail/configure/components/orchestrate/knowledge/dialog.tsx
@@ -57,6 +57,8 @@ type FormProps = Omit<Props, 'open' | 'onOpenChange'> & {
onClose: () => void
}
+const MAX_SPACE_BINDINGS = 10
+
const canBindSpace = (space: KnowledgeFsSpaceListItemResponse) =>
space.state === 'active' &&
space.technical_status === 'available' &&
@@ -298,7 +300,7 @@ function AgentKnowledgeRetrievalForm({
name: spaceName(space),
description: space.technical_summary?.description,
unavailable: false,
- disabled: !selectedIds.includes(value) && spaceCount >= 10,
+ disabled: !selectedIds.includes(value) && spaceCount >= MAX_SPACE_BINDINGS,
})
}
for (const item of draft) {
@@ -322,7 +324,7 @@ function AgentKnowledgeRetrievalForm({
? [
{
value: 'spaces' as const,
- label: t(($) => $['agentDetail.configure.knowledgeFs.select']),
+ label: t(($) => $['agentDetail.configure.knowledgeFs.title']),
items: [...spaceOptions.values()],
},
]
@@ -332,7 +334,16 @@ function AgentKnowledgeRetrievalForm({
getValue: (option) => option.value,
getLabel: (option) => option.name,
})
- const visibleBindings = getVisibleKnowledgeRetrievals(draft, knowledgeFsEnabled)
+ // Settings cards follow the picker's row order, not the order items were ticked in.
+ const rowOrder = new Map(
+ [...classicOptions, ...spaceOptions.values()].map((option, index) => [option.value, index]),
+ )
+ const rowIndex = (item: AgentKnowledgeRetrievalItem) =>
+ rowOrder.get(item.controlSpaceId ? spaceValue(item.controlSpaceId) : bindingValue(item.id)) ??
+ Number.POSITIVE_INFINITY
+ const visibleBindings = [...getVisibleKnowledgeRetrievals(draft, knowledgeFsEnabled)].sort(
+ (a, b) => rowIndex(a) - rowIndex(b),
+ )
const validation = validateKnowledgeRetrievals(visibleBindings, draft)
const update = (id: string, patch: Partial<AgentKnowledgeRetrievalItem>) =>
setDraft((current) => current.map((item) => (item.id === id ? { ...item, ...patch } : item)))
@@ -370,7 +381,7 @@ function AgentKnowledgeRetrievalForm({
const space = spacesById.get(id)
if (!space || !canBindSpace(space) || next.some((item) => item.controlSpaceId === id))
continue
- if (next.filter((item) => item.controlSpaceId).length >= 10) continue
+ if (next.filter((item) => item.controlSpaceId).length >= MAX_SPACE_BINDINGS) continue
const title = spaceName(space)
const name = next.some((item) => item.name?.toLowerCase() === title.toLowerCase())
? `${title.slice(0, 109)} (${id.slice(0, 8)})`
@@ -444,8 +455,24 @@ function AgentKnowledgeRetrievalForm({
className="max-h-none overflow-visible p-0"
>
{(group) => (
- <ComboboxGroup key={group.value} items={group.items}>
- {!!group.label && <ComboboxGroupLabel>{group.label}</ComboboxGroupLabel>}
+ <ComboboxGroup key={group.value} items={group.items} className="not-first:mt-4">
+ {!!group.label && (
+ <ComboboxGroupLabel className="flex items-center justify-between gap-2 pb-1 normal-case">
+ {group.value === 'spaces' ? (
+ <>
+ <span>{group.label}</span>
+ <span aria-hidden className="tabular-nums">
+ {spaceCount}/{MAX_SPACE_BINDINGS}
+ </span>
+ <span className="sr-only">
+ {t(($) => $['agentDetail.configure.knowledgeFs.select'])}
+ </span>
+ </>
+ ) : (
+ group.label
+ )}
+ </ComboboxGroupLabel>
+ )}
<ComboboxCollection<KnowledgeOption>>
{(option) => <KnowledgeOptionItem key={option.value} option={option} />}
</ComboboxCollection>
@@ -483,7 +510,7 @@ function AgentKnowledgeRetrievalForm({
</span>
<span
aria-hidden
- className="i-ri-arrow-down-s-line size-4 shrink-0 text-text-tertiary transition-transform group-data-panel-open:rotate-180 motion-reduce:transition-none"
+ className="i-ri-arrow-right-s-line size-4 shrink-0 text-text-tertiary transition-transform group-data-panel-open:rotate-90 motion-reduce:transition-none"
/>
</CollapsibleTrigger>
<CollapsiblePanel>
diff --git a/web/features/agent-v2/agent-detail/configure/components/orchestrate/knowledge/index.tsx b/web/features/agent-v2/agent-detail/configure/components/orchestrate/knowledge/index.tsx
index a52f51b2e1c..b8cfbc86ea8 100644
--- a/web/features/agent-v2/agent-detail/configure/components/orchestrate/knowledge/index.tsx
+++ b/web/features/agent-v2/agent-detail/configure/components/orchestrate/knowledge/index.tsx
@@ -99,11 +99,12 @@ export function AgentKnowledgeRetrieval() {
tip={knowledgeRetrievalTip}
panelContentClassName="flex flex-col gap-1"
actions={
- <ConfigureSectionAddButton
- ariaLabel={t(($) => $['agentDetail.configure.knowledgeRetrieval.add'])}
- onClick={() => addRetrieval()}
- disabled={readOnly}
- />
+ !readOnly ? (
+ <ConfigureSectionAddButton
+ ariaLabel={t(($) => $['agentDetail.configure.knowledgeRetrieval.add'])}
+ onClick={() => addRetrieval()}
+ />
+ ) : undefined
}
>
{visibleRetrievals.length === 0 ? (