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: preserve knowledge sidebar when adding files (#44552)

Joel0d06488de5df
diff --git a/web/app/(commonLayout)/@detailSidebar/datasets/[datasetId]/documents/create-from-pipeline/page.tsx b/web/app/(commonLayout)/@detailSidebar/datasets/[datasetId]/documents/create-from-pipeline/page.tsx
index 4418c174f78..afe08424660 100644
--- a/web/app/(commonLayout)/@detailSidebar/datasets/[datasetId]/documents/create-from-pipeline/page.tsx
+++ b/web/app/(commonLayout)/@detailSidebar/datasets/[datasetId]/documents/create-from-pipeline/page.tsx
@@ -1,3 +1,5 @@
+import { DatasetDetailSidebarSlot } from '../../sidebar-page'
+
export default function DatasetDocumentCreateFromPipelineDetailSidebarSlot() {
- return null
+ return <DatasetDetailSidebarSlot />
}
diff --git a/web/app/(commonLayout)/@detailSidebar/datasets/[datasetId]/documents/create/page.tsx b/web/app/(commonLayout)/@detailSidebar/datasets/[datasetId]/documents/create/page.tsx
index 9888c2f3197..3f2b1f4a8af 100644
--- a/web/app/(commonLayout)/@detailSidebar/datasets/[datasetId]/documents/create/page.tsx
+++ b/web/app/(commonLayout)/@detailSidebar/datasets/[datasetId]/documents/create/page.tsx
@@ -1,3 +1,5 @@
+import { DatasetDetailSidebarSlot } from '../../sidebar-page'
+
export default function DatasetDocumentCreateDetailSidebarSlot() {
- return null
+ return <DatasetDetailSidebarSlot />
}
diff --git a/web/app/components/main-nav/__tests__/index.spec.tsx b/web/app/components/main-nav/__tests__/index.spec.tsx
index 96aa7949ca5..d813b811d9b 100644
--- a/web/app/components/main-nav/__tests__/index.spec.tsx
+++ b/web/app/components/main-nav/__tests__/index.spec.tsx
@@ -654,23 +654,20 @@ describe('MainNav', () => {
)
})
- it.each([
- '/datasets/create',
- '/datasets/create-from-pipeline',
- '/datasets/connect',
- '/datasets/dataset-1/documents/create',
- '/datasets/dataset-1/documents/create-from-pipeline',
- ])('keeps global navigation on dataset creation route %s', (pathname) => {
- mockPathname = pathname
+ it.each(['/datasets/create', '/datasets/create-from-pipeline', '/datasets/connect'])(
+ 'keeps global navigation on dataset creation route %s',
+ (pathname) => {
+ mockPathname = pathname
- renderMainNav()
+ renderMainNav()
- expect(screen.getByRole('button', { name: workspaceMenuAccessibleName })).toBeInTheDocument()
- expect(screen.getByRole('link', { name: /navigation.menus.datasets/ })).toHaveAttribute(
- 'href',
- '/datasets',
- )
- })
+ expect(screen.getByRole('button', { name: workspaceMenuAccessibleName })).toBeInTheDocument()
+ expect(screen.getByRole('link', { name: /navigation.menus.datasets/ })).toHaveAttribute(
+ 'href',
+ '/datasets',
+ )
+ },
+ )
it.each(['/marketplace', '/plugins', '/templates', '/templates/marketing'])(
'marks marketplace active on route %s',
diff --git a/web/app/components/main-nav/__tests__/layout.spec.tsx b/web/app/components/main-nav/__tests__/layout.spec.tsx
index 3df0e5a15eb..88d157473d4 100644
--- a/web/app/components/main-nav/__tests__/layout.spec.tsx
+++ b/web/app/components/main-nav/__tests__/layout.spec.tsx
@@ -3,6 +3,8 @@ import { screen } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
import { createStore, Provider, useAtomValue, useSetAtom } from 'jotai'
import { renderToString } from 'react-dom/server'
+import DatasetDocumentCreateFromPipelineDetailSidebarSlot from '@/app/(commonLayout)/@detailSidebar/datasets/[datasetId]/documents/create-from-pipeline/page'
+import DatasetDocumentCreateDetailSidebarSlot from '@/app/(commonLayout)/@detailSidebar/datasets/[datasetId]/documents/create/page'
import {
detailSidebarModeAtom,
setDetailSidebarModeAtom,
@@ -55,6 +57,10 @@ vi.mock('../index', () => ({
),
}))
+vi.mock('@/app/components/app-sidebar/dataset-detail-sidebar', () => ({
+ DatasetDetailSidebar: () => <aside aria-label="Knowledge sidebar">Knowledge sidebar</aside>,
+}))
+
describe('MainNavLayout', () => {
beforeEach(() => {
vi.clearAllMocks()
@@ -181,27 +187,50 @@ describe('MainNavLayout', () => {
expect(screen.getByTestId('main-nav')).toBeInTheDocument()
})
- it.each(['/datasets/create', '/datasets/dataset-1/documents/create', '/deployments/create'])(
- 'keeps the global main nav on collection and creation route %s',
- (pathname) => {
- ;(usePathname as Mock).mockReturnValue(pathname)
+ it.each([
+ ['/datasets/dataset-1/documents/create', DatasetDocumentCreateDetailSidebarSlot],
+ [
+ '/datasets/dataset-1/documents/create-from-pipeline',
+ DatasetDocumentCreateFromPipelineDetailSidebarSlot,
+ ],
+ ] as const)(
+ 'keeps the Knowledge sidebar on document upload route %s',
+ (pathname, SidebarSlot) => {
+ vi.mocked(usePathname).mockReturnValue(pathname)
render(
- <MainNavLayout
- initialDetailSidebarMode="expand"
- detailSidebar={<aside aria-label="Detail sidebar">Detail sidebar</aside>}
- >
- <div>content</div>
+ <MainNavLayout initialDetailSidebarMode="expand" detailSidebar={<SidebarSlot />}>
+ <div>document upload</div>
</MainNavLayout>,
)
- expect(screen.getByTestId('main-nav')).toBeInTheDocument()
- expect(
- screen.queryByRole('complementary', { name: 'Detail sidebar' }),
- ).not.toBeInTheDocument()
+ expect(screen.getByRole('complementary', { name: 'Knowledge sidebar' })).toBeInTheDocument()
+ expect(screen.queryByTestId('main-nav')).not.toBeInTheDocument()
+ expect(screen.getByRole('main')).toHaveTextContent('document upload')
},
)
+ it.each([
+ '/datasets/create',
+ '/datasets/create-from-pipeline',
+ '/datasets/connect',
+ '/deployments/create',
+ ])('keeps the global main nav on collection and creation route %s', (pathname) => {
+ ;(usePathname as Mock).mockReturnValue(pathname)
+
+ render(
+ <MainNavLayout
+ initialDetailSidebarMode="expand"
+ detailSidebar={<aside aria-label="Detail sidebar">Detail sidebar</aside>}
+ >
+ <div>content</div>
+ </MainNavLayout>,
+ )
+
+ expect(screen.getByTestId('main-nav')).toBeInTheDocument()
+ expect(screen.queryByRole('complementary', { name: 'Detail sidebar' })).not.toBeInTheDocument()
+ })
+
it.each([
{ pathname: '/agents/agent-1/configure', datasetOperator: true, agentV2Enabled: true },
{ pathname: '/agents/agent-1/configure', datasetOperator: false, agentV2Enabled: false },
diff --git a/web/app/components/main-nav/routes.ts b/web/app/components/main-nav/routes.ts
index 9f068a12058..8fa5154d02b 100644
--- a/web/app/components/main-nav/routes.ts
+++ b/web/app/components/main-nav/routes.ts
@@ -3,7 +3,6 @@ import { buildIntegrationPath } from '@/app/components/integrations/routes'
type MainNavRouteVisibility = (options: MainNavRouteVisibilityOptions) => boolean
const DATASET_COLLECTION_ROUTES = new Set(['create', 'create-from-pipeline', 'connect'])
-const DATASET_DOCUMENT_CREATION_ROUTES = new Set(['create', 'create-from-pipeline'])
export type MainNavRouteConfig = {
key: string
@@ -127,7 +126,7 @@ function isAppDetailPathname(pathname: string) {
}
function isDatasetDetailPathname(pathname: string) {
- const [section, datasetId, subSection, action] = pathname.split('/').filter(Boolean)
+ const [section, datasetId, subSection] = pathname.split('/').filter(Boolean)
if (section !== 'datasets' || !datasetId) return false
@@ -135,9 +134,6 @@ function isDatasetDetailPathname(pathname: string) {
if (datasetId === 'new' && subSection === 'create') return false
- if (subSection === 'documents' && action && DATASET_DOCUMENT_CREATION_ROUTES.has(action))
- return false
-
return true
}