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): hide Agent template creation in CE and EE (#44035)

Wu Tianweie2ae06ab0759
diff --git a/web/features/agent-v2/roster/components/__tests__/roster-toolbar.spec.tsx b/web/features/agent-v2/roster/components/__tests__/roster-toolbar.spec.tsx
index 57def70118f..f20ad95f92e 100644
--- a/web/features/agent-v2/roster/components/__tests__/roster-toolbar.spec.tsx
+++ b/web/features/agent-v2/roster/components/__tests__/roster-toolbar.spec.tsx
@@ -1,6 +1,8 @@
-import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
+import type { GetSystemFeaturesResponse } from '@dify/contracts/api/console/system-features/types.gen'
import { screen, within } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
+import { consoleQuery } from '@/service/console'
+import { createConsoleQueryWrapper } from '@/test/console/query-data'
import { renderWithNuqs } from '@/test/nuqs-testing'
import { RosterToolbar } from '../roster-toolbar'
@@ -27,18 +29,22 @@ vi.mock('@/next/navigation', () => ({
}))
const renderToolbar = ({
+ deploymentEdition = 'CLOUD',
publicationCounts = { drafts: 2, published: 1 },
searchParams = '',
}: {
+ deploymentEdition?: GetSystemFeaturesResponse['deployment_edition']
publicationCounts?: { drafts: number; published: number }
searchParams?: string
} = {}) => {
- const queryClient = new QueryClient()
+ const { queryClient, wrapper: ConsoleQueryProvider } = createConsoleQueryWrapper({
+ systemFeatures: { deployment_edition: deploymentEdition },
+ })
const result = renderWithNuqs(
- <QueryClientProvider client={queryClient}>
+ <ConsoleQueryProvider>
<RosterToolbar publicationCounts={publicationCounts} />
- </QueryClientProvider>,
+ </ConsoleQueryProvider>,
{ searchParams },
)
@@ -54,11 +60,12 @@ describe('RosterToolbar', () => {
it.each([
{ canCreate: true, canImport: false },
{ canCreate: true, canImport: true },
- ])('shows the permitted create and import actions: %o', async (grants) => {
+ ])('keeps SaaS creation actions permission-gated: %o', async (grants) => {
+ const user = userEvent.setup()
Object.assign(permissions, grants)
renderToolbar()
- await userEvent.click(screen.getByRole('button', { name: 'common.operation.create' }))
+ await user.click(screen.getByRole('button', { name: 'common.operation.create' }))
expect(Boolean(screen.queryByRole('menuitem', { name: 'app.newApp.startFromBlank' }))).toBe(
grants.canCreate,
@@ -66,6 +73,45 @@ describe('RosterToolbar', () => {
expect(Boolean(screen.queryByRole('menuitem', { name: /app\.importApp/ }))).toBe(
grants.canImport,
)
+ expect(Boolean(screen.queryByRole('menuitem', { name: 'app.newApp.startFromTemplate' }))).toBe(
+ grants.canImport,
+ )
+ })
+
+ it.each(['COMMUNITY', 'ENTERPRISE'] as const)(
+ 'hides Agent template creation in %s while retaining blank creation and import',
+ async (deploymentEdition) => {
+ const user = userEvent.setup()
+ renderToolbar({ deploymentEdition })
+
+ await user.click(screen.getByRole('button', { name: 'common.operation.create' }))
+
+ expect(
+ screen.queryByRole('menuitem', { name: 'app.newApp.startFromTemplate' }),
+ ).not.toBeInTheDocument()
+ expect(
+ screen.getByRole('menuitem', { name: 'app.newApp.startFromBlank' }),
+ ).toBeInTheDocument()
+ expect(screen.getByRole('menuitem', { name: /app\.importApp/ })).toBeInTheDocument()
+ },
+ )
+
+ it('opens the Agent template picker in SaaS', async () => {
+ const user = userEvent.setup()
+ const { queryClient } = renderToolbar()
+ queryClient.setQueryData(
+ consoleQuery.explore.apps.get.queryOptions({
+ input: { query: { language: 'en-US' } },
+ }).queryKey,
+ { recommended_apps: [], categories: [] },
+ )
+
+ await user.click(screen.getByRole('button', { name: 'common.operation.create' }))
+ await user.click(screen.getByRole('menuitem', { name: 'app.newApp.startFromTemplate' }))
+
+ expect(
+ await screen.findByRole('dialog', { name: 'app.newApp.startFromTemplate' }),
+ ).toBeInTheDocument()
})
it('hides the create menu when neither action is permitted', () => {
diff --git a/web/features/agent-v2/roster/components/roster-create-menu.tsx b/web/features/agent-v2/roster/components/roster-create-menu.tsx
index 36241c46481..7ef6baaf749 100644
--- a/web/features/agent-v2/roster/components/roster-create-menu.tsx
+++ b/web/features/agent-v2/roster/components/roster-create-menu.tsx
@@ -1,11 +1,13 @@
'use client'
import { useQueryClient } from '@tanstack/react-query'
+import { useAtomValue } from 'jotai'
import { useState } from 'react'
import CreateAppTemplateDialog from '@/app/components/app/create-app-dialog'
import { CreateAppDropdown } from '@/app/components/app/create-app-dropdown'
import CreateFromDSLModal from '@/app/components/app/create-from-dsl-modal'
import { useCanCreateAgents, useCanImportAgents } from '@/features/agent-v2/permissions'
+import { deploymentEditionAtom } from '@/features/system-features/state'
import { consoleQuery } from '@/service/console'
import { CreateAgentDialog } from './create-agent-dialog'
@@ -16,6 +18,8 @@ export function RosterCreateMenu() {
const [templateDialogOpen, setTemplateDialogOpen] = useState(false)
const canCreate = useCanCreateAgents()
const canImport = useCanImportAgents()
+ const deploymentEdition = useAtomValue(deploymentEditionAtom)
+ const canCreateFromTemplate = deploymentEdition === 'CLOUD' && canImport
if (!canCreate && !canImport) return null
@@ -24,9 +28,9 @@ export function RosterCreateMenu() {
<CreateAppDropdown
onCreateBlank={canCreate ? () => setCreateDialogOpen(true) : undefined}
onImportDSL={canImport ? () => setImportDialogOpen(true) : undefined}
- onCreateTemplate={canImport ? () => setTemplateDialogOpen(true) : undefined}
+ onCreateTemplate={canCreateFromTemplate ? () => setTemplateDialogOpen(true) : undefined}
/>
- {canImport && templateDialogOpen && (
+ {canCreateFromTemplate && templateDialogOpen && (
<CreateAppTemplateDialog
show
templateMode="agent"