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(knowledge-fs): allow shared members to use spaces in apps (#44866)

Jyongb5d3f5600f44
diff --git a/api/services/knowledge_fs/app_binding_management.py b/api/services/knowledge_fs/app_binding_management.py
index 6964f7634fe..ea3a9cb6da4 100644
--- a/api/services/knowledge_fs/app_binding_management.py
+++ b/api/services/knowledge_fs/app_binding_management.py
@@ -150,11 +150,52 @@ class KnowledgeFSAppBindingManagementService:
control_space_id: str,
payload: KnowledgeFSAppBindingPayload,
) -> KnowledgeFSAppBindingResponse:
+ """Manage a space's grants from its access settings."""
self._authorize(
tenant_id=tenant_id,
actor_account_id=actor_account_id,
control_space_id=control_space_id,
)
+ return self._upsert(
+ tenant_id=tenant_id,
+ actor_account_id=actor_account_id,
+ control_space_id=control_space_id,
+ payload=payload,
+ )
+
+ def upsert_for_app(
+ self,
+ *,
+ tenant_id: str,
+ actor_account_id: str,
+ control_space_id: str,
+ payload: KnowledgeFSAppBindingPayload,
+ ) -> KnowledgeFSAppBindingResponse:
+ """Bind a readable, queryable space after the caller authorizes app editing/debugging.
+
+ Sharing a space lets its readers use it in apps without granting them control
+ of its access settings. Channel policy is still enforced at runtime admission.
+ """
+ self._authorize_app_binding(
+ tenant_id=tenant_id,
+ actor_account_id=actor_account_id,
+ control_space_id=control_space_id,
+ )
+ return self._upsert(
+ tenant_id=tenant_id,
+ actor_account_id=actor_account_id,
+ control_space_id=control_space_id,
+ payload=payload,
+ )
+
+ def _upsert(
+ self,
+ *,
+ tenant_id: str,
+ actor_account_id: str,
+ control_space_id: str,
+ payload: KnowledgeFSAppBindingPayload,
+ ) -> KnowledgeFSAppBindingResponse:
with self._session_maker.begin() as session:
if not self._apps.supports_binding(
session=session,
@@ -206,7 +247,7 @@ class KnowledgeFSAppBindingManagementService:
control_space_ids: builtins.list[str] | tuple[str, ...],
session: Session | None = None,
) -> builtins.list[KnowledgeFSAppBindingResponse]:
- """Make published Workflow bindings exactly match one validated graph snapshot."""
+ """Sync one validated graph after the caller authorizes publishing the Workflow app."""
return self._sync_bindings(
tenant_id=tenant_id,
actor_account_id=actor_account_id,
@@ -225,7 +266,7 @@ class KnowledgeFSAppBindingManagementService:
control_space_ids: builtins.list[str] | tuple[str, ...],
session: Session | None = None,
) -> builtins.list[KnowledgeFSAppBindingResponse]:
- """Reconcile the published Agent channel without changing Workflow grants."""
+ """Sync the Agent channel after the caller authorizes publishing the Agent app."""
return self._sync_bindings(
tenant_id=tenant_id,
actor_account_id=actor_account_id,
@@ -253,9 +294,10 @@ class KnowledgeFSAppBindingManagementService:
raise KnowledgeFSAppBindingManagementError("An application can bind at most 10 KnowledgeFS Spaces")
# Authorize every desired target before opening the mutation transaction. A failure therefore
- # cannot leave a partially updated set of published Workflow bindings.
+ # cannot leave a partially updated set of published app bindings. App authors need
+ # read/query access to the spaces, not permission to change their sharing settings.
for control_space_id in normalized_space_ids:
- self._authorize(
+ self._authorize_app_binding(
tenant_id=tenant_id,
actor_account_id=actor_account_id,
control_space_id=control_space_id,
@@ -417,6 +459,21 @@ class KnowledgeFSAppBindingManagementService:
caller_kinds=(caller_kind.value,),
)
+ def _authorize_app_binding(
+ self,
+ *,
+ tenant_id: str,
+ actor_account_id: str,
+ control_space_id: str,
+ ) -> None:
+ for permission in (KnowledgeFSProductPermission.READ, KnowledgeFSProductPermission.QUERY):
+ self._authorize(
+ tenant_id=tenant_id,
+ actor_account_id=actor_account_id,
+ control_space_id=control_space_id,
+ permission=permission,
+ )
+
def _authorize(
self,
*,
diff --git a/api/services/knowledge_fs/knowledge_retrieval_v2/knowledge_retrieval_v2_node.py b/api/services/knowledge_fs/knowledge_retrieval_v2/knowledge_retrieval_v2_node.py
index d3c7ea38605..2ce784eab21 100644
--- a/api/services/knowledge_fs/knowledge_retrieval_v2/knowledge_retrieval_v2_node.py
+++ b/api/services/knowledge_fs/knowledge_retrieval_v2/knowledge_retrieval_v2_node.py
@@ -366,7 +366,7 @@ class KnowledgeRetrievalV2Node(Node[KnowledgeRetrievalV2NodeData]):
def _ensure_draft_bindings(self, run_context: DifyRunContext) -> None:
# Only draft debugging may enable bindings. Explore runs the published workflow, so it must rely
- # on the bindings that already admit the app instead of requiring access-config permission.
+ # on existing app bindings instead of checking the current runner's authoring permissions.
if run_context.invoke_from is not InvokeFrom.DEBUGGER or run_context.user_from is not UserFrom.ACCOUNT:
return
binding_service = self._binding_service
diff --git a/api/services/knowledge_fs/workflow_runtime.py b/api/services/knowledge_fs/workflow_runtime.py
index 8d309a992c6..c9326304c5f 100644
--- a/api/services/knowledge_fs/workflow_runtime.py
+++ b/api/services/knowledge_fs/workflow_runtime.py
@@ -52,7 +52,7 @@ class _LazyWorkflowCapabilities:
control_space_id: str,
payload: KnowledgeFSAppBindingPayload,
) -> KnowledgeFSAppBindingResponse:
- return get_knowledge_fs_runtime(session_factory.get_session_maker()).app_bindings.upsert(
+ return get_knowledge_fs_runtime(session_factory.get_session_maker()).app_bindings.upsert_for_app(
tenant_id=tenant_id, actor_account_id=actor_account_id, control_space_id=control_space_id, payload=payload
)
diff --git a/api/tests/unit_tests/services/knowledge_fs/test_app_binding_management.py b/api/tests/unit_tests/services/knowledge_fs/test_app_binding_management.py
index c9ab2054d0f..6a349722eb7 100644
--- a/api/tests/unit_tests/services/knowledge_fs/test_app_binding_management.py
+++ b/api/tests/unit_tests/services/knowledge_fs/test_app_binding_management.py
@@ -1,5 +1,8 @@
from __future__ import annotations
+from collections.abc import Callable
+from typing import Literal
+
import pytest
from sqlalchemy import select
from sqlalchemy.orm import Session, sessionmaker
@@ -12,16 +15,27 @@ from models.knowledge_fs import (
KnowledgeFSAuthorizationRevision,
KnowledgeFSCapabilityIssuanceAudit,
KnowledgeFSControlSpace,
+ KnowledgeFSControlSpacePermission,
+ KnowledgeFSControlSpacePermissionRole,
KnowledgeFSControlSpaceState,
+ KnowledgeFSControlSpaceVisibility,
KnowledgeFSExternalAccessPolicy,
KnowledgeFSLifecycleOutbox,
)
from services.knowledge_fs.app_binding_management import (
+ KnowledgeFSAppBindingAuthorizationPort,
KnowledgeFSAppBindingManagementError,
KnowledgeFSAppBindingManagementService,
)
+from services.knowledge_fs.batch_capability import KnowledgeFSBatchCapabilityBroker
+from services.knowledge_fs.product_authorization import (
+ DifyKnowledgeFSProductRBACPort,
+ KnowledgeFSProductNotFoundError,
+)
from services.knowledge_fs.product_dto import KnowledgeFSAppBindingPayload
from services.knowledge_fs.product_operations import KnowledgeFSProductPermission
+from services.knowledge_fs.product_remote import UnavailableKnowledgeFSProductRemote
+from services.knowledge_fs.product_service import KnowledgeFSProductService
class _BindingSyncArgs(TypedDict, closed=True):
@@ -32,13 +46,19 @@ class _BindingSyncArgs(TypedDict, closed=True):
class ProductAuthorization:
- def __init__(self, *, fail_on: str | None = None) -> None:
+ def __init__(
+ self,
+ *,
+ fail_on: str | None = None,
+ permissions: frozenset[KnowledgeFSProductPermission] = frozenset(KnowledgeFSProductPermission),
+ ) -> None:
self.calls: list[dict[str, object]] = []
self.fail_on = fail_on
+ self.permissions = permissions
def authorize_control_space(self, **kwargs: object) -> object:
self.calls.append(kwargs)
- if kwargs["control_space_id"] == self.fail_on:
+ if kwargs["control_space_id"] == self.fail_on or kwargs["permission"] not in self.permissions:
raise PermissionError("forbidden")
return object()
@@ -63,13 +83,13 @@ class Revocations:
def _service(
sqlite_session: Session,
*,
- product: ProductAuthorization | None = None,
+ product: KnowledgeFSAppBindingAuthorizationPort | None = None,
apps: AppCatalog | None = None,
revocations: Revocations | None = None,
) -> KnowledgeFSAppBindingManagementService:
return KnowledgeFSAppBindingManagementService(
sessionmaker(bind=sqlite_session.get_bind(), expire_on_commit=False),
- product=product or ProductAuthorization(), # type: ignore[arg-type]
+ product=product or ProductAuthorization(),
apps=apps or AppCatalog(),
revocations=revocations or Revocations(), # type: ignore[arg-type]
)
@@ -471,3 +491,189 @@ def test_agent_sync_preserves_workflow_channel_and_rolls_back_with_publish(bindi
rows = {row.join_type: row for row in binding_session.scalars(select(AppKnowledgeFSSpaceJoin))}
assert rows[KnowledgeFSAppSpaceJoinType.WORKFLOW].status is KnowledgeFSAppSpaceJoinStatus.ACTIVE
assert rows[KnowledgeFSAppSpaceJoinType.AGENT].status is KnowledgeFSAppSpaceJoinStatus.REVOKED
+
+
+class ReadyWorkspace:
+ def require_product_routes(self, *, tenant_id: str) -> None:
+ assert tenant_id == "tenant-1"
+
+ def require_capability_v2(self, *, tenant_id: str) -> None:
+ raise AssertionError(f"Binding a space must not issue a capability for {tenant_id}")
+
+
+def shared_binding_service(
+ binding_session: Session, config_overrides: Callable[..., None]
+) -> KnowledgeFSAppBindingManagementService:
+ config_overrides(RBAC_ENABLED=False)
+ maker = sessionmaker(bind=binding_session.get_bind(), expire_on_commit=False)
+ gate = ReadyWorkspace()
+ product = KnowledgeFSProductService(
+ maker,
+ batch_capabilities=KnowledgeFSBatchCapabilityBroker(maker, cutover_gate=gate, issuer=None),
+ cutover_gate=gate,
+ remote=UnavailableKnowledgeFSProductRemote(),
+ rbac=DifyKnowledgeFSProductRBACPort(),
+ )
+ return _service(binding_session, product=product)
+
+
+def _bind_for_app(
+ service: KnowledgeFSAppBindingManagementService,
+ *,
+ space_id: str,
+ operation: Literal["draft", "workflow", "agent"],
+) -> None:
+ if operation == "draft":
+ service.upsert_for_app(
+ tenant_id="tenant-1",
+ actor_account_id="member-1",
+ control_space_id=space_id,
+ payload=KnowledgeFSAppBindingPayload(app_id="app-1", caller_kind=KnowledgeFSAppSpaceJoinType.WORKFLOW),
+ )
+ else:
+ sync = service.sync_workflow_bindings if operation == "workflow" else service.sync_agent_bindings
+ sync(
+ tenant_id="tenant-1",
+ actor_account_id="member-1",
+ app_id="app-1",
+ control_space_ids=[space_id],
+ )
+
+
+ "sqlite_session",
+ [
+ (
+ KnowledgeFSControlSpace,
+ KnowledgeFSControlSpacePermission,
+ KnowledgeFSExternalAccessPolicy,
+ KnowledgeFSAuthorizationRevision,
+ KnowledgeFSCapabilityIssuanceAudit,
+ KnowledgeFSLifecycleOutbox,
+ AppKnowledgeFSSpaceJoin,
+ )
+ ],
+ indirect=True,
+)
+class TestSharedSpaceBindings:
+ @pytest.mark.parametrize("operation", ["draft", "workflow", "agent"])
+ @pytest.mark.parametrize(
+ "visibility",
+ [KnowledgeFSControlSpaceVisibility.ALL_TEAM_MEMBERS, KnowledgeFSControlSpaceVisibility.PARTIAL_MEMBERS],
+ )
+ def test_shared_viewer_can_bind_for_debugging_and_publishing(
+ self,
+ binding_session: Session,
+ shared_binding_service: KnowledgeFSAppBindingManagementService,
+ operation: Literal["draft", "workflow", "agent"],
+ visibility: KnowledgeFSControlSpaceVisibility,
+ ) -> None:
+ space = binding_session.scalar(select(KnowledgeFSControlSpace))
+ assert space is not None
+ space.visibility = visibility
+ if visibility is KnowledgeFSControlSpaceVisibility.PARTIAL_MEMBERS:
+ binding_session.add(
+ KnowledgeFSControlSpacePermission(
+ tenant_id="tenant-1",
+ control_space_id=space.id,
+ account_id="member-1",
+ role=KnowledgeFSControlSpacePermissionRole.VIEWER,
+ )
+ )
+ binding_session.commit()
+
+ _bind_for_app(shared_binding_service, space_id=space.id, operation=operation)
+
+ binding = binding_session.scalar(select(AppKnowledgeFSSpaceJoin))
+ assert binding is not None
+ assert binding.control_space_id == space.id
+ assert binding.created_by_account_id == "member-1"
+ assert binding.status is KnowledgeFSAppSpaceJoinStatus.ACTIVE
+ assert binding.join_type is (
+ KnowledgeFSAppSpaceJoinType.AGENT if operation == "agent" else KnowledgeFSAppSpaceJoinType.WORKFLOW
+ )
+
+ @pytest.mark.parametrize("operation", ["draft", "workflow", "agent"])
+ @pytest.mark.parametrize("access", ["private", "unlisted", "other_tenant"])
+ def test_unshared_or_cross_tenant_spaces_cannot_be_bound(
+ self,
+ binding_session: Session,
+ shared_binding_service: KnowledgeFSAppBindingManagementService,
+ operation: Literal["draft", "workflow", "agent"],
+ access: str,
+ ) -> None:
+ space = binding_session.scalar(select(KnowledgeFSControlSpace))
+ assert space is not None
+ if access == "unlisted":
+ space.visibility = KnowledgeFSControlSpaceVisibility.PARTIAL_MEMBERS
+ elif access == "other_tenant":
+ space.tenant_id = "other-tenant"
+ space.visibility = KnowledgeFSControlSpaceVisibility.ALL_TEAM_MEMBERS
+ binding_session.commit()
+
+ with pytest.raises(KnowledgeFSProductNotFoundError):
+ _bind_for_app(shared_binding_service, space_id=space.id, operation=operation)
+
+ assert binding_session.scalar(select(AppKnowledgeFSSpaceJoin)) is None
+
+ @pytest.mark.parametrize("operation", ["draft", "workflow", "agent"])
+ @pytest.mark.parametrize(
+ "missing_permission", [KnowledgeFSProductPermission.READ, KnowledgeFSProductPermission.QUERY]
+ )
+ def test_binding_requires_both_read_and_query_even_with_access_configuration(
+ self,
+ binding_session: Session,
+ operation: Literal["draft", "workflow", "agent"],
+ missing_permission: KnowledgeFSProductPermission,
+ ) -> None:
+ space = binding_session.scalar(select(KnowledgeFSControlSpace))
+ assert space is not None
+ service = _service(
+ binding_session,
+ product=ProductAuthorization(permissions=frozenset(KnowledgeFSProductPermission) - {missing_permission}),
+ )
+
+ with pytest.raises(PermissionError, match="forbidden"):
+ _bind_for_app(service, space_id=space.id, operation=operation)
+
+ assert binding_session.scalar(select(AppKnowledgeFSSpaceJoin)) is None
+
+ @pytest.mark.parametrize("operation", ["list", "upsert", "revoke"])
+ def test_shared_viewer_cannot_manage_space_grants(
+ self,
+ binding_session: Session,
+ shared_binding_service: KnowledgeFSAppBindingManagementService,
+ operation: str,
+ ) -> None:
+ space = binding_session.scalar(select(KnowledgeFSControlSpace))
+ assert space is not None
+ space.visibility = KnowledgeFSControlSpaceVisibility.ALL_TEAM_MEMBERS
+ binding_session.commit()
+
+ if operation == "list":
+ with pytest.raises(PermissionError):
+ shared_binding_service.list(
+ tenant_id="tenant-1", actor_account_id="member-1", control_space_id=space.id
+ )
+ elif operation == "upsert":
+ with pytest.raises(PermissionError):
+ shared_binding_service.upsert(
+ tenant_id="tenant-1",
+ actor_account_id="member-1",
+ control_space_id=space.id,
+ payload=KnowledgeFSAppBindingPayload(
+ app_id="app-1", caller_kind=KnowledgeFSAppSpaceJoinType.WORKFLOW
+ ),
+ )
+ else:
+ with pytest.raises(PermissionError):
+ shared_binding_service.revoke(
+ tenant_id="tenant-1",
+ actor_account_id="member-1",
+ control_space_id=space.id,
+ app_id="app-1",
+ caller_kind=KnowledgeFSAppSpaceJoinType.WORKFLOW,
+ )
+
+ assert binding_session.scalar(select(AppKnowledgeFSSpaceJoin)) is None
diff --git a/api/tests/unit_tests/services/knowledge_fs/test_workflow_runtime.py b/api/tests/unit_tests/services/knowledge_fs/test_workflow_runtime.py
index 0a42b1396db..f570313f512 100644
--- a/api/tests/unit_tests/services/knowledge_fs/test_workflow_runtime.py
+++ b/api/tests/unit_tests/services/knowledge_fs/test_workflow_runtime.py
@@ -42,8 +42,8 @@ class _RecordingPort:
def list_metadata_fields(self, **kwargs: object) -> object:
return self._record("list_metadata_fields", **kwargs)
- def upsert(self, **kwargs: object) -> object:
- return self._record("upsert", **kwargs)
+ def upsert_for_app(self, **kwargs: object) -> object:
+ return self._record("upsert_for_app", **kwargs)
@dataclass
@@ -126,9 +126,9 @@ def test_application_registers_lazy_workflow_runtime_dependencies(monkeypatch: p
capabilities.upsert(
tenant_id="tenant", actor_account_id="actor", control_space_id="space", payload=binding_payload
)
- is runtime.app_bindings.results["upsert"]
+ is runtime.app_bindings.results["upsert_for_app"]
)
- assert runtime.app_bindings.calls["upsert"] == [
+ assert runtime.app_bindings.calls["upsert_for_app"] == [
{"tenant_id": "tenant", "actor_account_id": "actor", "control_space_id": "space", "payload": binding_payload}
]
assert len(resolve_runtime.calls) == 3
diff --git a/web/app/components/workflow/nodes/knowledge-retrieval-v2/components/__tests__/add-knowledge-space.spec.tsx b/web/app/components/workflow/nodes/knowledge-retrieval-v2/components/__tests__/add-knowledge-space.spec.tsx
index c3d883c7bcd..3bf7d8acb53 100644
--- a/web/app/components/workflow/nodes/knowledge-retrieval-v2/components/__tests__/add-knowledge-space.spec.tsx
+++ b/web/app/components/workflow/nodes/knowledge-retrieval-v2/components/__tests__/add-knowledge-space.spec.tsx
@@ -114,8 +114,35 @@ describe('AddKnowledgeSpace', () => {
expect(product).toHaveAttribute('aria-checked', 'true')
})
+ it.each(['all_team_members', 'partial_members'])(
+ 'allows selecting a %s space with read and query permissions',
+ async (visibility) => {
+ const user = userEvent.setup()
+ const onChange = vi.fn()
+ listSpaces.mockResolvedValue(
+ page([
+ space('shared-space', 'Shared docs', {
+ visibility,
+ permission_keys: ['knowledge_space_read', 'knowledge_space_query'],
+ }),
+ ]),
+ )
+ render(<AddKnowledgeSpace selectedSpaces={[]} onChange={onChange} />)
+
+ const dialog = await openSelector(user)
+ const shared = await within(dialog).findByRole('checkbox', { name: 'Shared docs' })
+ expect(shared).not.toHaveAttribute('aria-disabled', 'true')
+ await user.click(shared)
+ await user.click(within(dialog).getByRole('button', { name: 'common.operation.add' }))
+ expect(onChange).toHaveBeenCalledWith([
+ expect.objectContaining({ control_space_id: 'shared-space', name: 'Shared docs' }),
+ ])
+ },
+ )
+
it.each([
- ['without access configuration', { permission_keys: BINDING_PERMISSIONS.slice(0, 2) }],
+ ['without read permission', { permission_keys: ['knowledge_space_query'] }],
+ ['without query permission', { permission_keys: ['knowledge_space_read'] }],
['when inactive', { state: 'deleting' }],
])('does not offer a space %s that publishing would reject', async (_, overrides) => {
const user = userEvent.setup()
diff --git a/web/app/components/workflow/nodes/knowledge-retrieval-v2/config-helpers.ts b/web/app/components/workflow/nodes/knowledge-retrieval-v2/config-helpers.ts
index 60e277012cd..802fa523ce4 100644
--- a/web/app/components/workflow/nodes/knowledge-retrieval-v2/config-helpers.ts
+++ b/web/app/components/workflow/nodes/knowledge-retrieval-v2/config-helpers.ts
@@ -68,12 +68,11 @@ export const toControlSpaceSummary = (space: {
}
}
-/** Mirrors the published binding sync, which authorizes every selected space with these capabilities. */
+/** App authors need read/query access to a space, not permission to manage its sharing settings. */
export const canBindControlSpace = (
space: Pick<KnowledgeFsSpaceListItemResponse, 'permission_keys' | 'state' | 'technical_status'>,
) =>
space.state === 'active' &&
space.technical_status === 'available' &&
space.permission_keys.includes('knowledge_space_read') &&
- space.permission_keys.includes('knowledge_space_query') &&
- space.permission_keys.includes('knowledge_space_access_config')
+ space.permission_keys.includes('knowledge_space_query')
diff --git a/web/features/agent-v2/agent-detail/configure/components/orchestrate/knowledge/__tests__/index.spec.tsx b/web/features/agent-v2/agent-detail/configure/components/orchestrate/knowledge/__tests__/index.spec.tsx
index 693f6ded796..8bf0baf8fde 100644
--- a/web/features/agent-v2/agent-detail/configure/components/orchestrate/knowledge/__tests__/index.spec.tsx
+++ b/web/features/agent-v2/agent-detail/configure/components/orchestrate/knowledge/__tests__/index.spec.tsx
@@ -256,23 +256,45 @@ describe('KnowledgeFS composer interaction', () => {
expect(snapshot().knowledge.spaces[0].is_missing).toBe(false)
})
- it.each([
- 'knowledge_space_read',
- 'knowledge_space_query',
- 'knowledge_space_access_config',
- ] as const)('hides spaces without %s even when filtering by name', async (permission) => {
- const user = userEvent.setup()
- const restricted = space(SECOND, 'Restricted')
- restricted.permission_keys = restricted.permission_keys.filter((key) => key !== permission)
- setup([], { spaces: [space(), restricted] })
- const dialog = await open(user)
- expect(within(dialog).getAllByRole('checkbox')).toHaveLength(1)
- expect(within(dialog).queryByText('Restricted')).not.toBeInTheDocument()
- await user.type(within(dialog).getByRole('searchbox'), 'Restricted')
- expect(within(dialog).queryByRole('checkbox')).not.toBeInTheDocument()
- expect(within(dialog).getByText(/knowledgeFs.empty/)).toBeVisible()
- expect(within(dialog).queryByText(/knowledgeFs.publishPermission/)).not.toBeInTheDocument()
- })
+ it.each(['all_team_members', 'partial_members'] as const)(
+ 'allows selecting a %s space with read and query permissions',
+ async (visibility) => {
+ const user = userEvent.setup()
+ setup([], {
+ spaces: [
+ {
+ ...space(),
+ visibility,
+ permission_keys: ['knowledge_space_read', 'knowledge_space_query'],
+ },
+ ],
+ })
+ const dialog = await open(user)
+ await user.click(within(dialog).getByRole('checkbox', { name: 'Product manual' }))
+ await user.click(within(dialog).getByRole('button', { name: /operation.confirm/ }))
+ expect(snapshot().knowledge.spaces).toEqual([
+ expect.objectContaining({ control_space_id: SPACE, name: 'Product manual' }),
+ ])
+ expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
+ },
+ )
+
+ it.each(['knowledge_space_read', 'knowledge_space_query'] as const)(
+ 'hides spaces without %s even when filtering by name',
+ async (permission) => {
+ const user = userEvent.setup()
+ const restricted = space(SECOND, 'Restricted')
+ restricted.permission_keys = restricted.permission_keys.filter((key) => key !== permission)
+ setup([], { spaces: [space(), restricted] })
+ const dialog = await open(user)
+ expect(within(dialog).getAllByRole('checkbox')).toHaveLength(1)
+ expect(within(dialog).queryByText('Restricted')).not.toBeInTheDocument()
+ await user.type(within(dialog).getByRole('searchbox'), 'Restricted')
+ expect(within(dialog).queryByRole('checkbox')).not.toBeInTheDocument()
+ expect(within(dialog).getByText(/knowledgeFs.empty/)).toBeVisible()
+ expect(within(dialog).queryByText(/knowledgeFs.publishPermission/)).not.toBeInTheDocument()
+ },
+ )
it('hides unavailable and inactive spaces from the candidate list', async () => {
const user = userEvent.setup()
@@ -339,7 +361,7 @@ describe('KnowledgeFS composer interaction', () => {
],
pageParams: [1],
})
- refresh([{ ...space(), permission_keys: ['knowledge_space_read', 'knowledge_space_query'] }])
+ refresh([{ ...space(), permission_keys: ['knowledge_space_read'] }])
await waitFor(() => expect(within(dialog).queryByRole('checkbox')).not.toBeInTheDocument())
await user.click(within(dialog).getByRole('button', { name: /operation.confirm/ }))
expect(within(dialog).getByRole('alert').textContent).toMatch(/knowledgeFs.unavailable/)
diff --git a/web/features/agent-v2/agent-detail/configure/components/orchestrate/knowledge/dialog.stories.tsx b/web/features/agent-v2/agent-detail/configure/components/orchestrate/knowledge/dialog.stories.tsx
index e275d75ba34..bde6f80ee37 100644
--- a/web/features/agent-v2/agent-detail/configure/components/orchestrate/knowledge/dialog.stories.tsx
+++ b/web/features/agent-v2/agent-detail/configure/components/orchestrate/knowledge/dialog.stories.tsx
@@ -55,8 +55,7 @@ function createPreviewQueryClient(many: boolean) {
visibility: 'only_me',
permission_keys: [
'knowledge_space_read',
- 'knowledge_space_query',
- ...(index % examples.length === 5 ? [] : ['knowledge_space_access_config']),
+ ...(index % examples.length === 5 ? [] : ['knowledge_space_query']),
],
technical_summary: {
knowledge_space_id: id,
diff --git a/web/features/agent-v2/agent-detail/configure/components/orchestrate/knowledge/dialog.tsx b/web/features/agent-v2/agent-detail/configure/components/orchestrate/knowledge/dialog.tsx
index 6e7a343cac0..a49b32f77bc 100644
--- a/web/features/agent-v2/agent-detail/configure/components/orchestrate/knowledge/dialog.tsx
+++ b/web/features/agent-v2/agent-detail/configure/components/orchestrate/knowledge/dialog.tsx
@@ -46,8 +46,7 @@ const canBindSpace = (space: KnowledgeFsSpaceListItemResponse) =>
space.state === 'active' &&
space.technical_status === 'available' &&
space.permission_keys.includes('knowledge_space_read') &&
- space.permission_keys.includes('knowledge_space_query') &&
- space.permission_keys.includes('knowledge_space_access_config')
+ space.permission_keys.includes('knowledge_space_query')
function KnowledgeSpaceOption({
space,