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): keep the knowledge view switcher mounted across view changes (#45310)

yyh70f00048dda4
diff --git a/web/app/components/datasets/list/__tests__/index.spec.tsx b/web/app/components/datasets/list/__tests__/index.spec.tsx
index 9fb434faa96..831c500b349 100644
--- a/web/app/components/datasets/list/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/list/__tests__/index.spec.tsx
@@ -432,6 +432,21 @@ describe('KnowledgeFS view', () => {
expect(onUrlUpdate.mock.calls.at(-1)?.[0].searchParams.get('creator_ids')).toBe('creator-1')
})
+ it('keeps focus on the view switcher when switching with the keyboard', async () => {
+ const { user } = setup({ features: { enable_knowledge_fs: true } })
+ const classic = screen.getByRole('radio', { name: 'knowledgeSpace.view.classic' })
+
+ act(() => classic.focus())
+ await user.keyboard('{ArrowRight}')
+ expect(await screen.findByRole('region', { name: 'knowledgeSpace.new' })).toBeInTheDocument()
+ expect(screen.getByRole('radio', agentView)).toHaveFocus()
+
+ await user.keyboard('{ArrowLeft}')
+ expect(await screen.findByRole('link', { name: 'Test Dataset' })).toBeInTheDocument()
+ expect(screen.getByRole('radio', { name: 'knowledgeSpace.view.classic' })).toBe(classic)
+ expect(classic).toHaveFocus()
+ })
+
it('restores the Agent view from the URL', async () => {
setup({ features: { enable_knowledge_fs: true } }, undefined, '?view=agent')
diff --git a/web/app/components/datasets/list/header.tsx b/web/app/components/datasets/list/header.tsx
index 7c8180fdd50..bf8b56d06f6 100644
--- a/web/app/components/datasets/list/header.tsx
+++ b/web/app/components/datasets/list/header.tsx
@@ -1,6 +1,5 @@
'use client'
-import type { KnowledgeViewSwitcherProps } from '@/features/new-rag/list/knowledge-view-switcher'
import { Button } from '@langgenius/dify-ui/button'
import { Menu, MenuContent, MenuItem, MenuSeparator, MenuTrigger } from '@langgenius/dify-ui/menu'
import { useTranslation } from 'react-i18next'
@@ -11,12 +10,9 @@ import {
getStepByStepTourMenuContentProps,
useStepByStepTourControlledMenu,
} from '@/app/components/step-by-step-tour/menu'
-import { KnowledgeViewSwitcher } from '@/features/new-rag/list/knowledge-view-switcher'
import { TagFilter } from '@/features/tag-management/components/tag-filter'
-import { ServiceApi } from '../extra-info/service-api'
type Props = {
- apiBaseUrl: string
canConnectExternalDataset: boolean
canCreateDataset: boolean
creatorFilterValue: string[]
@@ -27,7 +23,6 @@ type Props = {
onCreateDataset: () => void
onCreateFromPipeline: () => void
onConnectDataset: () => void
- onExternalApiClick: () => void
onCreatorsChange: (value: string[]) => void
onIncludeAllChange: () => void
onKeywordsChange: (value: string) => void
@@ -36,11 +31,9 @@ type Props = {
stepByStepTourCreateMenuHighlightPart?: string
stepByStepTourCreateMenuOpen?: boolean
stepByStepTourCreateMenuTarget?: string
- knowledgeViewSwitcherProps?: KnowledgeViewSwitcherProps
}
const DatasetListHeader = ({
- apiBaseUrl,
canConnectExternalDataset,
canCreateDataset,
creatorFilterValue,
@@ -51,7 +44,6 @@ const DatasetListHeader = ({
onCreateDataset,
onCreateFromPipeline,
onConnectDataset,
- onExternalApiClick,
onCreatorsChange,
onIncludeAllChange,
onKeywordsChange,
@@ -60,7 +52,6 @@ const DatasetListHeader = ({
stepByStepTourCreateMenuHighlightPart,
stepByStepTourCreateMenuOpen,
stepByStepTourCreateMenuTarget,
- knowledgeViewSwitcherProps,
}: Props) => {
const { t } = useTranslation(['common', 'dataset'])
const showCreateMenu = canCreateDataset || canConnectExternalDataset
@@ -69,141 +60,110 @@ const DatasetListHeader = ({
})
return (
- <div className="sticky top-0 z-10 flex flex-col gap-3.5 bg-background-body px-8 pt-4 pb-2">
- <div className="flex min-h-6 w-full flex-wrap items-center justify-between gap-2">
- <div className="flex min-w-0 flex-wrap items-center gap-2">
- <h1 className="min-w-0 text-[18px]/[21.6px] font-semibold text-text-primary">
- {t(($) => $.knowledge, { ns: 'dataset' })}
- </h1>
- {knowledgeViewSwitcherProps && <KnowledgeViewSwitcher {...knowledgeViewSwitcherProps} />}
- </div>
- <div className="flex max-w-full shrink-0 flex-wrap items-center gap-2">
- {canConnectExternalDataset && (
- <Button
- variant="ghost"
- size="small"
- className="overflow-hidden text-text-tertiary"
- onClick={onExternalApiClick}
- >
- <span
- aria-hidden
- className="i-custom-vender-solid-development-api-connection-mod size-3.5 shrink-0"
- />
- <span className="system-xs-medium">
- {t(($) => $.externalAPIPanelTitle, { ns: 'dataset' })}
- </span>
- </Button>
- )}
- <ServiceApi apiBaseUrl={apiBaseUrl} />
- </div>
+ <div className="sticky top-0 z-10 flex flex-wrap items-center justify-between gap-2 bg-background-body px-8 pt-3.5 pb-2">
+ <div className="flex min-w-0 flex-wrap items-center gap-2">
+ <TagFilter
+ type="knowledge"
+ value={tagFilterValue}
+ onChange={onTagsChange}
+ onOpenTagManagement={onOpenTagManagement}
+ showLeadingIcon={false}
+ triggerClassName="min-w-0"
+ />
+ <CreatorFilter value={creatorFilterValue} onChange={onCreatorsChange} />
+ <SearchInput
+ className="w-full min-w-0 sm:w-50"
+ value={keywords}
+ onValueChange={onKeywordsChange}
+ />
+ {isCurrentWorkspaceOwner && (
+ <>
+ <div className="h-3.5 w-px bg-divider-regular" />
+ <CheckboxWithLabel
+ isChecked={includeAll}
+ onChange={onIncludeAllChange}
+ label={t(($) => $.allKnowledge, { ns: 'dataset' })}
+ labelClassName="system-md-regular text-text-tertiary"
+ className="h-8"
+ tooltip={t(($) => $.allKnowledgeDescription, { ns: 'dataset' }) as string}
+ />
+ </>
+ )}
</div>
- <div className="flex flex-wrap items-center justify-between gap-2">
- <div className="flex min-w-0 flex-wrap items-center gap-2">
- <TagFilter
- type="knowledge"
- value={tagFilterValue}
- onChange={onTagsChange}
- onOpenTagManagement={onOpenTagManagement}
- showLeadingIcon={false}
- triggerClassName="min-w-0"
- />
- <CreatorFilter value={creatorFilterValue} onChange={onCreatorsChange} />
- <SearchInput
- className="w-full min-w-0 sm:w-50"
- value={keywords}
- onValueChange={onKeywordsChange}
- />
- {isCurrentWorkspaceOwner && (
- <>
- <div className="h-3.5 w-px bg-divider-regular" />
- <CheckboxWithLabel
- isChecked={includeAll}
- onChange={onIncludeAllChange}
- label={t(($) => $.allKnowledge, { ns: 'dataset' })}
- labelClassName="system-md-regular text-text-tertiary"
- className="h-8"
- tooltip={t(($) => $.allKnowledgeDescription, { ns: 'dataset' }) as string}
- />
- </>
- )}
- </div>
- <div className="flex items-center gap-2">
- {showCreateMenu && (
- <Menu modal={false} open={createMenu.open} onOpenChange={createMenu.onOpenChange}>
- <MenuTrigger
- render={
- <Button
- variant="primary"
- size="medium"
- className="px-2 shadow-xs"
- data-step-by-step-tour-target={stepByStepTourCreateMenuTarget}
+ <div className="flex items-center gap-2">
+ {showCreateMenu && (
+ <Menu modal={false} open={createMenu.open} onOpenChange={createMenu.onOpenChange}>
+ <MenuTrigger
+ render={
+ <Button
+ variant="primary"
+ size="medium"
+ className="px-2 shadow-xs"
+ data-step-by-step-tour-target={stepByStepTourCreateMenuTarget}
+ >
+ <span aria-hidden className="i-ri-add-line size-4 shrink-0" />
+ <span>{t(($) => $['operation.create'], { ns: 'common' })}</span>
+ <span aria-hidden className="i-ri-arrow-down-s-line size-4 shrink-0" />
+ </Button>
+ }
+ />
+ <MenuContent
+ align="end"
+ {...getStepByStepTourMenuContentProps({
+ disableMotion: createMenu.controlled,
+ highlightPart: createMenu.controlled
+ ? stepByStepTourCreateMenuHighlightPart
+ : undefined,
+ interactionMode: createMenu.controlled ? 'presentation' : 'interactive',
+ className: 'w-80',
+ })}
+ >
+ {canCreateDataset && (
+ <>
+ <MenuItem
+ className="h-8 gap-1 rounded-lg px-2 py-1 system-md-regular text-text-secondary"
+ onClick={onCreateDataset}
>
- <span aria-hidden className="i-ri-add-line size-4 shrink-0" />
- <span>{t(($) => $['operation.create'], { ns: 'common' })}</span>
- <span aria-hidden className="i-ri-arrow-down-s-line size-4 shrink-0" />
- </Button>
- }
- />
- <MenuContent
- align="end"
- {...getStepByStepTourMenuContentProps({
- disableMotion: createMenu.controlled,
- highlightPart: createMenu.controlled
- ? stepByStepTourCreateMenuHighlightPart
- : undefined,
- interactionMode: createMenu.controlled ? 'presentation' : 'interactive',
- className: 'w-80',
- })}
- >
- {canCreateDataset && (
- <>
- <MenuItem
- className="h-8 gap-1 rounded-lg px-2 py-1 system-md-regular text-text-secondary"
- onClick={onCreateDataset}
- >
- <span
- aria-hidden
- className="i-ri-add-line size-4 shrink-0 text-text-secondary"
- />
- <span className="min-w-0 flex-1 truncate px-1">
- {t(($) => $['firstEmpty.createTitle'], { ns: 'dataset' })}
- </span>
- </MenuItem>
- <MenuItem
- className="h-8 gap-1 rounded-lg px-2 py-1 system-md-regular text-text-secondary"
- onClick={onCreateFromPipeline}
- >
- <span
- aria-hidden
- className="i-custom-vender-pipeline-pipeline-line size-4 shrink-0 text-text-secondary"
- />
- <span className="min-w-0 flex-1 truncate px-1">
- {t(($) => $['firstEmpty.pipelineTitle'], { ns: 'dataset' })}
- </span>
- </MenuItem>
- </>
- )}
- {canCreateDataset && canConnectExternalDataset && (
- <MenuSeparator className="my-1" />
- )}
- {canConnectExternalDataset && (
+ <span
+ aria-hidden
+ className="i-ri-add-line size-4 shrink-0 text-text-secondary"
+ />
+ <span className="min-w-0 flex-1 truncate px-1">
+ {t(($) => $['firstEmpty.createTitle'], { ns: 'dataset' })}
+ </span>
+ </MenuItem>
<MenuItem
className="h-8 gap-1 rounded-lg px-2 py-1 system-md-regular text-text-secondary"
- onClick={onConnectDataset}
+ onClick={onCreateFromPipeline}
>
<span
aria-hidden
- className="i-custom-vender-solid-development-api-connection-mod size-4 shrink-0 text-text-secondary"
+ className="i-custom-vender-pipeline-pipeline-line size-4 shrink-0 text-text-secondary"
/>
<span className="min-w-0 flex-1 truncate px-1">
- {t(($) => $.connectDataset, { ns: 'dataset' })}
+ {t(($) => $['firstEmpty.pipelineTitle'], { ns: 'dataset' })}
</span>
</MenuItem>
- )}
- </MenuContent>
- </Menu>
- )}
- </div>
+ </>
+ )}
+ {canCreateDataset && canConnectExternalDataset && <MenuSeparator className="my-1" />}
+ {canConnectExternalDataset && (
+ <MenuItem
+ className="h-8 gap-1 rounded-lg px-2 py-1 system-md-regular text-text-secondary"
+ onClick={onConnectDataset}
+ >
+ <span
+ aria-hidden
+ className="i-custom-vender-solid-development-api-connection-mod size-4 shrink-0 text-text-secondary"
+ />
+ <span className="min-w-0 flex-1 truncate px-1">
+ {t(($) => $.connectDataset, { ns: 'dataset' })}
+ </span>
+ </MenuItem>
+ )}
+ </MenuContent>
+ </Menu>
+ )}
</div>
</div>
)
diff --git a/web/app/components/datasets/list/index.tsx b/web/app/components/datasets/list/index.tsx
index 6e4f8f4de75..52bbbc7eea9 100644
--- a/web/app/components/datasets/list/index.tsx
+++ b/web/app/components/datasets/list/index.tsx
@@ -1,7 +1,6 @@
'use client'
-import type { KnowledgeViewSwitcherProps } from '@/features/new-rag/list/knowledge-view-switcher'
-import { useQuery, useSuspenseQuery } from '@tanstack/react-query'
+import { useSuspenseQuery } from '@tanstack/react-query'
// Libraries
import { useBoolean } from 'ahooks'
import { useDebouncedValue } from 'foxact/use-debounced-value'
@@ -19,8 +18,10 @@ import {
getStepByStepTourGuides,
STEP_BY_STEP_TOUR_TARGETS,
} from '@/app/components/step-by-step-tour/target-registry'
+import { useDocLink } from '@/context/i18n'
import { workspacePermissionKeysAtom } from '@/context/permission-state'
import { isCurrentWorkspaceOwnerAtom } from '@/context/workspace-state'
+import { KnowledgeViewSwitcher } from '@/features/new-rag/list/knowledge-view-switcher'
import { NewKnowledgeList } from '@/features/new-rag/list/new-knowledge-list'
import { KnowledgeUpgradeProvider } from '@/features/new-rag/upgrade/knowledge-upgrade-context'
import { TagManagementModal } from '@/features/tag-management/components/tag-management-modal'
@@ -31,24 +32,19 @@ import { hasPermission } from '@/utils/permission'
// Components
import FilterEmptyState from '../../base/filter-empty-state'
import { creatorIdsParser } from '../creator-filter-query'
-import ExternalAPIPanel from '../external-api/external-api-panel'
import Datasets from './datasets'
import DatasetFirstEmptyState from './first-empty-state'
import DatasetListHeader from './header'
+import { KnowledgeListTitleBar } from './title-bar'
import { useDatasetList, useInvalidDatasetList } from './use-dataset-list'
const knowledgeViewParser = parseAsStringLiteral(['classic', 'agent']).withDefault('classic')
-function LegacyList({
- knowledgeViewSwitcherProps,
-}: {
- knowledgeViewSwitcherProps?: KnowledgeViewSwitcherProps
-}) {
+function LegacyList() {
const { t } = useTranslation(['dataset'])
const { push } = useRouter()
const isCurrentWorkspaceOwner = useAtomValue(isCurrentWorkspaceOwnerAtom)
const [showTagManagementModal, setShowTagManagementModal] = useState(false)
- const [showExternalApiPanel, setShowExternalApiPanel] = useState(false)
const [includeAll, { toggle: toggleIncludeAll }] = useBoolean(false)
const invalidDatasetList = useInvalidDatasetList()
useDocumentTitle(t(($) => $.knowledge, { ns: 'dataset' }))
@@ -67,7 +63,6 @@ function LegacyList({
workspacePermissionKeys,
'dataset.external.connect',
)
- const { data: apiBaseInfo } = useQuery(consoleQuery.datasets.apiBaseInfo.get.queryOptions())
const datasetListQuery = useDatasetList({
creatorIds: creatorIDs,
includeAll,
@@ -135,7 +130,6 @@ function LegacyList({
return (
<div className="relative flex grow flex-col overflow-y-auto bg-background-body">
<DatasetListHeader
- apiBaseUrl={apiBaseInfo?.api_base_url ?? ''}
canConnectExternalDataset={canConnectExternalDataset}
canCreateDataset={canCreateDataset}
creatorFilterValue={creatorIDs}
@@ -146,7 +140,6 @@ function LegacyList({
onCreateDataset={() => push('/datasets/create')}
onCreateFromPipeline={() => push('/datasets/create-from-pipeline')}
onConnectDataset={() => push('/datasets/connect')}
- onExternalApiClick={() => setShowExternalApiPanel(true)}
onCreatorsChange={(value) => void setCreatorIDs(value)}
onIncludeAllChange={toggleIncludeAll}
onKeywordsChange={setKeywords}
@@ -159,7 +152,6 @@ function LegacyList({
stepByStepTourCreateMenuHighlightPart={
STEP_BY_STEP_TOUR_TARGETS.knowledgeWithDatasetsCreateMenu
}
- knowledgeViewSwitcherProps={knowledgeViewSwitcherProps}
/>
<div role="status" aria-atomic="true" className="sr-only">
{announceFilteredEmptyState ? filteredEmptyMessage : ''}
@@ -197,34 +189,28 @@ function LegacyList({
onClose={() => setShowTagManagementModal(false)}
onTagsChange={invalidDatasetList}
/>
- {showExternalApiPanel && canConnectExternalDataset && (
- <ExternalAPIPanel
- canManageExternalKnowledgeApi={canConnectExternalDataset}
- onClose={() => setShowExternalApiPanel(false)}
- />
- )}
</div>
)
}
function KnowledgeFsList() {
+ const docLink = useDocLink()
const [view, setView] = useQueryState('view', knowledgeViewParser)
- const onViewChange = (nextView: 'classic' | 'agent') => {
- void setView(nextView)
- }
return (
<KnowledgeUpgradeProvider onUpgradeStarted={() => void setView('agent')}>
- {view === 'agent' ? (
- <NewKnowledgeList view={view} onViewChange={onViewChange} />
- ) : (
- <LegacyList
- knowledgeViewSwitcherProps={{
- value: view,
- onChange: onViewChange,
- }}
+ <div className="flex min-h-0 grow flex-col bg-background-body">
+ <KnowledgeListTitleBar
+ apiReferenceUrl={
+ view === 'agent' ? docLink('/api-reference/guides/knowledge-base') : undefined
+ }
+ className={view === 'agent' ? 'px-4 sm:px-8' : 'px-8'}
+ viewSwitcher={
+ <KnowledgeViewSwitcher value={view} onChange={(nextView) => void setView(nextView)} />
+ }
/>
- )}
+ {view === 'agent' ? <NewKnowledgeList /> : <LegacyList />}
+ </div>
</KnowledgeUpgradeProvider>
)
}
@@ -236,7 +222,14 @@ function List() {
}),
)
- if (!knowledgeFsEnabled) return <LegacyList />
+ if (!knowledgeFsEnabled) {
+ return (
+ <div className="flex min-h-0 grow flex-col bg-background-body">
+ <KnowledgeListTitleBar className="px-8" />
+ <LegacyList />
+ </div>
+ )
+ }
return <KnowledgeFsList />
}
diff --git a/web/app/components/datasets/list/title-bar.tsx b/web/app/components/datasets/list/title-bar.tsx
new file mode 100644
index 00000000000..5e4abb5a58b
--- /dev/null
+++ b/web/app/components/datasets/list/title-bar.tsx
@@ -0,0 +1,72 @@
+'use client'
+
+import type { ReactNode } from 'react'
+import { Button } from '@langgenius/dify-ui/button'
+import { cn } from '@langgenius/dify-ui/cn'
+import { useQuery } from '@tanstack/react-query'
+import { useAtomValue } from 'jotai'
+import { useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { workspacePermissionKeysAtom } from '@/context/permission-state'
+import { consoleQuery } from '@/service/console'
+import { hasPermission } from '@/utils/permission'
+import ExternalAPIPanel from '../external-api/external-api-panel'
+import { ServiceApi } from '../extra-info/service-api'
+
+type Props = {
+ apiReferenceUrl?: string
+ className?: string
+ viewSwitcher?: ReactNode
+}
+
+export function KnowledgeListTitleBar({ apiReferenceUrl, className, viewSwitcher }: Props) {
+ const { t } = useTranslation(['dataset'])
+ const workspacePermissionKeys = useAtomValue(workspacePermissionKeysAtom)
+ const canConnectExternalDataset = hasPermission(
+ workspacePermissionKeys,
+ 'dataset.external.connect',
+ )
+ const { data: apiBaseInfo } = useQuery(consoleQuery.datasets.apiBaseInfo.get.queryOptions())
+ const [showExternalApiPanel, setShowExternalApiPanel] = useState(false)
+
+ return (
+ <div className={cn('shrink-0 bg-background-body pt-4', className)}>
+ <div className="flex min-h-6 w-full flex-wrap items-center justify-between gap-2">
+ <div className="flex min-w-0 flex-wrap items-center gap-2">
+ <h1 className="min-w-0 text-[18px]/[21.6px] font-semibold text-text-primary">
+ {t(($) => $.knowledge, { ns: 'dataset' })}
+ </h1>
+ {viewSwitcher}
+ </div>
+ <div className="flex max-w-full shrink-0 flex-wrap items-center gap-2">
+ {canConnectExternalDataset && (
+ <Button
+ variant="ghost"
+ size="small"
+ className="overflow-hidden text-text-tertiary"
+ onClick={() => setShowExternalApiPanel(true)}
+ >
+ <span
+ aria-hidden
+ className="i-custom-vender-solid-development-api-connection-mod size-3.5 shrink-0"
+ />
+ <span className="system-xs-medium">
+ {t(($) => $.externalAPIPanelTitle, { ns: 'dataset' })}
+ </span>
+ </Button>
+ )}
+ <ServiceApi
+ apiBaseUrl={apiBaseInfo?.api_base_url ?? ''}
+ apiReferenceUrl={apiReferenceUrl}
+ />
+ </div>
+ </div>
+ {showExternalApiPanel && canConnectExternalDataset && (
+ <ExternalAPIPanel
+ canManageExternalKnowledgeApi={canConnectExternalDataset}
+ onClose={() => setShowExternalApiPanel(false)}
+ />
+ )}
+ </div>
+ )
+}
diff --git a/web/features/new-rag/list/__tests__/delete-knowledge-space.browser.spec.tsx b/web/features/new-rag/list/__tests__/delete-knowledge-space.browser.spec.tsx
index a0e668ad335..34e63dc8a0b 100644
--- a/web/features/new-rag/list/__tests__/delete-knowledge-space.browser.spec.tsx
+++ b/web/features/new-rag/list/__tests__/delete-knowledge-space.browser.spec.tsx
@@ -81,7 +81,7 @@ async function setup(ids: string[]) {
const screen = await render(
<QueryClientTestProvider queryClient={queryClient}>
<NuqsTestingAdapter>
- <NewKnowledgeList view="agent" onViewChange={vi.fn()} />
+ <NewKnowledgeList />
</NuqsTestingAdapter>
</QueryClientTestProvider>,
)
diff --git a/web/features/new-rag/list/__tests__/knowledge-view-switcher.spec.tsx b/web/features/new-rag/list/__tests__/knowledge-view-switcher.spec.tsx
index 0cc4e66fa40..628c3fe933e 100644
--- a/web/features/new-rag/list/__tests__/knowledge-view-switcher.spec.tsx
+++ b/web/features/new-rag/list/__tests__/knowledge-view-switcher.spec.tsx
@@ -22,4 +22,17 @@ describe('KnowledgeViewSwitcher', () => {
expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
expect(onChange).not.toHaveBeenCalled()
})
+
+ it('leaves focus alone when the guide opens itself and focuses Got it when reopened', async () => {
+ const user = userEvent.setup()
+ render(<KnowledgeViewSwitcher value="classic" onChange={vi.fn()} />)
+
+ expect(guide()).not.toContainElement(document.activeElement as HTMLElement)
+ await user.click(within(guide()).getByRole('button', { name: 'knowledgeSpace.gotIt' }))
+ await user.click(screen.getByRole('button', { name: 'knowledgeSpace.guideTitle' }))
+
+ expect(
+ await within(guide()).findByRole('button', { name: 'knowledgeSpace.gotIt' }),
+ ).toHaveFocus()
+ })
})
diff --git a/web/features/new-rag/list/__tests__/new-knowledge-list.spec.tsx b/web/features/new-rag/list/__tests__/new-knowledge-list.spec.tsx
index 7cc92fbb821..bac59becf4f 100644
--- a/web/features/new-rag/list/__tests__/new-knowledge-list.spec.tsx
+++ b/web/features/new-rag/list/__tests__/new-knowledge-list.spec.tsx
@@ -175,7 +175,7 @@ function setup({
upgrades,
}}
>
- <NewKnowledgeList view="agent" onViewChange={vi.fn()} />
+ <NewKnowledgeList />
</KnowledgeUpgradeContext>
</UrlState>
)
@@ -562,9 +562,9 @@ describe('NewKnowledgeList', () => {
})
it.each([
- ['external-connect only', ['dataset.external.connect'], true],
- ['read-only', [], false],
- ])('hides creation entries from %s users', async (_, workspacePermissionKeys, canConnect) => {
+ ['external-connect only', ['dataset.external.connect']],
+ ['read-only', []],
+ ])('hides creation entries from %s users', async (_, workspacePermissionKeys) => {
setup({ workspacePermissionKeys })
expect(await screen.findByText('knowledgeSpace.readOnlyEmpty')).toBeInTheDocument()
@@ -574,9 +574,6 @@ describe('NewKnowledgeList', () => {
expect(
screen.queryByRole('link', { name: 'knowledgeSpace.connectSource' }),
).not.toBeInTheDocument()
- expect(Boolean(screen.queryByRole('button', { name: 'dataset.externalAPIPanelTitle' }))).toBe(
- canConnect,
- )
})
})
diff --git a/web/features/new-rag/list/knowledge-view-switcher.tsx b/web/features/new-rag/list/knowledge-view-switcher.tsx
index 3562b31369e..10616e18ee7 100644
--- a/web/features/new-rag/list/knowledge-view-switcher.tsx
+++ b/web/features/new-rag/list/knowledge-view-switcher.tsx
@@ -1,6 +1,7 @@
import { Button } from '@langgenius/dify-ui/button'
import {
Popover,
+ PopoverArrow,
PopoverContent,
PopoverDescription,
PopoverTitle,
@@ -8,7 +9,7 @@ import {
} from '@langgenius/dify-ui/popover'
import { SegmentedControl, SegmentedControlItem } from '@langgenius/dify-ui/segmented-control'
import { useIsClient } from 'foxact/use-is-client'
-import { useState } from 'react'
+import { useRef, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { useDocLink } from '@/context/i18n'
import {
@@ -28,6 +29,7 @@ export function KnowledgeViewSwitcher({ value, onChange }: KnowledgeViewSwitcher
const setGuideDismissed = useSetNewKnowledgeGuideDismissed()
const isClient = useIsClient()
const [guideOpenOverride, setGuideOpenOverride] = useState<boolean | null>(null)
+ const gotItRef = useRef<HTMLButtonElement>(null)
const guideOpen = isClient && (guideOpenOverride ?? !guideDismissed)
const dismissGuide = () => {
@@ -73,14 +75,12 @@ export function KnowledgeViewSwitcher({ value, onChange }: KnowledgeViewSwitcher
/>
<PopoverContent
sideOffset={13}
+ initialFocus={guideOpenOverride ? gotItRef : false}
className="relative flex max-h-[calc(100dvh-2rem)] min-h-40.5 w-80 max-w-[calc(100vw-2rem)] flex-col"
>
- <span
- aria-hidden
- className="absolute top-[-9.59px] left-1/2 flex size-[19.456px] -translate-x-1/2 items-center justify-center"
- >
- <span className="size-[13.757px] -rotate-45 rounded-tr-xs border-t border-r border-divider-subtle bg-components-panel-bg" />
- </span>
+ <PopoverArrow className="h-[9.728px] w-[19.456px] overflow-clip data-[side=bottom]:top-[-9.728px] data-[side=top]:bottom-[-9.728px] data-[side=top]:rotate-180">
+ <span className="absolute bottom-0 left-1/2 size-[13.757px] -translate-x-1/2 translate-y-1/2 -rotate-45 rounded-tr-xs border-t border-r border-divider-subtle bg-components-panel-bg" />
+ </PopoverArrow>
<div className="flex min-h-0 flex-1 flex-col overflow-y-auto px-4 pt-3.5 pb-4">
<PopoverTitle className="system-md-medium text-text-primary">
{t(($) => $.guideTitle)}
@@ -97,7 +97,7 @@ export function KnowledgeViewSwitcher({ value, onChange }: KnowledgeViewSwitcher
>
{t(($) => $.learnMore)}
</a>
- <Button variant="primary" size="small" onClick={dismissGuide}>
+ <Button ref={gotItRef} variant="primary" size="small" onClick={dismissGuide}>
{t(($) => $.gotIt)}
</Button>
</div>
diff --git a/web/features/new-rag/list/new-knowledge-list.tsx b/web/features/new-rag/list/new-knowledge-list.tsx
index cf7571d196f..445cf125b9d 100644
--- a/web/features/new-rag/list/new-knowledge-list.tsx
+++ b/web/features/new-rag/list/new-knowledge-list.tsx
@@ -23,10 +23,7 @@ import { useTranslation } from 'react-i18next'
import { SearchInput } from '@/app/components/base/search-input'
import { CreatorFilter } from '@/app/components/datasets/creator-filter'
import { creatorIdsParser } from '@/app/components/datasets/creator-filter-query'
-import ExternalAPIPanel from '@/app/components/datasets/external-api/external-api-panel'
-import { ServiceApi } from '@/app/components/datasets/extra-info/service-api'
import { MAIN_NAV_APP_CARD_GRID_CLASS_NAME } from '@/app/components/main-nav/app-card-grid'
-import { useDocLink } from '@/context/i18n'
import { workspacePermissionKeysAtom } from '@/context/permission-state'
import { knowledgeFsUploadEnabledAtom } from '@/features/knowledge-fs-availability/state'
import { TagFilter } from '@/features/tag-management/components/tag-filter'
@@ -41,7 +38,6 @@ import { KnowledgeUpgradeCard } from '../upgrade/knowledge-upgrade-card'
import { useKnowledgeUpgrade } from '../upgrade/knowledge-upgrade-context-value'
import { matchesKnowledgeUpgradeFilters } from '../upgrade/knowledge-upgrade-filters'
import { KnowledgeSpaceCard } from './knowledge-space-card'
-import { KnowledgeViewSwitcher } from './knowledge-view-switcher'
import { NewKnowledgeEmptyState, NewKnowledgeLoadingState, NewKnowledgePageState } from './states'
const PAGE_SIZE = 30
@@ -95,13 +91,7 @@ function isUnavailableError(error: unknown) {
return status === 404 || status === 503
}
-export function NewKnowledgeList({
- view,
- onViewChange,
-}: {
- view: 'classic' | 'agent'
- onViewChange: (value: 'classic' | 'agent') => void
-}) {
+export function NewKnowledgeList() {
const { t } = useTranslation(['knowledgeSpace', 'dataset'])
const { t: tCommon } = useTranslation(['common'])
const queryClient = useQueryClient()
@@ -119,9 +109,6 @@ export function NewKnowledgeList({
context: { silent: true },
}),
)
- const docLink = useDocLink()
- const { data: apiBaseInfo } = useQuery(consoleQuery.datasets.apiBaseInfo.get.queryOptions())
- const [showExternalApiPanel, setShowExternalApiPanel] = useState(false)
const [showTagManagementModal, setShowTagManagementModal] = useState(false)
const [highlightedControlSpaceId, setHighlightedControlSpaceId] = useState<string>()
const workspacePermissionKeys = useAtomValue(workspacePermissionKeysAtom)
@@ -269,72 +256,40 @@ export function NewKnowledgeList({
aria-label={t(($) => $.new)}
className="relative flex grow flex-col overflow-y-auto bg-background-body focus-visible:outline-2 focus-visible:outline-state-accent-solid"
>
- <header className="sticky top-0 z-10 flex flex-col gap-3.5 bg-background-body px-4 pt-4 pb-2 sm:px-8">
- <div className="flex min-h-6 flex-wrap items-center justify-between gap-2">
- <div className="flex min-w-0 flex-wrap items-center gap-2">
- <h1 className="text-[18px]/[21.6px] font-semibold text-text-primary">
- {t(($) => $.knowledge, { ns: 'dataset' })}
- </h1>
- <KnowledgeViewSwitcher value={view} onChange={onViewChange} />
- </div>
- <div className="flex max-w-full shrink-0 flex-wrap items-center gap-2">
- {canConnect && (
- <Button
- variant="ghost"
- size="small"
- className="overflow-hidden text-text-tertiary"
- onClick={() => setShowExternalApiPanel(true)}
- >
- <span
- aria-hidden
- className="i-custom-vender-solid-development-api-connection-mod size-3.5 shrink-0"
- />
- <span className="system-xs-medium">
- {t(($) => $.externalAPIPanelTitle, { ns: 'dataset' })}
- </span>
- </Button>
- )}
- <ServiceApi
- apiBaseUrl={apiBaseInfo?.api_base_url ?? ''}
- apiReferenceUrl={docLink('/api-reference/guides/knowledge-base')}
- />
- </div>
+ <header className="sticky top-0 z-10 flex flex-wrap items-center justify-between gap-2 bg-background-body px-4 pt-3.5 pb-2 sm:px-8">
+ <div className="flex min-w-0 flex-1 flex-wrap items-center gap-2">
+ <TagFilter
+ type="knowledge"
+ value={tagIds}
+ onChange={(nextTagIds) => void setTagIds(nextTagIds)}
+ onOpenTagManagement={() => setShowTagManagementModal(true)}
+ showLeadingIcon={false}
+ triggerClassName="min-w-0"
+ />
+ <CreatorFilter
+ value={creatorIds}
+ onChange={(nextCreatorIds) => void setCreatorIds(nextCreatorIds)}
+ />
+ <SearchInput
+ className="w-full min-w-0 sm:w-50"
+ value={searchValue}
+ onValueChange={(value) => void setSearchValue(value || null)}
+ />
</div>
- <div className="flex flex-wrap items-center justify-between gap-2">
- <div className="flex min-w-0 flex-1 flex-wrap items-center gap-2">
- <TagFilter
- type="knowledge"
- value={tagIds}
- onChange={(nextTagIds) => void setTagIds(nextTagIds)}
- onOpenTagManagement={() => setShowTagManagementModal(true)}
- showLeadingIcon={false}
- triggerClassName="min-w-0"
- />
- <CreatorFilter
- value={creatorIds}
- onChange={(nextCreatorIds) => void setCreatorIds(nextCreatorIds)}
- />
- <SearchInput
- className="w-full min-w-0 sm:w-50"
- value={searchValue}
- onValueChange={(value) => void setSearchValue(value || null)}
- />
+ {canCreate && (
+ <div className="flex items-center gap-1">
+ <Link
+ href="/datasets/new/create"
+ className={cn(
+ buttonVariants({ variant: 'primary', size: 'medium' }),
+ 'w-24 gap-0.5 overflow-hidden p-2!',
+ )}
+ >
+ <span aria-hidden className="i-ri-add-line size-4 shrink-0" />
+ <span className="pl-1">{createLabel}</span>
+ </Link>
</div>
- {canCreate && (
- <div className="flex items-center gap-1">
- <Link
- href="/datasets/new/create"
- className={cn(
- buttonVariants({ variant: 'primary', size: 'medium' }),
- 'w-24 gap-0.5 overflow-hidden p-2!',
- )}
- >
- <span aria-hidden className="i-ri-add-line size-4 shrink-0" />
- <span className="pl-1">{createLabel}</span>
- </Link>
- </div>
- )}
- </div>
+ )}
</header>
<div className="flex min-h-0 flex-1 flex-col">
{knowledgeSpacesQuery.isPending || (upgradeRecoveryPending && !hasVisibleKnowledge) ? (
@@ -523,12 +478,6 @@ export function NewKnowledgeList({
})
}}
/>
- {showExternalApiPanel && canConnect && (
- <ExternalAPIPanel
- canManageExternalKnowledgeApi={canConnect}
- onClose={() => setShowExternalApiPanel(false)}
- />
- )}
</section>
)
}