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): prevent dataset tag popup from triggering card navigation (#42269)

dxdx123fe3600f149d1
diff --git a/web/app/components/datasets/list/dataset-card/__tests__/tag-selector-navigation.browser.spec.tsx b/web/app/components/datasets/list/dataset-card/__tests__/tag-selector-navigation.browser.spec.tsx
new file mode 100644
index 00000000000..e390777dc68
--- /dev/null
+++ b/web/app/components/datasets/list/dataset-card/__tests__/tag-selector-navigation.browser.spec.tsx
@@ -0,0 +1,118 @@
+import type { TagResponse as Tag } from '@dify/contracts/api/console/tags/types.gen'
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
+import { createStore, Provider } from 'jotai'
+import { render } from 'vitest-browser-react'
+import { DatasetCardTags } from '@/features/tag-management/components/dataset-card-tags'
+import { seedRegisteredConsoleStateFixture } from '@/test/console/state-fixture'
+
+const tagList: Tag[] = [
+ {
+ id: 'knowledge-tag-1',
+ name: 'Knowledge',
+ type: 'knowledge',
+ binding_count: '',
+ },
+]
+
+vi.mock('@/context/permission-state', async () => {
+ const { createPermissionStateModuleMock } = await import('@/test/console/state-fixture')
+ return createPermissionStateModuleMock(() => ({
+ workspacePermissionKeys: ['dataset.tag.manage'],
+ }))
+})
+
+vi.mock('@/service/console', () => ({
+ consoleQuery: {
+ tags: {
+ get: {
+ queryOptions: () => ({
+ queryFn: async () => tagList,
+ queryKey: ['tags', 'knowledge'],
+ }),
+ },
+ post: {
+ mutationOptions: () => ({
+ mutationFn: async () => tagList[0]!,
+ }),
+ },
+ },
+ },
+}))
+
+vi.mock('@/features/tag-management/hooks/use-tag-mutations', () => ({
+ useApplyTagBindingsMutation: () => ({
+ mutate: vi.fn(),
+ }),
+}))
+
+const renderTagSelector = () => {
+ const queryClient = new QueryClient({
+ defaultOptions: {
+ queries: {
+ retry: false,
+ },
+ },
+ })
+ const store = createStore()
+ seedRegisteredConsoleStateFixture(store)
+
+ return render(
+ <Provider store={store}>
+ <QueryClientProvider client={queryClient}>
+ <DatasetCardTags datasetId="dataset-1" embeddingAvailable tags={[]} canBindOrUnbindTags />
+ </QueryClientProvider>
+ </Provider>,
+ )
+}
+
+describe('Dataset card tag selector navigation', () => {
+ it('does not trigger the parent click handler when selecting an existing tag', async () => {
+ const onOuterClick = vi.fn()
+
+ document.addEventListener('click', onOuterClick)
+ try {
+ const screen = await renderTagSelector()
+
+ await screen.getByRole('combobox', { name: 'common.tag.addTag' }).click()
+ await screen.getByRole('option', { name: 'Knowledge' }).click()
+
+ expect(onOuterClick).not.toHaveBeenCalled()
+ } finally {
+ document.removeEventListener('click', onOuterClick)
+ }
+ })
+
+ it('does not trigger the parent click handler when creating a tag', async () => {
+ const onOuterClick = vi.fn()
+
+ document.addEventListener('click', onOuterClick)
+ try {
+ const screen = await renderTagSelector()
+
+ await screen.getByRole('combobox', { name: 'common.tag.addTag' }).click()
+ const input = screen.getByRole('combobox', { name: 'common.tag.selectorPlaceholder' })
+ await input.fill('NewTag')
+ await screen.getByRole('option', { name: /NewTag/ }).click()
+
+ expect(onOuterClick).not.toHaveBeenCalled()
+ } finally {
+ document.removeEventListener('click', onOuterClick)
+ }
+ })
+
+ it('does not trigger the parent click handler when opening tag management', async () => {
+ const onOuterClick = vi.fn()
+
+ document.addEventListener('click', onOuterClick)
+ try {
+ const screen = await renderTagSelector()
+
+ await screen.getByRole('combobox', { name: 'common.tag.addTag' }).click()
+ await screen.getByRole('button', { name: 'common.tag.manageTags' }).click()
+
+ expect(onOuterClick).not.toHaveBeenCalled()
+ } finally {
+ document.removeEventListener('click', onOuterClick)
+ }
+ })
+})
diff --git a/web/features/tag-management/__tests__/tag-selector.spec.tsx b/web/features/tag-management/__tests__/tag-selector.spec.tsx
index e88aad06e82..653fae669ec 100644
--- a/web/features/tag-management/__tests__/tag-selector.spec.tsx
+++ b/web/features/tag-management/__tests__/tag-selector.spec.tsx
@@ -173,6 +173,28 @@ describe('TagSelector', () => {
}
})
+ it('keeps dataset tag popup option interactions inside the tag trigger', async () => {
+ const user = userEvent.setup()
+ const onOuterClick = vi.fn()
+ mockUseQueryData.current = [
+ { id: 'knowledge-tag-1', name: 'Knowledge', type: 'knowledge', binding_count: '' },
+ ]
+
+ document.addEventListener('click', onOuterClick)
+ try {
+ render(
+ <DatasetCardTags datasetId="dataset-1" embeddingAvailable tags={[]} canBindOrUnbindTags />,
+ )
+
+ await user.click(screen.getByRole('combobox', { name: i18n.addTag }))
+ await user.click(await screen.findByRole('option', { name: 'Knowledge' }))
+
+ expect(onOuterClick).not.toHaveBeenCalled()
+ } finally {
+ document.removeEventListener('click', onOuterClick)
+ }
+ })
+
it('renders the no tag trigger when no current tag is visible and binding is unavailable', () => {
render(
<TagSelector
diff --git a/web/features/tag-management/components/tag-selector.tsx b/web/features/tag-management/components/tag-selector.tsx
index debcac8c8a0..77719877b6d 100644
--- a/web/features/tag-management/components/tag-selector.tsx
+++ b/web/features/tag-management/components/tag-selector.tsx
@@ -283,6 +283,7 @@ export const TagSelector = ({
<ComboboxPortal>
<ComboboxPositioner placement="bottom-start" sideOffset={4}>
<ComboboxPopup
+ onClick={(event) => event.stopPropagation()}
aria-label={accessibleTriggerLabel}
className="w-(--anchor-width) min-w-60 rounded-lg border-[0.5px] border-components-panel-border bg-components-panel-bg-blur p-0 shadow-lg backdrop-blur-[5px]"
>