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.

chore: improve accessibility on the datasets list page (#42512)

Joel77cdee1f5b74
diff --git a/web/app/components/datasets/list/__tests__/index.spec.tsx b/web/app/components/datasets/list/__tests__/index.spec.tsx
index 1751a5aa107..f27c6b8b3c3 100644
--- a/web/app/components/datasets/list/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/list/__tests__/index.spec.tsx
@@ -617,9 +617,57 @@ describe('List', () => {
fireEvent.click(screen.getByTestId('include-all-checkbox'))
expect(screen.getByTestId('datasets-component')).toBeInTheDocument()
- expect(screen.getByText('dataset.filterEmpty.noKnowledge')).toBeInTheDocument()
+ expect(screen.getByRole('status')).toHaveTextContent('dataset.filterEmpty.noKnowledge')
expect(screen.queryByText('dataset.firstEmpty.title')).not.toBeInTheDocument()
})
+
+ it('announces empty search results only after the current filters finish loading', async () => {
+ const user = userEvent.setup()
+ const { useDatasetList } = await import('@/service/knowledge/use-dataset')
+ const result = {
+ data: { pages: [{ data: [], total: 1 }] },
+ fetchNextPage: vi.fn(),
+ hasNextPage: false,
+ isFetching: false,
+ isFetchingNextPage: false,
+ isPlaceholderData: false,
+ isError: false,
+ }
+ vi.mocked(useDatasetList).mockImplementation(
+ () => result as unknown as ReturnType<typeof useDatasetList>,
+ )
+ const { rerender } = render(<List />)
+ const status = screen.getByRole('status')
+ const search = screen.getByRole('searchbox')
+ expect(status).toBeEmptyDOMElement()
+
+ await user.type(search, 'missing')
+ expect(status).toBeEmptyDOMElement()
+ await waitFor(() =>
+ expect(useDatasetList).toHaveBeenLastCalledWith(
+ expect.objectContaining({ keyword: 'missing' }),
+ ),
+ )
+
+ result.data.pages = [{ data: [], total: 0 }]
+ result.isFetching = true
+ result.isPlaceholderData = true
+ rerender(<List />)
+ expect(status).toBeEmptyDOMElement()
+
+ result.isPlaceholderData = false
+ rerender(<List />)
+ expect(status).toBeEmptyDOMElement()
+
+ result.isFetching = false
+ rerender(<List />)
+ expect(screen.getByRole('status')).toBe(status)
+ expect(status).toHaveTextContent('dataset.filterEmpty.noKnowledge')
+ expect(search).toHaveFocus()
+
+ await user.type(search, ' again')
+ expect(status).toBeEmptyDOMElement()
+ })
})
describe('Branch Coverage', () => {
diff --git a/web/app/components/datasets/list/dataset-card/__tests__/index.spec.tsx b/web/app/components/datasets/list/dataset-card/__tests__/index.spec.tsx
index 5199b4eff3a..83d1e32ce43 100644
--- a/web/app/components/datasets/list/dataset-card/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/list/dataset-card/__tests__/index.spec.tsx
@@ -1,6 +1,7 @@
import type { DataSet } from '@/models/datasets'
import { QueryClientProvider } from '@tanstack/react-query'
import { fireEvent, screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
import * as React from 'react'
import { beforeEach, describe, expect, it, vi } from 'vite-plus/test'
import { IndexingType } from '@/app/components/datasets/create/step-two'
@@ -113,8 +114,10 @@ vi.mock('../components/corner-labels', () => ({
default: () => <div data-testid="corner-labels" />,
}))
vi.mock('../components/dataset-card-header', () => ({
- default: ({ dataset }: { dataset: DataSet }) => (
- <div data-testid="card-header">{dataset.name}</div>
+ default: ({ dataset, nameId }: { dataset: DataSet; nameId?: string }) => (
+ <div id={nameId} data-testid="card-header">
+ {dataset.name}
+ </div>
),
}))
vi.mock('../components/dataset-card-modals', () => ({
@@ -369,12 +372,16 @@ describe('DatasetCard Component', () => {
}
})
- it('should render and navigate to documents when clicked', () => {
+ it('exposes the document entry as a named link reachable by keyboard', async () => {
+ const user = userEvent.setup()
const dataset = createMockDataset()
render(<DatasetCard dataset={dataset} />)
- fireEvent.click(screen.getByText('Test Dataset'))
- expect(mockPush).toHaveBeenCalledWith('/datasets/dataset-1/documents')
+ const link = screen.getByRole('link', { name: dataset.name })
+ expect(link).toHaveAttribute('href', '/datasets/dataset-1/documents')
+ await user.tab()
+ expect(link).toHaveFocus()
+ expect(screen.getByTestId('tag-area').closest('a')).toBeNull()
})
it('should render preview-only dataset as a dimmed information-only card', () => {
@@ -388,7 +395,7 @@ describe('DatasetCard Component', () => {
render(<DatasetCard dataset={dataset} />)
const card = screen.getByRole('button', { name: 'Preview Only Dataset' })
- expect(card).toHaveClass('opacity-60')
+ expect(screen.queryByRole('link', { name: dataset.name })).not.toBeInTheDocument()
expect(card).not.toHaveAttribute('aria-disabled')
expect(screen.getByText('Preview Only Dataset')).toBeInTheDocument()
const tagArea = screen.getByTestId('tag-area')
@@ -404,20 +411,27 @@ describe('DatasetCard Component', () => {
})
})
- it('should not navigate preview-only external dataset to a detail page', () => {
+ it('explains preview-only access through the keyboard without exposing a detail link', async () => {
+ const user = userEvent.setup()
const dataset = createMockDataset({
provider: 'external',
permission_keys: [DatasetACLPermission.Preview],
})
render(<DatasetCard dataset={dataset} />)
- fireEvent.click(screen.getByRole('button', { name: 'Test Dataset' }))
+ const entry = screen.getByRole('button', { name: 'Test Dataset' })
+ expect(screen.queryByRole('link', { name: 'Test Dataset' })).not.toBeInTheDocument()
+ await user.tab()
+ expect(entry).toHaveFocus()
+ await user.keyboard('{Enter}')
expect(mockPush).not.toHaveBeenCalled()
expect(toastMocks.record).toHaveBeenCalledWith({
type: 'warning',
message: 'app.noAccessResourcePermission',
})
+ await user.keyboard(' ')
+ expect(toastMocks.record).toHaveBeenCalledTimes(2)
})
it('should use the hover background treatment', () => {
@@ -450,8 +464,10 @@ describe('DatasetCard Component', () => {
})
render(<DatasetCard dataset={dataset} />)
- fireEvent.click(screen.getByText('Test Dataset'))
- expect(mockPush).toHaveBeenCalledWith('/datasets/dataset-1/hitTesting')
+ expect(screen.getByRole('link', { name: dataset.name })).toHaveAttribute(
+ 'href',
+ '/datasets/dataset-1/hitTesting',
+ )
})
it('should navigate to settings for external provider when retrieval recall permission is missing', () => {
@@ -461,16 +477,20 @@ describe('DatasetCard Component', () => {
})
render(<DatasetCard dataset={dataset} />)
- fireEvent.click(screen.getByText('Test Dataset'))
- expect(mockPush).toHaveBeenCalledWith('/datasets/dataset-1/settings')
+ expect(screen.getByRole('link', { name: dataset.name })).toHaveAttribute(
+ 'href',
+ '/datasets/dataset-1/settings',
+ )
})
it('should navigate to pipeline for unpublished pipeline', () => {
const dataset = createMockDataset({ runtime_mode: 'rag_pipeline', is_published: false })
render(<DatasetCard dataset={dataset} />)
- fireEvent.click(screen.getByText('Test Dataset'))
- expect(mockPush).toHaveBeenCalledWith('/datasets/dataset-1/pipeline')
+ expect(screen.getByRole('link', { name: dataset.name })).toHaveAttribute(
+ 'href',
+ '/datasets/dataset-1/pipeline',
+ )
})
it('should allow tag binding when dataset has edit ACL', () => {
diff --git a/web/app/components/datasets/list/dataset-card/components/__tests__/dataset-card-footer.spec.tsx b/web/app/components/datasets/list/dataset-card/components/__tests__/dataset-card-footer.spec.tsx
index 7fe57bc2eff..ce54233bb60 100644
--- a/web/app/components/datasets/list/dataset-card/components/__tests__/dataset-card-footer.spec.tsx
+++ b/web/app/components/datasets/list/dataset-card/components/__tests__/dataset-card-footer.spec.tsx
@@ -1,5 +1,6 @@
import type { DataSet } from '@/models/datasets'
-import { render, screen } from '@testing-library/react'
+import { render, screen, waitFor, within } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
import { IndexingType } from '@/app/components/datasets/create/step-two'
import { ChunkingMode, DatasetPermission, DataSourceType } from '@/models/datasets'
import DatasetCardFooter from '../dataset-card-footer'
@@ -35,6 +36,65 @@ const createDataset = (overrides: Partial<DataSet> = {}): DataSet =>
}) as DataSet
describe('DatasetCardFooter', () => {
+ it.each([
+ {
+ available: 15,
+ total: 20,
+ count: '15 / 20',
+ description: 'dataset.partialEnabled:{"count":20,"num":15}',
+ },
+ { available: 20, total: 20, count: '20', description: 'dataset.docAllEnabled:{"count":20}' },
+ ])(
+ 'opens document availability using the keyboard ($count)',
+ async ({ available, total, count, description }) => {
+ const user = userEvent.setup()
+ render(
+ <DatasetCardFooter
+ dataset={createDataset({ total_available_documents: available, document_count: total })}
+ />,
+ )
+
+ await user.tab()
+ const trigger = screen.getByRole('button', { name: `${count} common.datasetMenus.documents` })
+ expect(trigger).toHaveFocus()
+ await user.keyboard('{Enter}')
+
+ const details = await screen.findByRole('dialog', { name: 'common.datasetMenus.documents' })
+ expect(within(details).getByText(description)).toBeInTheDocument()
+ await user.keyboard('{Escape}')
+ await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument())
+ expect(trigger).toHaveFocus()
+ },
+ )
+
+ it('opens linked app details with Space', async () => {
+ const user = userEvent.setup()
+ render(<DatasetCardFooter dataset={createDataset()} />)
+
+ await user.tab()
+ await user.tab()
+ expect(screen.getByRole('button', { name: '5 dataset.appCount' })).toHaveFocus()
+ await user.keyboard(' ')
+
+ expect(await screen.findByRole('dialog', { name: '5 dataset.appCount' })).toBeInTheDocument()
+ })
+
+ it('opens document details by click without activating the surrounding card', async () => {
+ const user = userEvent.setup()
+ const onDocumentClick = vi.fn()
+ render(<DatasetCardFooter dataset={createDataset()} />)
+ document.addEventListener('click', onDocumentClick)
+
+ try {
+ await user.click(screen.getByRole('button', { name: '10 common.datasetMenus.documents' }))
+ const details = await screen.findByRole('dialog', { name: 'common.datasetMenus.documents' })
+ await user.click(within(details).getByText('dataset.docAllEnabled:{"count":10}'))
+ expect(onDocumentClick).not.toHaveBeenCalled()
+ } finally {
+ document.removeEventListener('click', onDocumentClick)
+ }
+ })
+
it('shows the number of available documents when only part of a dataset is enabled', () => {
render(
<DatasetCardFooter
diff --git a/web/app/components/datasets/list/dataset-card/components/__tests__/operations-dropdown.browser.spec.tsx b/web/app/components/datasets/list/dataset-card/components/__tests__/operations-dropdown.browser.spec.tsx
new file mode 100644
index 00000000000..2ebdeb81cb5
--- /dev/null
+++ b/web/app/components/datasets/list/dataset-card/components/__tests__/operations-dropdown.browser.spec.tsx
@@ -0,0 +1,99 @@
+import type { DataSet } from '@/models/datasets'
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
+import { userEvent } from 'vite-plus/test/browser'
+import { render } from 'vitest-browser-react'
+import { userProfileQueryOptions } from '@/features/account-profile/client'
+import { systemFeaturesQueryOptions } from '@/features/system-features/client'
+import { createSystemFeaturesFixture } from '@/test/console/system-features'
+import { DatasetACLPermission } from '@/utils/permission'
+import CornerLabels from '../corner-labels'
+import OperationsDropdown from '../operations-dropdown'
+
+vi.mock('@/context/permission-state', async () => {
+ const { atom } = await import('jotai')
+ return { workspacePermissionKeysAtom: atom([]) }
+})
+
+vi.mock('@/features/account-profile/client', () => ({
+ userProfileQueryOptions: () => ({
+ queryKey: ['account-profile'],
+ queryFn: async () => ({ profile: { id: 'user-1' } }),
+ }),
+}))
+
+vi.mock('@/features/system-features/client', () => ({
+ systemFeaturesQueryOptions: () => ({
+ queryKey: ['system-features'],
+ queryFn: async () => ({ rbac_enabled: true }),
+ }),
+}))
+
+it.each([true, false])(
+ 'keeps operations visible and keyboard accessible with embedding available: %s',
+ async (embeddingAvailable) => {
+ // Real CSS and native Tab navigation catch visibility-hidden triggers that happy-dom misses.
+ const queryClient = new QueryClient({
+ defaultOptions: { queries: { retry: false, staleTime: Infinity } },
+ })
+ queryClient.setQueryData(userProfileQueryOptions().queryKey, {
+ profile: {
+ id: 'user-1',
+ name: 'Test User',
+ email: '[email protected]',
+ avatar: '',
+ avatar_url: null,
+ is_password_set: false,
+ timezone: 'Asia/Shanghai',
+ },
+ meta: { currentVersion: null, currentEnv: null },
+ })
+ queryClient.setQueryData(
+ systemFeaturesQueryOptions().queryKey,
+ createSystemFeaturesFixture({ rbac_enabled: true }),
+ )
+ const openRenameModal = vi.fn()
+ const dataset = {
+ id: 'dataset-1',
+ name: 'Test Dataset',
+ runtime_mode: 'general',
+ embedding_available: embeddingAvailable,
+ permission_keys: [DatasetACLPermission.Edit],
+ } as DataSet
+ const screen = await render(
+ <QueryClientProvider client={queryClient}>
+ <button type="button">Before dataset</button>
+ <div className="group relative mt-10 h-40 w-80">
+ <CornerLabels dataset={dataset} />
+ <OperationsDropdown
+ dataset={dataset}
+ openRenameModal={openRenameModal}
+ handleExportPipeline={vi.fn()}
+ detectIsUsedByApp={vi.fn()}
+ openAccessConfig={vi.fn()}
+ />
+ </div>
+ <button type="button">After dataset</button>
+ </QueryClientProvider>,
+ )
+
+ screen.getByRole('button', { name: 'Before dataset' }).element().focus()
+ await userEvent.keyboard('{Tab}')
+ const trigger = screen.getByRole('button', { name: 'Dataset operations' })
+ await expect.element(trigger).toHaveFocus()
+ await expect.element(trigger).toBeVisible()
+ if (!embeddingAvailable) {
+ const unavailableLabel = screen.getByText('dataset.cornerLabel.unavailable')
+ await expect.element(unavailableLabel).toBeVisible()
+ expect(unavailableLabel.element().getBoundingClientRect().bottom).toBeLessThanOrEqual(
+ trigger.element().getBoundingClientRect().top,
+ )
+ }
+ await userEvent.keyboard('{Enter}')
+ const edit = screen.getByRole('menuitem', { name: 'common.operation.edit' })
+ await expect.element(edit).toHaveFocus()
+ await userEvent.keyboard('{Enter}')
+ expect(openRenameModal).toHaveBeenCalledTimes(1)
+ await expect.element(screen.getByRole('menu')).not.toBeInTheDocument()
+ await expect.element(trigger).toHaveFocus()
+ },
+)
diff --git a/web/app/components/datasets/list/dataset-card/components/__tests__/operations-dropdown.spec.tsx b/web/app/components/datasets/list/dataset-card/components/__tests__/operations-dropdown.spec.tsx
index 963ba07f8e3..d2651e2abc4 100644
--- a/web/app/components/datasets/list/dataset-card/components/__tests__/operations-dropdown.spec.tsx
+++ b/web/app/components/datasets/list/dataset-card/components/__tests__/operations-dropdown.spec.tsx
@@ -83,17 +83,6 @@ describe('OperationsDropdown', () => {
const moreIcon = container.querySelector('.i-ri-more-fill')
expect(moreIcon).toBeInTheDocument()
})
-
- it('should render in hidden state initially (group-hover)', () => {
- const { container } = render(<OperationsDropdown {...defaultProps} />)
- const wrapper = container.firstChild as HTMLElement
- expect(wrapper).toHaveClass(
- 'invisible',
- 'pointer-events-none',
- 'group-hover:visible',
- 'group-hover:pointer-events-auto',
- )
- })
})
describe('Props', () => {
diff --git a/web/app/components/datasets/list/dataset-card/components/dataset-card-footer.tsx b/web/app/components/datasets/list/dataset-card/components/dataset-card-footer.tsx
index 1ec5883140f..e1fb6ebed74 100644
--- a/web/app/components/datasets/list/dataset-card/components/dataset-card-footer.tsx
+++ b/web/app/components/datasets/list/dataset-card/components/dataset-card-footer.tsx
@@ -1,7 +1,13 @@
import type { DataSet } from '@/models/datasets'
+import { Button } from '@langgenius/dify-ui/button'
import { cn } from '@langgenius/dify-ui/cn'
-import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
-import { RiFileTextFill, RiRobot2Fill } from '@remixicon/react'
+import {
+ Popover,
+ PopoverContent,
+ PopoverDescription,
+ PopoverTitle,
+ PopoverTrigger,
+} from '@langgenius/dify-ui/popover'
import * as React from 'react'
import { useMemo } from 'react'
import { useTranslation } from 'react-i18next'
@@ -25,7 +31,7 @@ const DatasetCardFooter = ({ dataset }: DatasetCardFooterProps) => {
return `${dataset.document_count}`
}, [dataset.document_count, dataset.total_available_documents])
- const documentCountTooltip = useMemo(() => {
+ const documentCountDescription = useMemo(() => {
const availableDocCount = dataset.total_available_documents ?? 0
if (availableDocCount < dataset.document_count)
return t(($) => $.partialEnabled, {
@@ -43,31 +49,44 @@ const DatasetCardFooter = ({ dataset }: DatasetCardFooterProps) => {
!dataset.embedding_available && 'opacity-30',
)}
>
- <Tooltip>
- <TooltipTrigger
+ <Popover>
+ <PopoverTrigger
+ onClick={(event) => event.stopPropagation()}
render={
- <div className="flex items-center gap-x-1">
- <RiFileTextFill className="size-3 text-text-quaternary" />
- <span className="system-xs-medium">{documentCount}</span>
- </div>
+ <Button variant="ghost" size="small" className="min-w-6 px-1 text-text-tertiary" />
}
- />
- <TooltipContent>{documentCountTooltip}</TooltipContent>
- </Tooltip>
+ >
+ <span aria-hidden="true" className="i-ri-file-text-fill size-3 text-text-quaternary" />
+ <span className="system-xs-medium">{documentCount}</span>
+ <span className="sr-only">{t(($) => $['datasetMenus.documents'], { ns: 'common' })}</span>
+ </PopoverTrigger>
+ <PopoverContent className="p-3" onClick={(event) => event.stopPropagation()}>
+ <PopoverTitle className="system-xs-medium text-text-primary">
+ {t(($) => $['datasetMenus.documents'], { ns: 'common' })}
+ </PopoverTitle>
+ <PopoverDescription className="system-xs-regular text-text-secondary">
+ {documentCountDescription}
+ </PopoverDescription>
+ </PopoverContent>
+ </Popover>
{!isExternalProvider && (
- <Tooltip>
- <TooltipTrigger
+ <Popover>
+ <PopoverTrigger
+ onClick={(event) => event.stopPropagation()}
render={
- <div className="flex items-center gap-x-1">
- <RiRobot2Fill className="size-3 text-text-quaternary" />
- <span className="system-xs-medium">{dataset.app_count}</span>
- </div>
+ <Button variant="ghost" size="small" className="min-w-6 px-1 text-text-tertiary" />
}
- />
- <TooltipContent>
- {`${dataset.app_count} ${t(($) => $.appCount, { ns: 'dataset' })}`}
- </TooltipContent>
- </Tooltip>
+ >
+ <span aria-hidden="true" className="i-ri-robot-2-fill size-3 text-text-quaternary" />
+ <span className="system-xs-medium">{dataset.app_count}</span>
+ <span className="sr-only">{t(($) => $.appCount, { ns: 'dataset' })}</span>
+ </PopoverTrigger>
+ <PopoverContent className="p-3" onClick={(event) => event.stopPropagation()}>
+ <PopoverTitle className="system-xs-regular text-text-secondary">
+ {`${dataset.app_count} ${t(($) => $.appCount, { ns: 'dataset' })}`}
+ </PopoverTitle>
+ </PopoverContent>
+ </Popover>
)}
<span className="system-xs-regular text-divider-deep">/</span>
<span className="system-xs-regular">{`${t(($) => $.updated, { ns: 'dataset' })} ${formatTimeFromNow(dataset.updated_at * 1000)}`}</span>
diff --git a/web/app/components/datasets/list/dataset-card/components/dataset-card-header.tsx b/web/app/components/datasets/list/dataset-card/components/dataset-card-header.tsx
index ee8ea7879f5..2060e2030c0 100644
--- a/web/app/components/datasets/list/dataset-card/components/dataset-card-header.tsx
+++ b/web/app/components/datasets/list/dataset-card/components/dataset-card-header.tsx
@@ -13,6 +13,7 @@ const docModeInfoClassName =
type DatasetCardHeaderProps = {
dataset: DataSet
+ nameId?: string
}
// DocModeInfo component - placed before usage
@@ -80,7 +81,7 @@ const DocModeInfo = ({ dataset, isExternalProvider, isShowDocModeInfo }: DocMode
}
// Main DatasetCardHeader component
-const DatasetCardHeader = ({ dataset }: DatasetCardHeaderProps) => {
+const DatasetCardHeader = ({ dataset, nameId }: DatasetCardHeaderProps) => {
const isExternalProvider = dataset.provider === EXTERNAL_PROVIDER
const isShowChunkingModeIcon =
@@ -111,7 +112,7 @@ const DatasetCardHeader = ({ dataset }: DatasetCardHeaderProps) => {
return (
<div
className={cn(
- 'flex items-center gap-x-3 px-4 pt-4 pb-2',
+ 'flex items-center gap-x-3 pt-4 pr-14 pb-2 pl-4',
!dataset.embedding_available && 'opacity-30',
)}
>
@@ -130,7 +131,11 @@ const DatasetCardHeader = ({ dataset }: DatasetCardHeaderProps) => {
)}
</div>
<div className="flex grow flex-col gap-y-1 overflow-hidden py-px">
- <div className="truncate system-md-semibold text-text-secondary" title={dataset.name}>
+ <div
+ id={nameId}
+ className="truncate system-md-semibold text-text-secondary"
+ title={dataset.name}
+ >
{dataset.name}
</div>
<DocModeInfo
diff --git a/web/app/components/datasets/list/dataset-card/components/operations-dropdown.tsx b/web/app/components/datasets/list/dataset-card/components/operations-dropdown.tsx
index abf4804e074..c7f1bed0133 100644
--- a/web/app/components/datasets/list/dataset-card/components/operations-dropdown.tsx
+++ b/web/app/components/datasets/list/dataset-card/components/operations-dropdown.tsx
@@ -78,12 +78,7 @@ const OperationsDropdown = ({
return (
<div
- className={cn(
- 'absolute top-2 right-2 z-5',
- open
- ? 'pointer-events-auto visible'
- : 'pointer-events-none invisible group-hover:pointer-events-auto group-hover:visible',
- )}
+ className={cn('absolute right-2 z-5', dataset.embedding_available ? 'top-2' : 'top-6')}
onClick={(e) => e.stopPropagation()}
>
<DropdownMenu modal={false} open={open} onOpenChange={setOpen}>
diff --git a/web/app/components/datasets/list/dataset-card/index.tsx b/web/app/components/datasets/list/dataset-card/index.tsx
index 97b156aefbe..08b4ddc2b57 100644
--- a/web/app/components/datasets/list/dataset-card/index.tsx
+++ b/web/app/components/datasets/list/dataset-card/index.tsx
@@ -1,17 +1,16 @@
'use client'
-import type { KeyboardEvent, MouseEvent } from 'react'
import type { DataSet } from '@/models/datasets'
import { cn } from '@langgenius/dify-ui/cn'
import { useSuspenseQuery } from '@tanstack/react-query'
import { useAtomValue } from 'jotai'
-import { useMemo } from 'react'
+import { useId, useMemo } from 'react'
import { useTranslation } from 'react-i18next'
import { toast } from '@/app/notifications'
import { workspacePermissionKeysAtom } from '@/context/permission-state'
import { userProfileQueryOptions } from '@/features/account-profile/client'
import { DatasetCardTags } from '@/features/tag-management/components/dataset-card-tags'
-import { useRouter } from '@/next/navigation'
+import Link from '@/next/link'
import {
getDatasetACLCapabilities,
hasOnlyDatasetPreviewPermission,
@@ -45,7 +44,7 @@ const DatasetCard = ({
stepByStepTourCardTarget,
}: DatasetCardProps) => {
const { t } = useTranslation()
- const { push } = useRouter()
+ const nameId = useId()
const { data: currentUserId } = useSuspenseQuery({
...userProfileQueryOptions(),
select: (data) => data.profile.id,
@@ -86,55 +85,51 @@ const DatasetCard = ({
toast.warning(t(($) => $.noAccessResourcePermission, { ns: 'app' }))
}
- const handleCardClick = (e: MouseEvent) => {
- e.preventDefault()
- if (isPreviewOnly) {
- showPreviewOnlyAccessWarning()
- return
- }
-
- if (isExternalProvider) {
- push(
- datasetACLCapabilities.canRetrievalRecall
- ? `/datasets/${dataset.id}/hitTesting`
- : `/datasets/${dataset.id}/settings`,
- )
- } else if (isPipelineUnpublished) {
- push(`/datasets/${dataset.id}/pipeline`)
- } else {
- push(`/datasets/${dataset.id}/documents`)
- }
- }
-
- const handlePreviewOnlyCardKeyDown = (e: KeyboardEvent<HTMLElement>) => {
- if (!isPreviewOnly || (e.key !== 'Enter' && e.key !== ' ')) return
-
- e.preventDefault()
- showPreviewOnlyAccessWarning()
- }
+ const href = isExternalProvider
+ ? datasetACLCapabilities.canRetrievalRecall
+ ? `/datasets/${dataset.id}/hitTesting`
+ : `/datasets/${dataset.id}/settings`
+ : isPipelineUnpublished
+ ? `/datasets/${dataset.id}/pipeline`
+ : `/datasets/${dataset.id}/documents`
const cardClassName = cn(
- 'group relative col-span-1 flex h-41.5 flex-col overflow-hidden rounded-xl border-[0.5px] border-solid border-components-card-border bg-components-card-bg shadow-xs shadow-shadow-shadow-3 transition-[background-color,box-shadow] duration-200 ease-in-out',
+ 'group relative col-span-1 flex min-h-41.5 flex-col overflow-hidden rounded-xl border-[0.5px] border-solid border-components-card-border bg-components-card-bg shadow-xs shadow-shadow-shadow-3 transition-[background-color,box-shadow] duration-200 ease-in-out',
isPreviewOnly
- ? 'cursor-not-allowed opacity-60 focus-visible:ring-2 focus-visible:ring-state-accent-solid focus-visible:outline-hidden'
- : 'cursor-pointer hover:bg-components-card-bg-alt hover:shadow-md hover:shadow-shadow-shadow-5 hover:[--color-tag-selector-mask-bg:var(--color-tag-selector-mask-hover-bg)]',
+ ? 'opacity-60'
+ : 'hover:bg-components-card-bg-alt hover:shadow-md hover:shadow-shadow-shadow-5 hover:[--color-tag-selector-mask-bg:var(--color-tag-selector-mask-hover-bg)]',
)
+ const content = (
+ <>
+ <DatasetCardHeader dataset={dataset} nameId={nameId} />
+ <Description dataset={dataset} />
+ </>
+ )
+ const entryClassName =
+ 'block rounded-t-xl focus-visible:ring-2 focus-visible:ring-state-accent-solid focus-visible:ring-inset focus-visible:outline-hidden'
return (
<>
<div
- role={isPreviewOnly ? 'button' : undefined}
- tabIndex={isPreviewOnly ? 0 : undefined}
- aria-label={isPreviewOnly ? dataset.name : undefined}
className={cardClassName}
data-disable-nprogress={true}
data-step-by-step-tour-target={stepByStepTourCardTarget}
- onClick={handleCardClick}
- onKeyDown={handlePreviewOnlyCardKeyDown}
>
<CornerLabels dataset={dataset} />
- <DatasetCardHeader dataset={dataset} />
- <Description dataset={dataset} />
+ {isPreviewOnly ? (
+ <button
+ type="button"
+ aria-labelledby={nameId}
+ className={cn(entryClassName, 'w-full cursor-not-allowed text-left')}
+ onClick={showPreviewOnlyAccessWarning}
+ >
+ {content}
+ </button>
+ ) : (
+ <Link href={href} aria-labelledby={nameId} className={entryClassName}>
+ {content}
+ </Link>
+ )}
<DatasetCardTags
datasetId={dataset.id}
embeddingAvailable={dataset.embedding_available}
diff --git a/web/app/components/datasets/list/index.tsx b/web/app/components/datasets/list/index.tsx
index 9e838753ee6..c2836fc9025 100644
--- a/web/app/components/datasets/list/index.tsx
+++ b/web/app/components/datasets/list/index.tsx
@@ -86,6 +86,17 @@ function LegacyList({
includeAll
const showEmptyDataList = !hasAnyDataset && hasResolvedFirstPage && !hasActiveFilters
const showFilteredEmptyState = !hasAnyDataset && hasResolvedFirstPage && hasActiveFilters
+ const filtersHaveSettled =
+ keywords === searchKeywords &&
+ tagFilterValue.length === tagIDs.length &&
+ tagFilterValue.every((id, index) => id === tagIDs[index])
+ const announceFilteredEmptyState =
+ showFilteredEmptyState &&
+ filtersHaveSettled &&
+ !datasetListQuery.isFetching &&
+ !datasetListQuery.isPlaceholderData &&
+ !datasetListQuery.isError
+ const filteredEmptyMessage = t(($) => $['filterEmpty.noKnowledge'], { ns: 'dataset' })
const activeStepByStepTourTaskId = useAtomValue(activeStepByStepTourTaskIdAtom)
const activeStepByStepTourGuideIndex = useAtomValue(activeStepByStepTourGuideIndexAtom)
const activeStepByStepTourGuideGroup = useAtomValue(activeStepByStepTourGuideGroupAtom)
@@ -149,6 +160,9 @@ function LegacyList({
}
knowledgeViewSwitcherProps={knowledgeViewSwitcherProps}
/>
+ <div role="status" aria-atomic="true" className="sr-only">
+ {announceFilteredEmptyState ? filteredEmptyMessage : ''}
+ </div>
{showEmptyDataList ? (
<DatasetFirstEmptyState
canConnectExternalDataset={canConnectExternalDataset}
@@ -159,7 +173,7 @@ function LegacyList({
datasetList={datasetListQuery.data}
emptyElement={
showFilteredEmptyState ? (
- <FilterEmptyState title={t(($) => $['filterEmpty.noKnowledge'], { ns: 'dataset' })} />
+ <FilterEmptyState title={<span aria-hidden="true">{filteredEmptyMessage}</span>} />
) : undefined
}
fetchNextPage={datasetListQuery.fetchNextPage}
diff --git a/web/features/tag-management/__tests__/tag-management-modal.spec.tsx b/web/features/tag-management/__tests__/tag-management-modal.spec.tsx
index 42d41572a5e..7d68cd10606 100644
--- a/web/features/tag-management/__tests__/tag-management-modal.spec.tsx
+++ b/web/features/tag-management/__tests__/tag-management-modal.spec.tsx
@@ -121,9 +121,10 @@ describe('TagManagementModal', () => {
})
describe('Rendering', () => {
- it('should render the modal title when show is true', () => {
+ it('should name the dialog with its visible title', () => {
render(<TagManagementModal {...defaultProps} />)
- expect(screen.getByText(i18n.manageTags)).toBeInTheDocument()
+ expect(screen.getByRole('dialog', { name: i18n.manageTags })).toBeInTheDocument()
+ expect(screen.getByRole('heading', { name: i18n.manageTags })).toBeVisible()
})
it('should render the new tag input with placeholder', () => {
diff --git a/web/features/tag-management/components/tag-management-modal.tsx b/web/features/tag-management/components/tag-management-modal.tsx
index 8e6eb9434ec..0188aa5fbeb 100644
--- a/web/features/tag-management/components/tag-management-modal.tsx
+++ b/web/features/tag-management/components/tag-management-modal.tsx
@@ -1,6 +1,6 @@
'use client'
import type { TagType } from '@dify/contracts/api/console/tags/types.gen'
-import { Dialog, DialogClose, DialogContent } from '@langgenius/dify-ui/dialog'
+import { Dialog, DialogClose, DialogContent, DialogTitle } from '@langgenius/dify-ui/dialog'
import { IconButton } from '@langgenius/dify-ui/icon-button'
import { useMutation, useQuery } from '@tanstack/react-query'
import { useAtomValue } from 'jotai'
@@ -73,10 +73,10 @@ export const TagManagementModal = ({
return (
<Dialog open={show} onOpenChange={(open) => !open && handleClose()}>
- <DialogContent className="w-150 max-w-150 rounded-xl p-8">
- <div className="relative pb-2 text-xl/7.5 font-semibold text-text-primary">
+ <DialogContent className="w-150 rounded-xl p-8">
+ <DialogTitle className="relative pb-2 text-xl/7.5 font-semibold text-text-primary">
{t(($) => $['tag.manageTags'], { ns: 'common' })}
- </div>
+ </DialogTitle>
<DialogClose
render={
<IconButton