opensource/dify
2
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-09-02 14:25:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(knowledge_fs): allow updating external access before profile activation

Browse Source
This commit is contained in:
Stephen Zhou 2026-08-26 11:38:50 +08:00
parent d002f60272
commit eeade9c19f
No known key found for this signature in database
2 changed files with 70 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
web/features/new-rag/__tests__/knowledge-settings-form.spec.tsx
View File

@ -627,6 +627,73 @@ describe('KnowledgeSettingsForm', () => {
expect(toastMock.success).not.toHaveBeenCalled()
})
it('keeps access channels submittable before the first model profile activates', async () => {
const user = userEvent.setup()
renderForm({
settings: {
...settings,
active_profile_available: false,
active_profile_revisions: {},
capabilities: {
deep: false,
index: false,
ingest: true,
query: false,
research: false,
source_sync: true,
},
},
})
const apiAccessSwitch = screen.getByRole('switch', {
name: 'dataset.newKnowledge.apiAgentAccess',
})
const workflowAccessSwitch = screen.getByRole('switch', {
name: 'dataset.newKnowledge.workflowAccess',
})
expect(apiAccessSwitch).not.toHaveAttribute('aria-disabled', 'true')
expect(workflowAccessSwitch).not.toHaveAttribute('aria-disabled', 'true')
expect(apiAccessSwitch).toHaveAccessibleDescription(
'dataset.newKnowledge.settings.apiAccessDescription',
)
await user.click(apiAccessSwitch)
await waitFor(() => {
expect(serviceMock.patchExternalAccess).toHaveBeenCalledWith(
{
body: {
agent_enabled: false,
mcp_enabled: true,
service_api_enabled: false,
workflow_enabled: true,
},
params: { control_space_id: 'space-1' },
},
expect.anything(),
)
})
await waitFor(() => expect(apiAccessSwitch).toHaveAttribute('aria-checked', 'false'))
expect(apiAccessSwitch).not.toHaveAttribute('aria-disabled', 'true')
expect(workflowAccessSwitch).not.toHaveAttribute('aria-disabled', 'true')
await user.click(apiAccessSwitch)
await waitFor(() => expect(serviceMock.patchExternalAccess).toHaveBeenCalledTimes(2))
expect(serviceMock.patchExternalAccess).toHaveBeenLastCalledWith(
{
body: {
agent_enabled: true,
mcp_enabled: true,
service_api_enabled: true,
workflow_enabled: true,
},
params: { control_space_id: 'space-1' },
},
expect.anything(),
)
})
it('keeps unrelated form controls interactive while external access is saving', async () => {
const user = userEvent.setup()
let finishExternalAccessSave!: (value: typeof externalAccess) => void
@ -1558,10 +1625,10 @@ describe('KnowledgeSettingsForm', () => {
)
expect(
screen.getByRole('switch', { name: 'dataset.newKnowledge.apiAgentAccess' }),
).toHaveAttribute('aria-disabled', 'true')
).not.toHaveAttribute('aria-disabled', 'true')
expect(
screen.getByRole('switch', { name: 'dataset.newKnowledge.workflowAccess' }),
).toHaveAttribute('aria-disabled', 'true')
).not.toHaveAttribute('aria-disabled', 'true')
await user.click(
screen.getByRole('button', {

3
web/features/new-rag/knowledge-settings-form.tsx
View File

@ -366,7 +366,6 @@ export function KnowledgeSettingsForm({
const canManageAccess = space.permission_keys.includes('knowledge_space_access_config')
const canDelete = space.permission_keys.includes('knowledge_space_delete')
const initialModelSetup = !settings.active_profile_available
const modelSetupReady = settings.active_profile_available
const readinessFieldLabel = (field: KnowledgeFsSettingsResponse['issues'][number]['field']) => {
if (field === 'embedding') return tSettings(($) => $['form.embeddingModel'])
if (field === 'reasoning') return tCommon(($) => $['modelProvider.systemReasoningModel.key'])
@ -451,7 +450,7 @@ export function KnowledgeSettingsForm({
settingsMutation.isPending ||
Boolean(pendingMigrationId)
const basicFieldsDisabled = !canEdit || isBasicSaving
const externalAccessDisabled = !canEdit || !canManageAccess || !modelSetupReady
const externalAccessDisabled = !canEdit || !canManageAccess
const retrievalFieldsDisabled = !canEdit || (!initialModelSetup && embeddingDirty)
const saveDisabled =
!basicDirty ||