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.

feat: optimize resource access config logic (#41164)

Wu Tianwei73dd8739ef6f
diff --git a/api/commands/rbac.py b/api/commands/rbac.py
index e6ca34afd31..22b7fe777b7 100644
--- a/api/commands/rbac.py
+++ b/api/commands/rbac.py
@@ -399,7 +399,9 @@ def migrate_dataset_permissions_to_rbac(
)
scanned_count += 1
- replace_whitelist_payload = ReplaceMemberBindings(scope=scope)
+ replace_whitelist_payload = ReplaceMemberBindings(
+ automatic_include_workspace_members=scope is RBACResourceWhitelistScope.ALL
+ )
if dry_run:
_emit_dataset_permission_migration_event(
{
diff --git a/api/controllers/common/app_access.py b/api/controllers/common/app_access.py
index 0644b09ca73..bfb3f0fc40a 100644
--- a/api/controllers/common/app_access.py
+++ b/api/controllers/common/app_access.py
@@ -17,8 +17,8 @@ if TYPE_CHECKING:
# the console and OpenAPI app-list endpoints.
APP_LIST_PERMISSION_KEYS: frozenset[str] = frozenset({"app.preview", "app.acl.preview", "app.full_access"})
-# Workspace permission key that lets a caller see apps they maintain even when
-# those apps are not in their preview whitelist.
+# Workspace permission key that lets a caller see apps they maintain when the
+# app whitelist is unrestricted.
_MANAGE_OWN_APPS_PERMISSION_KEY = "app.create_and_management"
@@ -33,7 +33,7 @@ class AppAccessFilter:
``accessible_app_ids`` of ``None`` means the caller can see every app in the
workspace (unrestricted). Otherwise it is the exact set of app ids the
- caller may preview; combined with ``can_manage_own_apps`` it also covers
+ caller may preview; combined with ``can_manage_own_apps`` it can also cover
apps the caller maintains.
"""
@@ -100,11 +100,10 @@ def resolve_app_access_filter(
if getattr(whitelist_scope, "unrestricted", False):
accessible_app_ids = permission_app_ids
else:
+ # A restricted app whitelist is the highest-priority visibility gate:
+ # default preview, per-app permission overrides, and own-app management
+ # must not expose apps outside this set.
accessible_app_ids = set(whitelist_scope.resource_ids)
- if permission_app_ids is not None:
- accessible_app_ids |= permission_app_ids
- elif has_default_preview:
- # Default preview overrides the whitelist restriction.
- accessible_app_ids = None
+ can_manage_own_apps = False
return AppAccessFilter(accessible_app_ids=accessible_app_ids, can_manage_own_apps=can_manage_own_apps)
diff --git a/api/controllers/console/app/app.py b/api/controllers/console/app/app.py
index 203c4a3dad5..8efbaf70d1f 100644
--- a/api/controllers/console/app/app.py
+++ b/api/controllers/console/app/app.py
@@ -42,7 +42,6 @@ from controllers.console.wraps import (
from core.ops.ops_trace_manager import OpsTraceManager
from core.rag.entities import PreProcessingRule, Rule, Segmentation
from core.rag.retrieval.retrieval_methods import RetrievalMethod
-from core.rbac import RBACResourceWhitelistScope
from core.trigger.constants import TRIGGER_NODE_TYPES
from extensions.ext_database import db
from fields.base import ResponseModel
@@ -711,14 +710,6 @@ class AppListApi(Resource):
app_service = AppService()
app = app_service.create_app(current_tenant_id, params, current_user, session=session)
- if dify_config.RBAC_ENABLED:
- enterprise_rbac_service.RBACService.AppAccess.replace_whitelist(
- tenant_id=str(current_tenant_id),
- account_id=current_user.id,
- app_id=str(app.id),
- payload=enterprise_rbac_service.ReplaceMemberBindings(scope=RBACResourceWhitelistScope.ALL),
- )
- initialize_created_app_rbac_access_task.delay(current_tenant_id, current_user.id, app_id=app.id)
permission_keys_map = enterprise_rbac_service.RBACService.AppPermissions.batch_get(
str(current_tenant_id),
current_user.id,
@@ -730,6 +721,17 @@ class AppListApi(Resource):
from_attributes=True,
context={"session": session},
).model_copy(update={"permission_keys": permission_keys_map.get(str(app.id), [])})
+
+ if dify_config.RBAC_ENABLED:
+ enterprise_rbac_service.RBACService.AppAccess.replace_whitelist(
+ current_tenant_id,
+ current_user.id,
+ str(app.id),
+ enterprise_rbac_service.ReplaceMemberBindings(automatic_include_workspace_members=True),
+ )
+
+ initialize_created_app_rbac_access_task.delay(current_tenant_id, current_user.id, app_id=app.id)
+
return app_detail.model_dump(mode="json"), 201
diff --git a/api/controllers/console/datasets/datasets.py b/api/controllers/console/datasets/datasets.py
index 1fef3e5e739..4be0ef1eefe 100644
--- a/api/controllers/console/datasets/datasets.py
+++ b/api/controllers/console/datasets/datasets.py
@@ -56,7 +56,6 @@ from services.app_service import AppService
from services.dataset_ref_service import DatasetRefService
from services.dataset_service import DatasetPermissionService, DatasetService, DocumentService
from services.enterprise import rbac_service as enterprise_rbac_service
-from services.enterprise.rbac_service import RBACResourceWhitelistScope, ReplaceMemberBindings
from tasks.initialize_created_app_rbac_access_task import initialize_created_app_rbac_access_task
register_response_schema_models(console_ns, ApiBaseUrlResponse, SimpleResultResponse, UsageCheckResponse)
@@ -480,15 +479,14 @@ class DatasetListApi(Resource):
}
if getattr(whitelist_scope, "unrestricted", False):
filtered_dataset_ids = permission_dataset_ids
+ include_own_datasets = "dataset.create_and_management" in permissions.workspace.permission_keys
else:
+ # A restricted dataset whitelist is the highest-priority visibility gate:
+ # default readonly, per-dataset permission overrides, and own-dataset
+ # management must not expose datasets outside this set.
filtered_dataset_ids = set(whitelist_scope.resource_ids)
- if permission_dataset_ids is not None:
- filtered_dataset_ids |= permission_dataset_ids
- elif has_default_readonly:
- filtered_dataset_ids = None
if filtered_dataset_ids is not None:
accessible_dataset_ids = sorted(filtered_dataset_ids)
- include_own_datasets = "dataset.create_and_management" in permissions.workspace.permission_keys
if query.ids:
datasets, total = DatasetService.get_datasets_by_ids(
@@ -613,23 +611,6 @@ class DatasetListApi(Resource):
except services.errors.dataset.DatasetNameDuplicateError:
raise DatasetNameDuplicateError()
- if dify_config.RBAC_ENABLED:
- if permission == DatasetPermissionEnum.ALL_TEAM:
- enterprise_rbac_service.RBACService.DatasetAccess.replace_whitelist(
- current_tenant_id,
- current_user.id,
- dataset.id,
- ReplaceMemberBindings(scope=RBACResourceWhitelistScope.ALL),
- )
- initialize_created_app_rbac_access_task.delay(current_tenant_id, current_user.id, dataset_id=dataset.id)
- else:
- enterprise_rbac_service.RBACService.DatasetAccess.replace_whitelist(
- current_tenant_id,
- current_user.id,
- dataset.id,
- ReplaceMemberBindings(scope=RBACResourceWhitelistScope.SPECIFIC),
- )
-
permission_keys_map = enterprise_rbac_service.RBACService.DatasetPermissions.batch_get(
current_tenant_id,
current_user.id,
@@ -641,6 +622,16 @@ class DatasetListApi(Resource):
dataset_detail_response_source(dataset, session=session), from_attributes=True
).model_dump(mode="json")
item["permission_keys"] = permission_keys_map.get(dataset.id, [])
+
+ if dify_config.RBAC_ENABLED:
+ enterprise_rbac_service.RBACService.DatasetAccess.replace_whitelist(
+ current_tenant_id,
+ current_user.id,
+ dataset.id,
+ enterprise_rbac_service.ReplaceMemberBindings(automatic_include_workspace_members=True),
+ )
+ initialize_created_app_rbac_access_task.delay(current_tenant_id, current_user.id, dataset_id=dataset.id)
+
return item, 201
diff --git a/api/controllers/console/datasets/datasets_document.py b/api/controllers/console/datasets/datasets_document.py
index 44af59123d1..a514d913550 100644
--- a/api/controllers/console/datasets/datasets_document.py
+++ b/api/controllers/console/datasets/datasets_document.py
@@ -60,7 +60,6 @@ from models.enums import IndexingStatus, ProcessRuleMode, SegmentStatus
from services.dataset_ref_service import DatasetRefService
from services.dataset_service import DatasetService, DocumentService
from services.enterprise import rbac_service as enterprise_rbac_service
-from services.enterprise.rbac_service import RBACResourceWhitelistScope, ReplaceMemberBindings
from services.entities.knowledge_entities.knowledge_entities import KnowledgeConfig, ProcessRule, RetrievalModel
from services.file_service import FileService
from services.vector_space_admission_service import get_vector_space_admission_error_fields
@@ -693,7 +692,7 @@ class DatasetInitApi(Resource):
current_tenant_id,
current_user.id,
dataset.id,
- ReplaceMemberBindings(scope=RBACResourceWhitelistScope.ALL),
+ enterprise_rbac_service.ReplaceMemberBindings(automatic_include_workspace_members=True),
)
initialize_created_app_rbac_access_task.delay(current_tenant_id, current_user.id, dataset_id=dataset.id)
diff --git a/api/controllers/console/datasets/external.py b/api/controllers/console/datasets/external.py
index 04f6a9fcc18..51a9cebb2f5 100644
--- a/api/controllers/console/datasets/external.py
+++ b/api/controllers/console/datasets/external.py
@@ -219,6 +219,16 @@ class ExternalApiTemplateListApi(Resource):
except services.errors.dataset.DatasetNameDuplicateError:
raise DatasetNameDuplicateError()
+ # if dify_config.RBAC_ENABLED:
+ # enterprise_rbac_service.RBACService.DatasetAccess.replace_whitelist(
+ # current_tenant_id,
+ # current_user.id,
+ # external_knowledge_api.id,
+ # enterprise_rbac_service.ReplaceMemberBindings(automatic_include_workspace_members=True),
+ # )
+ # initialize_created_app_rbac_access_task.delay(
+ # current_tenant_id, current_user.id, dataset_id=external_knowledge_api.id)
+
return external_knowledge_api_response(external_knowledge_api, session=session).model_dump(mode="json"), 201
diff --git a/api/controllers/console/datasets/rag_pipeline/rag_pipeline_datasets.py b/api/controllers/console/datasets/rag_pipeline/rag_pipeline_datasets.py
index 847aa902010..3bbbecaecfd 100644
--- a/api/controllers/console/datasets/rag_pipeline/rag_pipeline_datasets.py
+++ b/api/controllers/console/datasets/rag_pipeline/rag_pipeline_datasets.py
@@ -3,6 +3,7 @@ from pydantic import BaseModel
from werkzeug.exceptions import Forbidden
import services
+from configs import dify_config
from controllers.common.schema import JsonResponseWithStatus, register_response_schema_models, register_schema_models
from controllers.console import console_ns
from controllers.console.datasets.error import DatasetNameDuplicateError
@@ -22,8 +23,10 @@ from libs.login import login_required
from models import Account
from models.dataset import DatasetPermissionEnum
from services.dataset_service import DatasetPermissionService, DatasetService
+from services.enterprise import rbac_service as enterprise_rbac_service
from services.entities.knowledge_entities.rag_pipeline_entities import IconInfo, RagPipelineDatasetCreateEntity
from services.rag_pipeline.rag_pipeline_dsl_service import RagPipelineDslService
+from tasks.initialize_created_app_rbac_access_task import initialize_created_app_rbac_access_task
class RagPipelineDatasetImportPayload(BaseModel):
@@ -76,10 +79,11 @@ class CreateRagPipelineDatasetApi(Resource):
tenant_id=current_tenant_id,
rag_pipeline_dataset_create_entity=rag_pipeline_dataset_create_entity,
)
+ dataset_id = import_info["dataset_id"]
if rag_pipeline_dataset_create_entity.permission == "partial_members":
DatasetPermissionService.update_partial_member_list(
current_tenant_id,
- import_info["dataset_id"],
+ dataset_id,
rag_pipeline_dataset_create_entity.partial_member_list,
db.session(),
)
@@ -87,6 +91,15 @@ class CreateRagPipelineDatasetApi(Resource):
except services.errors.dataset.DatasetNameDuplicateError:
raise DatasetNameDuplicateError()
+ if dify_config.RBAC_ENABLED and dataset_id is not None:
+ enterprise_rbac_service.RBACService.DatasetAccess.replace_whitelist(
+ current_tenant_id,
+ current_user.id,
+ dataset_id,
+ enterprise_rbac_service.ReplaceMemberBindings(automatic_include_workspace_members=True),
+ )
+ initialize_created_app_rbac_access_task.delay(current_tenant_id, current_user.id, dataset_id=dataset_id)
+
return dump_response(RagPipelineImportResponse, import_info), 201
diff --git a/api/controllers/console/workspace/rbac.py b/api/controllers/console/workspace/rbac.py
index 9aaf2e59e3d..96b882871bf 100644
--- a/api/controllers/console/workspace/rbac.py
+++ b/api/controllers/console/workspace/rbac.py
@@ -13,7 +13,6 @@ from controllers.common.schema import query_params_from_model, register_response
from controllers.console import console_ns
from controllers.console.wraps import RBACPermission, RBACResourceScope, model_validate, rbac_permission_required
from core.db.session_factory import session_factory
-from core.rbac import RBACResourceWhitelistScope
from enums import DeploymentEdition
from extensions.ext_database import db
from libs.login import current_account_with_tenant, login_required
@@ -53,6 +52,7 @@ register_response_schema_models(
svc.DatasetAccessMatrix,
svc.WorkspaceAccessMatrix,
svc.ResourceWhitelist,
+ svc.ResourceWhitelistConfig,
svc.ResourceUserAccessPoliciesResponse,
svc.ReplaceUserAccessPoliciesResponse,
svc.RoleBindingsResponse,
@@ -171,6 +171,22 @@ def _hydrate_resource_user_account_names(items: list[svc.ResourceUserAccessPolic
item.account.email = account_names.get(account_id, {}).get("email", "")
+def _move_resource_maintainer_first(items: list[svc.ResourceUserAccessPolicies], maintainer_id: str | None) -> None:
+ if not maintainer_id:
+ return
+
+ normalized_maintainer_id = str(maintainer_id).strip()
+ if not normalized_maintainer_id:
+ return
+
+ for index, item in enumerate(items):
+ account_id = str(item.account.account_id or "").strip()
+ if account_id == normalized_maintainer_id:
+ if index:
+ items.insert(0, items.pop(index))
+ return
+
+
class _PaginationQuery(BaseModel):
model_config = ConfigDict(extra="ignore")
@@ -538,7 +554,7 @@ class RBACAccessPolicyBindingUnlockApi(Resource):
class _ResourceAccessScopeRequest(BaseModel):
- scope: RBACResourceWhitelistScope
+ automatic_include_workspace_members: bool
class _ReplaceBindingsRequest(BaseModel):
@@ -568,12 +584,17 @@ class _AccessControlLanguageQuery(BaseModel):
language: Literal["en", "ja", "zh"] | None = Field(default=None, description="Localized policy label language")
+class _ResourceUserAccessPoliciesQuery(_PaginationQuery):
+ language: Literal["en", "ja", "zh"] | None = Field(default=None, description="Localized policy label language")
+
+
register_schema_models(
console_ns,
_ResourceAccessScopeRequest,
_ReplaceBindingsRequest,
_DeleteMemberBindingsRequest,
_AccessControlLanguageQuery,
+ _ResourceUserAccessPoliciesQuery,
svc.ReplaceUserAccessPolicies,
)
@@ -625,21 +646,32 @@ class RBACAppWhitelistApi(Resource):
tenant_id,
account_id,
str(app_id),
- svc.ReplaceMemberBindings(scope=request.scope.value),
+ svc.ReplaceMemberBindings(automatic_include_workspace_members=request.automatic_include_workspace_members),
)
- if dify_config.RBAC_ENABLED and request.scope is RBACResourceWhitelistScope.ALL:
- initialize_created_app_rbac_access_task.delay(tenant_id, account_id, str(app_id))
+ if request.automatic_include_workspace_members:
+ initialize_created_app_rbac_access_task.delay(tenant_id, account_id, app_id=str(app_id))
return _dump(result)
+@console_ns.route("/workspaces/current/rbac/apps/<uuid:app_id>/whitelist_config")
+class RBACAppWhitelistConfigApi(Resource):
+ @login_required
+ @console_ns.response(200, "Success", console_ns.models[svc.ResourceWhitelistConfig.__name__])
+ def get(self, app_id):
+ tenant_id, account_id = _current_ids()
+ return _dump(svc.RBACService.AppAccess.whitelist_config(tenant_id, account_id, str(app_id)))
+
+
@console_ns.route("/workspaces/current/rbac/apps/<uuid:app_id>/user-access-policies")
class RBACAppUserAccessPoliciesApi(Resource):
@login_required
- @console_ns.doc(params=query_params_from_model(_AccessControlLanguageQuery))
+ @console_ns.doc(params=query_params_from_model(_ResourceUserAccessPoliciesQuery))
@console_ns.response(200, "Success", console_ns.models[svc.ResourceUserAccessPoliciesResponse.__name__])
def get(self, app_id):
tenant_id, account_id = _current_ids()
- result = svc.RBACService.AppAccess.user_access_policies(tenant_id, account_id, str(app_id))
+ options = _pagination_options()
+ result = svc.RBACService.AppAccess.user_access_policies(tenant_id, account_id, str(app_id), options=options)
+ _move_resource_maintainer_first(result.data, svc.app_maintainer_id(tenant_id, str(app_id)))
_hydrate_resource_user_account_names(result.data)
return _dump(result)
@@ -713,6 +745,15 @@ class RBACDatasetMatrixApi(Resource):
return _dump(result)
+@console_ns.route("/workspaces/current/rbac/datasets/<uuid:dataset_id>/whitelist_config")
+class RBACDatasetWhitelistConfigApi(Resource):
+ @login_required
+ @console_ns.response(200, "Success", console_ns.models[svc.ResourceWhitelistConfig.__name__])
+ def get(self, dataset_id):
+ tenant_id, account_id = _current_ids()
+ return _dump(svc.RBACService.DatasetAccess.whitelist_config(tenant_id, account_id, str(dataset_id)))
+
+
@console_ns.route("/workspaces/current/rbac/datasets/<uuid:dataset_id>/whitelist")
class RBACDatasetWhitelistApi(Resource):
@login_required
@@ -731,11 +772,11 @@ class RBACDatasetWhitelistApi(Resource):
tenant_id,
account_id,
str(dataset_id),
- svc.ReplaceMemberBindings(scope=request.scope.value),
+ svc.ReplaceMemberBindings(automatic_include_workspace_members=request.automatic_include_workspace_members),
)
# Widening the scope only records it: the members still need the default access policy
# before they can reach the dataset, same as the app whitelist route above.
- if dify_config.RBAC_ENABLED and request.scope is RBACResourceWhitelistScope.ALL:
+ if request.automatic_include_workspace_members:
initialize_created_app_rbac_access_task.delay(tenant_id, account_id, dataset_id=str(dataset_id))
return _dump(result)
@@ -743,11 +784,15 @@ class RBACDatasetWhitelistApi(Resource):
@console_ns.route("/workspaces/current/rbac/datasets/<uuid:dataset_id>/user-access-policies")
class RBACDatasetUserAccessPoliciesApi(Resource):
@login_required
- @console_ns.doc(params=query_params_from_model(_AccessControlLanguageQuery))
+ @console_ns.doc(params=query_params_from_model(_ResourceUserAccessPoliciesQuery))
@console_ns.response(200, "Success", console_ns.models[svc.ResourceUserAccessPoliciesResponse.__name__])
def get(self, dataset_id):
tenant_id, account_id = _current_ids()
- result = svc.RBACService.DatasetAccess.user_access_policies(tenant_id, account_id, str(dataset_id))
+ options = _pagination_options()
+ result = svc.RBACService.DatasetAccess.user_access_policies(
+ tenant_id, account_id, str(dataset_id), options=options
+ )
+ _move_resource_maintainer_first(result.data, svc.dataset_maintainer_id(tenant_id, str(dataset_id)))
_hydrate_resource_user_account_names(result.data)
return _dump(result)
diff --git a/api/controllers/service_api/dataset/dataset.py b/api/controllers/service_api/dataset/dataset.py
index 613486980ee..51667e1fbde 100644
--- a/api/controllers/service_api/dataset/dataset.py
+++ b/api/controllers/service_api/dataset/dataset.py
@@ -44,7 +44,7 @@ from models.dataset import DatasetPermissionEnum
from models.enums import TagType
from models.provider_ids import ModelProviderID
from services.dataset_service import DatasetPermissionService, DatasetService, DocumentService
-from services.enterprise.rbac_service import RBACResourceWhitelistScope, RBACService, ReplaceMemberBindings
+from services.enterprise import rbac_service as enterprise_rbac_service
from services.entities.knowledge_entities.knowledge_entities import (
ExternalRetrievalModel,
KnowledgeProvider,
@@ -548,21 +548,13 @@ class DatasetListApi(DatasetApiResource):
raise DatasetNameDuplicateError()
if dify_config.RBAC_ENABLED:
- if payload.permission == DatasetPermissionEnum.ALL_TEAM:
- RBACService.DatasetAccess.replace_whitelist(
- tenant_id,
- current_user.id,
- dataset.id,
- ReplaceMemberBindings(scope=RBACResourceWhitelistScope.ALL),
- )
- initialize_created_app_rbac_access_task.delay(tenant_id, current_user.id, dataset_id=dataset.id)
- else:
- RBACService.DatasetAccess.replace_whitelist(
- tenant_id,
- current_user.id,
- dataset.id,
- ReplaceMemberBindings(scope=RBACResourceWhitelistScope.SPECIFIC),
- )
+ enterprise_rbac_service.RBACService.DatasetAccess.replace_whitelist(
+ tenant_id,
+ current_user.id,
+ dataset.id,
+ enterprise_rbac_service.ReplaceMemberBindings(automatic_include_workspace_members=True),
+ )
+ initialize_created_app_rbac_access_task.delay(tenant_id, current_user.id, dataset_id=dataset.id)
return _dump_service_dataset_detail(dataset, session=session), 200
diff --git a/api/openapi/markdown/console-openapi.md b/api/openapi/markdown/console-openapi.md
index 25621593ea2..223d338d8b3 100644
--- a/api/openapi/markdown/console-openapi.md
+++ b/api/openapi/markdown/console-openapi.md
@@ -11325,6 +11325,9 @@ Returns permission flags that control workspace features like member invitations
| Name | Located in | Description | Required | Schema |
| ---- | ---------- | ----------- | -------- | ------ |
| language | query | Localized policy label language | No | string, <br>**Available values:** "en", "ja", "zh" |
+| limit | query | | No | integer |
+| page | query | | No | integer |
+| reverse | query | | No | boolean |
| app_id | path | | Yes | string (uuid) |
#### Responses
@@ -11385,6 +11388,19 @@ Returns permission flags that control workspace features like member invitations
| ---- | ----------- | ------ |
| 200 | Success | **application/json**: [ResourceWhitelist](#resourcewhitelist)<br> |
+### [GET] /workspaces/current/rbac/apps/{app_id}/whitelist_config
+#### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | | Yes | string (uuid) |
+
+#### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | **application/json**: [ResourceWhitelistConfig](#resourcewhitelistconfig)<br> |
+
### [DELETE] /workspaces/current/rbac/datasets/{dataset_id}/access-policies/{policy_id}/member-bindings
#### Parameters
@@ -11453,6 +11469,9 @@ Returns permission flags that control workspace features like member invitations
| Name | Located in | Description | Required | Schema |
| ---- | ---------- | ----------- | -------- | ------ |
| language | query | Localized policy label language | No | string, <br>**Available values:** "en", "ja", "zh" |
+| limit | query | | No | integer |
+| page | query | | No | integer |
+| reverse | query | | No | boolean |
| dataset_id | path | | Yes | string (uuid) |
#### Responses
@@ -11513,6 +11532,19 @@ Returns permission flags that control workspace features like member invitations
| ---- | ----------- | ------ |
| 200 | Success | **application/json**: [ResourceWhitelist](#resourcewhitelist)<br> |
+### [GET] /workspaces/current/rbac/datasets/{dataset_id}/whitelist_config
+#### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path | | Yes | string (uuid) |
+
+#### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | **application/json**: [ResourceWhitelistConfig](#resourcewhitelistconfig)<br> |
+
### [GET] /workspaces/current/rbac/members/{member_id}/rbac-roles
#### Parameters
@@ -21111,14 +21143,6 @@ Model class for provider quota configuration.
| ---- | ---- | ----------- | -------- |
| QuotaUnit | string | | |
-#### RBACResourceWhitelistScope
-
-Whitelist scopes accepted by RBAC app and dataset access config APIs.
-
-| Name | Type | Description | Required |
-| ---- | ---- | ----------- | -------- |
-| RBACResourceWhitelistScope | string | Whitelist scopes accepted by RBAC app and dataset access config APIs. | |
-
#### RBACRole
| Name | Type | Description | Required |
@@ -21389,7 +21413,7 @@ Whitelist scopes accepted by RBAC app and dataset access config APIs.
| Name | Type | Description | Required |
| ---- | ---- | ----------- | -------- |
| data | [ [ResourceUserAccessPolicies](#resourceuseraccesspolicies) ] | | No |
-| scope | [RBACResourceWhitelistScope](#rbacresourcewhitelistscope) | | Yes |
+| pagination | [Pagination](#pagination) | | No |
#### ResourceWhitelist
@@ -21397,6 +21421,12 @@ Whitelist scopes accepted by RBAC app and dataset access config APIs.
| ---- | ---- | ----------- | -------- |
| account_ids | [ string ] | | No |
+#### ResourceWhitelistConfig
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| automatic_include_workspace_members | boolean | | Yes |
+
#### RestrictModel
| Name | Type | Description | Required |
@@ -24981,7 +25011,16 @@ Workflow tool configuration
| Name | Type | Description | Required |
| ---- | ---- | ----------- | -------- |
-| scope | [RBACResourceWhitelistScope](#rbacresourcewhitelistscope) | | Yes |
+| automatic_include_workspace_members | boolean | | Yes |
+
+#### _ResourceUserAccessPoliciesQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| language | string | Localized policy label language | No |
+| limit | integer | | No |
+| page | integer | | No |
+| reverse | boolean | | No |
#### core__tools__entities__common_entities__I18nObject
diff --git a/api/services/enterprise/rbac_service.py b/api/services/enterprise/rbac_service.py
index fad5d1281c9..278e1475cd1 100644
--- a/api/services/enterprise/rbac_service.py
+++ b/api/services/enterprise/rbac_service.py
@@ -12,14 +12,26 @@ from sqlalchemy.exc import SQLAlchemyError
from sqlalchemy.orm import Session
from configs import dify_config
-from core.rbac import RBACResourceWhitelistScope
-from models import TenantAccountJoin, TenantAccountRole
+from core.db.session_factory import session_factory
+from models import App, Dataset, TenantAccountJoin, TenantAccountRole
from services.enterprise.base import EnterpriseRequest
T = TypeVar("T")
logger = logging.getLogger(__name__)
+def app_maintainer_id(tenant_id: str, app_id: str) -> str | None:
+ with session_factory.create_session() as session:
+ return session.scalar(select(App.maintainer).where(App.id == app_id, App.tenant_id == tenant_id))
+
+
+def dataset_maintainer_id(tenant_id: str, dataset_id: str) -> str | None:
+ with session_factory.create_session() as session:
+ return session.scalar(
+ select(Dataset.maintainer).where(Dataset.id == dataset_id, Dataset.tenant_id == tenant_id)
+ )
+
+
class _RBACModel(BaseModel):
model_config = ConfigDict(populate_by_name=True, extra="ignore")
@@ -223,6 +235,10 @@ class ResourceWhitelist(_RBACModel):
return value
+class ResourceWhitelistConfig(_RBACModel):
+ automatic_include_workspace_members: bool
+
+
class ResourceWhitelistResources(_RBACModel):
unrestricted: bool = False
resource_ids: list[str] = Field(default_factory=list)
@@ -249,8 +265,8 @@ class ResourceUserAccessPolicies(_RBACModel):
class ResourceUserAccessPoliciesResponse(_RBACModel):
- scope: RBACResourceWhitelistScope
data: list[ResourceUserAccessPolicies] = Field(default_factory=list)
+ pagination: Pagination | None = None
class ReplaceUserAccessPolicies(_RBACModel):
@@ -657,18 +673,7 @@ class ReplaceRoleBindings(_RBACModel):
class ReplaceMemberBindings(_RBACModel):
- scope: RBACResourceWhitelistScope = RBACResourceWhitelistScope.SPECIFIC
-
- @field_validator("scope")
- @classmethod
- def _normalize_scope(cls, value: Any) -> RBACResourceWhitelistScope:
- scope = str(value or "").strip().lower()
- if scope == "":
- return RBACResourceWhitelistScope.SPECIFIC
- try:
- return RBACResourceWhitelistScope(scope)
- except ValueError as exc:
- raise ValueError(f"invalid scope: {value}") from exc
+ automatic_include_workspace_members: bool = Field(default=False)
class DeleteMemberBindings(_RBACModel):
@@ -1118,14 +1123,19 @@ class RBACService:
@staticmethod
def user_access_policies(
- tenant_id: str, account_id: str | None, app_id: str
+ tenant_id: str,
+ account_id: str | None,
+ app_id: str,
+ *,
+ options: ListOption | None = None,
) -> ResourceUserAccessPoliciesResponse:
+ params = (options or ListOption()).to_params({"app_id": app_id})
data = _inner_call(
"GET",
f"{_INNER_PREFIX}/apps/user-access-policies",
tenant_id=tenant_id,
account_id=account_id,
- params={"app_id": app_id},
+ params=params,
)
return ResourceUserAccessPoliciesResponse.model_validate(data or {})
@@ -1159,6 +1169,17 @@ class RBACService:
)
return ResourceWhitelist.model_validate(data or {})
+ @staticmethod
+ def whitelist_config(tenant_id: str, account_id: str | None, app_id: str) -> ResourceWhitelistConfig:
+ data = _inner_call(
+ "GET",
+ f"{_INNER_PREFIX}/apps/whitelist",
+ tenant_id=tenant_id,
+ account_id=account_id,
+ params={"app_id": app_id},
+ )
+ return ResourceWhitelistConfig.model_validate(data or {})
+
@staticmethod
def replace_whitelist(
tenant_id: str,
@@ -1288,14 +1309,19 @@ class RBACService:
@staticmethod
def user_access_policies(
- tenant_id: str, account_id: str | None, dataset_id: str
+ tenant_id: str,
+ account_id: str | None,
+ dataset_id: str,
+ *,
+ options: ListOption | None = None,
) -> ResourceUserAccessPoliciesResponse:
+ params = (options or ListOption()).to_params({"dataset_id": dataset_id})
data = _inner_call(
"GET",
f"{_INNER_PREFIX}/datasets/user-access-policies",
tenant_id=tenant_id,
account_id=account_id,
- params={"dataset_id": dataset_id},
+ params=params,
)
return ResourceUserAccessPoliciesResponse.model_validate(data or {})
@@ -1328,6 +1354,17 @@ class RBACService:
)
return ResourceWhitelist.model_validate(data or {})
+ @staticmethod
+ def whitelist_config(tenant_id: str, account_id: str | None, dataset_id: str) -> ResourceWhitelistConfig:
+ data = _inner_call(
+ "GET",
+ f"{_INNER_PREFIX}/datasets/whitelist",
+ tenant_id=tenant_id,
+ account_id=account_id,
+ params={"dataset_id": dataset_id},
+ )
+ return ResourceWhitelistConfig.model_validate(data or {})
+
@staticmethod
def replace_whitelist(
tenant_id: str,
diff --git a/api/tests/unit_tests/commands/test_legacy_model_type_migration.py b/api/tests/unit_tests/commands/test_legacy_model_type_migration.py
index c5402df700e..23102154f1a 100644
--- a/api/tests/unit_tests/commands/test_legacy_model_type_migration.py
+++ b/api/tests/unit_tests/commands/test_legacy_model_type_migration.py
@@ -434,7 +434,7 @@ def test_dataset_permission_rbac_migration_uses_dataset_creator_as_operator(
assert calls[0]["tenant_id"] == "tenant-1"
assert calls[0]["account_id"] == "creator-account-1"
assert calls[0]["dataset_id"] == "dataset-1"
- assert calls[0]["payload"].scope is rbac_module.RBACResourceWhitelistScope.SPECIFIC
+ assert calls[0]["payload"].automatic_include_workspace_members is False
def test_dataset_permission_rbac_migration_dry_run_outputs_structured_proposed_changes(
@@ -482,7 +482,7 @@ def test_dataset_permission_rbac_migration_dry_run_outputs_structured_proposed_c
"tenant_id": "tenant-1",
"account_id": "creator-account-1",
"dataset_id": "dataset-1",
- "payload": {"scope": "specific"},
+ "payload": {"automatic_include_workspace_members": False},
},
}
assert events[1]["target_account_id"] == "member-account-1"
diff --git a/api/tests/unit_tests/controllers/common/test_app_access.py b/api/tests/unit_tests/controllers/common/test_app_access.py
index 2a3212b5940..940a7ee909c 100644
--- a/api/tests/unit_tests/controllers/common/test_app_access.py
+++ b/api/tests/unit_tests/controllers/common/test_app_access.py
@@ -114,7 +114,7 @@ class TestResolveAppAccessFilter:
assert flt.accessible_app_ids is None
assert flt.can_manage_own_apps is False
- def test_default_preview_overrides_whitelist_restriction(
+ def test_restricted_whitelist_overrides_default_preview(
self, monkeypatch: pytest.MonkeyPatch, unbound_session: Session
):
self._patch_whitelist(monkeypatch, ResourceWhitelistResources(unrestricted=False, resource_ids=["app-9"]))
@@ -124,9 +124,8 @@ class TestResolveAppAccessFilter:
flt = resolve_app_access_filter("tenant-1", "acc-1", session=unbound_session, permissions=permissions)
- # Workspace-level preview grant defeats the whitelist restriction.
- assert flt.accessible_app_ids is None
- assert flt.can_manage_own_apps is True
+ assert flt.accessible_app_ids == {"app-9"}
+ assert flt.can_manage_own_apps is False
def test_override_apps_collected_without_default_preview(
self, monkeypatch: pytest.MonkeyPatch, unbound_session: Session
@@ -143,7 +142,9 @@ class TestResolveAppAccessFilter:
assert flt.accessible_app_ids == {"app-1"}
- def test_whitelist_union_with_override_apps(self, monkeypatch: pytest.MonkeyPatch, unbound_session: Session):
+ def test_restricted_whitelist_ignores_override_apps(
+ self, monkeypatch: pytest.MonkeyPatch, unbound_session: Session
+ ):
self._patch_whitelist(monkeypatch, ResourceWhitelistResources(unrestricted=False, resource_ids=["app-5"]))
permissions = _permissions(
app_overrides=[ResourcePermissionKeys(resource_id="app-1", permission_keys=["app.acl.preview"])],
@@ -151,7 +152,7 @@ class TestResolveAppAccessFilter:
flt = resolve_app_access_filter("tenant-1", "acc-1", session=unbound_session, permissions=permissions)
- assert flt.accessible_app_ids == {"app-1", "app-5"}
+ assert flt.accessible_app_ids == {"app-5"}
def test_fetches_permissions_when_not_supplied(self, monkeypatch: pytest.MonkeyPatch, unbound_session: Session):
self._patch_whitelist(monkeypatch, ResourceWhitelistResources(unrestricted=False, resource_ids=[]))
@@ -170,5 +171,5 @@ class TestResolveAppAccessFilter:
flt = resolve_app_access_filter("tenant-1", "acc-1", session=session)
assert flt.accessible_app_ids == set()
- assert flt.can_manage_own_apps is True
+ assert flt.can_manage_own_apps is False
assert captured == {"tenant_id": "tenant-1", "account_id": "acc-1", "session": session}
diff --git a/api/tests/unit_tests/controllers/console/app/test_app_response_models.py b/api/tests/unit_tests/controllers/console/app/test_app_response_models.py
index ae4324879e6..b8a5ec91f40 100644
--- a/api/tests/unit_tests/controllers/console/app/test_app_response_models.py
+++ b/api/tests/unit_tests/controllers/console/app/test_app_response_models.py
@@ -629,19 +629,12 @@ def test_app_create_api_attaches_permission_keys(
"batch_get",
lambda tenant_id, account_id, app_ids, session: {"app-new": ["app.acl.view_layout", "app.acl.edit"]},
)
- initialize_rbac_task = MagicMock()
- monkeypatch.setattr(
- app_module,
- "initialize_created_app_rbac_access_task",
- initialize_rbac_task,
- )
- replace_whitelist = MagicMock()
monkeypatch.setattr(
app_module.enterprise_rbac_service.RBACService.AppAccess,
"replace_whitelist",
- replace_whitelist,
+ MagicMock(),
)
-
+ monkeypatch.setattr(app_module.initialize_created_app_rbac_access_task, "delay", MagicMock())
resp, status = method(
app_module.AppListApi(),
app_module.CreateAppPayload(
@@ -656,8 +649,6 @@ def test_app_create_api_attaches_permission_keys(
assert status == 201
assert resp["permission_keys"] == ["app.acl.view_layout", "app.acl.edit"]
- assert replace_whitelist.call_args.kwargs["payload"].scope is app_module.RBACResourceWhitelistScope.ALL
- initialize_rbac_task.delay.assert_called_once_with("tenant-1", "acct-1", app_id="app-new")
def test_app_list_api_attaches_permission_keys(
@@ -842,7 +833,7 @@ def test_recent_app_list_api_applies_rbac_visibility_filter(
assert resp == {"data": []}
params = get_recent_apps.call_args.args[2]
assert params.accessible_app_ids == ["app-shared"]
- assert params.include_own_apps is True
+ assert params.include_own_apps is False
def test_app_list_api_limits_to_apps_created_by_current_user_without_view_permission(
@@ -885,7 +876,7 @@ def test_app_list_api_limits_to_apps_created_by_current_user_without_view_permis
assert resp["data"] == []
params = get_paginate_apps.call_args.args[2]
assert params.accessible_app_ids == ["app-not-permitted", "app-shared"]
- assert params.include_own_apps is True
+ assert params.include_own_apps is False
assert params.is_created_by_me is None
@@ -928,9 +919,7 @@ def test_app_list_api_limits_to_preview_overrides_without_manage_own_permission(
monkeypatch.setattr(
app_module.enterprise_rbac_service.RBACService.AppAccess,
"whitelist_resources",
- lambda tenant_id, account_id: SimpleNamespace(
- resource_ids=["app-shared", "app-acl-shared", "app-full", "app-whitelist-only"]
- ),
+ lambda tenant_id, account_id: SimpleNamespace(resource_ids=["app-whitelist-only"]),
)
monkeypatch.setattr(
app_module.FeatureService,
@@ -941,7 +930,7 @@ def test_app_list_api_limits_to_preview_overrides_without_manage_own_permission(
method(app_module.AppListApi(), "tenant-1", "acct-1", unbound_session)
params = get_paginate_apps.call_args.args[2]
- assert params.accessible_app_ids == ["app-acl-shared", "app-full", "app-shared", "app-whitelist-only"]
+ assert params.accessible_app_ids == ["app-whitelist-only"]
assert params.include_own_apps is False
assert params.is_created_by_me is None
diff --git a/api/tests/unit_tests/controllers/console/datasets/test_datasets.py b/api/tests/unit_tests/controllers/console/datasets/test_datasets.py
index 1bbc48896cd..c4e8e7569f7 100644
--- a/api/tests/unit_tests/controllers/console/datasets/test_datasets.py
+++ b/api/tests/unit_tests/controllers/console/datasets/test_datasets.py
@@ -255,7 +255,7 @@ class TestDatasetList:
assert status == 200
assert resp["data"][0]["permission_keys"] == ["dataset.acl.readonly", "dataset.acl.edit"]
- def test_get_limits_to_own_datasets_without_default_read_permission(self, app: Flask):
+ def test_get_restricted_whitelist_blocks_own_dataset_fallback(self, app: Flask):
api = DatasetListApi()
method = unwrap(api.get)
current_user = self._mock_user()
@@ -280,9 +280,9 @@ class TestDatasetList:
):
method(api, MagicMock(), "tenant-1", current_user)
assert get_datasets.call_args.kwargs["accessible_dataset_ids"] == []
- assert get_datasets.call_args.kwargs["include_own_datasets"] is True
+ assert get_datasets.call_args.kwargs["include_own_datasets"] is False
- def test_get_workspace_owner_bypasses_dataset_whitelist(self, app: Flask):
+ def test_get_default_read_is_unrestricted_when_whitelist_unrestricted(self, app: Flask):
api = DatasetListApi()
method = unwrap(api.get)
current_user = self._mock_user()
@@ -306,7 +306,32 @@ class TestDatasetList:
method(api, MagicMock(), "tenant-1", current_user)
assert get_datasets.call_args.kwargs["accessible_dataset_ids"] is None
- def test_get_limits_to_dataset_read_overrides(self, app: Flask):
+ def test_get_restricted_whitelist_overrides_default_read_permission(self, app: Flask):
+ api = DatasetListApi()
+ method = unwrap(api.get)
+ current_user = self._mock_user()
+ permissions = enterprise_rbac_service.MyPermissionsResponse(
+ dataset=enterprise_rbac_service.ResourcePermissionSnapshot(default_permission_keys=["dataset.preview"])
+ )
+ with app.test_request_context("/datasets"):
+ with (
+ patch("controllers.console.datasets.datasets.dify_config.RBAC_ENABLED", True),
+ patch.object(DatasetService, "get_datasets", return_value=([], 0)) as get_datasets,
+ patch(
+ "controllers.console.datasets.datasets.enterprise_rbac_service.RBACService.MyPermissions.get",
+ return_value=permissions,
+ ),
+ patch(
+ "controllers.console.datasets.datasets.enterprise_rbac_service.RBACService.DatasetAccess.whitelist_resources",
+ return_value=SimpleNamespace(resource_ids=["dataset-whitelist-only"]),
+ ),
+ patch.object(ProviderManager, "get_configurations", return_value=MagicMock(get_models=lambda **_: [])),
+ ):
+ method(api, MagicMock(), "tenant-1", current_user)
+ assert get_datasets.call_args.kwargs["accessible_dataset_ids"] == ["dataset-whitelist-only"]
+ assert get_datasets.call_args.kwargs["include_own_datasets"] is False
+
+ def test_get_restricted_whitelist_ignores_dataset_read_overrides(self, app: Flask):
api = DatasetListApi()
method = unwrap(api.get)
current_user = self._mock_user()
@@ -336,17 +361,12 @@ class TestDatasetList:
),
patch(
"controllers.console.datasets.datasets.enterprise_rbac_service.RBACService.DatasetAccess.whitelist_resources",
- return_value=SimpleNamespace(
- resource_ids=["dataset-shared", "dataset-acl-shared", "dataset-full", "dataset-whitelist-only"]
- ),
+ return_value=SimpleNamespace(resource_ids=["dataset-whitelist-only"]),
),
patch.object(ProviderManager, "get_configurations", return_value=MagicMock(get_models=lambda **_: [])),
):
method(api, MagicMock(), "tenant-1", current_user)
assert get_datasets.call_args.kwargs["accessible_dataset_ids"] == [
- "dataset-acl-shared",
- "dataset-full",
- "dataset-shared",
"dataset-whitelist-only",
]
assert get_datasets.call_args.kwargs["include_own_datasets"] is False
diff --git a/api/tests/unit_tests/controllers/console/datasets/test_datasets_document.py b/api/tests/unit_tests/controllers/console/datasets/test_datasets_document.py
index f02256acb18..459af12ba76 100644
--- a/api/tests/unit_tests/controllers/console/datasets/test_datasets_document.py
+++ b/api/tests/unit_tests/controllers/console/datasets/test_datasets_document.py
@@ -51,7 +51,6 @@ from models.dataset import Dataset, DatasetPermissionEnum
from models.dataset import Document as DatasetDocument
from models.enums import DataSourceType, DocumentCreatedFrom, IndexingStatus
from services.dataset_ref_service import DatasetRef, DocumentRef
-from services.enterprise.rbac_service import RBACResourceWhitelistScope, ReplaceMemberBindings
from services.vector_space_admission_service import (
VECTOR_SPACE_ADMISSION_ERROR_CODE,
format_vector_space_admission_error,
@@ -516,10 +515,8 @@ class TestDatasetInitApi:
),
patch(
"controllers.console.datasets.datasets_document.enterprise_rbac_service.RBACService.DatasetAccess.replace_whitelist"
- ) as replace_whitelist,
- patch(
- "controllers.console.datasets.datasets_document.initialize_created_app_rbac_access_task"
- ) as initialize_rbac_task,
+ ),
+ patch("controllers.console.datasets.datasets_document.initialize_created_app_rbac_access_task.delay"),
):
response = method(api, session, tenant_id, user)
assert response["dataset"]["id"] == "ds-1"
@@ -528,13 +525,6 @@ class TestDatasetInitApi:
assert response["documents"][0]["doc_metadata"] == []
assert response["batch"] == "batch-init"
assert created_dataset.permission == DatasetPermissionEnum.ALL_TEAM
- replace_whitelist.assert_called_once_with(
- tenant_id,
- user.id,
- created_dataset.id,
- ReplaceMemberBindings(scope=RBACResourceWhitelistScope.ALL),
- )
- initialize_rbac_task.delay.assert_called_once_with(tenant_id, user.id, dataset_id=created_dataset.id)
class TestDocumentResource:
diff --git a/api/tests/unit_tests/controllers/console/workspace/test_rbac.py b/api/tests/unit_tests/controllers/console/workspace/test_rbac.py
index d9a88e630bd..861cce48d24 100644
--- a/api/tests/unit_tests/controllers/console/workspace/test_rbac.py
+++ b/api/tests/unit_tests/controllers/console/workspace/test_rbac.py
@@ -127,6 +127,27 @@ class TestAccessMatrixAccountNames:
assert items[0].account.account_name == "Alice"
+ def test_moves_resource_maintainer_to_first_position(self):
+ items = [
+ rbac_mod.svc.ResourceUserAccessPolicies(account={"account_id": "acct-2"}),
+ rbac_mod.svc.ResourceUserAccessPolicies(account={"account_id": "acct-maintainer"}),
+ rbac_mod.svc.ResourceUserAccessPolicies(account={"account_id": "acct-3"}),
+ ]
+
+ rbac_mod._move_resource_maintainer_first(items, "acct-maintainer")
+
+ assert [item.account.account_id for item in items] == ["acct-maintainer", "acct-2", "acct-3"]
+
+ def test_keeps_resource_user_order_when_maintainer_is_not_on_page(self):
+ items = [
+ rbac_mod.svc.ResourceUserAccessPolicies(account={"account_id": "acct-2"}),
+ rbac_mod.svc.ResourceUserAccessPolicies(account={"account_id": "acct-3"}),
+ ]
+
+ rbac_mod._move_resource_maintainer_first(items, "acct-maintainer")
+
+ assert [item.account.account_id for item in items] == ["acct-2", "acct-3"]
+
class TestPydanticModels:
"""The internal `_…Request` models are the contract between the browser
@@ -165,20 +186,13 @@ class TestPydanticModels:
with pytest.raises(ValidationError):
rbac_mod._AccessPolicyCreateRequest.model_validate({"name": "bad", "resource_type": "unknown"})
- def test_resource_access_scope_requires_scope(self):
+ def test_resource_access_scope_requires_automatic_include_workspace_members(self):
with pytest.raises(ValidationError):
rbac_mod._ResourceAccessScopeRequest.model_validate({})
- def test_resource_access_scope_defaults_empty_account_ids(self):
- parsed = rbac_mod._ResourceAccessScopeRequest.model_validate({"scope": "specific"})
- assert parsed.scope is rbac_mod.RBACResourceWhitelistScope.SPECIFIC
-
- def test_resource_access_scope_coerce_null_account_ids(self):
- rbac_mod._ResourceAccessScopeRequest.model_validate({"scope": "all"})
-
- def test_resource_access_scope_rejects_unknown_scope(self):
- with pytest.raises(ValidationError):
- rbac_mod._ResourceAccessScopeRequest.model_validate({"scope": "team"})
+ def test_resource_access_scope_accepts_automatic_include_workspace_members(self):
+ parsed = rbac_mod._ResourceAccessScopeRequest.model_validate({"automatic_include_workspace_members": True})
+ assert parsed.automatic_include_workspace_members is True
def test_replace_bindings_keeps_role_binding_contract(self):
parsed = rbac_mod._ReplaceBindingsRequest.model_validate({"role_ids": None})
@@ -324,18 +338,18 @@ class TestResourceAccessScopeBindings:
app.test_request_context(
"/workspaces/current/rbac/apps/app-1/whitelist",
method="PUT",
- json={"scope": "all"},
+ json={"automatic_include_workspace_members": True},
),
patch("controllers.console.workspace.rbac._current_ids", return_value=("tenant-1", "acct-actor")),
patch(
"controllers.console.workspace.rbac.svc.RBACService.AppAccess.replace_whitelist",
- return_value=rbac_mod.svc.ResourceWhitelist(),
+ return_value=rbac_mod.svc.ResourceWhitelist(automatic_include_workspace_members=True),
),
patch("controllers.console.workspace.rbac.initialize_created_app_rbac_access_task") as mock_sync_task,
):
inspect.unwrap(rbac_mod.RBACAppWhitelistApi.put)(rbac_mod.RBACAppWhitelistApi(), "app-1")
- mock_sync_task.delay.assert_called_once_with("tenant-1", "acct-actor", "app-1")
+ mock_sync_task.delay.assert_called_once_with("tenant-1", "acct-actor", app_id="app-1")
def test_dataset_whitelist_all_schedules_member_policy_sync(self, app):
# Widening a dataset to the whole workspace only records the scope; without granting the
@@ -344,12 +358,12 @@ class TestResourceAccessScopeBindings:
app.test_request_context(
"/workspaces/current/rbac/datasets/dataset-1/whitelist",
method="PUT",
- json={"scope": "all"},
+ json={"automatic_include_workspace_members": True},
),
patch("controllers.console.workspace.rbac._current_ids", return_value=("tenant-1", "acct-actor")),
patch(
"controllers.console.workspace.rbac.svc.RBACService.DatasetAccess.replace_whitelist",
- return_value=rbac_mod.svc.ResourceWhitelist(),
+ return_value=rbac_mod.svc.ResourceWhitelist(automatic_include_workspace_members=True),
),
patch("controllers.console.workspace.rbac.initialize_created_app_rbac_access_task") as mock_sync_task,
):
@@ -362,12 +376,12 @@ class TestResourceAccessScopeBindings:
app.test_request_context(
"/workspaces/current/rbac/datasets/dataset-1/whitelist",
method="PUT",
- json={"scope": "specific"},
+ json={"automatic_include_workspace_members": False},
),
patch("controllers.console.workspace.rbac._current_ids", return_value=("tenant-1", "acct-actor")),
patch(
"controllers.console.workspace.rbac.svc.RBACService.DatasetAccess.replace_whitelist",
- return_value=rbac_mod.svc.ResourceWhitelist(),
+ return_value=rbac_mod.svc.ResourceWhitelist(automatic_include_workspace_members=False),
),
patch("controllers.console.workspace.rbac.initialize_created_app_rbac_access_task") as mock_sync_task,
):
@@ -375,6 +389,42 @@ class TestResourceAccessScopeBindings:
mock_sync_task.delay.assert_not_called()
+ def test_app_whitelist_config_returns_switch_state_only(self, app):
+ result = rbac_mod.svc.ResourceWhitelistConfig(automatic_include_workspace_members=True)
+ with (
+ app.test_request_context("/workspaces/current/rbac/apps/app-1/whitelist_config"),
+ patch("controllers.console.workspace.rbac._current_ids", return_value=("tenant-1", "acct-1")),
+ patch(
+ "controllers.console.workspace.rbac.svc.RBACService.AppAccess.whitelist_config",
+ return_value=result,
+ ) as mock_get,
+ ):
+ response = inspect.unwrap(rbac_mod.RBACAppWhitelistConfigApi.get)(
+ rbac_mod.RBACAppWhitelistConfigApi(),
+ "app-1",
+ )
+
+ assert response == {"automatic_include_workspace_members": True}
+ mock_get.assert_called_once_with("tenant-1", "acct-1", "app-1")
+
+ def test_dataset_whitelist_config_returns_switch_state_only(self, app):
+ result = rbac_mod.svc.ResourceWhitelistConfig(automatic_include_workspace_members=False)
+ with (
+ app.test_request_context("/workspaces/current/rbac/datasets/dataset-1/whitelist_config"),
+ patch("controllers.console.workspace.rbac._current_ids", return_value=("tenant-1", "acct-1")),
+ patch(
+ "controllers.console.workspace.rbac.svc.RBACService.DatasetAccess.whitelist_config",
+ return_value=result,
+ ) as mock_get,
+ ):
+ response = inspect.unwrap(rbac_mod.RBACDatasetWhitelistConfigApi.get)(
+ rbac_mod.RBACDatasetWhitelistConfigApi(),
+ "dataset-1",
+ )
+
+ assert response == {"automatic_include_workspace_members": False}
+ mock_get.assert_called_once_with("tenant-1", "acct-1", "dataset-1")
+
def test_app_user_access_policy_assignment_forwards_ids(self, app):
with (
app.test_request_context(
@@ -499,6 +549,56 @@ class TestPaginationForwarding:
assert options.results_per_page == 15
assert options.reverse is True
+ def test_app_user_access_policies_forwards_outer_pagination_params(self, app):
+ result = rbac_mod.svc.ResourceUserAccessPoliciesResponse()
+ with (
+ app.test_request_context(
+ "/workspaces/current/rbac/apps/app-1/user-access-policies?page=2&limit=30&reverse=false"
+ ),
+ patch("controllers.console.workspace.rbac._current_ids", return_value=("tenant-1", "acct-1")),
+ patch(
+ "controllers.console.workspace.rbac.svc.RBACService.AppAccess.user_access_policies",
+ return_value=result,
+ ) as mock_list,
+ patch("controllers.console.workspace.rbac._dump", return_value={}),
+ ):
+ inspect.unwrap(rbac_mod.RBACAppUserAccessPoliciesApi.get)(
+ rbac_mod.RBACAppUserAccessPoliciesApi(),
+ "app-1",
+ )
+
+ args, kwargs = mock_list.call_args
+ assert args == ("tenant-1", "acct-1", "app-1")
+ options = kwargs["options"]
+ assert options.page_number == 2
+ assert options.results_per_page == 30
+ assert options.reverse is False
+
+ def test_dataset_user_access_policies_forwards_outer_pagination_params(self, app):
+ result = rbac_mod.svc.ResourceUserAccessPoliciesResponse()
+ with (
+ app.test_request_context(
+ "/workspaces/current/rbac/datasets/dataset-1/user-access-policies?page=3&limit=40&reverse=true"
+ ),
+ patch("controllers.console.workspace.rbac._current_ids", return_value=("tenant-1", "acct-1")),
+ patch(
+ "controllers.console.workspace.rbac.svc.RBACService.DatasetAccess.user_access_policies",
+ return_value=result,
+ ) as mock_list,
+ patch("controllers.console.workspace.rbac._dump", return_value={}),
+ ):
+ inspect.unwrap(rbac_mod.RBACDatasetUserAccessPoliciesApi.get)(
+ rbac_mod.RBACDatasetUserAccessPoliciesApi(),
+ "dataset-1",
+ )
+
+ args, kwargs = mock_list.call_args
+ assert args == ("tenant-1", "acct-1", "dataset-1")
+ options = kwargs["options"]
+ assert options.page_number == 3
+ assert options.results_per_page == 40
+ assert options.reverse is True
+
class TestAccessPolicyBindingLockUnlock:
def test_lock_forwards_binding_id(self, app):
diff --git a/api/tests/unit_tests/services/enterprise/test_rbac_service.py b/api/tests/unit_tests/services/enterprise/test_rbac_service.py
index 5d5b6b1273a..7ba01ee3537 100644
--- a/api/tests/unit_tests/services/enterprise/test_rbac_service.py
+++ b/api/tests/unit_tests/services/enterprise/test_rbac_service.py
@@ -301,6 +301,7 @@ class TestResourceAccess:
def test_app_user_access_policies(self, mock_send: MagicMock):
mock_send.return_value = {
"scope": "specific",
+ "pagination": {"total_count": 1, "per_page": 10, "current_page": 2, "total_pages": 3},
"data": [
{
"account": {"account_id": "acct-1", "account_name": "Alice"},
@@ -323,15 +324,54 @@ class TestResourceAccess:
],
}
- out = svc.RBACService.AppAccess.user_access_policies("tenant-1", "acct-1", "app-1")
+ out = svc.RBACService.AppAccess.user_access_policies(
+ "tenant-1",
+ "acct-1",
+ "app-1",
+ options=svc.ListOption(page_number=2, results_per_page=10, reverse=False),
+ )
call = _call_args(mock_send)
assert call.method == "GET"
assert call.endpoint == "/rbac/apps/user-access-policies"
- assert call.params == {"app_id": "app-1"}
+ assert call.params == {
+ "page_number": 2,
+ "results_per_page": 10,
+ "reverse": "false",
+ "app_id": "app-1",
+ }
assert out.data[0].account.account_name == "Alice"
assert out.data[0].roles[0].id == "role-1"
assert out.data[0].access_policies[0].id == "policy-1"
+ assert out.pagination
+ assert out.pagination.current_page == 2
+ assert "scope" not in out.model_dump(mode="json")
+
+ def test_dataset_user_access_policies_forwards_pagination(self, mock_send: MagicMock):
+ mock_send.return_value = {
+ "scope": "specific",
+ "data": [],
+ "pagination": {"total_count": 0, "per_page": 20, "current_page": 1, "total_pages": 0},
+ }
+
+ out = svc.RBACService.DatasetAccess.user_access_policies(
+ "tenant-1",
+ "acct-1",
+ "dataset-1",
+ options=svc.ListOption(page_number=1, results_per_page=20, reverse=True),
+ )
+
+ call = _call_args(mock_send)
+ assert call.method == "GET"
+ assert call.endpoint == "/rbac/datasets/user-access-policies"
+ assert call.params == {
+ "page_number": 1,
+ "results_per_page": 20,
+ "reverse": "true",
+ "dataset_id": "dataset-1",
+ }
+ assert out.pagination
+ assert out.pagination.per_page == 20
def test_dataset_replace_user_access_policies(self, mock_send: MagicMock):
mock_send.return_value = {
@@ -351,7 +391,7 @@ class TestResourceAccess:
assert out.access_policies[0].id == "policy-1"
def test_dataset_whitelist(self, mock_send: MagicMock):
- mock_send.return_value = {"account_ids": ["acct-2"]}
+ mock_send.return_value = {"account_ids": ["acct-2"], "automatic_include_workspace_members": False}
out = svc.RBACService.DatasetAccess.whitelist("tenant-1", "acct-1", "dataset-1")
@@ -361,6 +401,34 @@ class TestResourceAccess:
assert call.params == {"dataset_id": "dataset-1"}
assert out.account_ids == ["acct-2"]
+ def test_app_whitelist_config(self, mock_send: MagicMock):
+ mock_send.return_value = {
+ "account_ids": ["acct-1"],
+ "automatic_include_workspace_members": True,
+ }
+
+ out = svc.RBACService.AppAccess.whitelist_config("tenant-1", "acct-1", "app-1")
+
+ call = _call_args(mock_send)
+ assert call.method == "GET"
+ assert call.endpoint == "/rbac/apps/whitelist"
+ assert call.params == {"app_id": "app-1"}
+ assert out.model_dump(mode="json") == {"automatic_include_workspace_members": True}
+
+ def test_dataset_whitelist_config(self, mock_send: MagicMock):
+ mock_send.return_value = {
+ "account_ids": ["acct-1"],
+ "automatic_include_workspace_members": False,
+ }
+
+ out = svc.RBACService.DatasetAccess.whitelist_config("tenant-1", "acct-1", "dataset-1")
+
+ call = _call_args(mock_send)
+ assert call.method == "GET"
+ assert call.endpoint == "/rbac/datasets/whitelist"
+ assert call.params == {"dataset_id": "dataset-1"}
+ assert out.model_dump(mode="json") == {"automatic_include_workspace_members": False}
+
def test_app_matrix(self, mock_send: MagicMock):
mock_send.return_value = {"resource_id": "app-1", "items": []}
out = svc.RBACService.AppAccess.matrix("tenant-1", "acct-1", "app-1")
diff --git a/packages/contracts/generated/api/console/workspaces/orpc.gen.ts b/packages/contracts/generated/api/console/workspaces/orpc.gen.ts
index 9766ed55fb1..69a7e3a9d64 100644
--- a/packages/contracts/generated/api/console/workspaces/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/workspaces/orpc.gen.ts
@@ -123,6 +123,8 @@ import {
zGetWorkspacesCurrentRbacAppsByAppIdUserAccessPoliciesPath,
zGetWorkspacesCurrentRbacAppsByAppIdUserAccessPoliciesQuery,
zGetWorkspacesCurrentRbacAppsByAppIdUserAccessPoliciesResponse,
+ zGetWorkspacesCurrentRbacAppsByAppIdWhitelistConfigPath,
+ zGetWorkspacesCurrentRbacAppsByAppIdWhitelistConfigResponse,
zGetWorkspacesCurrentRbacAppsByAppIdWhitelistPath,
zGetWorkspacesCurrentRbacAppsByAppIdWhitelistResponse,
zGetWorkspacesCurrentRbacDatasetsByDatasetIdAccessPoliciesByPolicyIdMemberBindingsPath,
@@ -135,6 +137,8 @@ import {
zGetWorkspacesCurrentRbacDatasetsByDatasetIdUserAccessPoliciesPath,
zGetWorkspacesCurrentRbacDatasetsByDatasetIdUserAccessPoliciesQuery,
zGetWorkspacesCurrentRbacDatasetsByDatasetIdUserAccessPoliciesResponse,
+ zGetWorkspacesCurrentRbacDatasetsByDatasetIdWhitelistConfigPath,
+ zGetWorkspacesCurrentRbacDatasetsByDatasetIdWhitelistConfigResponse,
zGetWorkspacesCurrentRbacDatasetsByDatasetIdWhitelistPath,
zGetWorkspacesCurrentRbacDatasetsByDatasetIdWhitelistResponse,
zGetWorkspacesCurrentRbacMembersByMemberIdRbacRolesPath,
@@ -2553,12 +2557,28 @@ export const whitelist = {
put: put9,
}
+export const get44 = oc
+ .route({
+ inputStructure: 'detailed',
+ method: 'GET',
+ operationId: 'getWorkspacesCurrentRbacAppsByAppIdWhitelistConfig',
+ path: '/workspaces/current/rbac/apps/{app_id}/whitelist_config',
+ tags: ['console'],
+ })
+ .input(z.object({ params: zGetWorkspacesCurrentRbacAppsByAppIdWhitelistConfigPath }))
+ .output(zGetWorkspacesCurrentRbacAppsByAppIdWhitelistConfigResponse)
+
+export const whitelistConfig = {
+ get: get44,
+}
+
export const byAppId = {
accessPolicies: accessPolicies2,
accessPolicy,
userAccessPolicies,
users,
whitelist,
+ whitelistConfig,
}
export const apps = {
@@ -2585,7 +2605,7 @@ export const delete11 = oc
zDeleteWorkspacesCurrentRbacDatasetsByDatasetIdAccessPoliciesByPolicyIdMemberBindingsResponse,
)
-export const get44 = oc
+export const get45 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -2606,10 +2626,10 @@ export const get44 = oc
export const memberBindings2 = {
delete: delete11,
- get: get44,
+ get: get45,
}
-export const get45 = oc
+export const get46 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -2625,7 +2645,7 @@ export const get45 = oc
.output(zGetWorkspacesCurrentRbacDatasetsByDatasetIdAccessPoliciesByPolicyIdRoleBindingsResponse)
export const roleBindings2 = {
- get: get45,
+ get: get46,
}
export const byPolicyId3 = {
@@ -2637,7 +2657,7 @@ export const accessPolicies4 = {
byPolicyId: byPolicyId3,
}
-export const get46 = oc
+export const get47 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -2654,10 +2674,10 @@ export const get46 = oc
.output(zGetWorkspacesCurrentRbacDatasetsByDatasetIdAccessPolicyResponse)
export const accessPolicy2 = {
- get: get46,
+ get: get47,
}
-export const get47 = oc
+export const get48 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -2674,7 +2694,7 @@ export const get47 = oc
.output(zGetWorkspacesCurrentRbacDatasetsByDatasetIdUserAccessPoliciesResponse)
export const userAccessPolicies2 = {
- get: get47,
+ get: get48,
}
export const put10 = oc
@@ -2705,7 +2725,7 @@ export const users2 = {
byTargetAccountId: byTargetAccountId2,
}
-export const get48 = oc
+export const get49 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -2733,23 +2753,39 @@ export const put11 = oc
.output(zPutWorkspacesCurrentRbacDatasetsByDatasetIdWhitelistResponse)
export const whitelist2 = {
- get: get48,
+ get: get49,
put: put11,
}
+export const get50 = oc
+ .route({
+ inputStructure: 'detailed',
+ method: 'GET',
+ operationId: 'getWorkspacesCurrentRbacDatasetsByDatasetIdWhitelistConfig',
+ path: '/workspaces/current/rbac/datasets/{dataset_id}/whitelist_config',
+ tags: ['console'],
+ })
+ .input(z.object({ params: zGetWorkspacesCurrentRbacDatasetsByDatasetIdWhitelistConfigPath }))
+ .output(zGetWorkspacesCurrentRbacDatasetsByDatasetIdWhitelistConfigResponse)
+
+export const whitelistConfig2 = {
+ get: get50,
+}
+
export const byDatasetId = {
accessPolicies: accessPolicies4,
accessPolicy: accessPolicy2,
userAccessPolicies: userAccessPolicies2,
users: users2,
whitelist: whitelist2,
+ whitelistConfig: whitelistConfig2,
}
export const datasets = {
byDatasetId,
}
-export const get49 = oc
+export const get51 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -2777,7 +2813,7 @@ export const put12 = oc
.output(zPutWorkspacesCurrentRbacMembersByMemberIdRbacRolesResponse)
export const rbacRoles = {
- get: get49,
+ get: get51,
put: put12,
}
@@ -2789,7 +2825,7 @@ export const members2 = {
byMemberId: byMemberId2,
}
-export const get50 = oc
+export const get52 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -2800,10 +2836,10 @@ export const get50 = oc
.output(zGetWorkspacesCurrentRbacMyPermissionsResponse)
export const myPermissions = {
- get: get50,
+ get: get52,
}
-export const get51 = oc
+export const get53 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -2814,10 +2850,10 @@ export const get51 = oc
.output(zGetWorkspacesCurrentRbacRolePermissionsCatalogAppResponse)
export const app = {
- get: get51,
+ get: get53,
}
-export const get52 = oc
+export const get54 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -2828,10 +2864,10 @@ export const get52 = oc
.output(zGetWorkspacesCurrentRbacRolePermissionsCatalogDatasetResponse)
export const dataset = {
- get: get52,
+ get: get54,
}
-export const get53 = oc
+export const get55 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -2842,7 +2878,7 @@ export const get53 = oc
.output(zGetWorkspacesCurrentRbacRolePermissionsCatalogResponse)
export const catalog = {
- get: get53,
+ get: get55,
app,
dataset,
}
@@ -2867,7 +2903,7 @@ export const copy2 = {
post: post46,
}
-export const get54 = oc
+export const get56 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -2879,7 +2915,7 @@ export const get54 = oc
.output(zGetWorkspacesCurrentRbacRolesByRoleIdMembersResponse)
export const members3 = {
- get: get54,
+ get: get56,
}
export const delete12 = oc
@@ -2893,7 +2929,7 @@ export const delete12 = oc
.input(z.object({ params: zDeleteWorkspacesCurrentRbacRolesByRoleIdPath }))
.output(zDeleteWorkspacesCurrentRbacRolesByRoleIdResponse)
-export const get55 = oc
+export const get57 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -2917,13 +2953,13 @@ export const put13 = oc
export const byRoleId = {
delete: delete12,
- get: get55,
+ get: get57,
put: put13,
copy: copy2,
members: members3,
}
-export const get56 = oc
+export const get58 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -2945,7 +2981,7 @@ export const post47 = oc
.output(zPostWorkspacesCurrentRbacRolesResponse)
export const roles = {
- get: get56,
+ get: get58,
post: post47,
byRoleId,
}
@@ -2970,7 +3006,7 @@ export const bindings = {
put: put14,
}
-export const get57 = oc
+export const get59 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -2986,10 +3022,10 @@ export const get57 = oc
.output(zGetWorkspacesCurrentRbacWorkspaceAppsAccessPoliciesByPolicyIdMemberBindingsResponse)
export const memberBindings3 = {
- get: get57,
+ get: get59,
}
-export const get58 = oc
+export const get60 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -3005,7 +3041,7 @@ export const get58 = oc
.output(zGetWorkspacesCurrentRbacWorkspaceAppsAccessPoliciesByPolicyIdRoleBindingsResponse)
export const roleBindings3 = {
- get: get58,
+ get: get60,
}
export const byPolicyId4 = {
@@ -3018,7 +3054,7 @@ export const accessPolicies6 = {
byPolicyId: byPolicyId4,
}
-export const get59 = oc
+export const get61 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -3029,7 +3065,7 @@ export const get59 = oc
.output(zGetWorkspacesCurrentRbacWorkspaceAppsAccessPolicyResponse)
export const accessPolicy3 = {
- get: get59,
+ get: get61,
}
export const apps2 = {
@@ -3057,7 +3093,7 @@ export const bindings2 = {
put: put15,
}
-export const get60 = oc
+export const get62 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -3073,10 +3109,10 @@ export const get60 = oc
.output(zGetWorkspacesCurrentRbacWorkspaceDatasetsAccessPoliciesByPolicyIdMemberBindingsResponse)
export const memberBindings4 = {
- get: get60,
+ get: get62,
}
-export const get61 = oc
+export const get63 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -3092,7 +3128,7 @@ export const get61 = oc
.output(zGetWorkspacesCurrentRbacWorkspaceDatasetsAccessPoliciesByPolicyIdRoleBindingsResponse)
export const roleBindings4 = {
- get: get61,
+ get: get63,
}
export const byPolicyId5 = {
@@ -3105,7 +3141,7 @@ export const accessPolicies7 = {
byPolicyId: byPolicyId5,
}
-export const get62 = oc
+export const get64 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -3116,7 +3152,7 @@ export const get62 = oc
.output(zGetWorkspacesCurrentRbacWorkspaceDatasetsAccessPolicyResponse)
export const accessPolicy4 = {
- get: get62,
+ get: get64,
}
export const datasets2 = {
@@ -3180,7 +3216,7 @@ export const import_ = {
post: post49,
}
-export const get63 = oc
+export const get65 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -3191,7 +3227,7 @@ export const get63 = oc
.output(zGetWorkspacesCurrentSkillsTagsResponse)
export const tags = {
- get: get63,
+ get: get65,
}
export const post50 = oc
@@ -3234,7 +3270,7 @@ export const duplicate = {
post: post51,
}
-export const get64 = oc
+export const get66 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -3246,7 +3282,7 @@ export const get64 = oc
.output(zGetWorkspacesCurrentSkillsBySkillIdExportResponse)
export const export2 = {
- get: get64,
+ get: get66,
}
export const post52 = oc
@@ -3269,7 +3305,7 @@ export const check = {
post: post52,
}
-export const get65 = oc
+export const get67 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -3286,10 +3322,10 @@ export const get65 = oc
.output(zGetWorkspacesCurrentSkillsBySkillIdFilesContentResponse)
export const content = {
- get: get65,
+ get: get67,
}
-export const get66 = oc
+export const get68 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -3306,7 +3342,7 @@ export const get66 = oc
.output(zGetWorkspacesCurrentSkillsBySkillIdFilesPreviewResponse)
export const preview = {
- get: get66,
+ get: get68,
}
export const patch5 = oc
@@ -3369,7 +3405,7 @@ export const publish = {
post: post53,
}
-export const get67 = oc
+export const get69 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -3381,7 +3417,7 @@ export const get67 = oc
.output(zGetWorkspacesCurrentSkillsBySkillIdReferencesResponse)
export const references = {
- get: get67,
+ get: get69,
}
export const post54 = oc
@@ -3415,7 +3451,7 @@ export const delete13 = oc
.input(z.object({ params: zDeleteWorkspacesCurrentSkillsBySkillIdVersionsByVersionIdPath }))
.output(zDeleteWorkspacesCurrentSkillsBySkillIdVersionsByVersionIdResponse)
-export const get68 = oc
+export const get70 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -3444,11 +3480,11 @@ export const patch6 = oc
export const byVersionId = {
delete: delete13,
- get: get68,
+ get: get70,
patch: patch6,
}
-export const get69 = oc
+export const get71 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -3460,7 +3496,7 @@ export const get69 = oc
.output(zGetWorkspacesCurrentSkillsBySkillIdVersionsResponse)
export const versions = {
- get: get69,
+ get: get71,
byVersionId,
}
@@ -3480,7 +3516,7 @@ export const delete14 = oc
)
.output(zDeleteWorkspacesCurrentSkillsBySkillIdResponse)
-export const get70 = oc
+export const get72 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -3509,7 +3545,7 @@ export const patch7 = oc
export const bySkillId = {
delete: delete14,
- get: get70,
+ get: get72,
patch: patch7,
assist,
duplicate,
@@ -3521,7 +3557,7 @@ export const bySkillId = {
versions,
}
-export const get71 = oc
+export const get73 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -3545,7 +3581,7 @@ export const post55 = oc
.output(zPostWorkspacesCurrentSkillsResponse)
export const skills2 = {
- get: get71,
+ get: get73,
post: post55,
files,
import: import_,
@@ -3553,7 +3589,7 @@ export const skills2 = {
bySkillId,
}
-export const get72 = oc
+export const get74 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -3564,10 +3600,10 @@ export const get72 = oc
.output(zGetWorkspacesCurrentSummaryResponse)
export const summary2 = {
- get: get72,
+ get: get74,
}
-export const get73 = oc
+export const get75 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -3578,7 +3614,7 @@ export const get73 = oc
.output(zGetWorkspacesCurrentToolLabelsResponse)
export const toolLabels = {
- get: get73,
+ get: get75,
}
export const post56 = oc
@@ -3611,7 +3647,7 @@ export const delete15 = {
post: post57,
}
-export const get74 = oc
+export const get76 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -3622,11 +3658,11 @@ export const get74 = oc
.input(z.object({ query: zGetWorkspacesCurrentToolProviderApiGetQuery }))
.output(zGetWorkspacesCurrentToolProviderApiGetResponse)
-export const get75 = {
- get: get74,
+export const get77 = {
+ get: get76,
}
-export const get76 = oc
+export const get78 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -3638,7 +3674,7 @@ export const get76 = oc
.output(zGetWorkspacesCurrentToolProviderApiRemoteResponse)
export const remote = {
- get: get76,
+ get: get78,
}
export const post58 = oc
@@ -3675,7 +3711,7 @@ export const test = {
pre,
}
-export const get77 = oc
+export const get79 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -3687,7 +3723,7 @@ export const get77 = oc
.output(zGetWorkspacesCurrentToolProviderApiToolsResponse)
export const tools = {
- get: get77,
+ get: get79,
}
export const post60 = oc
@@ -3708,7 +3744,7 @@ export const update2 = {
export const api = {
add,
delete: delete15,
- get: get75,
+ get: get77,
remote,
schema,
test,
@@ -3736,7 +3772,7 @@ export const add2 = {
post: post61,
}
-export const get78 = oc
+export const get80 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -3753,10 +3789,10 @@ export const get78 = oc
.output(zGetWorkspacesCurrentToolProviderBuiltinByProviderCredentialInfoResponse)
export const info = {
- get: get78,
+ get: get80,
}
-export const get79 = oc
+export const get81 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -3776,7 +3812,7 @@ export const get79 = oc
)
export const byCredentialType = {
- get: get79,
+ get: get81,
}
export const schema2 = {
@@ -3788,7 +3824,7 @@ export const credential = {
schema: schema2,
}
-export const get80 = oc
+export const get82 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -3805,7 +3841,7 @@ export const get80 = oc
.output(zGetWorkspacesCurrentToolProviderBuiltinByProviderCredentialsResponse)
export const credentials3 = {
- get: get80,
+ get: get82,
}
export const post62 = oc
@@ -3848,7 +3884,7 @@ export const delete16 = {
post: post63,
}
-export const get81 = oc
+export const get83 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -3860,10 +3896,10 @@ export const get81 = oc
.output(zGetWorkspacesCurrentToolProviderBuiltinByProviderIconResponse)
export const icon2 = {
- get: get81,
+ get: get83,
}
-export const get82 = oc
+export const get84 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -3875,10 +3911,10 @@ export const get82 = oc
.output(zGetWorkspacesCurrentToolProviderBuiltinByProviderInfoResponse)
export const info2 = {
- get: get82,
+ get: get84,
}
-export const get83 = oc
+export const get85 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -3892,7 +3928,7 @@ export const get83 = oc
.output(zGetWorkspacesCurrentToolProviderBuiltinByProviderOauthClientSchemaResponse)
export const clientSchema = {
- get: get83,
+ get: get85,
}
export const delete17 = oc
@@ -3910,7 +3946,7 @@ export const delete17 = oc
)
.output(zDeleteWorkspacesCurrentToolProviderBuiltinByProviderOauthCustomClientResponse)
-export const get84 = oc
+export const get86 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -3941,7 +3977,7 @@ export const post64 = oc
export const customClient = {
delete: delete17,
- get: get84,
+ get: get86,
post: post64,
}
@@ -3950,7 +3986,7 @@ export const oauth = {
customClient,
}
-export const get85 = oc
+export const get87 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -3962,7 +3998,7 @@ export const get85 = oc
.output(zGetWorkspacesCurrentToolProviderBuiltinByProviderToolsResponse)
export const tools2 = {
- get: get85,
+ get: get87,
}
export const post65 = oc
@@ -4017,7 +4053,7 @@ export const auth = {
post: post66,
}
-export const get86 = oc
+export const get88 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -4029,14 +4065,14 @@ export const get86 = oc
.output(zGetWorkspacesCurrentToolProviderMcpToolsByProviderIdResponse)
export const byProviderId = {
- get: get86,
+ get: get88,
}
export const tools3 = {
byProviderId,
}
-export const get87 = oc
+export const get89 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -4048,7 +4084,7 @@ export const get87 = oc
.output(zGetWorkspacesCurrentToolProviderMcpUpdateByProviderIdResponse)
export const byProviderId2 = {
- get: get87,
+ get: get89,
}
export const update4 = {
@@ -4127,7 +4163,7 @@ export const delete19 = {
post: post69,
}
-export const get88 = oc
+export const get90 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -4138,11 +4174,11 @@ export const get88 = oc
.input(z.object({ query: zGetWorkspacesCurrentToolProviderWorkflowGetQuery.optional() }))
.output(zGetWorkspacesCurrentToolProviderWorkflowGetResponse)
-export const get89 = {
- get: get88,
+export const get91 = {
+ get: get90,
}
-export const get90 = oc
+export const get92 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -4154,7 +4190,7 @@ export const get90 = oc
.output(zGetWorkspacesCurrentToolProviderWorkflowToolsResponse)
export const tools4 = {
- get: get90,
+ get: get92,
}
export const post70 = oc
@@ -4175,7 +4211,7 @@ export const update5 = {
export const workflow = {
create: create2,
delete: delete19,
- get: get89,
+ get: get91,
tools: tools4,
update: update5,
}
@@ -4187,7 +4223,7 @@ export const toolProvider = {
workflow,
}
-export const get91 = oc
+export const get93 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -4199,10 +4235,10 @@ export const get91 = oc
.output(zGetWorkspacesCurrentToolProvidersResponse)
export const toolProviders = {
- get: get91,
+ get: get93,
}
-export const get92 = oc
+export const get94 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -4213,10 +4249,10 @@ export const get92 = oc
.output(zGetWorkspacesCurrentToolsApiResponse)
export const api2 = {
- get: get92,
+ get: get94,
}
-export const get93 = oc
+export const get95 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -4227,10 +4263,10 @@ export const get93 = oc
.output(zGetWorkspacesCurrentToolsBuiltinResponse)
export const builtin2 = {
- get: get93,
+ get: get95,
}
-export const get94 = oc
+export const get96 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -4241,10 +4277,10 @@ export const get94 = oc
.output(zGetWorkspacesCurrentToolsMcpResponse)
export const mcp2 = {
- get: get94,
+ get: get96,
}
-export const get95 = oc
+export const get97 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -4255,7 +4291,7 @@ export const get95 = oc
.output(zGetWorkspacesCurrentToolsWorkflowResponse)
export const workflow2 = {
- get: get95,
+ get: get97,
}
export const tools5 = {
@@ -4265,7 +4301,7 @@ export const tools5 = {
workflow: workflow2,
}
-export const get96 = oc
+export const get98 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -4277,13 +4313,13 @@ export const get96 = oc
.output(zGetWorkspacesCurrentTriggerProviderByProviderIconResponse)
export const icon3 = {
- get: get96,
+ get: get98,
}
/**
* Get info for a trigger provider
*/
-export const get97 = oc
+export const get99 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -4296,7 +4332,7 @@ export const get97 = oc
.output(zGetWorkspacesCurrentTriggerProviderByProviderInfoResponse)
export const info3 = {
- get: get97,
+ get: get99,
}
/**
@@ -4317,7 +4353,7 @@ export const delete20 = oc
/**
* Get OAuth client configuration for a provider
*/
-export const get98 = oc
+export const get100 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -4351,7 +4387,7 @@ export const post71 = oc
export const client = {
delete: delete20,
- get: get98,
+ get: get100,
post: post71,
}
@@ -4418,7 +4454,7 @@ export const create3 = {
/**
* Get the request logs for a subscription instance for a trigger provider
*/
-export const get99 = oc
+export const get101 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -4439,7 +4475,7 @@ export const get99 = oc
)
export const bySubscriptionBuilderId2 = {
- get: get99,
+ get: get101,
}
export const logs = {
@@ -4513,7 +4549,7 @@ export const verifyAndUpdate = {
/**
* Get a subscription instance for a trigger provider
*/
-export const get100 = oc
+export const get102 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -4534,7 +4570,7 @@ export const get100 = oc
)
export const bySubscriptionBuilderId5 = {
- get: get100,
+ get: get102,
}
export const builder = {
@@ -4549,7 +4585,7 @@ export const builder = {
/**
* List all trigger subscriptions for the current tenant's provider
*/
-export const get101 = oc
+export const get103 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -4562,13 +4598,13 @@ export const get101 = oc
.output(zGetWorkspacesCurrentTriggerProviderByProviderSubscriptionsListResponse)
export const list4 = {
- get: get101,
+ get: get103,
}
/**
* Initiate OAuth authorization flow for a trigger provider
*/
-export const get102 = oc
+export const get104 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -4585,7 +4621,7 @@ export const get102 = oc
.output(zGetWorkspacesCurrentTriggerProviderByProviderSubscriptionsOauthAuthorizeResponse)
export const authorize = {
- get: get102,
+ get: get104,
}
export const oauth3 = {
@@ -4702,7 +4738,7 @@ export const triggerProvider = {
/**
* List all trigger providers for the current tenant
*/
-export const get103 = oc
+export const get105 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -4714,7 +4750,7 @@ export const get103 = oc
.output(zGetWorkspacesCurrentTriggersResponse)
export const triggers = {
- get: get103,
+ get: get105,
}
export const current = {
@@ -4761,7 +4797,7 @@ export const webappLogo = {
upload: upload3,
}
-export const get104 = oc
+export const get106 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -4783,7 +4819,7 @@ export const post80 = oc
.output(zPostWorkspacesCustomConfigResponse)
export const customConfig = {
- get: get104,
+ get: get106,
post: post80,
webappLogo,
}
@@ -4818,7 +4854,7 @@ export const switch3 = {
post: post82,
}
-export const get105 = oc
+export const get107 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -4830,7 +4866,7 @@ export const get105 = oc
.output(zGetWorkspacesByTenantIdModelProvidersByProviderByIconTypeByLangResponse)
export const byLang = {
- get: get105,
+ get: get107,
}
export const byIconType = {
@@ -4849,7 +4885,7 @@ export const byTenantId = {
modelProviders: modelProviders2,
}
-export const get106 = oc
+export const get108 = oc
.route({
inputStructure: 'detailed',
method: 'GET',
@@ -4860,7 +4896,7 @@ export const get106 = oc
.output(zGetWorkspacesResponse)
export const workspaces = {
- get: get106,
+ get: get108,
current,
customConfig,
info: info4,
diff --git a/packages/contracts/generated/api/console/workspaces/types.gen.ts b/packages/contracts/generated/api/console/workspaces/types.gen.ts
index 689966e444b..58b995b4c08 100644
--- a/packages/contracts/generated/api/console/workspaces/types.gen.ts
+++ b/packages/contracts/generated/api/console/workspaces/types.gen.ts
@@ -570,7 +570,7 @@ export type AppAccessMatrix = {
export type ResourceUserAccessPoliciesResponse = {
data?: Array<ResourceUserAccessPolicies>
- scope: RbacResourceWhitelistScope
+ pagination?: Pagination | null
}
export type ReplaceUserAccessPolicies = {
@@ -587,7 +587,11 @@ export type ResourceWhitelist = {
}
export type ResourceAccessScopeRequest = {
- scope: RbacResourceWhitelistScope
+ automatic_include_workspace_members: boolean
+}
+
+export type ResourceWhitelistConfig = {
+ automatic_include_workspace_members: boolean
}
export type DatasetAccessMatrix = {
@@ -1721,8 +1725,6 @@ export type ResourceUserAccessPolicies = {
roles?: Array<RbacRole>
}
-export type RbacResourceWhitelistScope = 'all' | 'only_me' | 'specific'
-
export type ResourcePermissionSnapshot = {
default_permission_keys?: Array<string>
overrides?: Array<ResourcePermissionKeys>
@@ -4563,6 +4565,9 @@ export type GetWorkspacesCurrentRbacAppsByAppIdUserAccessPoliciesData = {
}
query?: {
language?: 'en' | 'ja' | 'zh'
+ limit?: number
+ page?: number
+ reverse?: boolean
}
url: '/workspaces/current/rbac/apps/{app_id}/user-access-policies'
}
@@ -4623,6 +4628,22 @@ export type PutWorkspacesCurrentRbacAppsByAppIdWhitelistResponses = {
export type PutWorkspacesCurrentRbacAppsByAppIdWhitelistResponse =
PutWorkspacesCurrentRbacAppsByAppIdWhitelistResponses[keyof PutWorkspacesCurrentRbacAppsByAppIdWhitelistResponses]
+export type GetWorkspacesCurrentRbacAppsByAppIdWhitelistConfigData = {
+ body?: never
+ path: {
+ app_id: string
+ }
+ query?: never
+ url: '/workspaces/current/rbac/apps/{app_id}/whitelist_config'
+}
+
+export type GetWorkspacesCurrentRbacAppsByAppIdWhitelistConfigResponses = {
+ 200: ResourceWhitelistConfig
+}
+
+export type GetWorkspacesCurrentRbacAppsByAppIdWhitelistConfigResponse =
+ GetWorkspacesCurrentRbacAppsByAppIdWhitelistConfigResponses[keyof GetWorkspacesCurrentRbacAppsByAppIdWhitelistConfigResponses]
+
export type DeleteWorkspacesCurrentRbacDatasetsByDatasetIdAccessPoliciesByPolicyIdMemberBindingsData =
{
body: DeleteMemberBindingsRequest
@@ -4704,6 +4725,9 @@ export type GetWorkspacesCurrentRbacDatasetsByDatasetIdUserAccessPoliciesData =
}
query?: {
language?: 'en' | 'ja' | 'zh'
+ limit?: number
+ page?: number
+ reverse?: boolean
}
url: '/workspaces/current/rbac/datasets/{dataset_id}/user-access-policies'
}
@@ -4765,6 +4789,22 @@ export type PutWorkspacesCurrentRbacDatasetsByDatasetIdWhitelistResponses = {
export type PutWorkspacesCurrentRbacDatasetsByDatasetIdWhitelistResponse =
PutWorkspacesCurrentRbacDatasetsByDatasetIdWhitelistResponses[keyof PutWorkspacesCurrentRbacDatasetsByDatasetIdWhitelistResponses]
+export type GetWorkspacesCurrentRbacDatasetsByDatasetIdWhitelistConfigData = {
+ body?: never
+ path: {
+ dataset_id: string
+ }
+ query?: never
+ url: '/workspaces/current/rbac/datasets/{dataset_id}/whitelist_config'
+}
+
+export type GetWorkspacesCurrentRbacDatasetsByDatasetIdWhitelistConfigResponses = {
+ 200: ResourceWhitelistConfig
+}
+
+export type GetWorkspacesCurrentRbacDatasetsByDatasetIdWhitelistConfigResponse =
+ GetWorkspacesCurrentRbacDatasetsByDatasetIdWhitelistConfigResponses[keyof GetWorkspacesCurrentRbacDatasetsByDatasetIdWhitelistConfigResponses]
+
export type GetWorkspacesCurrentRbacMembersByMemberIdRbacRolesData = {
body?: never
path: {
diff --git a/packages/contracts/generated/api/console/workspaces/zod.gen.ts b/packages/contracts/generated/api/console/workspaces/zod.gen.ts
index 148b04d9c82..fa7e8ee27c4 100644
--- a/packages/contracts/generated/api/console/workspaces/zod.gen.ts
+++ b/packages/contracts/generated/api/console/workspaces/zod.gen.ts
@@ -427,6 +427,20 @@ export const zResourceWhitelist = z.object({
account_ids: z.array(z.string()).optional(),
})
+/**
+ * _ResourceAccessScopeRequest
+ */
+export const zResourceAccessScopeRequest = z.object({
+ automatic_include_workspace_members: z.boolean(),
+})
+
+/**
+ * ResourceWhitelistConfig
+ */
+export const zResourceWhitelistConfig = z.object({
+ automatic_include_workspace_members: z.boolean(),
+})
+
/**
* _ReplaceMemberRolesRequest
*/
@@ -1310,20 +1324,6 @@ export const zRoleBindingsResponse = z.object({
data: z.array(zAccessPolicyRoleBinding).optional(),
})
-/**
- * RBACResourceWhitelistScope
- *
- * Whitelist scopes accepted by RBAC app and dataset access config APIs.
- */
-export const zRbacResourceWhitelistScope = z.enum(['all', 'only_me', 'specific'])
-
-/**
- * _ResourceAccessScopeRequest
- */
-export const zResourceAccessScopeRequest = z.object({
- scope: zRbacResourceWhitelistScope,
-})
-
/**
* WorkspacePermissionSnapshot
*/
@@ -2530,7 +2530,7 @@ export const zResourceUserAccessPolicies = z.object({
*/
export const zResourceUserAccessPoliciesResponse = z.object({
data: z.array(zResourceUserAccessPolicies).optional(),
- scope: zRbacResourceWhitelistScope,
+ pagination: zPagination.nullish(),
})
/**
@@ -4964,6 +4964,9 @@ export const zGetWorkspacesCurrentRbacAppsByAppIdUserAccessPoliciesPath = z.obje
export const zGetWorkspacesCurrentRbacAppsByAppIdUserAccessPoliciesQuery = z.object({
language: z.enum(['en', 'ja', 'zh']).optional(),
+ limit: z.int().gte(1).lte(99999).optional(),
+ page: z.int().gte(1).optional(),
+ reverse: z.boolean().optional(),
})
/**
@@ -5007,6 +5010,15 @@ export const zPutWorkspacesCurrentRbacAppsByAppIdWhitelistPath = z.object({
*/
export const zPutWorkspacesCurrentRbacAppsByAppIdWhitelistResponse = zResourceWhitelist
+export const zGetWorkspacesCurrentRbacAppsByAppIdWhitelistConfigPath = z.object({
+ app_id: z.uuid(),
+})
+
+/**
+ * Success
+ */
+export const zGetWorkspacesCurrentRbacAppsByAppIdWhitelistConfigResponse = zResourceWhitelistConfig
+
export const zDeleteWorkspacesCurrentRbacDatasetsByDatasetIdAccessPoliciesByPolicyIdMemberBindingsBody =
zDeleteMemberBindingsRequest
@@ -5065,6 +5077,9 @@ export const zGetWorkspacesCurrentRbacDatasetsByDatasetIdUserAccessPoliciesPath
export const zGetWorkspacesCurrentRbacDatasetsByDatasetIdUserAccessPoliciesQuery = z.object({
language: z.enum(['en', 'ja', 'zh']).optional(),
+ limit: z.int().gte(1).lte(99999).optional(),
+ page: z.int().gte(1).optional(),
+ reverse: z.boolean().optional(),
})
/**
@@ -5108,6 +5123,16 @@ export const zPutWorkspacesCurrentRbacDatasetsByDatasetIdWhitelistPath = z.objec
*/
export const zPutWorkspacesCurrentRbacDatasetsByDatasetIdWhitelistResponse = zResourceWhitelist
+export const zGetWorkspacesCurrentRbacDatasetsByDatasetIdWhitelistConfigPath = z.object({
+ dataset_id: z.uuid(),
+})
+
+/**
+ * Success
+ */
+export const zGetWorkspacesCurrentRbacDatasetsByDatasetIdWhitelistConfigResponse =
+ zResourceWhitelistConfig
+
export const zGetWorkspacesCurrentRbacMembersByMemberIdRbacRolesPath = z.object({
member_id: z.uuid(),
})
diff --git a/web/app/components/access-rules-editor/__tests__/index.spec.tsx b/web/app/components/access-rules-editor/__tests__/index.spec.tsx
index 9652987e7f2..82a516c7b32 100644
--- a/web/app/components/access-rules-editor/__tests__/index.spec.tsx
+++ b/web/app/components/access-rules-editor/__tests__/index.spec.tsx
@@ -8,12 +8,10 @@ const mockMembers = vi.hoisted(() => ({
accounts: [] as Member[] | null,
isLoading: false,
}))
+const mockUseMembers = vi.hoisted(() => vi.fn())
vi.mock('@/service/use-common', () => ({
- useMembers: vi.fn(() => ({
- data: { accounts: mockMembers.accounts },
- isLoading: mockMembers.isLoading,
- })),
+ useMembers: mockUseMembers,
}))
const createRule = (resourceType: 'app' | 'dataset'): AccessPolicyWithBindings => ({
@@ -88,6 +86,10 @@ describe('AccessRulesEditor', () => {
vi.clearAllMocks()
mockMembers.accounts = []
mockMembers.isLoading = false
+ mockUseMembers.mockImplementation(() => ({
+ data: { accounts: mockMembers.accounts },
+ isLoading: mockMembers.isLoading,
+ }))
})
it('should render loading state before empty or row content', () => {
@@ -97,8 +99,8 @@ describe('AccessRulesEditor', () => {
userAccessSettings={[]}
isLoadingRules
isLoadingUserAccessSettings={false}
- openScope="specific"
- isUpdatingOpenScope={false}
+ automaticIncludeWorkspaceMembers={false}
+ isUpdatingAutomaticIncludeWorkspaceMembers={false}
updatingAccountId={null}
/>,
)
@@ -114,8 +116,8 @@ describe('AccessRulesEditor', () => {
userAccessSettings={[]}
isLoadingRules={false}
isLoadingUserAccessSettings={false}
- openScope="specific"
- isUpdatingOpenScope={false}
+ automaticIncludeWorkspaceMembers={false}
+ isUpdatingAutomaticIncludeWorkspaceMembers={false}
updatingAccountId={null}
/>,
)
@@ -123,37 +125,31 @@ describe('AccessRulesEditor', () => {
expect(screen.getByText('permission.accessRule.noUserAccessSettings')).toBeInTheDocument()
})
- it('should disable resource access controls before open scope is available', () => {
+ it('should disable automatic inclusion before its value is available', () => {
render(
<AccessRulesEditor
rules={[]}
userAccessSettings={[]}
isLoadingRules={false}
isLoadingUserAccessSettings={false}
- isUpdatingOpenScope={false}
+ isUpdatingAutomaticIncludeWorkspaceMembers={false}
updatingAccountId={null}
/>,
)
- expect(screen.getByText('permission.accessRule.resourceOpenScope')).toBeInTheDocument()
expect(
- screen.getByRole('button', { name: 'permission.accessRule.resourceOpenScopeDescription' }),
+ screen.getByText('permission.accessRule.automaticallyIncludeWorkspaceMembersDescription'),
).toBeInTheDocument()
-
- const allMembersButton = screen.getByRole('button', {
- name: /permission\.accessRule\.allPermittedMembers/,
- })
- const specificMembersButton = screen.getByRole('button', {
- name: /permission\.accessRule\.specificMembersOnly/,
+ const automaticInclusionSwitch = screen.getByRole('switch', {
+ name: 'permission.accessRule.automaticallyIncludeWorkspaceMembers',
})
- expect(allMembersButton).toBeDisabled()
- expect(specificMembersButton).toBeDisabled()
- expect(allMembersButton).toHaveAttribute('aria-pressed', 'false')
- expect(specificMembersButton).toHaveAttribute('aria-pressed', 'false')
+ expect(automaticInclusionSwitch).toHaveAttribute('aria-disabled', 'true')
+ expect(automaticInclusionSwitch).toHaveAttribute('aria-checked', 'false')
})
- it('should render resource access controls and update account exceptions', () => {
- const onOpenScopeChange = vi.fn()
+ it('should toggle automatic inclusion and update account exceptions', async () => {
+ const user = userEvent.setup()
+ const onAutomaticIncludeWorkspaceMembersChange = vi.fn()
const onUserAccessPoliciesChange = vi.fn()
const onRemoveAccessPolicyMemberBinding = vi.fn()
@@ -163,83 +159,81 @@ describe('AccessRulesEditor', () => {
userAccessSettings={[createUserAccessSetting()]}
isLoadingRules={false}
isLoadingUserAccessSettings={false}
- openScope="specific"
- isUpdatingOpenScope={false}
+ automaticIncludeWorkspaceMembers={false}
+ isUpdatingAutomaticIncludeWorkspaceMembers={false}
updatingAccountId={null}
- onOpenScopeChange={onOpenScopeChange}
+ onAutomaticIncludeWorkspaceMembersChange={onAutomaticIncludeWorkspaceMembersChange}
onUserAccessPoliciesChange={onUserAccessPoliciesChange}
onRemoveAccessPolicyMemberBinding={onRemoveAccessPolicyMemberBinding}
/>,
)
- expect(screen.getByText('permission.accessRule.resourceOpenScope')).toBeInTheDocument()
- expect(
- screen.getByRole('button', { name: /permission\.accessRule\.specificMembersOnly/ }),
- ).toHaveAttribute('aria-pressed', 'true')
- expect(
- screen.getByText('permission.accessRule.individualPermissionSettings'),
- ).toBeInTheDocument()
+ expect(screen.getByText('permission.accessRule.allowedMembers')).toBeInTheDocument()
expect(screen.getByText('Evan')).toBeInTheDocument()
expect(screen.getByText('[email protected]')).toBeInTheDocument()
expect(screen.queryByText('Maintainer')).not.toBeInTheDocument()
expect(screen.getAllByText('Manage').length).toBeGreaterThan(0)
- fireEvent.click(
- screen.getByRole('button', { name: /permission\.accessRule\.allPermittedMembers/ }),
+ await user.click(
+ screen.getByRole('switch', {
+ name: 'permission.accessRule.automaticallyIncludeWorkspaceMembers',
+ }),
)
- expect(onOpenScopeChange).not.toHaveBeenCalled()
- expect(screen.getByText('permission.accessRule.changeOpenScopeTitle')).toBeInTheDocument()
- expect(screen.getByText('permission.accessRule.changeOpenScopeDescription')).toBeInTheDocument()
+ expect(onAutomaticIncludeWorkspaceMembersChange).toHaveBeenCalledWith(true)
- fireEvent.click(screen.getByRole('button', { name: 'common.operation.change' }))
- expect(onOpenScopeChange).toHaveBeenCalledWith('all')
-
- fireEvent.click(screen.getByRole('button', { name: 'common.operation.remove' }))
+ await user.click(screen.getByRole('button', { name: 'common.operation.remove' }))
expect(onRemoveAccessPolicyMemberBinding).toHaveBeenCalledWith('account-1', 'app-policy-id')
})
- it('should hide the only-me option and allow changing a legacy only-me scope', () => {
- const onOpenScopeChange = vi.fn()
+ it('should render and remove the default access policy', async () => {
+ const user = userEvent.setup()
+ const onRemoveAccessPolicyMemberBinding = vi.fn()
render(
<AccessRulesEditor
- rules={[]}
- userAccessSettings={[]}
+ rules={[createRule('app')]}
+ userAccessSettings={[createDefaultUserAccessSetting()]}
isLoadingRules={false}
isLoadingUserAccessSettings={false}
- openScope="only_me"
- isUpdatingOpenScope={false}
+ automaticIncludeWorkspaceMembers={false}
+ isUpdatingAutomaticIncludeWorkspaceMembers={false}
updatingAccountId={null}
- onOpenScopeChange={onOpenScopeChange}
+ onRemoveAccessPolicyMemberBinding={onRemoveAccessPolicyMemberBinding}
/>,
)
- expect(
- screen.queryByRole('button', { name: /permission\.accessRule\.onlyMe/ }),
- ).not.toBeInTheDocument()
-
- fireEvent.click(
- screen.getByRole('button', { name: /permission\.accessRule\.specificMembersOnly/ }),
- )
- fireEvent.click(screen.getByRole('button', { name: 'common.operation.change' }))
-
- expect(onOpenScopeChange).toHaveBeenCalledWith('specific')
+ expect(screen.getByText('permission.accessRule.defaultPermission')).toBeInTheDocument()
+ await user.click(screen.getByRole('button', { name: 'common.operation.remove' }))
+ expect(onRemoveAccessPolicyMemberBinding).toHaveBeenCalledWith('account-1', 'default')
})
- it('should render the fixed default option when an account has no exception policy', () => {
+ it('should disable membership changes while automatic inclusion is enabled', () => {
render(
<AccessRulesEditor
rules={[createRule('app')]}
- userAccessSettings={[createDefaultUserAccessSetting()]}
+ userAccessSettings={[createUserAccessSetting()]}
isLoadingRules={false}
isLoadingUserAccessSettings={false}
- openScope="specific"
- isUpdatingOpenScope={false}
+ automaticIncludeWorkspaceMembers
+ isUpdatingAutomaticIncludeWorkspaceMembers={false}
+ existingAccountIds={['account-1']}
updatingAccountId={null}
+ onUserAccessPoliciesChange={vi.fn()}
+ onRemoveAccessPolicyMemberBinding={vi.fn()}
+ onAddAccessSubject={vi.fn()}
/>,
)
- expect(screen.getByText('permission.accessRule.defaultPermission')).toBeInTheDocument()
+ expect(screen.getByRole('button', { name: 'common.operation.add' })).toBeDisabled()
+ expect(screen.getByRole('checkbox', { name: 'common.operation.selectAll' })).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ )
+ expect(screen.getByRole('checkbox', { name: 'Evan' })).toHaveAttribute('aria-disabled', 'true')
+ expect(screen.getByRole('button', { name: 'common.operation.remove' })).toBeDisabled()
+ expect(
+ screen.getByLabelText(/permission\.accessRule\.exceptionPermissionFor/),
+ ).not.toBeDisabled()
})
it('should mark maintainer rows and prevent editing them', () => {
@@ -252,8 +246,8 @@ describe('AccessRulesEditor', () => {
userAccessSettings={[createUserAccessSetting()]}
isLoadingRules={false}
isLoadingUserAccessSettings={false}
- openScope="specific"
- isUpdatingOpenScope={false}
+ automaticIncludeWorkspaceMembers={false}
+ isUpdatingAutomaticIncludeWorkspaceMembers={false}
updatingAccountId={null}
maintainerId="account-1"
onUserAccessPoliciesChange={onUserAccessPoliciesChange}
@@ -262,6 +256,7 @@ describe('AccessRulesEditor', () => {
)
expect(screen.getByText('permission.accessRule.maintainer')).toBeInTheDocument()
+ expect(screen.getByRole('checkbox', { name: 'Evan' })).toHaveAttribute('aria-disabled', 'true')
expect(screen.getByLabelText(/permission\.accessRule\.exceptionPermissionFor/)).toBeDisabled()
const removeButton = screen.getByRole('button', { name: 'common.operation.remove' })
@@ -272,8 +267,10 @@ describe('AccessRulesEditor', () => {
expect(onRemoveAccessPolicyMemberBinding).not.toHaveBeenCalled()
})
- it('should keep open scope unchanged when the confirmation is cancelled', () => {
- const onOpenScopeChange = vi.fn()
+ it('should navigate through member pages and change the page size', async () => {
+ const user = userEvent.setup()
+ const onPageChange = vi.fn()
+ const onPageSizeChange = vi.fn()
render(
<AccessRulesEditor
@@ -281,22 +278,26 @@ describe('AccessRulesEditor', () => {
userAccessSettings={[]}
isLoadingRules={false}
isLoadingUserAccessSettings={false}
- openScope="specific"
- isUpdatingOpenScope={false}
+ automaticIncludeWorkspaceMembers={false}
+ isUpdatingAutomaticIncludeWorkspaceMembers={false}
+ currentPage={1}
+ pageSize={10}
+ totalPages={3}
updatingAccountId={null}
- onOpenScopeChange={onOpenScopeChange}
+ onPageChange={onPageChange}
+ onPageSizeChange={onPageSizeChange}
/>,
)
- fireEvent.click(
- screen.getByRole('button', { name: /permission\.accessRule\.allPermittedMembers/ }),
- )
- fireEvent.click(screen.getByRole('button', { name: 'common.operation.cancel' }))
+ await user.click(screen.getByRole('button', { name: 'common.pagination.next' }))
+ expect(onPageChange).toHaveBeenCalledWith(2)
- expect(onOpenScopeChange).not.toHaveBeenCalled()
+ expect(screen.getByRole('radio', { name: '10' })).toBeChecked()
+ await user.click(screen.getByRole('radio', { name: '25' }))
+ expect(onPageSizeChange).toHaveBeenCalledWith(25)
})
- it('should add unassigned members with default permission', async () => {
+ it('should load members only after opening the add-member popover', async () => {
const user = userEvent.setup()
const onAddAccessSubject = vi.fn()
mockMembers.accounts = [
@@ -314,16 +315,21 @@ describe('AccessRulesEditor', () => {
userAccessSettings={[createUserAccessSetting()]}
isLoadingRules={false}
isLoadingUserAccessSettings={false}
- openScope="specific"
- isUpdatingOpenScope={false}
+ automaticIncludeWorkspaceMembers={false}
+ isUpdatingAutomaticIncludeWorkspaceMembers={false}
+ existingAccountIds={['account-1']}
updatingAccountId={null}
onAddAccessSubject={onAddAccessSubject}
/>,
)
- await user.click(screen.getByRole('button', { name: 'permission.accessRule.addException' }))
+ expect(mockUseMembers).not.toHaveBeenCalled()
+ await user.click(screen.getByRole('button', { name: 'common.operation.add' }))
+ expect(mockUseMembers).toHaveBeenCalledTimes(1)
- const dialog = screen.getByRole('dialog', { name: 'permission.accessRule.addMembersTitle' })
+ const dialog = await screen.findByRole('dialog', {
+ name: 'permission.accessRule.addMembersTitle',
+ })
expect(within(dialog).getByText('Evan')).toBeInTheDocument()
expect(within(dialog).getByRole('button', { name: 'common.operation.added' })).toBeDisabled()
expect(
@@ -342,4 +348,93 @@ describe('AccessRulesEditor', () => {
expect(onAddAccessSubject).toHaveBeenCalledWith('account-2', ['default'])
})
+
+ it('should select individual rows and all selectable rows on the current page', async () => {
+ const user = userEvent.setup()
+ const firstSetting = createUserAccessSetting()
+ const secondSetting = {
+ ...createUserAccessSetting(),
+ account: {
+ account_id: 'account-2',
+ account_name: 'Mia',
+ email: '[email protected]',
+ },
+ }
+
+ render(
+ <AccessRulesEditor
+ rules={[createRule('app')]}
+ userAccessSettings={[firstSetting, secondSetting]}
+ isLoadingRules={false}
+ isLoadingUserAccessSettings={false}
+ automaticIncludeWorkspaceMembers={false}
+ isUpdatingAutomaticIncludeWorkspaceMembers={false}
+ updatingAccountId={null}
+ onBatchRemoveAccessPolicyMemberBindings={vi.fn().mockResolvedValue(undefined)}
+ />,
+ )
+
+ const selectAll = screen.getByRole('checkbox', { name: 'common.operation.selectAll' })
+ const evan = screen.getByRole('checkbox', { name: 'Evan' })
+ const mia = screen.getByRole('checkbox', { name: 'Mia' })
+
+ await user.click(evan)
+ expect(evan).toBeChecked()
+ expect(selectAll).toHaveAttribute('data-indeterminate')
+
+ await user.click(selectAll)
+ expect(evan).toBeChecked()
+ expect(mia).toBeChecked()
+ expect(selectAll).toBeChecked()
+ })
+
+ it('should batch-remove selected members grouped by access policy', async () => {
+ const user = userEvent.setup()
+ const onBatchRemoveAccessPolicyMemberBindings = vi.fn().mockResolvedValue(undefined)
+ const firstSetting = createUserAccessSetting()
+ const secondSetting = {
+ ...createUserAccessSetting(),
+ account: {
+ account_id: 'account-2',
+ account_name: 'Mia',
+ email: '[email protected]',
+ },
+ }
+ const thirdSetting = {
+ ...createDefaultUserAccessSetting(),
+ account: {
+ account_id: 'account-3',
+ account_name: 'Zoe',
+ email: '[email protected]',
+ },
+ }
+
+ render(
+ <AccessRulesEditor
+ rules={[createRule('app')]}
+ userAccessSettings={[firstSetting, secondSetting, thirdSetting]}
+ isLoadingRules={false}
+ isLoadingUserAccessSettings={false}
+ automaticIncludeWorkspaceMembers={false}
+ isUpdatingAutomaticIncludeWorkspaceMembers={false}
+ updatingAccountId={null}
+ onBatchRemoveAccessPolicyMemberBindings={onBatchRemoveAccessPolicyMemberBindings}
+ />,
+ )
+
+ await user.click(screen.getByRole('checkbox', { name: 'common.operation.selectAll' }))
+ expect(screen.getByText('permission.accessRule.selected')).toBeInTheDocument()
+
+ await user.click(screen.getByRole('button', { name: 'common.operation.delete' }))
+ const dialog = screen.getByRole('alertdialog', {
+ name: 'permission.accessRule.batchRemoveTitle',
+ })
+ await user.click(within(dialog).getByRole('button', { name: 'common.operation.sure' }))
+
+ expect(onBatchRemoveAccessPolicyMemberBindings).toHaveBeenCalledWith([
+ { accessPolicyId: 'app-policy-id', accountIds: ['account-1', 'account-2'] },
+ { accessPolicyId: 'default', accountIds: ['account-3'] },
+ ])
+ expect(screen.queryByText('permission.accessRule.selected')).not.toBeInTheDocument()
+ })
})
diff --git a/web/app/components/access-rules-editor/add-access-subject-popover.tsx b/web/app/components/access-rules-editor/add-access-subject-popover.tsx
index 4b8d7590ee0..d754762c592 100644
--- a/web/app/components/access-rules-editor/add-access-subject-popover.tsx
+++ b/web/app/components/access-rules-editor/add-access-subject-popover.tsx
@@ -1,6 +1,5 @@
'use client'
-import type { ResourceUserAccessSetting } from '@/models/access-control'
import type { Member } from '@/models/common'
import { Avatar } from '@langgenius/dify-ui/avatar'
import { Button } from '@langgenius/dify-ui/button'
@@ -14,23 +13,27 @@ import { useMembers } from '@/service/use-common'
import { DEFAULT_ACCESS_POLICY_ID } from './constants'
type AddAccessSubjectPopoverProps = {
- userAccessSettings: ResourceUserAccessSetting[]
+ disabled?: boolean
+ existingAccountIds?: string[]
updatingAccountId: string | null
onAddAccessSubject: (accountId: string, accessPolicyIds: string[]) => void
}
-function AddAccessSubjectPopover({
- userAccessSettings,
+type AddAccessSubjectPopoverContentProps = {
+ existingAccountIds: string[]
+ updatingAccountId: string | null
+ onAddAccessSubject: (accountId: string, accessPolicyIds: string[]) => void
+}
+
+function AddAccessSubjectPopoverContent({
+ existingAccountIds,
updatingAccountId,
onAddAccessSubject,
-}: AddAccessSubjectPopoverProps) {
+}: AddAccessSubjectPopoverContentProps) {
const { t } = useTranslation()
- const [open, setOpen] = useState(false)
const [searchValue, setSearchValue] = useState('')
const { data: membersData, isLoading } = useMembers()
- const existingAccountIds = useMemo(() => {
- return new Set(userAccessSettings.map((setting) => setting.account.account_id))
- }, [userAccessSettings])
+ const existingAccountIdSet = useMemo(() => new Set(existingAccountIds), [existingAccountIds])
const availableMembers = useMemo(() => {
const normalizedSearchValue = searchValue.trim().toLowerCase()
@@ -53,126 +56,152 @@ function AddAccessSubjectPopover({
[onAddAccessSubject],
)
- const handleOpenChange = useCallback((nextOpen: boolean) => {
- if (!nextOpen) setSearchValue('')
-
- setOpen(nextOpen)
- }, [])
-
- const addExceptionLabel = t(($) => $['accessRule.addException'], { ns: 'permission' })
- const addMembersTitle = t(($) => $['accessRule.addMembersTitle'], { ns: 'permission' })
const addLabel = t(($) => $['operation.add'], { ns: 'common' })
+ const addMembersTitle = t(($) => $['accessRule.addMembersTitle'], { ns: 'permission' })
const addedLabel = t(($) => $['operation.added'], { ns: 'common' })
return (
- <Popover open={open} onOpenChange={handleOpenChange}>
+ <PopoverContent
+ placement="bottom-end"
+ sideOffset={8}
+ className="w-86 max-w-[calc(100vw-32px)] overflow-hidden bg-components-panel-bg-blur p-0 shadow-lg backdrop-blur-[5px]"
+ >
+ <PopoverTitle className="sr-only">{addMembersTitle}</PopoverTitle>
+ <div className="p-2 pb-1">
+ <InputGroup>
+ <InputGroupInput
+ type="search"
+ aria-label={t(($) => $['operation.search'], { ns: 'common' })}
+ value={searchValue}
+ placeholder={t(($) => $['placeholder.search'], { ns: 'common' })}
+ className="[&::-webkit-search-cancel-button]:appearance-none [&::-webkit-search-decoration]:appearance-none"
+ onValueChange={setSearchValue}
+ autoComplete="off"
+ enterKeyHint="search"
+ />
+ <InputGroupAddon className="ps-1.75 pe-1.25">
+ <span
+ className="i-ri-search-line size-4 text-components-input-text-placeholder"
+ aria-hidden="true"
+ />
+ </InputGroupAddon>
+ </InputGroup>
+ </div>
+ {isLoading ? (
+ <div className="flex h-20 items-center justify-center p-1">
+ <Loading type="app" />
+ </div>
+ ) : availableMembers.length === 0 ? (
+ <div className="px-3 py-6 text-center system-xs-regular text-text-tertiary">
+ {t(($) => $['accessRule.noAvailableMembers'], { ns: 'permission' })}
+ </div>
+ ) : (
+ <ul className="max-h-80 overflow-y-auto p-1">
+ {availableMembers.map((member) => {
+ const isAdded = existingAccountIdSet.has(member.id)
+ const isUpdating = updatingAccountId === member.id
+ const memberName = member.name || member.email
+
+ return (
+ <li
+ key={member.id}
+ className={cn(
+ 'flex min-h-10 items-center gap-2 rounded-lg py-1 pr-3 pl-2',
+ !isAdded && 'hover:bg-state-base-hover',
+ )}
+ >
+ <Avatar
+ avatar={member.avatar_url ?? member.avatar ?? null}
+ name={memberName}
+ size="sm"
+ className={cn('bg-components-icon-bg-blue-solid', isAdded && 'opacity-50')}
+ />
+ <div className={cn('min-w-0 flex-1', isAdded && 'opacity-50')}>
+ <div className="truncate system-sm-medium text-text-secondary">{memberName}</div>
+ <div className="truncate system-xs-regular text-text-tertiary">
+ {member.email}
+ </div>
+ </div>
+ {isAdded ? (
+ <button
+ type="button"
+ disabled
+ className="shrink-0 cursor-not-allowed border-0 bg-transparent p-0 system-xs-regular text-text-tertiary disabled:opacity-100"
+ >
+ {addedLabel}
+ </button>
+ ) : (
+ <button
+ type="button"
+ disabled={updatingAccountId !== null}
+ aria-label={t(($) => $['accessRule.addMemberAria'], {
+ ns: 'permission',
+ name: memberName,
+ })}
+ className={cn(
+ 'flex h-6 shrink-0 items-center rounded-md px-1 system-xs-medium text-text-accent outline-hidden',
+ 'hover:bg-state-accent-hover focus-visible:bg-state-accent-hover focus-visible:ring-2 focus-visible:ring-state-accent-solid',
+ 'disabled:cursor-not-allowed disabled:text-text-disabled disabled:hover:bg-transparent',
+ )}
+ onClick={() => handleAddMember(member)}
+ >
+ {isUpdating ? (
+ <span className="i-ri-loader-2-line size-3.5 animate-spin" aria-hidden />
+ ) : (
+ `+ ${addLabel}`
+ )}
+ </button>
+ )}
+ </li>
+ )
+ })}
+ </ul>
+ )}
+ </PopoverContent>
+ )
+}
+
+function AddAccessSubjectPopover({
+ disabled = false,
+ existingAccountIds,
+ updatingAccountId,
+ onAddAccessSubject,
+}: AddAccessSubjectPopoverProps) {
+ const { t } = useTranslation()
+ const [open, setOpen] = useState(false)
+ const isOpen = !disabled && open
+
+ const handleOpenChange = useCallback(
+ (nextOpen: boolean) => {
+ if (disabled && nextOpen) return
+
+ setOpen(nextOpen)
+ },
+ [disabled],
+ )
+
+ return (
+ <Popover open={isOpen} onOpenChange={handleOpenChange}>
<PopoverTrigger
render={
- <Button variant="primary" size="medium">
+ <Button
+ variant="primary"
+ size="medium"
+ disabled={disabled || existingAccountIds === undefined}
+ loading={!disabled && existingAccountIds === undefined}
+ >
<span className="i-ri-add-line size-3.5" aria-hidden />
- <span>{addExceptionLabel}</span>
+ <span>{t(($) => $['operation.add'], { ns: 'common' })}</span>
</Button>
}
/>
- <PopoverContent
- placement="bottom-end"
- sideOffset={8}
- className="w-[344px] max-w-[calc(100vw-32px)] overflow-hidden bg-components-panel-bg-blur p-0 shadow-lg backdrop-blur-[5px]"
- >
- <PopoverTitle className="sr-only">{addMembersTitle}</PopoverTitle>
- <div className="p-2 pb-1">
- <InputGroup>
- <InputGroupInput
- type="search"
- aria-label={t(($) => $['operation.search'], { ns: 'common' })}
- value={searchValue}
- placeholder={t(($) => $['placeholder.search'], { ns: 'common' })}
- className="[&::-webkit-search-cancel-button]:appearance-none [&::-webkit-search-decoration]:appearance-none"
- onValueChange={setSearchValue}
- autoComplete="off"
- enterKeyHint="search"
- />
- <InputGroupAddon className="ps-1.75 pe-1.25">
- <span
- className="i-ri-search-line size-4 text-components-input-text-placeholder"
- aria-hidden="true"
- />
- </InputGroupAddon>
- </InputGroup>
- </div>
- {isLoading ? (
- <div className="flex h-20 items-center justify-center p-1">
- <Loading type="app" />
- </div>
- ) : availableMembers.length === 0 ? (
- <div className="px-3 py-6 text-center system-xs-regular text-text-tertiary">
- {t(($) => $['accessRule.noAvailableMembers'], { ns: 'permission' })}
- </div>
- ) : (
- <ul className="max-h-80 overflow-y-auto p-1">
- {availableMembers.map((member) => {
- const isAdded = existingAccountIds.has(member.id)
- const isUpdating = updatingAccountId === member.id
- const memberName = member.name || member.email
-
- return (
- <li
- key={member.id}
- className={cn(
- 'flex min-h-10 items-center gap-2 rounded-lg py-1 pr-3 pl-2',
- !isAdded && 'hover:bg-state-base-hover',
- )}
- >
- <Avatar
- avatar={member.avatar_url ?? member.avatar ?? null}
- name={memberName}
- size="sm"
- className={cn('bg-components-icon-bg-blue-solid', isAdded && 'opacity-50')}
- />
- <div className={cn('min-w-0 flex-1', isAdded && 'opacity-50')}>
- <div className="truncate system-sm-medium text-text-secondary">
- {memberName}
- </div>
- <div className="truncate system-xs-regular text-text-tertiary">
- {member.email}
- </div>
- </div>
- {isAdded ? (
- <button
- type="button"
- disabled
- className="shrink-0 cursor-not-allowed border-0 bg-transparent p-0 system-xs-regular text-text-tertiary disabled:opacity-100"
- >
- {addedLabel}
- </button>
- ) : (
- <button
- type="button"
- disabled={isUpdating}
- aria-label={t(($) => $['accessRule.addMemberAria'], {
- ns: 'permission',
- name: memberName,
- })}
- className={cn(
- 'flex h-6 shrink-0 items-center rounded-md px-1 system-xs-medium text-text-accent outline-hidden',
- 'hover:bg-state-accent-hover focus-visible:bg-state-accent-hover focus-visible:ring-2 focus-visible:ring-state-accent-solid',
- 'disabled:cursor-not-allowed disabled:text-text-disabled disabled:hover:bg-transparent',
- )}
- onClick={() => handleAddMember(member)}
- >
- {isUpdating ? (
- <span className="i-ri-loader-2-line size-3.5 animate-spin" aria-hidden />
- ) : (
- `+ ${addLabel}`
- )}
- </button>
- )}
- </li>
- )
- })}
- </ul>
- )}
- </PopoverContent>
+ {isOpen && existingAccountIds !== undefined && (
+ <AddAccessSubjectPopoverContent
+ existingAccountIds={existingAccountIds}
+ updatingAccountId={updatingAccountId}
+ onAddAccessSubject={onAddAccessSubject}
+ />
+ )}
</Popover>
)
}
diff --git a/web/app/components/access-rules-editor/automatic-include-workspace-members-section.tsx b/web/app/components/access-rules-editor/automatic-include-workspace-members-section.tsx
new file mode 100644
index 00000000000..9c9912f0a9c
--- /dev/null
+++ b/web/app/components/access-rules-editor/automatic-include-workspace-members-section.tsx
@@ -0,0 +1,49 @@
+'use client'
+
+import { Switch } from '@langgenius/dify-ui/switch'
+import { memo, useId } from 'react'
+import { useTranslation } from 'react-i18next'
+
+type AutomaticIncludeWorkspaceMembersSectionProps = {
+ checked?: boolean
+ loading: boolean
+ onChange?: (checked: boolean) => void
+}
+
+function AutomaticIncludeWorkspaceMembersSection({
+ checked,
+ loading,
+ onChange,
+}: AutomaticIncludeWorkspaceMembersSectionProps) {
+ const { t } = useTranslation()
+ const labelId = useId()
+ const descriptionId = useId()
+
+ return (
+ <section className="flex min-h-21 items-center gap-4 rounded-xl border border-components-panel-border bg-background-default-subtle p-4">
+ <div className="min-w-0 flex-1">
+ <h2 id={labelId} className="system-sm-semibold text-text-secondary">
+ {t(($) => $['accessRule.automaticallyIncludeWorkspaceMembers'], {
+ ns: 'permission',
+ })}
+ </h2>
+ <p id={descriptionId} className="mt-0.5 system-xs-regular text-text-tertiary">
+ {t(($) => $['accessRule.automaticallyIncludeWorkspaceMembersDescription'], {
+ ns: 'permission',
+ })}
+ </p>
+ </div>
+ <Switch
+ size="lg"
+ checked={checked ?? false}
+ disabled={checked === undefined || !onChange}
+ loading={loading}
+ aria-labelledby={labelId}
+ aria-describedby={descriptionId}
+ onCheckedChange={onChange}
+ />
+ </section>
+ )
+}
+
+export default memo(AutomaticIncludeWorkspaceMembersSection)
diff --git a/web/app/components/access-rules-editor/batch-action.tsx b/web/app/components/access-rules-editor/batch-action.tsx
new file mode 100644
index 00000000000..b01a271a1c0
--- /dev/null
+++ b/web/app/components/access-rules-editor/batch-action.tsx
@@ -0,0 +1,104 @@
+'use client'
+
+import {
+ AlertDialog,
+ AlertDialogActions,
+ AlertDialogCancelButton,
+ AlertDialogConfirmButton,
+ AlertDialogContent,
+ AlertDialogDescription,
+ AlertDialogTitle,
+} from '@langgenius/dify-ui/alert-dialog'
+import { Button } from '@langgenius/dify-ui/button'
+import { cn } from '@langgenius/dify-ui/cn'
+import { useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import Divider from '@/app/components/base/divider'
+
+type AccessRulesBatchActionProps = {
+ className?: string
+ selectedCount: number
+ onDelete: () => Promise<void>
+ onCancel: () => void
+}
+
+export default function AccessRulesBatchAction({
+ className,
+ selectedCount,
+ onDelete,
+ onCancel,
+}: AccessRulesBatchActionProps) {
+ const { t } = useTranslation()
+ const [isDeleteConfirmOpen, setIsDeleteConfirmOpen] = useState(false)
+ const [isDeleting, setIsDeleting] = useState(false)
+
+ const handleDelete = async () => {
+ setIsDeleting(true)
+
+ try {
+ await onDelete()
+ setIsDeleteConfirmOpen(false)
+ } finally {
+ setIsDeleting(false)
+ }
+ }
+
+ return (
+ <div className={cn('pointer-events-none flex w-full justify-center', className)}>
+ <div
+ role="toolbar"
+ aria-label={t(($) => $['operation.selectCount'], {
+ ns: 'common',
+ count: selectedCount,
+ })}
+ className="pointer-events-auto flex items-center gap-1 rounded-[10px] border border-components-actionbar-border-accent bg-components-actionbar-bg-accent p-1 shadow-xl shadow-shadow-shadow-5"
+ >
+ <div className="inline-flex items-center gap-2 py-1 pr-3 pl-2">
+ <span className="flex size-5 items-center justify-center rounded-md bg-text-accent system-xs-medium text-text-primary-on-surface">
+ {selectedCount}
+ </span>
+ <span className="system-sm-semibold text-text-accent">
+ {t(($) => $['accessRule.selected'], { ns: 'permission' })}
+ </span>
+ </div>
+ <Divider type="vertical" className="mx-0.5 h-3.5 bg-divider-regular" />
+ <Button variant="ghost" tone="destructive" onClick={() => setIsDeleteConfirmOpen(true)}>
+ <span className="i-ri-delete-bin-line size-4" aria-hidden />
+ <span>{t(($) => $['operation.delete'], { ns: 'common' })}</span>
+ </Button>
+ <Divider type="vertical" className="mx-0.5 h-3.5 bg-divider-regular" />
+ <Button variant="ghost" onClick={onCancel}>
+ {t(($) => $['operation.cancel'], { ns: 'common' })}
+ </Button>
+ </div>
+ <AlertDialog
+ open={isDeleteConfirmOpen}
+ onOpenChange={(open) => {
+ if (!isDeleting) setIsDeleteConfirmOpen(open)
+ }}
+ >
+ <AlertDialogContent>
+ <div className="flex flex-col gap-2 px-6 pt-6 pb-4">
+ <AlertDialogTitle className="w-full truncate title-2xl-semi-bold text-text-primary">
+ {t(($) => $['accessRule.batchRemoveTitle'], { ns: 'permission' })}
+ </AlertDialogTitle>
+ <AlertDialogDescription className="w-full system-md-regular wrap-break-word whitespace-pre-wrap text-text-tertiary">
+ {t(($) => $['accessRule.batchRemoveDescription'], {
+ ns: 'permission',
+ count: selectedCount,
+ })}
+ </AlertDialogDescription>
+ </div>
+ <AlertDialogActions>
+ <AlertDialogCancelButton disabled={isDeleting}>
+ {t(($) => $['operation.cancel'], { ns: 'common' })}
+ </AlertDialogCancelButton>
+ <AlertDialogConfirmButton loading={isDeleting} onClick={handleDelete}>
+ {t(($) => $['operation.sure'], { ns: 'common' })}
+ </AlertDialogConfirmButton>
+ </AlertDialogActions>
+ </AlertDialogContent>
+ </AlertDialog>
+ </div>
+ )
+}
diff --git a/web/app/components/access-rules-editor/constants.ts b/web/app/components/access-rules-editor/constants.ts
index 2e5fe085136..25eb9dd549f 100644
--- a/web/app/components/access-rules-editor/constants.ts
+++ b/web/app/components/access-rules-editor/constants.ts
@@ -1,2 +1,3 @@
-export const ACCESS_RULE_TABLE_GRID = 'grid-cols-[minmax(0,0.72fr)_minmax(0,1fr)_72px]'
+export const ACCESS_RULE_TABLE_GRID =
+ 'grid-cols-[minmax(0,0.72fr)_minmax(0,1fr)_minmax(72px,0.54fr)]'
export const DEFAULT_ACCESS_POLICY_ID = 'default'
diff --git a/web/app/components/access-rules-editor/index.tsx b/web/app/components/access-rules-editor/index.tsx
index 36d9c9546ec..1f1a185e683 100644
--- a/web/app/components/access-rules-editor/index.tsx
+++ b/web/app/components/access-rules-editor/index.tsx
@@ -1,128 +1,359 @@
'use client'
-import type {
- AccessPolicyWithBindings,
- ResourceOpenScope,
- ResourceUserAccessSetting,
-} from '@/models/access-control'
+import type { AccessPolicyWithBindings, ResourceUserAccessSetting } from '@/models/access-control'
import { Button } from '@langgenius/dify-ui/button'
+import { Checkbox } from '@langgenius/dify-ui/checkbox'
import { cn } from '@langgenius/dify-ui/cn'
-import { useMemo } from 'react'
+import { Pagination } from '@langgenius/dify-ui/pagination'
+import { memo, useCallback, useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next'
import Loading from '@/app/components/base/loading'
+import { RESOURCE_ACCESS_SETTINGS_PAGE_SIZE_OPTIONS } from '@/service/access-control/constants'
import AddAccessSubjectPopover from './add-access-subject-popover'
-import { ACCESS_RULE_TABLE_GRID } from './constants'
-import ResourceOpenScopeSection from './open-scope-section'
-import TitleInfotip from './title-infotip'
+import AutomaticIncludeWorkspaceMembersSection from './automatic-include-workspace-members-section'
+import AccessRulesBatchAction from './batch-action'
+import { ACCESS_RULE_TABLE_GRID, DEFAULT_ACCESS_POLICY_ID } from './constants'
import UserAccessPolicyRow from './user-access-policy-row'
+export type AccessPolicyMemberBindingRemoval = {
+ accessPolicyId: string
+ accountIds: string[]
+}
+
export type AccessRulesEditorProps = {
rules: AccessPolicyWithBindings[]
userAccessSettings: ResourceUserAccessSetting[]
isLoadingRules: boolean
isLoadingUserAccessSettings: boolean
- openScope?: ResourceOpenScope
- isUpdatingOpenScope: boolean
+ automaticIncludeWorkspaceMembers?: boolean
+ isUpdatingAutomaticIncludeWorkspaceMembers: boolean
+ existingAccountIds?: string[]
+ currentPage?: number
+ pageSize?: number
+ totalCount?: number
+ totalPages?: number
+ isChangingPage?: boolean
updatingAccountId: string | null
maintainerId?: string | null
className?: string
- onOpenScopeChange?: (openScope: ResourceOpenScope) => void
+ onAutomaticIncludeWorkspaceMembersChange?: (checked: boolean) => void
+ onPageChange?: (page: number) => void
+ onPageSizeChange?: (pageSize: number) => void
onUserAccessPoliciesChange?: (accountId: string, accessPolicyIds: string[]) => void
onRemoveAccessPolicyMemberBinding?: (accountId: string, accessPolicyId: string) => void
+ onBatchRemoveAccessPolicyMemberBindings?: (
+ removals: AccessPolicyMemberBindingRemoval[],
+ ) => Promise<void>
onAddAccessSubject?: (accountId: string, accessPolicyIds: string[]) => void
}
-export default function AccessRulesEditor({
+function AccessRulesEditor({
rules,
userAccessSettings,
isLoadingRules,
isLoadingUserAccessSettings,
- openScope,
- isUpdatingOpenScope,
+ automaticIncludeWorkspaceMembers,
+ isUpdatingAutomaticIncludeWorkspaceMembers,
+ existingAccountIds,
+ currentPage = 1,
+ pageSize,
+ totalCount,
+ totalPages = 0,
+ isChangingPage = false,
updatingAccountId,
maintainerId,
className,
- onOpenScopeChange,
+ onAutomaticIncludeWorkspaceMembersChange,
+ onPageChange,
+ onPageSizeChange,
onUserAccessPoliciesChange,
onRemoveAccessPolicyMemberBinding,
+ onBatchRemoveAccessPolicyMemberBindings,
onAddAccessSubject,
}: AccessRulesEditorProps) {
const { t } = useTranslation()
+ const [selectedAccountIds, setSelectedAccountIds] = useState<Set<string>>(() => new Set())
const isLoading = isLoadingRules || isLoadingUserAccessSettings
- const individualPermissionSettingsTip = t(
- ($) => $['accessRule.individualPermissionSettingsTip'],
- { ns: 'permission' },
- )
+ const shouldCenterTableBody = isLoading || userAccessSettings.length === 0
+ const areMembershipChangesDisabled = automaticIncludeWorkspaceMembers === true
const policyOptions = useMemo(() => {
return rules.map((rule) => ({
id: rule.policy.id,
name: rule.policy.name,
}))
}, [rules])
+ const selectableAccountIds = useMemo(
+ () =>
+ userAccessSettings
+ .map((setting) => setting.account.account_id)
+ .filter((accountId) => accountId !== maintainerId),
+ [maintainerId, userAccessSettings],
+ )
+ const selectedAccountCount = selectableAccountIds.filter((accountId) =>
+ selectedAccountIds.has(accountId),
+ ).length
+ const areAllAccountsSelected =
+ selectableAccountIds.length > 0 && selectedAccountCount === selectableAccountIds.length
+ const areSomeAccountsSelected = selectedAccountCount > 0 && !areAllAccountsSelected
+ const showPagination = totalPages > 0 && !!onPageChange
+ const selectedBindingRemovals = useMemo(() => {
+ const accountIdsByAccessPolicyId = new Map<string, string[]>()
+
+ for (const setting of userAccessSettings) {
+ const accountId = setting.account.account_id
+ if (!selectedAccountIds.has(accountId) || accountId === maintainerId) continue
+
+ const accessPolicyId = setting.access_policies[0]?.id ?? DEFAULT_ACCESS_POLICY_ID
+ const accountIds = accountIdsByAccessPolicyId.get(accessPolicyId)
+ if (accountIds) accountIds.push(accountId)
+ else accountIdsByAccessPolicyId.set(accessPolicyId, [accountId])
+ }
+
+ return Array.from(accountIdsByAccessPolicyId, ([accessPolicyId, accountIds]) => ({
+ accessPolicyId,
+ accountIds,
+ }))
+ }, [maintainerId, selectedAccountIds, userAccessSettings])
+
+ const handleSelectAllAccounts = useCallback(
+ (selected: boolean) => {
+ setSelectedAccountIds((current) => {
+ const next = new Set(current)
+ for (const accountId of selectableAccountIds) {
+ if (selected) next.add(accountId)
+ else next.delete(accountId)
+ }
+ return next
+ })
+ },
+ [selectableAccountIds],
+ )
+
+ const handleAccountSelectedChange = useCallback((accountId: string, selected: boolean) => {
+ setSelectedAccountIds((current) => {
+ const next = new Set(current)
+ if (selected) next.add(accountId)
+ else next.delete(accountId)
+ return next
+ })
+ }, [])
+
+ const handleRemoveAccessPolicyMemberBinding = useCallback(
+ (accountId: string, accessPolicyId: string) => {
+ setSelectedAccountIds((current) => {
+ const next = new Set(current)
+ next.delete(accountId)
+ return next
+ })
+ onRemoveAccessPolicyMemberBinding?.(accountId, accessPolicyId)
+ },
+ [onRemoveAccessPolicyMemberBinding],
+ )
+
+ const handleAutomaticIncludeWorkspaceMembersChange = useCallback(
+ (checked: boolean) => {
+ if (checked) setSelectedAccountIds(new Set())
+
+ onAutomaticIncludeWorkspaceMembersChange?.(checked)
+ },
+ [onAutomaticIncludeWorkspaceMembersChange],
+ )
+
+ const handlePageChange = useCallback(
+ (page: number) => {
+ setSelectedAccountIds(new Set())
+ onPageChange?.(page)
+ },
+ [onPageChange],
+ )
+
+ const handlePageSizeChange = useCallback(
+ (nextPageSize: number) => {
+ setSelectedAccountIds(new Set())
+ onPageSizeChange?.(nextPageSize)
+ },
+ [onPageSizeChange],
+ )
+
+ const handleBatchRemoveAccessPolicyMemberBindings = useCallback(async () => {
+ if (
+ areMembershipChangesDisabled ||
+ !onBatchRemoveAccessPolicyMemberBindings ||
+ selectedBindingRemovals.length === 0
+ )
+ return
+
+ await onBatchRemoveAccessPolicyMemberBindings(selectedBindingRemovals)
+ setSelectedAccountIds(new Set())
+ }, [
+ areMembershipChangesDisabled,
+ onBatchRemoveAccessPolicyMemberBindings,
+ selectedBindingRemovals,
+ ])
return (
- <div className={cn('flex flex-col gap-4', className)}>
- <ResourceOpenScopeSection
- value={openScope}
- disabled={isUpdatingOpenScope || !openScope}
- onChange={onOpenScopeChange}
- />
+ <div className={cn('flex min-h-0 flex-col gap-4 overflow-hidden', className)}>
<div className="flex min-h-8 items-center gap-2">
- <div className="flex min-w-0 flex-1 items-center gap-1">
+ <div className="flex min-w-0 flex-1 items-center gap-2">
<h2 className="system-sm-semibold text-text-secondary">
- {t(($) => $['accessRule.individualPermissionSettings'], { ns: 'permission' })}
+ {t(($) => $['accessRule.allowedMembers'], { ns: 'permission' })}
</h2>
- <TitleInfotip content={individualPermissionSettingsTip} />
+ <span className="flex min-w-4.5 items-center justify-center rounded-[5px] border border-divider-deep px-1.25 py-0.75 system-2xs-medium-uppercase text-text-tertiary">
+ {totalCount ?? 0}
+ </span>
</div>
{onAddAccessSubject ? (
<AddAccessSubjectPopover
- userAccessSettings={userAccessSettings}
+ disabled={areMembershipChangesDisabled}
+ existingAccountIds={existingAccountIds}
updatingAccountId={updatingAccountId}
onAddAccessSubject={onAddAccessSubject}
/>
) : (
<Button variant="primary" size="medium" disabled>
<span className="i-ri-add-line size-3.5" aria-hidden />
- <span>{t(($) => $['accessRule.addException'], { ns: 'permission' })}</span>
+ <span>{t(($) => $['operation.add'], { ns: 'common' })}</span>
</Button>
)}
</div>
- <section className="overflow-hidden rounded-xl border border-components-panel-border bg-components-panel-bg">
- <div
- className={cn(
- 'grid items-center gap-4 border-b border-divider-deep px-10 py-4 system-sm-semibold text-text-tertiary',
- ACCESS_RULE_TABLE_GRID,
- )}
+ <AutomaticIncludeWorkspaceMembersSection
+ checked={automaticIncludeWorkspaceMembers}
+ loading={isUpdatingAutomaticIncludeWorkspaceMembers}
+ onChange={
+ onAutomaticIncludeWorkspaceMembersChange
+ ? handleAutomaticIncludeWorkspaceMembersChange
+ : undefined
+ }
+ />
+ <div className="relative min-h-0 w-full flex-1">
+ <section
+ aria-busy={isLoading || isChangingPage}
+ className="flex h-full min-h-0 flex-col overflow-hidden rounded-xl border border-components-panel-border bg-components-panel-bg"
>
- <div>{t(($) => $['accessRule.member'], { ns: 'permission' })}</div>
- <div>{t(($) => $['accessRule.permission'], { ns: 'permission' })}</div>
- <div>{t(($) => $['accessRule.actions'], { ns: 'permission' })}</div>
- </div>
- {isLoading ? (
- <div className="px-4 py-8 text-center">
- <Loading type="app" />
- </div>
- ) : userAccessSettings.length === 0 ? (
- <div className="px-4 py-8 text-center system-sm-regular text-text-tertiary">
- {t(($) => $['accessRule.noUserAccessSettings'], { ns: 'permission' })}
- </div>
- ) : (
- <div className="px-4">
- {userAccessSettings.map((setting, index) => (
- <UserAccessPolicyRow
- key={setting.account.account_id}
- setting={setting}
- policyOptions={policyOptions}
- disabled={updatingAccountId === setting.account.account_id}
- isMaintainer={maintainerId === setting.account.account_id}
- className={cn(index > 0 && 'border-t border-divider-subtle')}
- onChange={onUserAccessPoliciesChange}
- onRemove={onRemoveAccessPolicyMemberBinding}
- />
- ))}
- </div>
- )}
- </section>
+ <table
+ aria-label={t(($) => $['accessRule.allowedMembers'], {
+ ns: 'permission',
+ })}
+ className="flex min-h-0 w-full flex-1 flex-col"
+ >
+ <thead className="block shrink-0 bg-components-panel-bg">
+ <tr
+ className={cn(
+ 'grid items-center gap-4 border-b border-divider-deep px-4 py-4 system-sm-semibold text-text-tertiary',
+ ACCESS_RULE_TABLE_GRID,
+ )}
+ >
+ <th scope="col" className="font-inherit flex items-center gap-3 text-left">
+ <Checkbox
+ aria-label={t(($) => $['operation.selectAll'], { ns: 'common' })}
+ checked={areAllAccountsSelected}
+ indeterminate={areSomeAccountsSelected}
+ disabled={
+ isChangingPage ||
+ areMembershipChangesDisabled ||
+ !onBatchRemoveAccessPolicyMemberBindings ||
+ selectableAccountIds.length === 0
+ }
+ onCheckedChange={handleSelectAllAccounts}
+ />
+ <span>{t(($) => $['accessRule.collaborator'], { ns: 'permission' })}</span>
+ </th>
+ <th scope="col" className="font-inherit text-left">
+ {t(($) => $['accessRule.accessPermission'], { ns: 'permission' })}
+ </th>
+ <th scope="col" className="font-inherit text-left">
+ {t(($) => $['accessRule.actions'], { ns: 'permission' })}
+ </th>
+ </tr>
+ </thead>
+ <tbody
+ className={cn(
+ 'block min-h-0 flex-1 overflow-y-auto overscroll-contain px-4 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-state-accent-solid focus-visible:outline-solid',
+ shouldCenterTableBody && 'flex flex-col',
+ )}
+ >
+ {isLoading ? (
+ <tr className="flex flex-1">
+ <td
+ colSpan={3}
+ className="flex flex-1 items-center justify-center px-4 py-8 text-center"
+ >
+ <Loading type="app" />
+ </td>
+ </tr>
+ ) : userAccessSettings.length === 0 ? (
+ <tr className="flex flex-1">
+ <td
+ colSpan={3}
+ className="flex flex-1 items-center justify-center px-4 py-8 text-center system-sm-regular text-text-tertiary"
+ >
+ {t(($) => $['accessRule.noUserAccessSettings'], { ns: 'permission' })}
+ </td>
+ </tr>
+ ) : (
+ userAccessSettings.map((setting, index) => (
+ <UserAccessPolicyRow
+ key={setting.account.account_id}
+ setting={setting}
+ policyOptions={policyOptions}
+ disabled={isChangingPage || updatingAccountId === setting.account.account_id}
+ membershipChangesDisabled={areMembershipChangesDisabled}
+ selectionDisabled={!onBatchRemoveAccessPolicyMemberBindings}
+ isMaintainer={maintainerId === setting.account.account_id}
+ selected={selectedAccountIds.has(setting.account.account_id)}
+ className={cn(index > 0 && 'border-t border-divider-subtle')}
+ onSelectedChange={handleAccountSelectedChange}
+ onChange={onUserAccessPoliciesChange}
+ onRemove={handleRemoveAccessPolicyMemberBinding}
+ />
+ ))
+ )}
+ </tbody>
+ </table>
+ {showPagination ? (
+ <Pagination
+ page={currentPage}
+ totalPages={totalPages}
+ onPageChange={handlePageChange}
+ className="shrink-0 border-t border-divider-subtle"
+ labels={{
+ previous: t(($) => $['pagination.previous'], { ns: 'common' }),
+ next: t(($) => $['pagination.next'], { ns: 'common' }),
+ editPageNumber: (page, pageCount) =>
+ t(($) => $['pagination.editPageNumber'], {
+ ns: 'common',
+ page,
+ totalPages: pageCount,
+ }),
+ pageNumberInput: t(($) => $['pagination.pageNumber'], { ns: 'common' }),
+ }}
+ pageSize={
+ pageSize !== undefined && onPageSizeChange
+ ? {
+ value: pageSize,
+ options: RESOURCE_ACCESS_SETTINGS_PAGE_SIZE_OPTIONS,
+ onValueChange: handlePageSizeChange,
+ label: t(($) => $['pagination.perPage'], { ns: 'common' }),
+ ariaLabel: t(($) => $['pagination.perPage'], { ns: 'common' }),
+ }
+ : undefined
+ }
+ />
+ ) : null}
+ </section>
+ {selectedAccountCount > 0 &&
+ !areMembershipChangesDisabled &&
+ onBatchRemoveAccessPolicyMemberBindings ? (
+ <AccessRulesBatchAction
+ className={cn('absolute inset-x-0 z-20', showPagination ? 'bottom-16' : 'bottom-4')}
+ selectedCount={selectedAccountCount}
+ onDelete={handleBatchRemoveAccessPolicyMemberBindings}
+ onCancel={() => setSelectedAccountIds(new Set())}
+ />
+ ) : null}
+ </div>
</div>
)
}
+
+export default memo(AccessRulesEditor)
diff --git a/web/app/components/access-rules-editor/open-scope-confirm-dialog.tsx b/web/app/components/access-rules-editor/open-scope-confirm-dialog.tsx
deleted file mode 100644
index e164b1354b9..00000000000
--- a/web/app/components/access-rules-editor/open-scope-confirm-dialog.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-'use client'
-
-import {
- AlertDialog,
- AlertDialogActions,
- AlertDialogCancelButton,
- AlertDialogConfirmButton,
- AlertDialogContent,
- AlertDialogDescription,
- AlertDialogTitle,
-} from '@langgenius/dify-ui/alert-dialog'
-import { memo, useCallback } from 'react'
-import { useTranslation } from 'react-i18next'
-
-type OpenScopeConfirmDialogProps = {
- open: boolean
- onCancel: () => void
- onConfirm: () => void
-}
-
-function OpenScopeConfirmDialog({ open, onCancel, onConfirm }: OpenScopeConfirmDialogProps) {
- const { t } = useTranslation()
- const handleOpenChange = useCallback(
- (nextOpen: boolean) => {
- if (!nextOpen) onCancel()
- },
- [onCancel],
- )
-
- return (
- <AlertDialog open={open} onOpenChange={handleOpenChange}>
- <AlertDialogContent className="w-120 overflow-hidden! rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg p-0! text-left align-middle shadow-lg">
- <div className="flex flex-col items-start gap-2 self-stretch p-6 pb-4">
- <AlertDialogTitle className="title-2xl-semi-bold text-text-primary">
- {t(($) => $['accessRule.changeOpenScopeTitle'], { ns: 'permission' })}
- </AlertDialogTitle>
- <AlertDialogDescription
- render={<div />}
- className="system-md-regular text-text-secondary"
- >
- {t(($) => $['accessRule.changeOpenScopeDescription'], { ns: 'permission' })}
- </AlertDialogDescription>
- </div>
- <AlertDialogActions className="gap-2 p-6">
- <AlertDialogCancelButton variant="secondary">
- {t(($) => $['operation.cancel'], { ns: 'common' })}
- </AlertDialogCancelButton>
- <AlertDialogConfirmButton onClick={onConfirm}>
- {t(($) => $['operation.change'], { ns: 'common' })}
- </AlertDialogConfirmButton>
- </AlertDialogActions>
- </AlertDialogContent>
- </AlertDialog>
- )
-}
-
-export default memo(OpenScopeConfirmDialog)
diff --git a/web/app/components/access-rules-editor/open-scope-option.tsx b/web/app/components/access-rules-editor/open-scope-option.tsx
deleted file mode 100644
index fb2fc20943e..00000000000
--- a/web/app/components/access-rules-editor/open-scope-option.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-'use client'
-
-import type { ResourceOpenScope } from '@/models/access-control'
-import { cn } from '@langgenius/dify-ui/cn'
-import { memo } from 'react'
-
-type OpenScopeOptionProps = {
- value: ResourceOpenScope
- selected: boolean
- disabled: boolean
- title: string
- description: string
- onChange?: (openScope: ResourceOpenScope) => void
-}
-
-function OpenScopeOption({
- value,
- selected,
- disabled,
- title,
- description,
- onChange,
-}: OpenScopeOptionProps) {
- return (
- <button
- type="button"
- aria-pressed={selected}
- disabled={disabled || !onChange}
- className={cn(
- 'flex min-h-19 flex-col items-start rounded-xl border bg-components-panel-bg px-7 py-3 text-left shadow-xs outline-hidden transition-colors',
- 'focus-visible:ring-2 focus-visible:ring-state-accent-solid',
- selected
- ? 'border-[1.5px] border-state-accent-solid'
- : 'border-components-panel-border hover:border-divider-deep',
- (disabled || !onChange) && 'cursor-not-allowed opacity-70',
- )}
- onClick={() => onChange?.(value)}
- >
- <div className="system-sm-semibold text-text-secondary">{title}</div>
- <p className="mt-0.5 system-xs-regular text-text-tertiary">{description}</p>
- </button>
- )
-}
-
-export default memo(OpenScopeOption)
diff --git a/web/app/components/access-rules-editor/open-scope-section.tsx b/web/app/components/access-rules-editor/open-scope-section.tsx
deleted file mode 100644
index 8f3ecfe9a76..00000000000
--- a/web/app/components/access-rules-editor/open-scope-section.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-'use client'
-
-import type { ResourceOpenScope } from '@/models/access-control'
-import { memo, useCallback, useState } from 'react'
-import { useTranslation } from 'react-i18next'
-import OpenScopeConfirmDialog from './open-scope-confirm-dialog'
-import OpenScopeOption from './open-scope-option'
-import TitleInfotip from './title-infotip'
-
-type ResourceOpenScopeSectionProps = {
- value?: ResourceOpenScope
- disabled: boolean
- onChange?: (openScope: ResourceOpenScope) => void
-}
-
-function ResourceOpenScopeSection({ value, disabled, onChange }: ResourceOpenScopeSectionProps) {
- const { t } = useTranslation()
- const [pendingOpenScope, setPendingOpenScope] = useState<ResourceOpenScope | null>(null)
- const resourceOpenScopeDescription = t(($) => $['accessRule.resourceOpenScopeDescription'], {
- ns: 'permission',
- })
-
- const handleRequestChange = useCallback(
- (nextOpenScope: ResourceOpenScope) => {
- if (nextOpenScope === value) return
-
- setPendingOpenScope(nextOpenScope)
- },
- [value],
- )
-
- const handleCancelChange = useCallback(() => {
- setPendingOpenScope(null)
- }, [])
-
- const handleConfirmChange = useCallback(() => {
- if (!pendingOpenScope) return
-
- onChange?.(pendingOpenScope)
- setPendingOpenScope(null)
- }, [onChange, pendingOpenScope])
-
- return (
- <section className="flex flex-col gap-2">
- <div className="flex min-w-0 items-center gap-1">
- <h2 className="system-sm-semibold text-text-secondary">
- {t(($) => $['accessRule.resourceOpenScope'], { ns: 'permission' })}
- </h2>
- <TitleInfotip content={resourceOpenScopeDescription} />
- </div>
- <div className="grid grid-cols-1 gap-2 sm:grid-cols-2">
- <OpenScopeOption
- value="all"
- selected={value === 'all'}
- disabled={disabled || !onChange}
- title={t(($) => $['accessRule.allPermittedMembers'], { ns: 'permission' })}
- description={t(($) => $['accessRule.allPermittedMembersDescription'], {
- ns: 'permission',
- })}
- onChange={onChange ? handleRequestChange : undefined}
- />
- <OpenScopeOption
- value="specific"
- selected={value === 'specific'}
- disabled={disabled || !onChange}
- title={t(($) => $['accessRule.specificMembersOnly'], { ns: 'permission' })}
- description={t(($) => $['accessRule.specificMembersOnlyDescription'], {
- ns: 'permission',
- })}
- onChange={onChange ? handleRequestChange : undefined}
- />
- </div>
- <OpenScopeConfirmDialog
- open={!!pendingOpenScope}
- onCancel={handleCancelChange}
- onConfirm={handleConfirmChange}
- />
- </section>
- )
-}
-
-export default memo(ResourceOpenScopeSection)
diff --git a/web/app/components/access-rules-editor/title-infotip.tsx b/web/app/components/access-rules-editor/title-infotip.tsx
deleted file mode 100644
index d0b150c2dc6..00000000000
--- a/web/app/components/access-rules-editor/title-infotip.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-'use client'
-
-import { Infotip } from '@/app/components/base/infotip'
-
-export default function TitleInfotip({ content }: { content: string }) {
- return (
- <Infotip
- aria-label={content}
- popupClassName="max-w-64 text-left wrap-break-word text-text-secondary"
- >
- {content}
- </Infotip>
- )
-}
diff --git a/web/app/components/access-rules-editor/user-access-policy-row.tsx b/web/app/components/access-rules-editor/user-access-policy-row.tsx
index efa817549c9..b1a1a22e1e5 100644
--- a/web/app/components/access-rules-editor/user-access-policy-row.tsx
+++ b/web/app/components/access-rules-editor/user-access-policy-row.tsx
@@ -2,6 +2,7 @@
import type { ResourceUserAccessSetting } from '@/models/access-control'
import { Avatar } from '@langgenius/dify-ui/avatar'
+import { Checkbox } from '@langgenius/dify-ui/checkbox'
import { cn } from '@langgenius/dify-ui/cn'
import {
Select,
@@ -25,8 +26,12 @@ type UserAccessPolicyRowProps = {
setting: ResourceUserAccessSetting
policyOptions: PolicyOption[]
disabled: boolean
+ membershipChangesDisabled?: boolean
+ selectionDisabled?: boolean
isMaintainer?: boolean
+ selected?: boolean
className?: string
+ onSelectedChange?: (accountId: string, selected: boolean) => void
onChange?: (accountId: string, accessPolicyIds: string[]) => void
onRemove?: (accountId: string, accessPolicyId: string) => void
}
@@ -35,18 +40,23 @@ function UserAccessPolicyRow({
setting,
policyOptions,
disabled,
+ membershipChangesDisabled = false,
+ selectionDisabled = false,
isMaintainer = false,
+ selected = false,
className,
+ onSelectedChange,
onChange,
onRemove,
}: UserAccessPolicyRowProps) {
const { t } = useTranslation()
const accountId = setting.account.account_id
const selectedPolicy = setting.access_policies[0]
- const selectedAccessPolicyId = selectedPolicy?.id
- const selectedPolicyId = selectedAccessPolicyId ?? DEFAULT_ACCESS_POLICY_ID
+ const selectedPolicyId = selectedPolicy?.id ?? DEFAULT_ACCESS_POLICY_ID
const isPolicySelectDisabled = disabled || isMaintainer || !onChange
- const isRemoveDisabled = disabled || isMaintainer || !onRemove || !selectedAccessPolicyId
+ const isRemoveDisabled = disabled || membershipChangesDisabled || isMaintainer || !onRemove
+ const isSelectionDisabled =
+ disabled || membershipChangesDisabled || selectionDisabled || isMaintainer || !onSelectedChange
const defaultAccessPolicyName = t(($) => $['accessRule.defaultPermission'], { ns: 'permission' })
const accountEmail = setting.account.email || setting.account.account_name
@@ -60,20 +70,20 @@ function UserAccessPolicyRow({
)
const handleRemove = useCallback(() => {
- if (isRemoveDisabled || !selectedAccessPolicyId) return
+ if (isRemoveDisabled) return
- onRemove?.(accountId, selectedAccessPolicyId)
- }, [accountId, isRemoveDisabled, onRemove, selectedAccessPolicyId])
+ onRemove?.(accountId, selectedPolicyId)
+ }, [accountId, isRemoveDisabled, onRemove, selectedPolicyId])
return (
- <div
- className={cn(
- 'grid min-h-19 items-center gap-4 px-6 py-4',
- ACCESS_RULE_TABLE_GRID,
- className,
- )}
- >
- <div className="flex min-w-0 items-center gap-3">
+ <tr className={cn('grid min-h-19 items-center gap-4 py-4', ACCESS_RULE_TABLE_GRID, className)}>
+ <td className="flex min-w-0 items-center gap-3">
+ <Checkbox
+ aria-label={setting.account.account_name}
+ checked={selected}
+ disabled={isSelectionDisabled}
+ onCheckedChange={(checked) => onSelectedChange?.(accountId, checked)}
+ />
<Avatar
avatar={setting.account.avatar ?? null}
name={setting.account.account_name}
@@ -93,45 +103,49 @@ function UserAccessPolicyRow({
</div>
<p className="truncate system-xs-regular text-text-tertiary">{accountEmail}</p>
</div>
- </div>
- <Select value={selectedPolicyId} onValueChange={handlePolicyChange}>
- <SelectTrigger
- aria-label={t(($) => $['accessRule.exceptionPermissionFor'], {
- ns: 'permission',
- name: setting.account.account_name,
- })}
- size="small"
- disabled={isPolicySelectDisabled}
- className="w-36"
- >
- <SelectValue>
- {selectedPolicyId === DEFAULT_ACCESS_POLICY_ID
- ? defaultAccessPolicyName
- : setting.access_policies[0]?.name}
- </SelectValue>
- </SelectTrigger>
- <SelectContent>
- <SelectItem value={DEFAULT_ACCESS_POLICY_ID}>
- <SelectItemText>{defaultAccessPolicyName}</SelectItemText>
- <SelectItemIndicator />
- </SelectItem>
- {policyOptions.map((policy) => (
- <SelectItem key={policy.id} value={policy.id}>
- <SelectItemText>{policy.name}</SelectItemText>
+ </td>
+ <td>
+ <Select value={selectedPolicyId} onValueChange={handlePolicyChange}>
+ <SelectTrigger
+ aria-label={t(($) => $['accessRule.exceptionPermissionFor'], {
+ ns: 'permission',
+ name: setting.account.account_name,
+ })}
+ size="small"
+ disabled={isPolicySelectDisabled}
+ className="w-30.25"
+ >
+ <SelectValue>
+ {selectedPolicyId === DEFAULT_ACCESS_POLICY_ID
+ ? defaultAccessPolicyName
+ : setting.access_policies[0]?.name}
+ </SelectValue>
+ </SelectTrigger>
+ <SelectContent>
+ <SelectItem value={DEFAULT_ACCESS_POLICY_ID}>
+ <SelectItemText>{defaultAccessPolicyName}</SelectItemText>
<SelectItemIndicator />
</SelectItem>
- ))}
- </SelectContent>
- </Select>
- <button
- type="button"
- disabled={isRemoveDisabled}
- className="w-fit rounded-md border-none bg-transparent p-0 text-left system-xs-medium text-text-destructive outline-hidden hover:underline focus-visible:ring-2 focus-visible:ring-state-accent-solid disabled:cursor-not-allowed disabled:text-text-disabled disabled:hover:no-underline"
- onClick={handleRemove}
- >
- {t(($) => $['operation.remove'], { ns: 'common' })}
- </button>
- </div>
+ {policyOptions.map((policy) => (
+ <SelectItem key={policy.id} value={policy.id}>
+ <SelectItemText>{policy.name}</SelectItemText>
+ <SelectItemIndicator />
+ </SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
+ </td>
+ <td>
+ <button
+ type="button"
+ disabled={isRemoveDisabled}
+ className="w-fit rounded-md border-none bg-transparent p-0 text-left system-md-medium text-text-destructive outline-hidden hover:underline focus-visible:ring-2 focus-visible:ring-state-accent-solid disabled:cursor-not-allowed disabled:text-text-disabled disabled:hover:no-underline"
+ onClick={handleRemove}
+ >
+ {t(($) => $['operation.remove'], { ns: 'common' })}
+ </button>
+ </td>
+ </tr>
)
}
diff --git a/web/app/components/app/access-config/__tests__/index.spec.tsx b/web/app/components/app/access-config/__tests__/index.spec.tsx
index 6b436e4ac35..98808f656a1 100644
--- a/web/app/components/app/access-config/__tests__/index.spec.tsx
+++ b/web/app/components/app/access-config/__tests__/index.spec.tsx
@@ -1,8 +1,10 @@
import type { AccessRulesEditorProps } from '@/app/components/access-rules-editor'
-import { screen } from '@testing-library/react'
+import { act, screen } from '@testing-library/react'
import { useStore } from '@/app/components/app/store'
import {
useAppAccessRules,
+ useAppResourceWhitelist,
+ useAppResourceWhitelistConfig,
useAppUserAccessSettings,
} from '@/service/access-control/use-app-access-config'
import { renderWithConsoleQuery } from '@/test/console/query-data'
@@ -19,9 +21,7 @@ let mockIsRbacEnabled = true
const render = (ui: Parameters<typeof renderWithConsoleQuery>[0]) =>
renderWithConsoleQuery(ui, {
accountProfile: mockConsoleState.userProfile,
- systemFeatures: {
- rbac_enabled: mockIsRbacEnabled,
- },
+ systemFeatures: { rbac_enabled: mockIsRbacEnabled },
})
const mockAppAccessRules = vi.hoisted(() => ({
@@ -29,10 +29,39 @@ const mockAppAccessRules = vi.hoisted(() => ({
isLoading: false,
}))
+const createUserAccessSetting = (
+ accountId: string,
+): AccessRulesEditorProps['userAccessSettings'][number] => ({
+ account: {
+ account_id: accountId,
+ account_name: accountId,
+ },
+ roles: [],
+ access_policies: [],
+})
+
const mockAppUserAccessSettings = vi.hoisted(() => ({
- data: [] as NonNullable<AccessRulesEditorProps['userAccessSettings']>,
- scope: 'specific' as AccessRulesEditorProps['openScope'],
+ data: [] as AccessRulesEditorProps['userAccessSettings'],
+ pagination: {
+ current_page: 1,
+ per_page: 10,
+ total_count: 0,
+ total_pages: 0,
+ },
isLoading: false,
+ isPlaceholderData: false,
+}))
+
+const mockAppResourceWhitelist = vi.hoisted(() => ({
+ data: {
+ account_ids: [] as string[],
+ } as { account_ids?: string[] } | undefined,
+}))
+
+const mockAppResourceWhitelistConfig = vi.hoisted(() => ({
+ data: {
+ automatic_include_workspace_members: false,
+ } as { automatic_include_workspace_members: boolean } | undefined,
}))
const mockAccessRulesEditor = vi.hoisted(() => ({
@@ -40,9 +69,11 @@ const mockAccessRulesEditor = vi.hoisted(() => ({
}))
const mockMutations = vi.hoisted(() => ({
- updateOpenScope: vi.fn(),
+ updateAutomaticIncludeWorkspaceMembers: vi.fn(),
updateUserAccessSettings: vi.fn(),
removeMemberBindings: vi.fn(),
+ removeMemberBindingsAsync: vi.fn(),
+ isUpdatingAutomaticIncludeWorkspaceMembers: false,
}))
vi.mock('@/context/permission-state', async () => {
@@ -56,20 +87,25 @@ vi.mock('@/service/access-control/use-app-access-config', () => ({
isLoading: mockAppAccessRules.isLoading,
})),
useAppUserAccessSettings: vi.fn(() => ({
- data: mockAppUserAccessSettings.scope
- ? { data: mockAppUserAccessSettings.data, scope: mockAppUserAccessSettings.scope }
- : undefined,
+ data: {
+ data: mockAppUserAccessSettings.data,
+ pagination: mockAppUserAccessSettings.pagination,
+ },
isLoading: mockAppUserAccessSettings.isLoading,
+ isPlaceholderData: mockAppUserAccessSettings.isPlaceholderData,
})),
- useUpdateAppOpenScope: vi.fn(() => ({
- mutate: mockMutations.updateOpenScope,
- isPending: false,
+ useAppResourceWhitelist: vi.fn(() => ({ data: mockAppResourceWhitelist.data })),
+ useAppResourceWhitelistConfig: vi.fn(() => ({ data: mockAppResourceWhitelistConfig.data })),
+ useUpdateAppAutomaticIncludeWorkspaceMembers: vi.fn(() => ({
+ mutate: mockMutations.updateAutomaticIncludeWorkspaceMembers,
+ isPending: mockMutations.isUpdatingAutomaticIncludeWorkspaceMembers,
})),
useUpdateAppUserAccessSettings: vi.fn(() => ({
mutate: mockMutations.updateUserAccessSettings,
})),
useRemoveAppAccessPolicyMemberBindings: vi.fn(() => ({
mutate: mockMutations.removeMemberBindings,
+ mutateAsync: mockMutations.removeMemberBindingsAsync,
})),
}))
@@ -89,161 +125,259 @@ describe('AppAccessConfigPage', () => {
mockAppAccessRules.items = []
mockAppAccessRules.isLoading = false
mockAppUserAccessSettings.data = []
- mockAppUserAccessSettings.scope = 'specific'
+ mockAppUserAccessSettings.pagination = {
+ current_page: 1,
+ per_page: 10,
+ total_count: 0,
+ total_pages: 0,
+ }
mockAppUserAccessSettings.isLoading = false
+ mockAppUserAccessSettings.isPlaceholderData = false
+ mockAppResourceWhitelist.data = {
+ account_ids: [],
+ }
+ mockAppResourceWhitelistConfig.data = {
+ automatic_include_workspace_members: false,
+ }
+ mockMutations.isUpdatingAutomaticIncludeWorkspaceMembers = false
+ mockMutations.removeMemberBindingsAsync.mockResolvedValue(undefined)
mockAccessRulesEditor.props = null
useStore.setState({
appDetail: {
id: 'app-1',
maintainer: 'account-1',
permission_keys: [AppACLPermission.AccessConfig],
- } as NonNullable<ReturnType<typeof useStore.getState>['appDetail']>,
+ } as unknown as NonNullable<ReturnType<typeof useStore.getState>['appDetail']>,
})
})
- // Rendering wires the app access rules into the shared editor.
- describe('Rendering', () => {
- it('should render access config title and pass app rules to the editor', () => {
- render(<AppAccessConfigPage appId="app-1" />)
-
- expect(
- screen.getByRole('heading', { name: 'common.settings.resourceAccess' }),
- ).toBeInTheDocument()
- expect(screen.getByText('permission.accessRule.appDescription')).toBeInTheDocument()
- expect(screen.getByTestId('access-rules-editor')).toBeInTheDocument()
- expect(mockAccessRulesEditor.props?.className).toBe('w-full max-w-200')
- expect(mockAccessRulesEditor.props?.rules).toEqual([])
- expect(mockAccessRulesEditor.props?.userAccessSettings).toEqual([])
- expect(mockAccessRulesEditor.props?.openScope).toBe('specific')
- })
+ it('should render the first paginated member page with config and whitelist data', () => {
+ mockAppResourceWhitelistConfig.data = {
+ automatic_include_workspace_members: true,
+ }
+ mockAppUserAccessSettings.pagination = {
+ current_page: 1,
+ per_page: 10,
+ total_count: 45,
+ total_pages: 3,
+ }
+ mockAppResourceWhitelist.data = {
+ account_ids: ['account-1', 'account-2'],
+ }
+
+ render(<AppAccessConfigPage appId="app-1" />)
+
+ expect(
+ screen.getByRole('heading', { name: 'common.settings.resourceAccess' }),
+ ).toBeInTheDocument()
+ expect(screen.getByTestId('access-rules-editor')).toBeInTheDocument()
+ expect(useAppUserAccessSettings).toHaveBeenCalledWith('app-1', expect.any(String), 1, 10)
+ expect(useAppResourceWhitelist).toHaveBeenCalledWith('app-1')
+ expect(useAppResourceWhitelistConfig).toHaveBeenCalledWith('app-1')
+ expect(mockAccessRulesEditor.props?.automaticIncludeWorkspaceMembers).toBe(true)
+ expect(mockAccessRulesEditor.props?.existingAccountIds).toEqual(['account-1', 'account-2'])
+ expect(mockAccessRulesEditor.props?.currentPage).toBe(1)
+ expect(mockAccessRulesEditor.props?.pageSize).toBe(10)
+ expect(mockAccessRulesEditor.props?.totalCount).toBe(45)
+ expect(mockAccessRulesEditor.props?.totalPages).toBe(3)
+ expect(mockAccessRulesEditor.props?.maintainerId).toBe('account-1')
+ })
- it('should not pass open scope before user access settings finish loading', () => {
- mockAppUserAccessSettings.scope = undefined
- mockAppUserAccessSettings.isLoading = true
+ it('should keep the switch state while the add-member whitelist is loading', () => {
+ mockAppResourceWhitelistConfig.data = {
+ automatic_include_workspace_members: true,
+ }
+ mockAppResourceWhitelist.data = undefined
- render(<AppAccessConfigPage appId="app-1" />)
+ render(<AppAccessConfigPage appId="app-1" />)
- expect(mockAccessRulesEditor.props?.openScope).toBeUndefined()
- })
+ expect(mockAccessRulesEditor.props?.automaticIncludeWorkspaceMembers).toBe(true)
+ expect(mockAccessRulesEditor.props?.existingAccountIds).toBeUndefined()
+ })
- it('should pass the user access settings open scope to the editor', () => {
- mockAppUserAccessSettings.scope = 'all'
+ it('should request the selected member page', () => {
+ render(<AppAccessConfigPage appId="app-1" />)
- render(<AppAccessConfigPage appId="app-1" />)
+ act(() => mockAccessRulesEditor.props?.onPageChange?.(2))
- expect(mockAccessRulesEditor.props?.openScope).toBe('all')
- })
+ expect(useAppUserAccessSettings).toHaveBeenLastCalledWith('app-1', expect.any(String), 2, 10)
+ })
- it('should pass access rule loading state to the editor', () => {
- mockAppAccessRules.isLoading = true
- mockAppUserAccessSettings.isLoading = true
+ it('should request the selected page size from the first page', () => {
+ render(<AppAccessConfigPage appId="app-1" />)
- render(<AppAccessConfigPage appId="app-1" />)
+ act(() => mockAccessRulesEditor.props?.onPageChange?.(3))
+ act(() => mockAccessRulesEditor.props?.onPageSizeChange?.(50))
- expect(mockAccessRulesEditor.props?.isLoadingRules).toBe(true)
- expect(mockAccessRulesEditor.props?.isLoadingUserAccessSettings).toBe(true)
- expect(mockAccessRulesEditor.props?.isUpdatingOpenScope).toBe(true)
- })
+ expect(useAppUserAccessSettings).toHaveBeenLastCalledWith('app-1', expect.any(String), 1, 50)
+ expect(mockAccessRulesEditor.props?.pageSize).toBe(50)
+ })
+
+ it('should return to the first page when automatic member inclusion is disabled', () => {
+ mockAppResourceWhitelistConfig.data = {
+ automatic_include_workspace_members: true,
+ }
+ render(<AppAccessConfigPage appId="app-1" />)
+ act(() => mockAccessRulesEditor.props?.onPageChange?.(2))
+
+ act(() => mockAccessRulesEditor.props?.onAutomaticIncludeWorkspaceMembersChange?.(false))
- it('should pass the app maintainer id from app detail to the editor', () => {
- useStore.setState({
- appDetail: {
- id: 'app-1',
- maintainer: 'account-1',
- permission_keys: [AppACLPermission.AccessConfig],
- } as NonNullable<ReturnType<typeof useStore.getState>['appDetail']>,
- })
+ expect(useAppUserAccessSettings).toHaveBeenLastCalledWith('app-1', expect.any(String), 1, 10)
+ })
+
+ it('should jump to the new last page after adding a member', () => {
+ mockAppUserAccessSettings.pagination = {
+ current_page: 2,
+ per_page: 10,
+ total_count: 20,
+ total_pages: 2,
+ }
+ mockAppResourceWhitelist.data = {
+ // The whitelist can omit an implicitly included maintainer; pagination is authoritative.
+ account_ids: Array.from({ length: 19 }, (_, index) => `account-${index + 1}`),
+ }
+ render(<AppAccessConfigPage appId="app-1" />)
+
+ act(() => mockAccessRulesEditor.props?.onAddAccessSubject?.('account-21', ['default']))
+
+ expect(mockMutations.updateUserAccessSettings).toHaveBeenCalledWith(
+ { accountId: 'account-21', accessPolicyIds: ['default'] },
+ expect.objectContaining({ onSuccess: expect.any(Function), onSettled: expect.any(Function) }),
+ )
+ const callbacks = mockMutations.updateUserAccessSettings.mock.calls.at(-1)?.[1] as {
+ onSuccess: () => void
+ }
+ act(() => callbacks.onSuccess())
+ expect(useAppUserAccessSettings).toHaveBeenLastCalledWith('app-1', expect.any(String), 3, 10)
+ })
- render(<AppAccessConfigPage appId="app-1" />)
+ it('should load the previous page after removing the only member on the last page', () => {
+ mockAppUserAccessSettings.data = [createUserAccessSetting('account-11')]
+ mockAppUserAccessSettings.pagination = {
+ current_page: 2,
+ per_page: 10,
+ total_count: 11,
+ total_pages: 2,
+ }
+ render(<AppAccessConfigPage appId="app-1" />)
+ act(() => mockAccessRulesEditor.props?.onPageChange?.(2))
+
+ act(() =>
+ mockAccessRulesEditor.props?.onRemoveAccessPolicyMemberBinding?.('account-11', 'default'),
+ )
+ const callbacks = mockMutations.removeMemberBindings.mock.calls.at(-1)?.[1] as {
+ onSuccess: () => void
+ }
+ mockAppUserAccessSettings.data = []
+ mockAppUserAccessSettings.pagination = {
+ current_page: 2,
+ per_page: 10,
+ total_count: 10,
+ total_pages: 1,
+ }
+ mockAppUserAccessSettings.isPlaceholderData = true
+ act(() => callbacks.onSuccess())
+
+ expect(useAppUserAccessSettings).toHaveBeenLastCalledWith('app-1', expect.any(String), 1, 10)
+ expect(mockAccessRulesEditor.props?.isLoadingUserAccessSettings).toBe(true)
+ })
- expect(mockAccessRulesEditor.props?.maintainerId).toBe('account-1')
+ it('should wire switch, policy update, and removal mutations', async () => {
+ render(<AppAccessConfigPage appId="app-1" />)
+
+ mockAccessRulesEditor.props?.onAutomaticIncludeWorkspaceMembersChange?.(true)
+ expect(mockMutations.updateAutomaticIncludeWorkspaceMembers).toHaveBeenCalledWith(
+ true,
+ expect.objectContaining({ onError: expect.any(Function), onSuccess: expect.any(Function) }),
+ )
+
+ mockAccessRulesEditor.props?.onUserAccessPoliciesChange?.('account-1', ['policy-1'])
+ expect(mockMutations.updateUserAccessSettings).toHaveBeenCalledWith(
+ { accountId: 'account-1', accessPolicyIds: ['policy-1'] },
+ expect.objectContaining({ onSettled: expect.any(Function) }),
+ )
+
+ mockAccessRulesEditor.props?.onRemoveAccessPolicyMemberBinding?.('account-3', 'policy-3')
+ expect(mockMutations.removeMemberBindings).toHaveBeenCalledWith(
+ [{ accessPolicyId: 'policy-3', accountIds: ['account-3'] }],
+ expect.objectContaining({ onSettled: expect.any(Function) }),
+ )
+
+ const removals = [
+ { accessPolicyId: 'policy-1', accountIds: ['account-1', 'account-2'] },
+ { accessPolicyId: 'default', accountIds: ['account-4'] },
+ ]
+ await act(async () => {
+ await mockAccessRulesEditor.props?.onBatchRemoveAccessPolicyMemberBindings?.(removals)
})
+ expect(mockMutations.removeMemberBindingsAsync).toHaveBeenCalledOnce()
+ expect(mockMutations.removeMemberBindingsAsync).toHaveBeenCalledWith(removals)
+ })
- it('should wire open scope and user policy updates', () => {
- render(<AppAccessConfigPage appId="app-1" />)
-
- mockAccessRulesEditor.props?.onOpenScopeChange?.('all')
- expect(mockMutations.updateOpenScope).toHaveBeenCalledWith(
- 'all',
- expect.objectContaining({
- onError: expect.any(Function),
- }),
- )
-
- mockAccessRulesEditor.props?.onUserAccessPoliciesChange?.('account-1', ['policy-1'])
- expect(mockMutations.updateUserAccessSettings).toHaveBeenCalledWith(
- {
- accountId: 'account-1',
- accessPolicyIds: ['policy-1'],
- },
- expect.objectContaining({
- onSettled: expect.any(Function),
- }),
- )
-
- mockAccessRulesEditor.props?.onAddAccessSubject?.('account-2', ['default'])
- expect(mockMutations.updateUserAccessSettings).toHaveBeenCalledWith(
- {
- accountId: 'account-2',
- accessPolicyIds: ['default'],
- },
- expect.objectContaining({
- onSettled: expect.any(Function),
- }),
- )
-
- mockAccessRulesEditor.props?.onRemoveAccessPolicyMemberBinding?.('account-3', 'policy-3')
- expect(mockMutations.removeMemberBindings).toHaveBeenCalledWith(
- {
- accessPolicyId: 'policy-3',
- accountIds: ['account-3'],
- },
- expect.objectContaining({
- onSettled: expect.any(Function),
- }),
- )
+ it('should block member changes but allow permission updates during automatic inclusion', async () => {
+ mockAppResourceWhitelistConfig.data = {
+ automatic_include_workspace_members: true,
+ }
+ render(<AppAccessConfigPage appId="app-1" />)
+
+ mockAccessRulesEditor.props?.onAddAccessSubject?.('account-2', ['default'])
+ mockAccessRulesEditor.props?.onRemoveAccessPolicyMemberBinding?.('account-2', 'policy-1')
+ await act(async () => {
+ await mockAccessRulesEditor.props?.onBatchRemoveAccessPolicyMemberBindings?.([
+ { accessPolicyId: 'policy-1', accountIds: ['account-2'] },
+ ])
})
- it('should not mount access config data hooks when access config permission is missing', () => {
- useStore.setState({
- appDetail: {
- id: 'app-1',
- maintainer: 'account-1',
- permission_keys: [AppACLPermission.ViewLayout],
- } as NonNullable<ReturnType<typeof useStore.getState>['appDetail']>,
- })
+ expect(mockMutations.updateUserAccessSettings).not.toHaveBeenCalled()
+ expect(mockMutations.removeMemberBindings).not.toHaveBeenCalled()
+ expect(mockMutations.removeMemberBindingsAsync).not.toHaveBeenCalled()
- render(<AppAccessConfigPage appId="app-1" />)
+ mockAccessRulesEditor.props?.onUserAccessPoliciesChange?.('account-2', ['policy-2'])
+ expect(mockMutations.updateUserAccessSettings).toHaveBeenCalledWith(
+ { accountId: 'account-2', accessPolicyIds: ['policy-2'] },
+ expect.objectContaining({ onSettled: expect.any(Function) }),
+ )
+ })
- expect(screen.queryByTestId('access-rules-editor')).not.toBeInTheDocument()
- expect(useAppAccessRules).not.toHaveBeenCalled()
- expect(useAppUserAccessSettings).not.toHaveBeenCalled()
+ it('should not mount access config data hooks when access permission is missing', () => {
+ useStore.setState({
+ appDetail: {
+ id: 'app-1',
+ maintainer: 'account-1',
+ permission_keys: [AppACLPermission.ViewLayout],
+ } as NonNullable<ReturnType<typeof useStore.getState>['appDetail']>,
})
- it('should not mount access config data hooks when RBAC is disabled', () => {
- mockIsRbacEnabled = false
+ render(<AppAccessConfigPage appId="app-1" />)
- render(<AppAccessConfigPage appId="app-1" />)
+ expect(screen.queryByTestId('access-rules-editor')).not.toBeInTheDocument()
+ expect(useAppAccessRules).not.toHaveBeenCalled()
+ expect(useAppUserAccessSettings).not.toHaveBeenCalled()
+ })
- expect(screen.queryByTestId('access-rules-editor')).not.toBeInTheDocument()
- expect(useAppAccessRules).not.toHaveBeenCalled()
- expect(useAppUserAccessSettings).not.toHaveBeenCalled()
- })
+ it('should not mount access config data hooks when RBAC is disabled', () => {
+ mockIsRbacEnabled = false
- it('should allow the app maintainer with app management workspace permission', () => {
- mockConsoleState.userProfile = { id: 'account-1' }
- mockConsoleState.workspacePermissionKeys = ['app.create_and_management']
- useStore.setState({
- appDetail: {
- id: 'app-1',
- maintainer: 'account-1',
- permission_keys: [] as string[],
- } as NonNullable<ReturnType<typeof useStore.getState>['appDetail']>,
- })
+ render(<AppAccessConfigPage appId="app-1" />)
- render(<AppAccessConfigPage appId="app-1" />)
+ expect(screen.queryByTestId('access-rules-editor')).not.toBeInTheDocument()
+ expect(useAppAccessRules).not.toHaveBeenCalled()
+ expect(useAppUserAccessSettings).not.toHaveBeenCalled()
+ })
- expect(screen.getByTestId('access-rules-editor')).toBeInTheDocument()
+ it('should allow the maintainer with app management workspace permission', () => {
+ mockConsoleState.userProfile = { id: 'account-1' }
+ mockConsoleState.workspacePermissionKeys = ['app.create_and_management']
+ useStore.setState({
+ appDetail: {
+ id: 'app-1',
+ maintainer: 'account-1',
+ permission_keys: [],
+ } as unknown as NonNullable<ReturnType<typeof useStore.getState>['appDetail']>,
})
+
+ render(<AppAccessConfigPage appId="app-1" />)
+
+ expect(screen.getByTestId('access-rules-editor')).toBeInTheDocument()
})
})
diff --git a/web/app/components/app/access-config/index.tsx b/web/app/components/app/access-config/index.tsx
index 2189480cad7..de96391e682 100644
--- a/web/app/components/app/access-config/index.tsx
+++ b/web/app/components/app/access-config/index.tsx
@@ -1,13 +1,6 @@
'use client'
-import type { ResourceOpenScope } from '@/models/access-control'
-import {
- ScrollArea,
- ScrollAreaContent,
- ScrollAreaScrollbar,
- ScrollAreaThumb,
- ScrollAreaViewport,
-} from '@langgenius/dify-ui/scroll-area'
+import type { AccessPolicyMemberBindingRemoval } from '@/app/components/access-rules-editor'
import { useSuspenseQuery } from '@tanstack/react-query'
import { useAtomValue } from 'jotai'
import { useCallback, useMemo, useState } from 'react'
@@ -19,11 +12,14 @@ import { workspacePermissionKeysAtom } from '@/context/permission-state'
import { userProfileQueryOptions } from '@/features/account-profile/client'
import { systemFeaturesQueryOptions } from '@/features/system-features/client'
import { getAccessControlTemplateLanguage } from '@/i18n-config/language'
+import { RESOURCE_ACCESS_SETTINGS_PAGE_SIZE } from '@/service/access-control/constants'
import {
useAppAccessRules,
+ useAppResourceWhitelist,
+ useAppResourceWhitelistConfig,
useAppUserAccessSettings,
useRemoveAppAccessPolicyMemberBindings,
- useUpdateAppOpenScope,
+ useUpdateAppAutomaticIncludeWorkspaceMembers,
useUpdateAppUserAccessSettings,
} from '@/service/access-control/use-app-access-config'
import { getAppACLCapabilities } from '@/utils/permission'
@@ -41,35 +37,59 @@ const AppAccessConfigContent = ({ appId, maintainerId }: AppAccessConfigContentP
const { t } = useTranslation()
const locale = useLocale()
const language = useMemo(() => getAccessControlTemplateLanguage(locale), [locale])
+ const [currentPage, setCurrentPage] = useState(1)
+ const [pageSize, setPageSize] = useState<number>(RESOURCE_ACCESS_SETTINGS_PAGE_SIZE)
const { data: appAccessRulesResponse, isLoading: isLoadingAppAccessRules } = useAppAccessRules(
appId,
language,
)
- const { data: appUserAccessSettingsResponse, isLoading: isLoadingAppUserAccessSettings } =
- useAppUserAccessSettings(appId, language)
- const { mutate: updateAppOpenScope, isPending: isUpdatingAppOpenScope } =
- useUpdateAppOpenScope(appId)
+ const {
+ data: appUserAccessSettingsResponse,
+ isLoading: isLoadingAppUserAccessSettings,
+ isPlaceholderData: isChangingAppUserAccessSettingsPage,
+ } = useAppUserAccessSettings(appId, language, currentPage, pageSize)
+ const { data: appResourceWhitelist } = useAppResourceWhitelist(appId)
+ const { data: appResourceWhitelistConfig } = useAppResourceWhitelistConfig(appId)
+ const {
+ mutate: updateAppAutomaticIncludeWorkspaceMembers,
+ isPending: isUpdatingAppAutomaticIncludeWorkspaceMembers,
+ } = useUpdateAppAutomaticIncludeWorkspaceMembers(appId)
const { mutate: updateAppUserAccessSettings } = useUpdateAppUserAccessSettings(appId)
- const { mutate: removeAppAccessPolicyMemberBindings } =
- useRemoveAppAccessPolicyMemberBindings(appId)
- const [optimisticOpenScope, setOptimisticOpenScope] = useState<ResourceOpenScope | null>(null)
+ const {
+ mutate: removeAppAccessPolicyMemberBindings,
+ mutateAsync: removeAppAccessPolicyMemberBindingsAsync,
+ } = useRemoveAppAccessPolicyMemberBindings(appId)
+ const [
+ optimisticAutomaticIncludeWorkspaceMembers,
+ setOptimisticAutomaticIncludeWorkspaceMembers,
+ ] = useState<boolean | null>(null)
const [updatingAccountId, setUpdatingAccountId] = useState<string | null>(null)
const appAccessRules = appAccessRulesResponse?.items || []
- const appUserAccessSettings = appUserAccessSettingsResponse?.data || []
- const openScope = optimisticOpenScope || appUserAccessSettingsResponse?.scope
+ const appUserAccessSettings = appUserAccessSettingsResponse?.data ?? []
+ const appUserAccessSettingsPagination = appUserAccessSettingsResponse?.pagination
+ const isLoadingEmptyPage =
+ appUserAccessSettings.length === 0 &&
+ (isChangingAppUserAccessSettingsPage ||
+ (currentPage > 1 &&
+ appUserAccessSettingsPagination !== undefined &&
+ currentPage > appUserAccessSettingsPagination.total_pages))
+ const automaticIncludeWorkspaceMembers =
+ optimisticAutomaticIncludeWorkspaceMembers ??
+ appResourceWhitelistConfig?.automatic_include_workspace_members
- const handleOpenScopeChange = useCallback(
- (nextOpenScope: ResourceOpenScope) => {
- if (nextOpenScope === openScope) return
+ const handleAutomaticIncludeWorkspaceMembersChange = useCallback(
+ (nextValue: boolean) => {
+ if (nextValue === automaticIncludeWorkspaceMembers) return
- const previousOptimisticOpenScope = optimisticOpenScope
- setOptimisticOpenScope(nextOpenScope)
- updateAppOpenScope(nextOpenScope, {
- onError: () => setOptimisticOpenScope(previousOptimisticOpenScope),
+ if (!nextValue) setCurrentPage(1)
+ setOptimisticAutomaticIncludeWorkspaceMembers(nextValue)
+ updateAppAutomaticIncludeWorkspaceMembers(nextValue, {
+ onError: () => setOptimisticAutomaticIncludeWorkspaceMembers(null),
+ onSuccess: () => setOptimisticAutomaticIncludeWorkspaceMembers(null),
})
},
- [openScope, optimisticOpenScope, updateAppOpenScope],
+ [automaticIncludeWorkspaceMembers, updateAppAutomaticIncludeWorkspaceMembers],
)
const handleUserAccessPoliciesChange = useCallback(
@@ -83,52 +103,131 @@ const AppAccessConfigContent = ({ appId, maintainerId }: AppAccessConfigContentP
[updateAppUserAccessSettings],
)
+ const handleAddAccessSubject = useCallback(
+ (accountId: string, accessPolicyIds: string[]) => {
+ if (automaticIncludeWorkspaceMembers) return
+
+ const existingAccountCount =
+ appUserAccessSettingsPagination?.total_count ??
+ appResourceWhitelist?.account_ids?.length ??
+ 0
+ const lastPageAfterAdd = Math.max(Math.ceil((existingAccountCount + 1) / pageSize), 1)
+
+ setUpdatingAccountId(accountId)
+ updateAppUserAccessSettings(
+ { accountId, accessPolicyIds },
+ {
+ onSuccess: () => setCurrentPage(lastPageAfterAdd),
+ onSettled: () => setUpdatingAccountId(null),
+ },
+ )
+ },
+ [
+ appResourceWhitelist?.account_ids?.length,
+ appUserAccessSettingsPagination?.total_count,
+ automaticIncludeWorkspaceMembers,
+ pageSize,
+ updateAppUserAccessSettings,
+ ],
+ )
+
+ const handlePageSizeChange = useCallback((nextPageSize: number) => {
+ setCurrentPage(1)
+ setPageSize(nextPageSize)
+ }, [])
+
const handleRemoveAccessPolicyMemberBinding = useCallback(
(accountId: string, accessPolicyId: string) => {
+ if (automaticIncludeWorkspaceMembers) return
+
+ const shouldReturnToPreviousPage =
+ currentPage > 1 &&
+ currentPage === appUserAccessSettingsPagination?.total_pages &&
+ appUserAccessSettings.length === 1
+
setUpdatingAccountId(accountId)
- removeAppAccessPolicyMemberBindings(
- { accessPolicyId, accountIds: [accountId] },
- { onSettled: () => setUpdatingAccountId(null) },
+ removeAppAccessPolicyMemberBindings([{ accessPolicyId, accountIds: [accountId] }], {
+ onSuccess: () => {
+ if (shouldReturnToPreviousPage) {
+ setCurrentPage((page) => (page === currentPage ? page - 1 : page))
+ }
+ },
+ onSettled: () => setUpdatingAccountId(null),
+ })
+ },
+ [
+ appUserAccessSettings.length,
+ appUserAccessSettingsPagination?.total_pages,
+ automaticIncludeWorkspaceMembers,
+ currentPage,
+ removeAppAccessPolicyMemberBindings,
+ ],
+ )
+
+ const handleBatchRemoveAccessPolicyMemberBindings = useCallback(
+ async (removals: AccessPolicyMemberBindingRemoval[]) => {
+ if (automaticIncludeWorkspaceMembers) return
+
+ const removedAccountCount = removals.reduce(
+ (count, removal) => count + removal.accountIds.length,
+ 0,
)
+ const shouldReturnToPreviousPage =
+ currentPage > 1 &&
+ currentPage === appUserAccessSettingsPagination?.total_pages &&
+ removedAccountCount >= appUserAccessSettings.length
+
+ await removeAppAccessPolicyMemberBindingsAsync(removals)
+ if (shouldReturnToPreviousPage) {
+ setCurrentPage((page) => (page === currentPage ? page - 1 : page))
+ }
},
- [removeAppAccessPolicyMemberBindings],
+ [
+ appUserAccessSettings.length,
+ appUserAccessSettingsPagination?.total_pages,
+ automaticIncludeWorkspaceMembers,
+ currentPage,
+ removeAppAccessPolicyMemberBindingsAsync,
+ ],
)
return (
- <ScrollArea className="h-full bg-background-default-subtle">
- <ScrollAreaViewport className="overscroll-contain">
- <ScrollAreaContent>
- <header className="flex min-h-15.5 flex-col justify-center px-6 py-3">
- <h1 className="system-xl-semibold text-text-primary">
- {t(($) => $['settings.resourceAccess'], { ns: 'common' })}
- </h1>
- <p className="mt-0.5 system-sm-regular text-text-tertiary">
- {t(($) => $['accessRule.appDescription'], { ns: 'permission' })}
- </p>
- </header>
- <main className="w-full px-6 pt-8 pb-10">
- <AccessRulesEditor
- className="w-full max-w-200"
- rules={appAccessRules}
- userAccessSettings={appUserAccessSettings}
- isLoadingRules={isLoadingAppAccessRules}
- isLoadingUserAccessSettings={isLoadingAppUserAccessSettings}
- openScope={openScope}
- isUpdatingOpenScope={isLoadingAppUserAccessSettings || isUpdatingAppOpenScope}
- updatingAccountId={updatingAccountId}
- maintainerId={maintainerId}
- onOpenScopeChange={handleOpenScopeChange}
- onUserAccessPoliciesChange={handleUserAccessPoliciesChange}
- onRemoveAccessPolicyMemberBinding={handleRemoveAccessPolicyMemberBinding}
- onAddAccessSubject={handleUserAccessPoliciesChange}
- />
- </main>
- </ScrollAreaContent>
- </ScrollAreaViewport>
- <ScrollAreaScrollbar>
- <ScrollAreaThumb />
- </ScrollAreaScrollbar>
- </ScrollArea>
+ <div className="flex h-full min-h-0 flex-col overflow-hidden bg-background-default-subtle">
+ <header className="flex min-h-15.5 shrink-0 flex-col justify-center px-6 py-3">
+ <h1 className="system-xl-semibold text-text-primary">
+ {t(($) => $['settings.resourceAccess'], { ns: 'common' })}
+ </h1>
+ <p className="mt-0.5 system-sm-regular text-text-tertiary">
+ {t(($) => $['accessRule.appDescription'], { ns: 'permission' })}
+ </p>
+ </header>
+ <main className="flex min-h-0 w-full max-w-240 flex-1 flex-col px-6 pt-8 pb-10 sm:pr-20 sm:pl-12.5">
+ <AccessRulesEditor
+ className="min-h-0 w-full flex-1"
+ rules={appAccessRules}
+ userAccessSettings={appUserAccessSettings}
+ isLoadingRules={isLoadingAppAccessRules}
+ isLoadingUserAccessSettings={isLoadingAppUserAccessSettings || isLoadingEmptyPage}
+ automaticIncludeWorkspaceMembers={automaticIncludeWorkspaceMembers}
+ isUpdatingAutomaticIncludeWorkspaceMembers={isUpdatingAppAutomaticIncludeWorkspaceMembers}
+ existingAccountIds={appResourceWhitelist?.account_ids}
+ currentPage={appUserAccessSettingsPagination?.current_page ?? currentPage}
+ pageSize={pageSize}
+ totalCount={appUserAccessSettingsPagination?.total_count}
+ totalPages={appUserAccessSettingsPagination?.total_pages ?? 0}
+ isChangingPage={isChangingAppUserAccessSettingsPage}
+ updatingAccountId={updatingAccountId}
+ maintainerId={maintainerId}
+ onAutomaticIncludeWorkspaceMembersChange={handleAutomaticIncludeWorkspaceMembersChange}
+ onPageChange={setCurrentPage}
+ onPageSizeChange={handlePageSizeChange}
+ onUserAccessPoliciesChange={handleUserAccessPoliciesChange}
+ onRemoveAccessPolicyMemberBinding={handleRemoveAccessPolicyMemberBinding}
+ onBatchRemoveAccessPolicyMemberBindings={handleBatchRemoveAccessPolicyMemberBindings}
+ onAddAccessSubject={handleAddAccessSubject}
+ />
+ </main>
+ </div>
)
}
diff --git a/web/app/components/datasets/access-config/__tests__/index.spec.tsx b/web/app/components/datasets/access-config/__tests__/index.spec.tsx
index fa7dfc08de2..237a00e5b38 100644
--- a/web/app/components/datasets/access-config/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/access-config/__tests__/index.spec.tsx
@@ -1,7 +1,9 @@
import type { AccessRulesEditorProps } from '@/app/components/access-rules-editor'
-import { screen } from '@testing-library/react'
+import { act, screen } from '@testing-library/react'
import {
useDatasetAccessRules,
+ useDatasetResourceWhitelist,
+ useDatasetResourceWhitelistConfig,
useDatasetUserAccessSettings,
} from '@/service/access-control/use-dataset-access-config'
import { renderWithConsoleQuery } from '@/test/console/query-data'
@@ -13,10 +15,39 @@ const mockDatasetAccessRules = vi.hoisted(() => ({
isLoading: false,
}))
+const createUserAccessSetting = (
+ accountId: string,
+): AccessRulesEditorProps['userAccessSettings'][number] => ({
+ account: {
+ account_id: accountId,
+ account_name: accountId,
+ },
+ roles: [],
+ access_policies: [],
+})
+
const mockDatasetUserAccessSettings = vi.hoisted(() => ({
- data: [] as NonNullable<AccessRulesEditorProps['userAccessSettings']>,
- scope: 'specific' as AccessRulesEditorProps['openScope'],
+ data: [] as AccessRulesEditorProps['userAccessSettings'],
+ pagination: {
+ current_page: 1,
+ per_page: 10,
+ total_count: 0,
+ total_pages: 0,
+ },
isLoading: false,
+ isPlaceholderData: false,
+}))
+
+const mockDatasetResourceWhitelist = vi.hoisted(() => ({
+ data: {
+ account_ids: [] as string[],
+ } as { account_ids?: string[] } | undefined,
+}))
+
+const mockDatasetResourceWhitelistConfig = vi.hoisted(() => ({
+ data: {
+ automatic_include_workspace_members: false,
+ } as { automatic_include_workspace_members: boolean } | undefined,
}))
const mockDatasetDetail = vi.hoisted(() => ({
@@ -32,9 +63,7 @@ let mockIsRbacEnabled = true
const render = (ui: Parameters<typeof renderWithConsoleQuery>[0]) =>
renderWithConsoleQuery(ui, {
- systemFeatures: {
- rbac_enabled: mockIsRbacEnabled,
- },
+ systemFeatures: { rbac_enabled: mockIsRbacEnabled },
})
const mockAccessRulesEditor = vi.hoisted(() => ({
@@ -42,9 +71,11 @@ const mockAccessRulesEditor = vi.hoisted(() => ({
}))
const mockMutations = vi.hoisted(() => ({
- updateOpenScope: vi.fn(),
+ updateAutomaticIncludeWorkspaceMembers: vi.fn(),
updateUserAccessSettings: vi.fn(),
removeMemberBindings: vi.fn(),
+ removeMemberBindingsAsync: vi.fn(),
+ isUpdatingAutomaticIncludeWorkspaceMembers: false,
}))
vi.mock('@/service/access-control/use-dataset-access-config', () => ({
@@ -53,20 +84,27 @@ vi.mock('@/service/access-control/use-dataset-access-config', () => ({
isLoading: mockDatasetAccessRules.isLoading,
})),
useDatasetUserAccessSettings: vi.fn(() => ({
- data: mockDatasetUserAccessSettings.scope
- ? { data: mockDatasetUserAccessSettings.data, scope: mockDatasetUserAccessSettings.scope }
- : undefined,
+ data: {
+ data: mockDatasetUserAccessSettings.data,
+ pagination: mockDatasetUserAccessSettings.pagination,
+ },
isLoading: mockDatasetUserAccessSettings.isLoading,
+ isPlaceholderData: mockDatasetUserAccessSettings.isPlaceholderData,
})),
- useUpdateDatasetOpenScope: vi.fn(() => ({
- mutate: mockMutations.updateOpenScope,
- isPending: false,
+ useDatasetResourceWhitelist: vi.fn(() => ({ data: mockDatasetResourceWhitelist.data })),
+ useDatasetResourceWhitelistConfig: vi.fn(() => ({
+ data: mockDatasetResourceWhitelistConfig.data,
+ })),
+ useUpdateDatasetAutomaticIncludeWorkspaceMembers: vi.fn(() => ({
+ mutate: mockMutations.updateAutomaticIncludeWorkspaceMembers,
+ isPending: mockMutations.isUpdatingAutomaticIncludeWorkspaceMembers,
})),
useUpdateDatasetUserAccessSettings: vi.fn(() => ({
mutate: mockMutations.updateUserAccessSettings,
})),
useRemoveDatasetAccessPolicyMemberBindings: vi.fn(() => ({
mutate: mockMutations.removeMemberBindings,
+ mutateAsync: mockMutations.removeMemberBindingsAsync,
})),
}))
@@ -76,22 +114,20 @@ vi.mock('@/context/dataset-detail', () => ({
selector: (state: {
dataset?: { maintainer?: string | null; permission_keys?: string[] }
}) => unknown,
- ) => {
- return selector({ dataset: mockDatasetDetail.dataset })
- },
+ ) => selector({ dataset: mockDatasetDetail.dataset }),
),
}))
vi.mock('@/context/workspace-state', async () => {
const { createWorkspaceStateModuleMock } = await import('@/test/console/state-fixture')
-
return createWorkspaceStateModuleMock(() => mockConsoleState)
})
+
vi.mock('@/context/permission-state', async () => {
const { createPermissionStateModuleMock } = await import('@/test/console/state-fixture')
-
return createPermissionStateModuleMock(() => mockConsoleState)
})
+
vi.mock('@/app/components/access-rules-editor', () => ({
default: (props: AccessRulesEditorProps) => {
mockAccessRulesEditor.props = props
@@ -105,8 +141,22 @@ describe('DatasetAccessConfigPage', () => {
mockDatasetAccessRules.items = []
mockDatasetAccessRules.isLoading = false
mockDatasetUserAccessSettings.data = []
- mockDatasetUserAccessSettings.scope = 'specific'
+ mockDatasetUserAccessSettings.pagination = {
+ current_page: 1,
+ per_page: 10,
+ total_count: 0,
+ total_pages: 0,
+ }
mockDatasetUserAccessSettings.isLoading = false
+ mockDatasetUserAccessSettings.isPlaceholderData = false
+ mockDatasetResourceWhitelist.data = {
+ account_ids: [],
+ }
+ mockDatasetResourceWhitelistConfig.data = {
+ automatic_include_workspace_members: false,
+ }
+ mockMutations.isUpdatingAutomaticIncludeWorkspaceMembers = false
+ mockMutations.removeMemberBindingsAsync.mockResolvedValue(undefined)
mockDatasetDetail.dataset = {
maintainer: 'maintainer-1',
permission_keys: [DatasetACLPermission.AccessConfig],
@@ -117,143 +167,258 @@ describe('DatasetAccessConfigPage', () => {
mockAccessRulesEditor.props = null
})
- // Rendering wires dataset access rules into the shared editor.
- describe('Rendering', () => {
- it('should render access config title and pass dataset rules to the editor', () => {
- render(<DatasetAccessConfigPage datasetId="dataset-1" />)
-
- expect(
- screen.getByRole('heading', { name: 'common.settings.resourceAccess' }),
- ).toBeInTheDocument()
- expect(screen.getByText('permission.accessRule.datasetDescription')).toBeInTheDocument()
- expect(screen.getByTestId('access-rules-editor')).toBeInTheDocument()
- expect(mockAccessRulesEditor.props?.className).toBe('w-full max-w-200')
- expect(mockAccessRulesEditor.props?.rules).toEqual([])
- expect(mockAccessRulesEditor.props?.userAccessSettings).toEqual([])
- expect(mockAccessRulesEditor.props?.openScope).toBe('specific')
+ it('should render the first paginated member page with config and whitelist data', () => {
+ mockDatasetResourceWhitelistConfig.data = {
+ automatic_include_workspace_members: true,
+ }
+ mockDatasetUserAccessSettings.pagination = {
+ current_page: 1,
+ per_page: 10,
+ total_count: 21,
+ total_pages: 2,
+ }
+ mockDatasetResourceWhitelist.data = {
+ account_ids: ['maintainer-1', 'account-2'],
+ }
+
+ render(<DatasetAccessConfigPage datasetId="dataset-1" />)
+
+ expect(
+ screen.getByRole('heading', { name: 'common.settings.resourceAccess' }),
+ ).toBeInTheDocument()
+ expect(screen.getByTestId('access-rules-editor')).toBeInTheDocument()
+ expect(useDatasetUserAccessSettings).toHaveBeenCalledWith(
+ 'dataset-1',
+ expect.any(String),
+ 1,
+ 10,
+ { enabled: true },
+ )
+ expect(useDatasetResourceWhitelist).toHaveBeenCalledWith('dataset-1', { enabled: true })
+ expect(useDatasetResourceWhitelistConfig).toHaveBeenCalledWith('dataset-1', {
+ enabled: true,
})
+ expect(mockAccessRulesEditor.props?.automaticIncludeWorkspaceMembers).toBe(true)
+ expect(mockAccessRulesEditor.props?.existingAccountIds).toEqual(['maintainer-1', 'account-2'])
+ expect(mockAccessRulesEditor.props?.currentPage).toBe(1)
+ expect(mockAccessRulesEditor.props?.pageSize).toBe(10)
+ expect(mockAccessRulesEditor.props?.totalCount).toBe(21)
+ expect(mockAccessRulesEditor.props?.totalPages).toBe(2)
+ expect(mockAccessRulesEditor.props?.maintainerId).toBe('maintainer-1')
+ })
- it('should not pass open scope before user access settings finish loading', () => {
- mockDatasetUserAccessSettings.scope = undefined
- mockDatasetUserAccessSettings.isLoading = true
+ it('should request the selected member page', () => {
+ render(<DatasetAccessConfigPage datasetId="dataset-1" />)
- render(<DatasetAccessConfigPage datasetId="dataset-1" />)
+ act(() => mockAccessRulesEditor.props?.onPageChange?.(2))
- expect(mockAccessRulesEditor.props?.openScope).toBeUndefined()
- })
+ expect(useDatasetUserAccessSettings).toHaveBeenLastCalledWith(
+ 'dataset-1',
+ expect.any(String),
+ 2,
+ 10,
+ { enabled: true },
+ )
+ })
- it('should pass the user access settings open scope to the editor', () => {
- mockDatasetUserAccessSettings.scope = 'all'
+ it('should request the selected page size from the first page', () => {
+ render(<DatasetAccessConfigPage datasetId="dataset-1" />)
- render(<DatasetAccessConfigPage datasetId="dataset-1" />)
+ act(() => mockAccessRulesEditor.props?.onPageChange?.(3))
+ act(() => mockAccessRulesEditor.props?.onPageSizeChange?.(25))
- expect(mockAccessRulesEditor.props?.openScope).toBe('all')
- })
+ expect(useDatasetUserAccessSettings).toHaveBeenLastCalledWith(
+ 'dataset-1',
+ expect.any(String),
+ 1,
+ 25,
+ { enabled: true },
+ )
+ expect(mockAccessRulesEditor.props?.pageSize).toBe(25)
+ })
- it('should pass access rule loading state to the editor', () => {
- mockDatasetAccessRules.isLoading = true
- mockDatasetUserAccessSettings.isLoading = true
+ it('should return to the first page when automatic member inclusion is disabled', () => {
+ mockDatasetResourceWhitelistConfig.data = {
+ automatic_include_workspace_members: true,
+ }
+ render(<DatasetAccessConfigPage datasetId="dataset-1" />)
+ act(() => mockAccessRulesEditor.props?.onPageChange?.(2))
+
+ act(() => mockAccessRulesEditor.props?.onAutomaticIncludeWorkspaceMembersChange?.(false))
+
+ expect(useDatasetUserAccessSettings).toHaveBeenLastCalledWith(
+ 'dataset-1',
+ expect.any(String),
+ 1,
+ 10,
+ { enabled: true },
+ )
+ })
+
+ it('should jump to the new last page after adding a member', () => {
+ mockDatasetUserAccessSettings.pagination = {
+ current_page: 1,
+ per_page: 10,
+ total_count: 10,
+ total_pages: 1,
+ }
+ mockDatasetResourceWhitelist.data = {
+ // The whitelist can omit an implicitly included maintainer; pagination is authoritative.
+ account_ids: Array.from({ length: 9 }, (_, index) => `account-${index + 1}`),
+ }
+ render(<DatasetAccessConfigPage datasetId="dataset-1" />)
- render(<DatasetAccessConfigPage datasetId="dataset-1" />)
+ act(() => mockAccessRulesEditor.props?.onAddAccessSubject?.('account-11', ['default']))
- expect(mockAccessRulesEditor.props?.isLoadingRules).toBe(true)
- expect(mockAccessRulesEditor.props?.isLoadingUserAccessSettings).toBe(true)
- expect(mockAccessRulesEditor.props?.isUpdatingOpenScope).toBe(true)
+ const callbacks = mockMutations.updateUserAccessSettings.mock.calls.at(-1)?.[1] as {
+ onSuccess: () => void
+ }
+ act(() => callbacks.onSuccess())
+ expect(useDatasetUserAccessSettings).toHaveBeenLastCalledWith(
+ 'dataset-1',
+ expect.any(String),
+ 2,
+ 10,
+ { enabled: true },
+ )
+ })
+
+ it('should load the previous page after removing every member on the last page', async () => {
+ mockDatasetUserAccessSettings.data = [
+ createUserAccessSetting('account-11'),
+ createUserAccessSetting('account-12'),
+ ]
+ mockDatasetUserAccessSettings.pagination = {
+ current_page: 2,
+ per_page: 10,
+ total_count: 12,
+ total_pages: 2,
+ }
+ render(<DatasetAccessConfigPage datasetId="dataset-1" />)
+ act(() => mockAccessRulesEditor.props?.onPageChange?.(2))
+
+ mockDatasetUserAccessSettings.data = []
+ mockDatasetUserAccessSettings.pagination = {
+ current_page: 2,
+ per_page: 10,
+ total_count: 10,
+ total_pages: 1,
+ }
+ mockDatasetUserAccessSettings.isPlaceholderData = true
+ await act(async () => {
+ await mockAccessRulesEditor.props?.onBatchRemoveAccessPolicyMemberBindings?.([
+ { accessPolicyId: 'default', accountIds: ['account-11', 'account-12'] },
+ ])
})
- it('should pass the dataset maintainer id from dataset detail to the editor', () => {
- mockDatasetDetail.dataset = {
- maintainer: 'account-1',
- permission_keys: [DatasetACLPermission.AccessConfig],
- }
+ expect(useDatasetUserAccessSettings).toHaveBeenLastCalledWith(
+ 'dataset-1',
+ expect.any(String),
+ 1,
+ 10,
+ { enabled: true },
+ )
+ expect(mockAccessRulesEditor.props?.isLoadingUserAccessSettings).toBe(true)
+ })
+
+ it('should disable all access config queries when permission is missing', () => {
+ mockDatasetDetail.dataset = {
+ maintainer: 'account-1',
+ permission_keys: [],
+ }
- render(<DatasetAccessConfigPage datasetId="dataset-1" />)
+ render(<DatasetAccessConfigPage datasetId="dataset-1" />)
- expect(mockAccessRulesEditor.props?.maintainerId).toBe('account-1')
+ expect(screen.queryByTestId('access-rules-editor')).not.toBeInTheDocument()
+ expect(useDatasetAccessRules).toHaveBeenCalledWith('dataset-1', expect.any(String), {
+ enabled: false,
+ })
+ expect(useDatasetUserAccessSettings).toHaveBeenCalledWith(
+ 'dataset-1',
+ expect.any(String),
+ 1,
+ 10,
+ { enabled: false },
+ )
+ expect(useDatasetResourceWhitelist).toHaveBeenCalledWith('dataset-1', { enabled: false })
+ expect(useDatasetResourceWhitelistConfig).toHaveBeenCalledWith('dataset-1', {
+ enabled: false,
})
+ })
- it('should disable access config queries and hide the editor when access config permission is missing', () => {
- mockDatasetDetail.dataset = {
- maintainer: 'account-1',
- permission_keys: [],
- }
-
- render(<DatasetAccessConfigPage datasetId="dataset-1" />)
-
- expect(screen.queryByTestId('access-rules-editor')).not.toBeInTheDocument()
- expect(vi.mocked(useDatasetAccessRules)).toHaveBeenCalledWith(
- 'dataset-1',
- expect.any(String),
- { enabled: false },
- )
- expect(vi.mocked(useDatasetUserAccessSettings)).toHaveBeenCalledWith(
- 'dataset-1',
- expect.any(String),
- { enabled: false },
- )
+ it('should disable all access config queries when RBAC is disabled', () => {
+ mockIsRbacEnabled = false
+
+ render(<DatasetAccessConfigPage datasetId="dataset-1" />)
+
+ expect(screen.queryByTestId('access-rules-editor')).not.toBeInTheDocument()
+ expect(useDatasetUserAccessSettings).toHaveBeenCalledWith(
+ 'dataset-1',
+ expect.any(String),
+ 1,
+ 10,
+ { enabled: false },
+ )
+ expect(useDatasetResourceWhitelist).toHaveBeenCalledWith('dataset-1', { enabled: false })
+ expect(useDatasetResourceWhitelistConfig).toHaveBeenCalledWith('dataset-1', {
+ enabled: false,
})
+ })
- it('should disable access config queries and hide the editor when RBAC is disabled', () => {
- mockIsRbacEnabled = false
-
- render(<DatasetAccessConfigPage datasetId="dataset-1" />)
-
- expect(screen.queryByTestId('access-rules-editor')).not.toBeInTheDocument()
- expect(vi.mocked(useDatasetAccessRules)).toHaveBeenCalledWith(
- 'dataset-1',
- expect.any(String),
- { enabled: false },
- )
- expect(vi.mocked(useDatasetUserAccessSettings)).toHaveBeenCalledWith(
- 'dataset-1',
- expect.any(String),
- { enabled: false },
- )
+ it('should wire switch, policy update, and removal mutations', async () => {
+ render(<DatasetAccessConfigPage datasetId="dataset-1" />)
+
+ mockAccessRulesEditor.props?.onAutomaticIncludeWorkspaceMembersChange?.(true)
+ expect(mockMutations.updateAutomaticIncludeWorkspaceMembers).toHaveBeenCalledWith(
+ true,
+ expect.objectContaining({ onError: expect.any(Function), onSuccess: expect.any(Function) }),
+ )
+
+ mockAccessRulesEditor.props?.onUserAccessPoliciesChange?.('account-1', ['policy-1'])
+ expect(mockMutations.updateUserAccessSettings).toHaveBeenCalledWith(
+ { accountId: 'account-1', accessPolicyIds: ['policy-1'] },
+ expect.objectContaining({ onSettled: expect.any(Function) }),
+ )
+
+ mockAccessRulesEditor.props?.onRemoveAccessPolicyMemberBinding?.('account-3', 'policy-3')
+ expect(mockMutations.removeMemberBindings).toHaveBeenCalledWith(
+ [{ accessPolicyId: 'policy-3', accountIds: ['account-3'] }],
+ expect.objectContaining({ onSettled: expect.any(Function) }),
+ )
+
+ const removals = [
+ { accessPolicyId: 'policy-1', accountIds: ['account-1', 'account-2'] },
+ { accessPolicyId: 'default', accountIds: ['account-4'] },
+ ]
+ await act(async () => {
+ await mockAccessRulesEditor.props?.onBatchRemoveAccessPolicyMemberBindings?.(removals)
})
+ expect(mockMutations.removeMemberBindingsAsync).toHaveBeenCalledOnce()
+ expect(mockMutations.removeMemberBindingsAsync).toHaveBeenCalledWith(removals)
+ })
- it('should wire open scope and user policy updates', () => {
- render(<DatasetAccessConfigPage datasetId="dataset-1" />)
-
- mockAccessRulesEditor.props?.onOpenScopeChange?.('all')
- expect(mockMutations.updateOpenScope).toHaveBeenCalledWith(
- 'all',
- expect.objectContaining({
- onError: expect.any(Function),
- }),
- )
-
- mockAccessRulesEditor.props?.onUserAccessPoliciesChange?.('account-1', ['policy-1'])
- expect(mockMutations.updateUserAccessSettings).toHaveBeenCalledWith(
- {
- accountId: 'account-1',
- accessPolicyIds: ['policy-1'],
- },
- expect.objectContaining({
- onSettled: expect.any(Function),
- }),
- )
-
- mockAccessRulesEditor.props?.onAddAccessSubject?.('account-2', ['default'])
- expect(mockMutations.updateUserAccessSettings).toHaveBeenCalledWith(
- {
- accountId: 'account-2',
- accessPolicyIds: ['default'],
- },
- expect.objectContaining({
- onSettled: expect.any(Function),
- }),
- )
-
- mockAccessRulesEditor.props?.onRemoveAccessPolicyMemberBinding?.('account-3', 'policy-3')
- expect(mockMutations.removeMemberBindings).toHaveBeenCalledWith(
- {
- accessPolicyId: 'policy-3',
- accountIds: ['account-3'],
- },
- expect.objectContaining({
- onSettled: expect.any(Function),
- }),
- )
+ it('should block member changes but allow permission updates during automatic inclusion', async () => {
+ mockDatasetResourceWhitelistConfig.data = {
+ automatic_include_workspace_members: true,
+ }
+ render(<DatasetAccessConfigPage datasetId="dataset-1" />)
+
+ mockAccessRulesEditor.props?.onAddAccessSubject?.('account-2', ['default'])
+ mockAccessRulesEditor.props?.onRemoveAccessPolicyMemberBinding?.('account-2', 'policy-1')
+ await act(async () => {
+ await mockAccessRulesEditor.props?.onBatchRemoveAccessPolicyMemberBindings?.([
+ { accessPolicyId: 'policy-1', accountIds: ['account-2'] },
+ ])
})
+
+ expect(mockMutations.updateUserAccessSettings).not.toHaveBeenCalled()
+ expect(mockMutations.removeMemberBindings).not.toHaveBeenCalled()
+ expect(mockMutations.removeMemberBindingsAsync).not.toHaveBeenCalled()
+
+ mockAccessRulesEditor.props?.onUserAccessPoliciesChange?.('account-2', ['policy-2'])
+ expect(mockMutations.updateUserAccessSettings).toHaveBeenCalledWith(
+ { accountId: 'account-2', accessPolicyIds: ['policy-2'] },
+ expect.objectContaining({ onSettled: expect.any(Function) }),
+ )
})
})
diff --git a/web/app/components/datasets/access-config/index.tsx b/web/app/components/datasets/access-config/index.tsx
index ab811bb7d35..780ffe75f37 100644
--- a/web/app/components/datasets/access-config/index.tsx
+++ b/web/app/components/datasets/access-config/index.tsx
@@ -1,13 +1,6 @@
'use client'
-import type { ResourceOpenScope } from '@/models/access-control'
-import {
- ScrollArea,
- ScrollAreaContent,
- ScrollAreaScrollbar,
- ScrollAreaThumb,
- ScrollAreaViewport,
-} from '@langgenius/dify-ui/scroll-area'
+import type { AccessPolicyMemberBindingRemoval } from '@/app/components/access-rules-editor'
import { useSuspenseQuery } from '@tanstack/react-query'
import { useAtomValue } from 'jotai'
import { useCallback, useMemo, useState } from 'react'
@@ -20,11 +13,14 @@ import { workspacePermissionKeysAtom } from '@/context/permission-state'
import { userProfileQueryOptions } from '@/features/account-profile/client'
import { systemFeaturesQueryOptions } from '@/features/system-features/client'
import { getAccessControlTemplateLanguage } from '@/i18n-config/language'
+import { RESOURCE_ACCESS_SETTINGS_PAGE_SIZE } from '@/service/access-control/constants'
import {
useDatasetAccessRules,
+ useDatasetResourceWhitelist,
+ useDatasetResourceWhitelistConfig,
useDatasetUserAccessSettings,
useRemoveDatasetAccessPolicyMemberBindings,
- useUpdateDatasetOpenScope,
+ useUpdateDatasetAutomaticIncludeWorkspaceMembers,
useUpdateDatasetUserAccessSettings,
} from '@/service/access-control/use-dataset-access-config'
import { getDatasetACLCapabilities } from '@/utils/permission'
@@ -37,6 +33,8 @@ const DatasetAccessConfigPage = ({ datasetId }: DatasetAccessConfigPageProps) =>
const { t } = useTranslation()
const locale = useLocale()
const language = useMemo(() => getAccessControlTemplateLanguage(locale), [locale])
+ const [currentPage, setCurrentPage] = useState(1)
+ const [pageSize, setPageSize] = useState<number>(RESOURCE_ACCESS_SETTINGS_PAGE_SIZE)
const dataset = useDatasetDetailContextWithSelector((state) => state.dataset)
const { data: currentUserId } = useSuspenseQuery({
...userProfileQueryOptions(),
@@ -55,32 +53,64 @@ const DatasetAccessConfigPage = ({ datasetId }: DatasetAccessConfigPageProps) =>
}).canAccessConfig
const { data: datasetAccessRulesResponse, isLoading: isLoadingDatasetAccessRules } =
useDatasetAccessRules(datasetId, language, { enabled: canAccessConfig })
- const { data: datasetUserAccessSettingsResponse, isLoading: isLoadingDatasetUserAccessSettings } =
- useDatasetUserAccessSettings(datasetId, language, { enabled: canAccessConfig })
- const { mutate: updateDatasetOpenScope, isPending: isUpdatingDatasetOpenScope } =
- useUpdateDatasetOpenScope(datasetId)
+ const {
+ data: datasetUserAccessSettingsResponse,
+ isLoading: isLoadingDatasetUserAccessSettings,
+ isPlaceholderData: isChangingDatasetUserAccessSettingsPage,
+ } = useDatasetUserAccessSettings(datasetId, language, currentPage, pageSize, {
+ enabled: canAccessConfig,
+ })
+ const { data: datasetResourceWhitelist } = useDatasetResourceWhitelist(datasetId, {
+ enabled: canAccessConfig,
+ })
+ const { data: datasetResourceWhitelistConfig } = useDatasetResourceWhitelistConfig(datasetId, {
+ enabled: canAccessConfig,
+ })
+ const {
+ mutate: updateDatasetAutomaticIncludeWorkspaceMembers,
+ isPending: isUpdatingDatasetAutomaticIncludeWorkspaceMembers,
+ } = useUpdateDatasetAutomaticIncludeWorkspaceMembers(datasetId)
const { mutate: updateDatasetUserAccessSettings } = useUpdateDatasetUserAccessSettings(datasetId)
- const { mutate: removeDatasetAccessPolicyMemberBindings } =
- useRemoveDatasetAccessPolicyMemberBindings(datasetId)
- const [optimisticOpenScope, setOptimisticOpenScope] = useState<ResourceOpenScope | null>(null)
+ const {
+ mutate: removeDatasetAccessPolicyMemberBindings,
+ mutateAsync: removeDatasetAccessPolicyMemberBindingsAsync,
+ } = useRemoveDatasetAccessPolicyMemberBindings(datasetId)
+ const [
+ optimisticAutomaticIncludeWorkspaceMembers,
+ setOptimisticAutomaticIncludeWorkspaceMembers,
+ ] = useState<boolean | null>(null)
const [updatingAccountId, setUpdatingAccountId] = useState<string | null>(null)
const datasetAccessRules = datasetAccessRulesResponse?.items || []
- const datasetUserAccessSettings = datasetUserAccessSettingsResponse?.data || []
- const openScope = optimisticOpenScope || datasetUserAccessSettingsResponse?.scope
+ const datasetUserAccessSettings = datasetUserAccessSettingsResponse?.data ?? []
+ const datasetUserAccessSettingsPagination = datasetUserAccessSettingsResponse?.pagination
+ const isLoadingEmptyPage =
+ datasetUserAccessSettings.length === 0 &&
+ (isChangingDatasetUserAccessSettingsPage ||
+ (currentPage > 1 &&
+ datasetUserAccessSettingsPagination !== undefined &&
+ currentPage > datasetUserAccessSettingsPagination.total_pages))
+ const automaticIncludeWorkspaceMembers =
+ optimisticAutomaticIncludeWorkspaceMembers ??
+ datasetResourceWhitelistConfig?.automatic_include_workspace_members
- const handleOpenScopeChange = useCallback(
- (nextOpenScope: ResourceOpenScope) => {
+ const handleAutomaticIncludeWorkspaceMembersChange = useCallback(
+ (nextValue: boolean) => {
if (!canAccessConfig) return
- if (nextOpenScope === openScope) return
+ if (nextValue === automaticIncludeWorkspaceMembers) return
- const previousOptimisticOpenScope = optimisticOpenScope
- setOptimisticOpenScope(nextOpenScope)
- updateDatasetOpenScope(nextOpenScope, {
- onError: () => setOptimisticOpenScope(previousOptimisticOpenScope),
+ if (!nextValue) setCurrentPage(1)
+ setOptimisticAutomaticIncludeWorkspaceMembers(nextValue)
+ updateDatasetAutomaticIncludeWorkspaceMembers(nextValue, {
+ onError: () => setOptimisticAutomaticIncludeWorkspaceMembers(null),
+ onSuccess: () => setOptimisticAutomaticIncludeWorkspaceMembers(null),
})
},
- [canAccessConfig, openScope, optimisticOpenScope, updateDatasetOpenScope],
+ [
+ automaticIncludeWorkspaceMembers,
+ canAccessConfig,
+ updateDatasetAutomaticIncludeWorkspaceMembers,
+ ],
)
const handleUserAccessPoliciesChange = useCallback(
@@ -96,56 +126,140 @@ const DatasetAccessConfigPage = ({ datasetId }: DatasetAccessConfigPageProps) =>
[canAccessConfig, updateDatasetUserAccessSettings],
)
+ const handleAddAccessSubject = useCallback(
+ (accountId: string, accessPolicyIds: string[]) => {
+ if (!canAccessConfig) return
+ if (automaticIncludeWorkspaceMembers) return
+
+ const existingAccountCount =
+ datasetUserAccessSettingsPagination?.total_count ??
+ datasetResourceWhitelist?.account_ids?.length ??
+ 0
+ const lastPageAfterAdd = Math.max(Math.ceil((existingAccountCount + 1) / pageSize), 1)
+
+ setUpdatingAccountId(accountId)
+ updateDatasetUserAccessSettings(
+ { accountId, accessPolicyIds },
+ {
+ onSuccess: () => setCurrentPage(lastPageAfterAdd),
+ onSettled: () => setUpdatingAccountId(null),
+ },
+ )
+ },
+ [
+ canAccessConfig,
+ datasetResourceWhitelist?.account_ids?.length,
+ datasetUserAccessSettingsPagination?.total_count,
+ automaticIncludeWorkspaceMembers,
+ pageSize,
+ updateDatasetUserAccessSettings,
+ ],
+ )
+
+ const handlePageSizeChange = useCallback((nextPageSize: number) => {
+ setCurrentPage(1)
+ setPageSize(nextPageSize)
+ }, [])
+
const handleRemoveAccessPolicyMemberBinding = useCallback(
(accountId: string, accessPolicyId: string) => {
if (!canAccessConfig) return
+ if (automaticIncludeWorkspaceMembers) return
+
+ const shouldReturnToPreviousPage =
+ currentPage > 1 &&
+ currentPage === datasetUserAccessSettingsPagination?.total_pages &&
+ datasetUserAccessSettings.length === 1
setUpdatingAccountId(accountId)
- removeDatasetAccessPolicyMemberBindings(
- { accessPolicyId, accountIds: [accountId] },
- { onSettled: () => setUpdatingAccountId(null) },
+ removeDatasetAccessPolicyMemberBindings([{ accessPolicyId, accountIds: [accountId] }], {
+ onSuccess: () => {
+ if (shouldReturnToPreviousPage) {
+ setCurrentPage((page) => (page === currentPage ? page - 1 : page))
+ }
+ },
+ onSettled: () => setUpdatingAccountId(null),
+ })
+ },
+ [
+ automaticIncludeWorkspaceMembers,
+ canAccessConfig,
+ currentPage,
+ datasetUserAccessSettings.length,
+ datasetUserAccessSettingsPagination?.total_pages,
+ removeDatasetAccessPolicyMemberBindings,
+ ],
+ )
+
+ const handleBatchRemoveAccessPolicyMemberBindings = useCallback(
+ async (removals: AccessPolicyMemberBindingRemoval[]) => {
+ if (!canAccessConfig || automaticIncludeWorkspaceMembers) return
+
+ const removedAccountCount = removals.reduce(
+ (count, removal) => count + removal.accountIds.length,
+ 0,
)
+ const shouldReturnToPreviousPage =
+ currentPage > 1 &&
+ currentPage === datasetUserAccessSettingsPagination?.total_pages &&
+ removedAccountCount >= datasetUserAccessSettings.length
+
+ await removeDatasetAccessPolicyMemberBindingsAsync(removals)
+ if (shouldReturnToPreviousPage) {
+ setCurrentPage((page) => (page === currentPage ? page - 1 : page))
+ }
},
- [canAccessConfig, removeDatasetAccessPolicyMemberBindings],
+ [
+ automaticIncludeWorkspaceMembers,
+ canAccessConfig,
+ currentPage,
+ datasetUserAccessSettings.length,
+ datasetUserAccessSettingsPagination?.total_pages,
+ removeDatasetAccessPolicyMemberBindingsAsync,
+ ],
)
if (!canAccessConfig) return <Loading type="app" />
return (
- <ScrollArea className="h-full bg-background-default-subtle">
- <ScrollAreaViewport className="overscroll-contain">
- <ScrollAreaContent>
- <header className="flex min-h-15.5 flex-col justify-center px-6 py-3">
- <h1 className="system-sm-semibold text-text-primary">
- {t(($) => $['settings.resourceAccess'], { ns: 'common' })}
- </h1>
- <p className="mt-0.5 system-xs-regular text-text-tertiary">
- {t(($) => $['accessRule.datasetDescription'], { ns: 'permission' })}
- </p>
- </header>
- <main className="w-full px-6 pt-8 pb-10">
- <AccessRulesEditor
- className="w-full max-w-200"
- rules={datasetAccessRules}
- userAccessSettings={datasetUserAccessSettings}
- isLoadingRules={isLoadingDatasetAccessRules}
- isLoadingUserAccessSettings={isLoadingDatasetUserAccessSettings}
- openScope={openScope}
- isUpdatingOpenScope={isLoadingDatasetUserAccessSettings || isUpdatingDatasetOpenScope}
- updatingAccountId={updatingAccountId}
- maintainerId={dataset?.maintainer}
- onOpenScopeChange={handleOpenScopeChange}
- onUserAccessPoliciesChange={handleUserAccessPoliciesChange}
- onRemoveAccessPolicyMemberBinding={handleRemoveAccessPolicyMemberBinding}
- onAddAccessSubject={handleUserAccessPoliciesChange}
- />
- </main>
- </ScrollAreaContent>
- </ScrollAreaViewport>
- <ScrollAreaScrollbar>
- <ScrollAreaThumb />
- </ScrollAreaScrollbar>
- </ScrollArea>
+ <div className="flex h-full min-h-0 flex-col overflow-hidden bg-background-default-subtle">
+ <header className="flex min-h-15.5 shrink-0 flex-col justify-center px-6 py-3">
+ <h1 className="system-xl-semibold text-text-primary">
+ {t(($) => $['settings.resourceAccess'], { ns: 'common' })}
+ </h1>
+ <p className="mt-0.5 system-sm-regular text-text-tertiary">
+ {t(($) => $['accessRule.datasetDescription'], { ns: 'permission' })}
+ </p>
+ </header>
+ <main className="flex min-h-0 w-full max-w-240 flex-1 flex-col px-6 pt-8 pb-10 sm:pr-20 sm:pl-12.5">
+ <AccessRulesEditor
+ className="min-h-0 w-full flex-1"
+ rules={datasetAccessRules}
+ userAccessSettings={datasetUserAccessSettings}
+ isLoadingRules={isLoadingDatasetAccessRules}
+ isLoadingUserAccessSettings={isLoadingDatasetUserAccessSettings || isLoadingEmptyPage}
+ automaticIncludeWorkspaceMembers={automaticIncludeWorkspaceMembers}
+ isUpdatingAutomaticIncludeWorkspaceMembers={
+ isUpdatingDatasetAutomaticIncludeWorkspaceMembers
+ }
+ existingAccountIds={datasetResourceWhitelist?.account_ids}
+ currentPage={datasetUserAccessSettingsPagination?.current_page ?? currentPage}
+ pageSize={pageSize}
+ totalCount={datasetUserAccessSettingsPagination?.total_count}
+ totalPages={datasetUserAccessSettingsPagination?.total_pages ?? 0}
+ isChangingPage={isChangingDatasetUserAccessSettingsPage}
+ updatingAccountId={updatingAccountId}
+ maintainerId={dataset?.maintainer}
+ onAutomaticIncludeWorkspaceMembersChange={handleAutomaticIncludeWorkspaceMembersChange}
+ onPageChange={setCurrentPage}
+ onPageSizeChange={handlePageSizeChange}
+ onUserAccessPoliciesChange={handleUserAccessPoliciesChange}
+ onRemoveAccessPolicyMemberBinding={handleRemoveAccessPolicyMemberBinding}
+ onBatchRemoveAccessPolicyMemberBindings={handleBatchRemoveAccessPolicyMemberBindings}
+ onAddAccessSubject={handleAddAccessSubject}
+ />
+ </main>
+ </div>
)
}
diff --git a/web/i18n/ar-TN/permission-keys.json b/web/i18n/ar-TN/permission-keys.json
index e4822af4297..a7f129455c5 100644
--- a/web/i18n/ar-TN/permission-keys.json
+++ b/web/i18n/ar-TN/permission-keys.json
@@ -2,21 +2,21 @@
"agent.manage": "إدارة Agents",
"api_extension.manage": "إدارة إعدادات امتداد API",
"app.access_config": "تكوين أذونات الوصول إلى التطبيق",
- "app.acl.access_config": "تكوين أذونات الوصول إلى التطبيق",
+ "app.acl.access_config": "عرض أذونات الوصول وإدارتها",
"app.acl.delete": "حذف التطبيق",
"app.acl.deploy": "نشر التطبيق",
- "app.acl.edit": "تعديل التطبيق وتنسيقه",
- "app.acl.import_export_dsl": "استيراد / تصدير DSL",
- "app.acl.log_and_annotation": "الوصول إلى السجلات والتعليقات التوضيحية",
- "app.acl.monitor": "الوصول إلى صفحة المراقبة",
+ "app.acl.edit": "تعديل معلومات التطبيق وتنسيقه",
+ "app.acl.import_export_dsl": "استيراد DSL التطبيق وتصديره",
+ "app.acl.log_and_annotation": "عرض السجلات والتعليقات التوضيحية وإدارتها",
+ "app.acl.monitor": "عرض مراقبة التطبيق",
"app.acl.preview": "معاينة التطبيق",
- "app.acl.release_and_version": "نشر التطبيق وإدارة الإصدارات",
+ "app.acl.release_and_version": "نشر إصدارات التطبيق وإدارتها",
"app.acl.test_and_run": "اختبار التطبيق واستخدامه",
- "app.acl.tracing_config": "تكوين التتبع الخارجي",
- "app.acl.view_layout": "صفحة التنسيق للقراءة فقط",
+ "app.acl.tracing_config": "عرض تتبعات مراقبة التطبيق وتكوينها",
+ "app.acl.view_layout": "عرض تنسيق التطبيق",
"app.create_and_management": "إنشاء التطبيقات",
"app.tag.manage": "إدارة وسوم التطبيق",
- "app_library.access": "الوصول إلى مكتبة التطبيقات",
+ "app_library.access": "عرض مكتبة التطبيقات واستخدامها",
"billing.manage": "تغيير خطط الاشتراك",
"billing.subscription.manage": "إدارة الفوترة والاشتراكات في بوابة الفوترة",
"billing.view": "الوصول إلى إعدادات الفوترة",
@@ -26,18 +26,18 @@
"customization.manage": "إدارة التخصيص",
"data_source.manage": "إدارة تكوين مصدر البيانات",
"dataset.access_config": "تكوين أذونات الوصول إلى قاعدة المعرفة",
- "dataset.acl.access_config": "تكوين أذونات الوصول إلى قاعدة المعرفة",
+ "dataset.acl.access_config": "عرض أذونات الوصول إلى قاعدة المعرفة وإدارتها",
"dataset.acl.delete": "حذف قاعدة المعرفة",
- "dataset.acl.delete_file": "حذف ملفات قاعدة المعرفة",
- "dataset.acl.document_download": "تنزيل المستندات",
- "dataset.acl.edit": "تعديل قاعدة المعرفة",
- "dataset.acl.import_export_dsl": "استيراد / تصدير DSL لخط أنابيب المعرفة",
- "dataset.acl.pipeline_release": "نشر خط أنابيب المعرفة وإدارة الإصدارات",
- "dataset.acl.pipeline_test": "اختبار خط الأنابيب",
+ "dataset.acl.delete_file": "حذف مستندات قاعدة المعرفة",
+ "dataset.acl.document_download": "تنزيل مستندات قاعدة المعرفة",
+ "dataset.acl.edit": "تعديل محتوى قاعدة المعرفة وإعداداتها",
+ "dataset.acl.import_export_dsl": "استيراد DSL لخط الأنابيب وتصديره",
+ "dataset.acl.pipeline_release": "نشر إصدارات خط الأنابيب وإدارتها",
+ "dataset.acl.pipeline_test": "اختبر خط الأنابيب",
"dataset.acl.preview": "معاينة قاعدة المعرفة",
- "dataset.acl.readonly": "قاعدة المعرفة للقراءة فقط",
- "dataset.acl.retrieval_recall": "استرجاع قاعدة المعرفة",
- "dataset.acl.use": "إضافة مستندات إلى قاعدة المعرفة",
+ "dataset.acl.readonly": "عرض محتوى قاعدة المعرفة وإعداداتها",
+ "dataset.acl.retrieval_recall": "عرض اختبارات الاسترجاع وتنفيذها",
+ "dataset.acl.use": "رفع مستندات قاعدة المعرفة",
"dataset.api_key.manage": "إدارة مفاتيح API لقاعدة المعرفة",
"dataset.create_and_management": "إنشاء قواعد المعرفة",
"dataset.external.connect": "الاتصال بقواعد المعرفة الخارجية",
@@ -48,6 +48,10 @@
"plugin.install": "تثبيت الإضافات وتحديثها",
"plugin.model_config": "تكوين النماذج",
"plugin.plugin_preferences": "تكوين التحديثات التلقائية",
+ "skill.delete": "حذف Skill",
+ "skill.edit": "تعديل Skill",
+ "skill.publish": "نشر Skill",
+ "skill.view": "عرض Skill",
"snippets.create_and_modify": "إنشاء المقتطفات وتعديلها",
"snippets.management": "إدارة المقتطفات",
"tool.manage": "إدارة الأدوات",
diff --git a/web/i18n/ar-TN/permission.json b/web/i18n/ar-TN/permission.json
index bb8eb0a89c3..1a0bdc89b3f 100644
--- a/web/i18n/ar-TN/permission.json
+++ b/web/i18n/ar-TN/permission.json
@@ -1,14 +1,20 @@
{
+ "accessRule.accessPermission": "إذن الوصول",
"accessRule.actions": "الإجراءات",
- "accessRule.addException": "إضافة استثناء",
"accessRule.addMemberAria": "إضافة {{name}}",
"accessRule.addMembersTitle": "إضافة أعضاء",
"accessRule.allPermittedMembers": "جميع الأعضاء الذين لديهم أذونات الأدوار",
"accessRule.allPermittedMembersDescription": "يمكن للأعضاء الذين لديهم أذونات أدوار مطابقة الوصول إلى هذا المورد.",
- "accessRule.appDescription": "تحكم في من يُفتح له هذا التطبيق. لا يزال الأعضاء بحاجة إلى أذونات الأدوار لعرضه أو تشغيله.",
+ "accessRule.allowedMembers": "الأعضاء المسموح لهم",
+ "accessRule.appDescription": "حدّد من يمكنه الوصول إلى هذا التطبيق ودرجة تفصيل أذونات الوصول.",
"accessRule.appTitle": "مجموعة أذونات التطبيق",
+ "accessRule.automaticallyIncludeWorkspaceMembers": "تضمين أعضاء مساحة العمل تلقائيًا",
+ "accessRule.automaticallyIncludeWorkspaceMembersDescription": "يتم تضمين جميع أعضاء مساحة العمل الحاليين والمستقبليين تلقائيًا. وتظل أذونات الأدوار تحدد ما يمكنهم فعله.",
+ "accessRule.batchRemoveDescription": "ستتم إزالة الأعضاء المحددين من قائمة الأعضاء المسموح لهم.",
+ "accessRule.batchRemoveTitle": "إزالة الأعضاء المحددين؟",
"accessRule.changeOpenScopeDescription": "سيؤدي تغيير نطاق الفتح إلى إعادة تعيين جميع استثناءات أذونات الأعضاء لهذا المورد. ستحتاج إلى إضافة استثناءات أذونات الأعضاء مرة أخرى بعد التبديل.",
"accessRule.changeOpenScopeTitle": "تغيير نطاق فتح المورد؟",
+ "accessRule.collaborator": "المتعاون",
"accessRule.collapseSection": "طي {{title}}",
"accessRule.copied": "تم نسخ قاعدة الوصول بنجاح",
"accessRule.created": "تم إنشاء قاعدة الوصول بنجاح",
@@ -20,20 +26,17 @@
"accessRule.deleted": "تم حذف قاعدة الوصول بنجاح",
"accessRule.exceptionPermissionFor": "إذن استثنائي لـ {{name}}",
"accessRule.expandSection": "توسيع {{title}}",
- "accessRule.individualPermissionSettings": "استثناءات أذونات الأعضاء",
- "accessRule.individualPermissionSettingsTip": "عيّن استثناءات الأذونات لمتعاونين أو مجموعات محددة. تتجاوز هذه الإعدادات أذونات أدوارهم.",
"accessRule.maintainer": "مشرف الصيانة",
- "accessRule.member": "العضو المستثنى",
"accessRule.newPermissionSet": "مجموعة أذونات جديدة",
"accessRule.noAvailableMembers": "لا يوجد أعضاء متاحون للإضافة",
"accessRule.noDescription": "لا يوجد وصف",
"accessRule.noRules": "لا توجد قواعد وصول",
- "accessRule.noUserAccessSettings": "لا توجد استثناءات لأذونات الأعضاء",
+ "accessRule.noUserAccessSettings": "لا يوجد أعضاء مسموح لهم بالوصول",
"accessRule.onlyMe": "أنا فقط",
"accessRule.onlyMeDescription": "يمكنك وحدك الوصول إلى هذا المورد.",
- "accessRule.permission": "الإذن الاستثنائي",
"accessRule.resourceOpenScope": "نطاق فتح المورد",
"accessRule.resourceOpenScopeDescription": "اختر من يُفتح له هذا المورد. لا تزال أذونات الأدوار تحدد ما يمكن لكل عضو فعله.",
+ "accessRule.selected": "محدد",
"accessRule.specificMembersOnly": "أعضاء محددون فقط",
"accessRule.specificMembersOnlyDescription": "يمكن للأعضاء المحددين فقط الوصول إلى هذا المورد.",
"accessRule.summary_one": "{{count}} مجموعة أذونات",
diff --git a/web/i18n/de-DE/permission-keys.json b/web/i18n/de-DE/permission-keys.json
index 5b27d880702..fb32d92c699 100644
--- a/web/i18n/de-DE/permission-keys.json
+++ b/web/i18n/de-DE/permission-keys.json
@@ -2,21 +2,21 @@
"agent.manage": "Agents verwalten",
"api_extension.manage": "API-Erweiterungskonfiguration verwalten",
"app.access_config": "App-Zugriffsberechtigungen konfigurieren",
- "app.acl.access_config": "App-Zugriffsberechtigungen konfigurieren",
+ "app.acl.access_config": "Zugriffsberechtigungen anzeigen und verwalten",
"app.acl.delete": "App löschen",
"app.acl.deploy": "App bereitstellen",
- "app.acl.edit": "App bearbeiten und orchestrieren",
- "app.acl.import_export_dsl": "DSL importieren / exportieren",
- "app.acl.log_and_annotation": "Auf Logs und Annotationen zugreifen",
- "app.acl.monitor": "Auf Monitoring-Seite zugreifen",
+ "app.acl.edit": "App-Informationen bearbeiten und App orchestrieren",
+ "app.acl.import_export_dsl": "App-DSL importieren und exportieren",
+ "app.acl.log_and_annotation": "Logs und Annotationen anzeigen und verwalten",
+ "app.acl.monitor": "App-Monitoring anzeigen",
"app.acl.preview": "App-Vorschau",
- "app.acl.release_and_version": "App-Veröffentlichung und Versionsverwaltung",
+ "app.acl.release_and_version": "App-Versionen veröffentlichen und verwalten",
"app.acl.test_and_run": "App testen und verwenden",
- "app.acl.tracing_config": "Externes Tracing konfigurieren",
- "app.acl.view_layout": "Schreibgeschützte Orchestrierungsseite",
+ "app.acl.tracing_config": "App-Monitoring-Traces anzeigen und konfigurieren",
+ "app.acl.view_layout": "App-Orchestrierung anzeigen",
"app.create_and_management": "Apps erstellen",
"app.tag.manage": "App-Tags verwalten",
- "app_library.access": "Auf App-Bibliothek zugreifen",
+ "app_library.access": "App-Bibliothek anzeigen und verwenden",
"billing.manage": "Abonnementpläne ändern",
"billing.subscription.manage": "Abrechnung und Abonnements im Abrechnungsportal verwalten",
"billing.view": "Auf Abrechnungseinstellungen zugreifen",
@@ -26,18 +26,18 @@
"customization.manage": "Anpassung verwalten",
"data_source.manage": "Datenquellenkonfiguration verwalten",
"dataset.access_config": "Zugriffsberechtigungen der Wissensdatenbank konfigurieren",
- "dataset.acl.access_config": "Zugriffsberechtigungen der Wissensdatenbank konfigurieren",
+ "dataset.acl.access_config": "Zugriffsberechtigungen der Wissensdatenbank anzeigen und verwalten",
"dataset.acl.delete": "Wissensdatenbank löschen",
- "dataset.acl.delete_file": "Wissensdatenbankdateien löschen",
- "dataset.acl.document_download": "Dokumente herunterladen",
- "dataset.acl.edit": "Wissensdatenbank bearbeiten",
- "dataset.acl.import_export_dsl": "Knowledge-Pipeline-DSL importieren / exportieren",
- "dataset.acl.pipeline_release": "Knowledge-Pipeline-Veröffentlichung und Versionsverwaltung",
- "dataset.acl.pipeline_test": "Pipeline-Tests",
+ "dataset.acl.delete_file": "Dokumente der Wissensdatenbank löschen",
+ "dataset.acl.document_download": "Dokumente der Wissensdatenbank herunterladen",
+ "dataset.acl.edit": "Inhalte und Einstellungen der Wissensdatenbank bearbeiten",
+ "dataset.acl.import_export_dsl": "Pipeline-DSL importieren und exportieren",
+ "dataset.acl.pipeline_release": "Pipeline-Versionen veröffentlichen und verwalten",
+ "dataset.acl.pipeline_test": "Pipeline testen",
"dataset.acl.preview": "Wissensdatenbank-Vorschau",
- "dataset.acl.readonly": "Schreibgeschützte Wissensdatenbank",
- "dataset.acl.retrieval_recall": "Wissensdatenbank-Abruf",
- "dataset.acl.use": "Dokumente zur Wissensdatenbank hinzufügen",
+ "dataset.acl.readonly": "Inhalte und Einstellungen der Wissensdatenbank anzeigen",
+ "dataset.acl.retrieval_recall": "Abruf-Tests anzeigen und ausführen",
+ "dataset.acl.use": "Dokumente in die Wissensdatenbank hochladen",
"dataset.api_key.manage": "API-Schlüssel der Wissensdatenbank verwalten",
"dataset.create_and_management": "Wissensdatenbanken erstellen",
"dataset.external.connect": "Externe Wissensdatenbanken verbinden",
@@ -48,6 +48,10 @@
"plugin.install": "Plugins installieren und aktualisieren",
"plugin.model_config": "Modelle konfigurieren",
"plugin.plugin_preferences": "Automatische Updates konfigurieren",
+ "skill.delete": "Skill löschen",
+ "skill.edit": "Skill bearbeiten",
+ "skill.publish": "Skill veröffentlichen",
+ "skill.view": "Skill anzeigen",
"snippets.create_and_modify": "Snippets erstellen und ändern",
"snippets.management": "Snippets verwalten",
"tool.manage": "Tools verwalten",
diff --git a/web/i18n/de-DE/permission.json b/web/i18n/de-DE/permission.json
index 370ff7b44a0..53f573305e9 100644
--- a/web/i18n/de-DE/permission.json
+++ b/web/i18n/de-DE/permission.json
@@ -1,14 +1,20 @@
{
+ "accessRule.accessPermission": "Zugriffsberechtigung",
"accessRule.actions": "Aktionen",
- "accessRule.addException": "Ausnahme hinzufügen",
"accessRule.addMemberAria": "{{name}} hinzufügen",
"accessRule.addMembersTitle": "Mitglieder hinzufügen",
"accessRule.allPermittedMembers": "Alle Mitglieder mit Rollenberechtigungen",
"accessRule.allPermittedMembersDescription": "Mitglieder mit passenden Rollenberechtigungen können auf diese Ressource zugreifen.",
- "accessRule.appDescription": "Steuern Sie, für wen diese App geöffnet ist. Mitglieder benötigen dennoch Rollenberechtigungen, um sie anzuzeigen oder zu bedienen.",
+ "accessRule.allowedMembers": "Zulässige Mitglieder",
+ "accessRule.appDescription": "Legen Sie fest, wer auf diese App zugreifen kann und wie granular die Zugriffsberechtigungen sind.",
"accessRule.appTitle": "App-Berechtigungssatz",
+ "accessRule.automaticallyIncludeWorkspaceMembers": "Workspace-Mitglieder automatisch einbeziehen",
+ "accessRule.automaticallyIncludeWorkspaceMembersDescription": "Alle aktuellen und zukünftigen Workspace-Mitglieder werden automatisch einbezogen. Rollenberechtigungen bestimmen weiterhin, was sie tun können.",
+ "accessRule.batchRemoveDescription": "Die ausgewählten Mitglieder werden aus der Liste der zulässigen Mitglieder entfernt.",
+ "accessRule.batchRemoveTitle": "Ausgewählte Mitglieder entfernen?",
"accessRule.changeOpenScopeDescription": "Das Ändern des Freigabebereichs setzt alle Berechtigungsausnahmen für Mitglieder dieser Ressource zurück. Nach dem Wechsel müssen Sie die Berechtigungsausnahmen für Mitglieder erneut hinzufügen.",
"accessRule.changeOpenScopeTitle": "Freigabebereich der Ressource ändern?",
+ "accessRule.collaborator": "Mitwirkende",
"accessRule.collapseSection": "{{title}} einklappen",
"accessRule.copied": "Zugriffsregel erfolgreich kopiert",
"accessRule.created": "Zugriffsregel erfolgreich erstellt",
@@ -20,20 +26,17 @@
"accessRule.deleted": "Zugriffsregel erfolgreich gelöscht",
"accessRule.exceptionPermissionFor": "Ausnahmeberechtigung für {{name}}",
"accessRule.expandSection": "{{title}} ausklappen",
- "accessRule.individualPermissionSettings": "Berechtigungsausnahmen für Mitglieder",
- "accessRule.individualPermissionSettingsTip": "Legen Sie Berechtigungsausnahmen für bestimmte Mitarbeiter oder Gruppen fest. Diese Einstellungen überschreiben deren Rollenberechtigungen.",
"accessRule.maintainer": "Betreuer",
- "accessRule.member": "Mitglied mit Ausnahme",
"accessRule.newPermissionSet": "Neuer Berechtigungssatz",
"accessRule.noAvailableMembers": "Keine Mitglieder zum Hinzufügen verfügbar",
"accessRule.noDescription": "Keine Beschreibung",
"accessRule.noRules": "Keine Zugriffsregeln",
- "accessRule.noUserAccessSettings": "Keine Berechtigungsausnahmen für Mitglieder",
+ "accessRule.noUserAccessSettings": "Keine zulässigen Mitglieder",
"accessRule.onlyMe": "Nur ich",
"accessRule.onlyMeDescription": "Nur Sie können auf diese Ressource zugreifen.",
- "accessRule.permission": "Ausnahmeberechtigung",
"accessRule.resourceOpenScope": "Freigabebereich der Ressource",
"accessRule.resourceOpenScopeDescription": "Wählen Sie, für wen diese Ressource geöffnet ist. Rollenberechtigungen bestimmen weiterhin, was jedes Mitglied tun kann.",
+ "accessRule.selected": "Ausgewählt",
"accessRule.specificMembersOnly": "Nur bestimmte Mitglieder",
"accessRule.specificMembersOnlyDescription": "Nur ausgewählte Mitglieder können auf diese Ressource zugreifen.",
"accessRule.summary_one": "{{count}} Berechtigungssatz",
diff --git a/web/i18n/en-US/permission-keys.json b/web/i18n/en-US/permission-keys.json
index 52e657e5e6c..2344caa11e1 100644
--- a/web/i18n/en-US/permission-keys.json
+++ b/web/i18n/en-US/permission-keys.json
@@ -2,21 +2,21 @@
"agent.manage": "Manage Agents",
"api_extension.manage": "Manage API extension configuration",
"app.access_config": "Configure app access permissions",
- "app.acl.access_config": "Configure app access permissions",
+ "app.acl.access_config": "View and manage access permissions",
"app.acl.delete": "Delete app",
"app.acl.deploy": "Deploy app",
- "app.acl.edit": "Edit and orchestrate app",
- "app.acl.import_export_dsl": "Import / export DSL",
- "app.acl.log_and_annotation": "Access logs and annotations",
- "app.acl.monitor": "Access monitoring page",
+ "app.acl.edit": "Edit app information and orchestrate app",
+ "app.acl.import_export_dsl": "Import and export app DSL",
+ "app.acl.log_and_annotation": "View and manage logs and annotations",
+ "app.acl.monitor": "View app monitoring",
"app.acl.preview": "Preview app",
- "app.acl.release_and_version": "App publishing and version management",
+ "app.acl.release_and_version": "Publish and manage app versions",
"app.acl.test_and_run": "Test and use app",
- "app.acl.tracing_config": "Configure external tracing",
- "app.acl.view_layout": "Read-only orchestration page",
+ "app.acl.tracing_config": "View and configure app monitoring traces",
+ "app.acl.view_layout": "View app orchestration",
"app.create_and_management": "Create apps",
"app.tag.manage": "Manage app tags",
- "app_library.access": "Access App Library",
+ "app_library.access": "View and use App Library",
"billing.manage": "Change subscription plans",
"billing.subscription.manage": "Manage billing and subscriptions in the billing portal",
"billing.view": "Access Billing settings",
@@ -26,18 +26,18 @@
"customization.manage": "Manage customization",
"data_source.manage": "Manage data source configuration",
"dataset.access_config": "Configure knowledge base access permissions",
- "dataset.acl.access_config": "Configure knowledge base access permissions",
+ "dataset.acl.access_config": "View and manage knowledge base access permissions",
"dataset.acl.delete": "Delete knowledge base",
- "dataset.acl.delete_file": "Delete knowledge base files",
- "dataset.acl.document_download": "Download documents",
- "dataset.acl.edit": "Edit knowledge base",
- "dataset.acl.import_export_dsl": "Import / export knowledge pipeline DSL",
- "dataset.acl.pipeline_release": "Knowledge pipeline publishing and version management",
- "dataset.acl.pipeline_test": "Pipeline testing",
+ "dataset.acl.delete_file": "Delete knowledge base documents",
+ "dataset.acl.document_download": "Download knowledge base documents",
+ "dataset.acl.edit": "Edit knowledge base content and settings",
+ "dataset.acl.import_export_dsl": "Import and export pipeline DSL",
+ "dataset.acl.pipeline_release": "Publish and manage pipeline versions",
+ "dataset.acl.pipeline_test": "Test pipeline",
"dataset.acl.preview": "Preview knowledge base",
- "dataset.acl.readonly": "Read-only knowledge base",
- "dataset.acl.retrieval_recall": "Knowledge base retrieval",
- "dataset.acl.use": "Add documents to knowledge base",
+ "dataset.acl.readonly": "View knowledge base content and settings",
+ "dataset.acl.retrieval_recall": "View and run retrieval tests",
+ "dataset.acl.use": "Upload knowledge base documents",
"dataset.api_key.manage": "Manage knowledge base API keys",
"dataset.create_and_management": "Create knowledge bases",
"dataset.external.connect": "Connect external knowledge bases",
@@ -48,6 +48,10 @@
"plugin.install": "Install and update plugins",
"plugin.model_config": "Configure models",
"plugin.plugin_preferences": "Configure auto updates",
+ "skill.delete": "Delete Skill",
+ "skill.edit": "Edit Skill",
+ "skill.publish": "Publish Skill",
+ "skill.view": "View Skill",
"snippets.create_and_modify": "Create and modify snippets",
"snippets.management": "Manage snippets",
"tool.manage": "Manage tools",
diff --git a/web/i18n/en-US/permission.json b/web/i18n/en-US/permission.json
index 36decc0afa7..48fa3c7443f 100644
--- a/web/i18n/en-US/permission.json
+++ b/web/i18n/en-US/permission.json
@@ -1,14 +1,20 @@
{
+ "accessRule.accessPermission": "Access permission",
"accessRule.actions": "Actions",
- "accessRule.addException": "Add exception",
"accessRule.addMemberAria": "Add {{name}}",
"accessRule.addMembersTitle": "Add members",
"accessRule.allPermittedMembers": "All members with role permissions",
"accessRule.allPermittedMembersDescription": "Members with matching role permissions can access this resource.",
- "accessRule.appDescription": "Control who this app is open to. Members still need role permissions to view or operate it.",
+ "accessRule.allowedMembers": "Allowed members",
+ "accessRule.appDescription": "Set who can access this app and the granularity of access permissions.",
"accessRule.appTitle": "App Permission Set",
+ "accessRule.automaticallyIncludeWorkspaceMembers": "Automatically include workspace members",
+ "accessRule.automaticallyIncludeWorkspaceMembersDescription": "All current and future workspace members are automatically included. Role permissions still determine what they can do.",
+ "accessRule.batchRemoveDescription": "The selected members will be removed from the allowed members list.",
+ "accessRule.batchRemoveTitle": "Remove selected members?",
"accessRule.changeOpenScopeDescription": "Changing the open scope will reset all member permission exceptions for this resource. You'll need to add the member permission exceptions again after switching.",
"accessRule.changeOpenScopeTitle": "Change resource open scope?",
+ "accessRule.collaborator": "Collaborator",
"accessRule.collapseSection": "Collapse {{title}}",
"accessRule.copied": "Access rule copied successfully",
"accessRule.created": "Access rule created successfully",
@@ -20,20 +26,17 @@
"accessRule.deleted": "Access rule deleted successfully",
"accessRule.exceptionPermissionFor": "Exception permission for {{name}}",
"accessRule.expandSection": "Expand {{title}}",
- "accessRule.individualPermissionSettings": "Member permission exceptions",
- "accessRule.individualPermissionSettingsTip": "Set permission exceptions for specific collaborators or groups. These settings override their role permissions.",
"accessRule.maintainer": "Maintainer",
- "accessRule.member": "Exception member",
"accessRule.newPermissionSet": "New permission set",
"accessRule.noAvailableMembers": "No members available to add",
"accessRule.noDescription": "No description",
"accessRule.noRules": "No access rules",
- "accessRule.noUserAccessSettings": "No member permission exceptions",
+ "accessRule.noUserAccessSettings": "No members are allowed access",
"accessRule.onlyMe": "Only me",
"accessRule.onlyMeDescription": "Only you can access this resource.",
- "accessRule.permission": "Exception permission",
"accessRule.resourceOpenScope": "Resource open scope",
"accessRule.resourceOpenScopeDescription": "Choose who this resource is open to. Role permissions still decide what each member can do.",
+ "accessRule.selected": "Selected",
"accessRule.specificMembersOnly": "Specific members only",
"accessRule.specificMembersOnlyDescription": "Only selected members can access this resource.",
"accessRule.summary_one": "{{count}} permission set",
diff --git a/web/i18n/es-ES/permission-keys.json b/web/i18n/es-ES/permission-keys.json
index b47fd3ed44b..af3336ceea7 100644
--- a/web/i18n/es-ES/permission-keys.json
+++ b/web/i18n/es-ES/permission-keys.json
@@ -2,21 +2,21 @@
"agent.manage": "Gestionar Agents",
"api_extension.manage": "Gestionar la configuración de la extensión de API",
"app.access_config": "Configurar los permisos de acceso de la app",
- "app.acl.access_config": "Configurar los permisos de acceso de la app",
+ "app.acl.access_config": "Ver y gestionar los permisos de acceso",
"app.acl.delete": "Eliminar app",
"app.acl.deploy": "Desplegar la app",
- "app.acl.edit": "Editar y orquestar la app",
- "app.acl.import_export_dsl": "Importar / exportar DSL",
- "app.acl.log_and_annotation": "Acceder a logs y anotaciones",
- "app.acl.monitor": "Acceder a la página de supervisión",
+ "app.acl.edit": "Editar la información y orquestar la app",
+ "app.acl.import_export_dsl": "Importar y exportar el DSL de la app",
+ "app.acl.log_and_annotation": "Ver y gestionar logs y anotaciones",
+ "app.acl.monitor": "Ver la supervisión de la app",
"app.acl.preview": "Previsualizar app",
- "app.acl.release_and_version": "Publicación de la app y gestión de versiones",
+ "app.acl.release_and_version": "Publicar y gestionar versiones de la app",
"app.acl.test_and_run": "Probar y usar la app",
- "app.acl.tracing_config": "Configurar tracing externo",
- "app.acl.view_layout": "Página de orquestación de solo lectura",
+ "app.acl.tracing_config": "Ver y configurar el tracing de supervisión de la app",
+ "app.acl.view_layout": "Ver la orquestación de la app",
"app.create_and_management": "Crear apps",
"app.tag.manage": "Gestionar etiquetas de apps",
- "app_library.access": "Acceder a la Biblioteca de apps",
+ "app_library.access": "Ver y usar la Biblioteca de apps",
"billing.manage": "Cambiar planes de suscripción",
"billing.subscription.manage": "Gestionar la facturación y las suscripciones en el portal de facturación",
"billing.view": "Acceder a la configuración de facturación",
@@ -26,18 +26,18 @@
"customization.manage": "Gestionar la personalización",
"data_source.manage": "Gestionar la configuración de la fuente de datos",
"dataset.access_config": "Configurar los permisos de acceso de la base de conocimiento",
- "dataset.acl.access_config": "Configurar los permisos de acceso de la base de conocimiento",
+ "dataset.acl.access_config": "Ver y gestionar los permisos de acceso de la base de conocimiento",
"dataset.acl.delete": "Eliminar base de conocimiento",
- "dataset.acl.delete_file": "Eliminar archivos de la base de conocimiento",
- "dataset.acl.document_download": "Descargar documentos",
- "dataset.acl.edit": "Editar base de conocimiento",
- "dataset.acl.import_export_dsl": "Importar / exportar el DSL del pipeline de conocimiento",
- "dataset.acl.pipeline_release": "Publicación del pipeline de conocimiento y gestión de versiones",
- "dataset.acl.pipeline_test": "Pruebas del pipeline",
+ "dataset.acl.delete_file": "Eliminar documentos de la base de conocimiento",
+ "dataset.acl.document_download": "Descargar documentos de la base de conocimiento",
+ "dataset.acl.edit": "Editar el contenido y la configuración de la base de conocimiento",
+ "dataset.acl.import_export_dsl": "Importar y exportar el DSL del pipeline",
+ "dataset.acl.pipeline_release": "Publicar y gestionar versiones del pipeline",
+ "dataset.acl.pipeline_test": "Probar el pipeline",
"dataset.acl.preview": "Previsualizar base de conocimiento",
- "dataset.acl.readonly": "Base de conocimiento de solo lectura",
- "dataset.acl.retrieval_recall": "Recuperación de la base de conocimiento",
- "dataset.acl.use": "Añadir documentos a la base de conocimiento",
+ "dataset.acl.readonly": "Ver el contenido y la configuración de la base de conocimiento",
+ "dataset.acl.retrieval_recall": "Ver y ejecutar pruebas de recuperación",
+ "dataset.acl.use": "Subir documentos a la base de conocimiento",
"dataset.api_key.manage": "Gestionar las claves de API de la base de conocimiento",
"dataset.create_and_management": "Crear bases de conocimiento",
"dataset.external.connect": "Conectar bases de conocimiento externas",
@@ -48,6 +48,10 @@
"plugin.install": "Instalar y actualizar plugins",
"plugin.model_config": "Configurar modelos",
"plugin.plugin_preferences": "Configurar actualizaciones automáticas",
+ "skill.delete": "Eliminar Skill",
+ "skill.edit": "Editar Skill",
+ "skill.publish": "Publicar Skill",
+ "skill.view": "Ver Skill",
"snippets.create_and_modify": "Crear y modificar fragmentos",
"snippets.management": "Gestionar fragmentos",
"tool.manage": "Gestionar herramientas",
diff --git a/web/i18n/es-ES/permission.json b/web/i18n/es-ES/permission.json
index a1deccdfa0a..1f5b04f51f7 100644
--- a/web/i18n/es-ES/permission.json
+++ b/web/i18n/es-ES/permission.json
@@ -1,14 +1,20 @@
{
+ "accessRule.accessPermission": "Permiso de acceso",
"accessRule.actions": "Acciones",
- "accessRule.addException": "Añadir excepción",
"accessRule.addMemberAria": "Añadir {{name}}",
"accessRule.addMembersTitle": "Añadir miembros",
"accessRule.allPermittedMembers": "Todos los miembros con permisos de rol",
"accessRule.allPermittedMembersDescription": "Los miembros con permisos de rol coincidentes pueden acceder a este recurso.",
- "accessRule.appDescription": "Controla a quién está abierta esta app. Los miembros todavía necesitan permisos de rol para verla u operarla.",
+ "accessRule.allowedMembers": "Miembros permitidos",
+ "accessRule.appDescription": "Configura quién puede acceder a esta app y la granularidad de los permisos de acceso.",
"accessRule.appTitle": "Conjunto de permisos de app",
+ "accessRule.automaticallyIncludeWorkspaceMembers": "Incluir automáticamente a los miembros del espacio de trabajo",
+ "accessRule.automaticallyIncludeWorkspaceMembersDescription": "Todos los miembros actuales y futuros del espacio de trabajo se incluyen automáticamente. Los permisos de rol siguen determinando lo que pueden hacer.",
+ "accessRule.batchRemoveDescription": "Los miembros seleccionados se eliminarán de la lista de miembros permitidos.",
+ "accessRule.batchRemoveTitle": "¿Eliminar a los miembros seleccionados?",
"accessRule.changeOpenScopeDescription": "Cambiar el ámbito de apertura restablecerá todas las excepciones de permisos de miembros para este recurso. Tendrás que volver a añadir las excepciones de permisos de miembros después de cambiarlo.",
"accessRule.changeOpenScopeTitle": "¿Cambiar el ámbito de apertura del recurso?",
+ "accessRule.collaborator": "Colaborador",
"accessRule.collapseSection": "Contraer {{title}}",
"accessRule.copied": "Regla de acceso copiada correctamente",
"accessRule.created": "Regla de acceso creada correctamente",
@@ -20,20 +26,17 @@
"accessRule.deleted": "Regla de acceso eliminada correctamente",
"accessRule.exceptionPermissionFor": "Permiso de excepción para {{name}}",
"accessRule.expandSection": "Expandir {{title}}",
- "accessRule.individualPermissionSettings": "Excepciones de permisos de miembros",
- "accessRule.individualPermissionSettingsTip": "Establece excepciones de permisos para colaboradores o grupos específicos. Estos ajustes anulan sus permisos de rol.",
"accessRule.maintainer": "Mantenedor",
- "accessRule.member": "Miembro con excepción",
"accessRule.newPermissionSet": "Nuevo conjunto de permisos",
"accessRule.noAvailableMembers": "No hay miembros disponibles para añadir",
"accessRule.noDescription": "Sin descripción",
"accessRule.noRules": "Sin reglas de acceso",
- "accessRule.noUserAccessSettings": "No hay excepciones de permisos de miembros",
+ "accessRule.noUserAccessSettings": "Ningún miembro tiene acceso",
"accessRule.onlyMe": "Solo yo",
"accessRule.onlyMeDescription": "Solo tú puedes acceder a este recurso.",
- "accessRule.permission": "Permiso de excepción",
"accessRule.resourceOpenScope": "Ámbito de apertura del recurso",
"accessRule.resourceOpenScopeDescription": "Elige a quién está abierto este recurso. Los permisos de rol siguen decidiendo lo que puede hacer cada miembro.",
+ "accessRule.selected": "Seleccionados",
"accessRule.specificMembersOnly": "Solo miembros específicos",
"accessRule.specificMembersOnlyDescription": "Solo los miembros seleccionados pueden acceder a este recurso.",
"accessRule.summary_one": "{{count}} conjunto de permisos",
diff --git a/web/i18n/fa-IR/permission-keys.json b/web/i18n/fa-IR/permission-keys.json
index d3d8dcdff81..372374ed3b8 100644
--- a/web/i18n/fa-IR/permission-keys.json
+++ b/web/i18n/fa-IR/permission-keys.json
@@ -2,21 +2,21 @@
"agent.manage": "مدیریت Agents",
"api_extension.manage": "مدیریت پیکربندی افزونه API",
"app.access_config": "پیکربندی مجوزهای دسترسی برنامه",
- "app.acl.access_config": "پیکربندی مجوزهای دسترسی برنامه",
+ "app.acl.access_config": "مشاهده و مدیریت مجوزهای دسترسی",
"app.acl.delete": "حذف برنامه",
"app.acl.deploy": "استقرار برنامه",
- "app.acl.edit": "ویرایش و هماهنگ‌سازی برنامه",
- "app.acl.import_export_dsl": "وارد کردن / صادر کردن DSL",
- "app.acl.log_and_annotation": "دسترسی به گزارش‌ها و حاشیه‌نویسی‌ها",
- "app.acl.monitor": "دسترسی به صفحه نظارت",
+ "app.acl.edit": "ویرایش اطلاعات برنامه و هماهنگ‌سازی برنامه",
+ "app.acl.import_export_dsl": "وارد کردن و صادر کردن DSL برنامه",
+ "app.acl.log_and_annotation": "مشاهده و مدیریت گزارش‌ها و حاشیه‌نویسی‌ها",
+ "app.acl.monitor": "مشاهده نظارت برنامه",
"app.acl.preview": "پیش‌نمایش برنامه",
- "app.acl.release_and_version": "انتشار برنامه و مدیریت نسخه",
+ "app.acl.release_and_version": "انتشار و مدیریت نسخه‌های برنامه",
"app.acl.test_and_run": "آزمایش و استفاده از برنامه",
- "app.acl.tracing_config": "پیکربندی رهگیری خارجی",
- "app.acl.view_layout": "صفحه هماهنگ‌سازی فقط‌خواندنی",
+ "app.acl.tracing_config": "مشاهده و پیکربندی رهگیری نظارت برنامه",
+ "app.acl.view_layout": "مشاهده هماهنگ‌سازی برنامه",
"app.create_and_management": "ایجاد برنامه‌ها",
"app.tag.manage": "مدیریت برچسب‌های برنامه",
- "app_library.access": "دسترسی به کتابخانه برنامه",
+ "app_library.access": "مشاهده و استفاده از کتابخانه برنامه",
"billing.manage": "تغییر طرح‌های اشتراک",
"billing.subscription.manage": "مدیریت صورت‌حساب و اشتراک‌ها در پورتال صورت‌حساب",
"billing.view": "دسترسی به تنظیمات صورت‌حساب",
@@ -26,18 +26,18 @@
"customization.manage": "مدیریت سفارشی‌سازی",
"data_source.manage": "مدیریت پیکربندی منبع داده",
"dataset.access_config": "پیکربندی مجوزهای دسترسی پایگاه دانش",
- "dataset.acl.access_config": "پیکربندی مجوزهای دسترسی پایگاه دانش",
+ "dataset.acl.access_config": "مشاهده و مدیریت مجوزهای دسترسی پایگاه دانش",
"dataset.acl.delete": "حذف پایگاه دانش",
- "dataset.acl.delete_file": "حذف فایل‌های پایگاه دانش",
- "dataset.acl.document_download": "دانلود اسناد",
- "dataset.acl.edit": "ویرایش پایگاه دانش",
- "dataset.acl.import_export_dsl": "وارد کردن / صادر کردن DSL خط لوله دانش",
- "dataset.acl.pipeline_release": "انتشار خط لوله دانش و مدیریت نسخه",
- "dataset.acl.pipeline_test": "آزمایش خط لوله",
+ "dataset.acl.delete_file": "حذف اسناد پایگاه دانش",
+ "dataset.acl.document_download": "دانلود اسناد پایگاه دانش",
+ "dataset.acl.edit": "ویرایش محتوا و تنظیمات پایگاه دانش",
+ "dataset.acl.import_export_dsl": "وارد کردن و صادر کردن DSL خط لوله",
+ "dataset.acl.pipeline_release": "انتشار و مدیریت نسخه‌های خط لوله",
+ "dataset.acl.pipeline_test": "خط لوله را آزمایش کنید",
"dataset.acl.preview": "پیش‌نمایش پایگاه دانش",
- "dataset.acl.readonly": "پایگاه دانش فقط‌خواندنی",
- "dataset.acl.retrieval_recall": "بازیابی پایگاه دانش",
- "dataset.acl.use": "افزودن اسناد به پایگاه دانش",
+ "dataset.acl.readonly": "مشاهده محتوا و تنظیمات پایگاه دانش",
+ "dataset.acl.retrieval_recall": "مشاهده و اجرای آزمون‌های بازیابی",
+ "dataset.acl.use": "بارگذاری اسناد پایگاه دانش",
"dataset.api_key.manage": "مدیریت کلیدهای API پایگاه دانش",
"dataset.create_and_management": "ایجاد پایگاه‌های دانش",
"dataset.external.connect": "اتصال به پایگاه‌های دانش خارجی",
@@ -48,6 +48,10 @@
"plugin.install": "نصب و به‌روزرسانی افزونه‌ها",
"plugin.model_config": "پیکربندی مدل‌ها",
"plugin.plugin_preferences": "پیکربندی به‌روزرسانی‌های خودکار",
+ "skill.delete": "حذف Skill",
+ "skill.edit": "ویرایش Skill",
+ "skill.publish": "انتشار Skill",
+ "skill.view": "مشاهده Skill",
"snippets.create_and_modify": "ایجاد و اصلاح قطعه‌کدها",
"snippets.management": "مدیریت قطعه‌کدها",
"tool.manage": "مدیریت ابزارها",
diff --git a/web/i18n/fa-IR/permission.json b/web/i18n/fa-IR/permission.json
index 9bb9220a92e..c281a23e036 100644
--- a/web/i18n/fa-IR/permission.json
+++ b/web/i18n/fa-IR/permission.json
@@ -1,14 +1,20 @@
{
+ "accessRule.accessPermission": "مجوز دسترسی",
"accessRule.actions": "اقدامات",
- "accessRule.addException": "افزودن استثنا",
"accessRule.addMemberAria": "افزودن {{name}}",
"accessRule.addMembersTitle": "افزودن اعضا",
"accessRule.allPermittedMembers": "همه اعضای دارای مجوزهای نقش",
"accessRule.allPermittedMembersDescription": "اعضای دارای مجوزهای نقش منطبق می‌توانند به این منبع دسترسی داشته باشند.",
- "accessRule.appDescription": "کنترل کنید این برنامه برای چه کسانی باز است. اعضا همچنان برای مشاهده یا کار با آن به مجوزهای نقش نیاز دارند.",
+ "accessRule.allowedMembers": "اعضای مجاز",
+ "accessRule.appDescription": "مشخص کنید چه کسانی می‌توانند به این برنامه دسترسی داشته باشند و سطح جزئیات مجوزهای دسترسی را تعیین کنید.",
"accessRule.appTitle": "مجموعه مجوز برنامه",
+ "accessRule.automaticallyIncludeWorkspaceMembers": "اعضای فضای کاری را به‌طور خودکار اضافه کن",
+ "accessRule.automaticallyIncludeWorkspaceMembersDescription": "همه اعضای فعلی و آینده فضای کاری به‌طور خودکار اضافه می‌شوند. مجوزهای نقش همچنان مشخص می‌کنند چه کارهایی می‌توانند انجام دهند.",
+ "accessRule.batchRemoveDescription": "اعضای انتخاب‌شده از فهرست اعضای مجاز حذف خواهند شد.",
+ "accessRule.batchRemoveTitle": "اعضای انتخاب‌شده حذف شوند؟",
"accessRule.changeOpenScopeDescription": "تغییر دامنه دسترسی، همه استثناهای مجوز اعضای این منبع را بازنشانی می‌کند. پس از تغییر، باید استثناهای مجوز اعضا را دوباره اضافه کنید.",
"accessRule.changeOpenScopeTitle": "دامنه دسترسی منبع تغییر کند؟",
+ "accessRule.collaborator": "همکار",
"accessRule.collapseSection": "جمع کردن {{title}}",
"accessRule.copied": "قانون دسترسی با موفقیت کپی شد",
"accessRule.created": "قانون دسترسی با موفقیت ایجاد شد",
@@ -20,20 +26,17 @@
"accessRule.deleted": "قانون دسترسی با موفقیت حذف شد",
"accessRule.exceptionPermissionFor": "مجوز استثنا برای {{name}}",
"accessRule.expandSection": "گسترش {{title}}",
- "accessRule.individualPermissionSettings": "استثناهای مجوز اعضا",
- "accessRule.individualPermissionSettingsTip": "استثناهای مجوز را برای همکاران یا گروه‌های خاص تنظیم کنید. این تنظیمات مجوزهای نقش آن‌ها را لغو می‌کنند.",
"accessRule.maintainer": "نگهدارنده",
- "accessRule.member": "عضو دارای استثنا",
"accessRule.newPermissionSet": "مجموعه مجوز جدید",
"accessRule.noAvailableMembers": "هیچ عضوی برای افزودن در دسترس نیست",
"accessRule.noDescription": "بدون توضیحات",
"accessRule.noRules": "بدون قانون دسترسی",
- "accessRule.noUserAccessSettings": "هیچ استثنای مجوزی برای اعضا وجود ندارد",
+ "accessRule.noUserAccessSettings": "هیچ عضوی اجازه دسترسی ندارد",
"accessRule.onlyMe": "فقط من",
"accessRule.onlyMeDescription": "فقط شما می‌توانید به این منبع دسترسی داشته باشید.",
- "accessRule.permission": "مجوز استثنایی",
"accessRule.resourceOpenScope": "دامنه دسترسی منبع",
"accessRule.resourceOpenScopeDescription": "انتخاب کنید این منبع برای چه کسانی باز است. مجوزهای نقش همچنان تعیین می‌کنند هر عضو چه کاری می‌تواند انجام دهد.",
+ "accessRule.selected": "انتخاب‌شده",
"accessRule.specificMembersOnly": "فقط اعضای خاص",
"accessRule.specificMembersOnlyDescription": "فقط اعضای انتخاب‌شده می‌توانند به این منبع دسترسی داشته باشند.",
"accessRule.summary_one": "{{count}} مجموعه مجوز",
diff --git a/web/i18n/fr-FR/permission-keys.json b/web/i18n/fr-FR/permission-keys.json
index 7dbca3d7930..074da133fae 100644
--- a/web/i18n/fr-FR/permission-keys.json
+++ b/web/i18n/fr-FR/permission-keys.json
@@ -2,21 +2,21 @@
"agent.manage": "Gérer Agents",
"api_extension.manage": "Gérer la configuration de l'extension API",
"app.access_config": "Configurer les autorisations d'accès à l'application",
- "app.acl.access_config": "Configurer les autorisations d'accès à l'application",
+ "app.acl.access_config": "Afficher et gérer les autorisations d'accès",
"app.acl.delete": "Supprimer l'application",
"app.acl.deploy": "Déployer l'application",
- "app.acl.edit": "Modifier et orchestrer l'application",
- "app.acl.import_export_dsl": "Importer / exporter le DSL",
- "app.acl.log_and_annotation": "Accéder aux journaux et annotations",
- "app.acl.monitor": "Accéder à la page de surveillance",
+ "app.acl.edit": "Modifier les informations et orchestrer l'application",
+ "app.acl.import_export_dsl": "Importer et exporter le DSL de l'application",
+ "app.acl.log_and_annotation": "Afficher et gérer les journaux et annotations",
+ "app.acl.monitor": "Afficher la surveillance de l'application",
"app.acl.preview": "Prévisualiser l'application",
- "app.acl.release_and_version": "Publication de l'application et gestion des versions",
+ "app.acl.release_and_version": "Publier et gérer les versions de l'application",
"app.acl.test_and_run": "Tester et utiliser l'application",
- "app.acl.tracing_config": "Configurer le traçage externe",
- "app.acl.view_layout": "Page d'orchestration en lecture seule",
+ "app.acl.tracing_config": "Afficher et configurer le traçage de surveillance de l'application",
+ "app.acl.view_layout": "Afficher l'orchestration de l'application",
"app.create_and_management": "Créer des applications",
"app.tag.manage": "Gérer les étiquettes d'applications",
- "app_library.access": "Accéder à la bibliothèque d'applications",
+ "app_library.access": "Afficher et utiliser la bibliothèque d'applications",
"billing.manage": "Modifier les forfaits d'abonnement",
"billing.subscription.manage": "Gérer la facturation et les abonnements dans le portail de facturation",
"billing.view": "Accéder aux paramètres de facturation",
@@ -26,18 +26,18 @@
"customization.manage": "Gérer la personnalisation",
"data_source.manage": "Gérer la configuration des sources de données",
"dataset.access_config": "Configurer les autorisations d'accès à la base de connaissances",
- "dataset.acl.access_config": "Configurer les autorisations d'accès à la base de connaissances",
+ "dataset.acl.access_config": "Afficher et gérer les autorisations d'accès à la base de connaissances",
"dataset.acl.delete": "Supprimer la base de connaissances",
- "dataset.acl.delete_file": "Supprimer les fichiers de la base de connaissances",
- "dataset.acl.document_download": "Télécharger des documents",
- "dataset.acl.edit": "Modifier la base de connaissances",
- "dataset.acl.import_export_dsl": "Importer / exporter le DSL du pipeline de connaissances",
- "dataset.acl.pipeline_release": "Publication du pipeline de connaissances et gestion des versions",
- "dataset.acl.pipeline_test": "Test du pipeline",
+ "dataset.acl.delete_file": "Supprimer les documents de la base de connaissances",
+ "dataset.acl.document_download": "Télécharger les documents de la base de connaissances",
+ "dataset.acl.edit": "Modifier le contenu et les paramètres de la base de connaissances",
+ "dataset.acl.import_export_dsl": "Importer et exporter le DSL du pipeline",
+ "dataset.acl.pipeline_release": "Publier et gérer les versions du pipeline",
+ "dataset.acl.pipeline_test": "Tester le pipeline",
"dataset.acl.preview": "Prévisualiser la base de connaissances",
- "dataset.acl.readonly": "Base de connaissances en lecture seule",
- "dataset.acl.retrieval_recall": "Récupération dans la base de connaissances",
- "dataset.acl.use": "Ajouter des documents à la base de connaissances",
+ "dataset.acl.readonly": "Afficher le contenu et les paramètres de la base de connaissances",
+ "dataset.acl.retrieval_recall": "Afficher et exécuter les tests de récupération",
+ "dataset.acl.use": "Téléverser des documents dans la base de connaissances",
"dataset.api_key.manage": "Gérer les clés API de la base de connaissances",
"dataset.create_and_management": "Créer des bases de connaissances",
"dataset.external.connect": "Connecter des bases de connaissances externes",
@@ -48,6 +48,10 @@
"plugin.install": "Installer et mettre à jour les plugins",
"plugin.model_config": "Configurer les modèles",
"plugin.plugin_preferences": "Configurer les mises à jour automatiques",
+ "skill.delete": "Supprimer Skill",
+ "skill.edit": "Modifier Skill",
+ "skill.publish": "Publier Skill",
+ "skill.view": "Afficher Skill",
"snippets.create_and_modify": "Créer et modifier des extraits",
"snippets.management": "Gérer les extraits",
"tool.manage": "Gérer les outils",
diff --git a/web/i18n/fr-FR/permission.json b/web/i18n/fr-FR/permission.json
index 95ae235d873..79bdd910672 100644
--- a/web/i18n/fr-FR/permission.json
+++ b/web/i18n/fr-FR/permission.json
@@ -1,14 +1,20 @@
{
+ "accessRule.accessPermission": "Autorisation d’accès",
"accessRule.actions": "Actions",
- "accessRule.addException": "Ajouter une exception",
"accessRule.addMemberAria": "Ajouter {{name}}",
"accessRule.addMembersTitle": "Ajouter des membres",
"accessRule.allPermittedMembers": "Tous les membres ayant les autorisations de rôle",
"accessRule.allPermittedMembersDescription": "Les membres disposant d'autorisations de rôle correspondantes peuvent accéder à cette ressource.",
- "accessRule.appDescription": "Contrôlez à qui cette application est ouverte. Les membres ont toujours besoin d'autorisations de rôle pour la consulter ou l'utiliser.",
+ "accessRule.allowedMembers": "Membres autorisés",
+ "accessRule.appDescription": "Définissez qui peut accéder à cette application et la granularité des autorisations d’accès.",
"accessRule.appTitle": "Ensemble d'autorisations d'application",
+ "accessRule.automaticallyIncludeWorkspaceMembers": "Inclure automatiquement les membres de l’espace de travail",
+ "accessRule.automaticallyIncludeWorkspaceMembersDescription": "Tous les membres actuels et futurs de l’espace de travail sont automatiquement inclus. Les autorisations de rôle déterminent toujours ce qu’ils peuvent faire.",
+ "accessRule.batchRemoveDescription": "Les membres sélectionnés seront retirés de la liste des membres autorisés.",
+ "accessRule.batchRemoveTitle": "Retirer les membres sélectionnés ?",
"accessRule.changeOpenScopeDescription": "Modifier la portée d'ouverture réinitialisera toutes les exceptions d'autorisation des membres pour cette ressource. Vous devrez les ajouter à nouveau après le changement.",
"accessRule.changeOpenScopeTitle": "Modifier la portée d'ouverture de la ressource ?",
+ "accessRule.collaborator": "Collaborateur",
"accessRule.collapseSection": "Réduire {{title}}",
"accessRule.copied": "Règle d'accès copiée avec succès",
"accessRule.created": "Règle d'accès créée avec succès",
@@ -20,20 +26,17 @@
"accessRule.deleted": "Règle d'accès supprimée avec succès",
"accessRule.exceptionPermissionFor": "Autorisation d'exception pour {{name}}",
"accessRule.expandSection": "Développer {{title}}",
- "accessRule.individualPermissionSettings": "Exceptions d'autorisation des membres",
- "accessRule.individualPermissionSettingsTip": "Définissez des exceptions d'autorisation pour des collaborateurs ou des groupes spécifiques. Ces paramètres remplacent leurs autorisations de rôle.",
"accessRule.maintainer": "Mainteneur",
- "accessRule.member": "Membre avec exception",
"accessRule.newPermissionSet": "Nouvel ensemble d'autorisations",
"accessRule.noAvailableMembers": "Aucun membre disponible à ajouter",
"accessRule.noDescription": "Aucune description",
"accessRule.noRules": "Aucune règle d'accès",
- "accessRule.noUserAccessSettings": "Aucune exception d'autorisation pour les membres",
+ "accessRule.noUserAccessSettings": "Aucun membre n’a accès",
"accessRule.onlyMe": "Moi uniquement",
"accessRule.onlyMeDescription": "Vous seul pouvez accéder à cette ressource.",
- "accessRule.permission": "Autorisation d'exception",
"accessRule.resourceOpenScope": "Portée d'ouverture de la ressource",
"accessRule.resourceOpenScopeDescription": "Choisissez à qui cette ressource est ouverte. Les autorisations de rôle déterminent toujours ce que chaque membre peut faire.",
+ "accessRule.selected": "Sélectionnés",
"accessRule.specificMembersOnly": "Membres spécifiques uniquement",
"accessRule.specificMembersOnlyDescription": "Seuls les membres sélectionnés peuvent accéder à cette ressource.",
"accessRule.summary_one": "{{count}} ensemble d'autorisations",
diff --git a/web/i18n/hi-IN/permission-keys.json b/web/i18n/hi-IN/permission-keys.json
index 7bb708c6f93..314cbfba84b 100644
--- a/web/i18n/hi-IN/permission-keys.json
+++ b/web/i18n/hi-IN/permission-keys.json
@@ -2,21 +2,21 @@
"agent.manage": "Agents प्रबंधित करें",
"api_extension.manage": "API एक्सटेंशन कॉन्फ़िगरेशन प्रबंधित करें",
"app.access_config": "ऐप एक्सेस अनुमतियाँ कॉन्फ़िगर करें",
- "app.acl.access_config": "ऐप एक्सेस अनुमतियाँ कॉन्फ़िगर करें",
+ "app.acl.access_config": "एक्सेस अनुमतियाँ देखें और प्रबंधित करें",
"app.acl.delete": "ऐप हटाएं",
"app.acl.deploy": "ऐप डिप्लॉय करें",
- "app.acl.edit": "ऐप संपादित और ऑर्केस्ट्रेट करें",
- "app.acl.import_export_dsl": "DSL आयात / निर्यात करें",
- "app.acl.log_and_annotation": "लॉग और एनोटेशन तक पहुंच",
- "app.acl.monitor": "मॉनिटरिंग पेज तक पहुंच",
+ "app.acl.edit": "ऐप की जानकारी संपादित करें और ऐप को ऑर्केस्ट्रेट करें",
+ "app.acl.import_export_dsl": "ऐप DSL आयात और निर्यात करें",
+ "app.acl.log_and_annotation": "लॉग और एनोटेशन देखें और प्रबंधित करें",
+ "app.acl.monitor": "ऐप मॉनिटरिंग देखें",
"app.acl.preview": "ऐप पूर्वावलोकन करें",
- "app.acl.release_and_version": "ऐप प्रकाशन और संस्करण प्रबंधन",
+ "app.acl.release_and_version": "ऐप संस्करण प्रकाशित और प्रबंधित करें",
"app.acl.test_and_run": "ऐप परीक्षण और उपयोग करें",
- "app.acl.tracing_config": "बाहरी ट्रेसिंग कॉन्फ़िगर करें",
- "app.acl.view_layout": "केवल-पढ़ने योग्य ऑर्केस्ट्रेशन पृष्ठ",
+ "app.acl.tracing_config": "ऐप मॉनिटरिंग ट्रेस देखें और कॉन्फ़िगर करें",
+ "app.acl.view_layout": "ऐप ऑर्केस्ट्रेशन देखें",
"app.create_and_management": "ऐप्स बनाएं",
"app.tag.manage": "ऐप टैग प्रबंधित करें",
- "app_library.access": "ऐप लाइब्रेरी तक पहुंचें",
+ "app_library.access": "ऐप लाइब्रेरी देखें और उपयोग करें",
"billing.manage": "सदस्यता योजनाएं बदलें",
"billing.subscription.manage": "बिलिंग पोर्टल में बिलिंग और सदस्यताएं प्रबंधित करें",
"billing.view": "बिलिंग सेटिंग्स तक पहुंचें",
@@ -26,18 +26,18 @@
"customization.manage": "अनुकूलन प्रबंधित करें",
"data_source.manage": "डेटा स्रोत कॉन्फ़िगरेशन प्रबंधित करें",
"dataset.access_config": "ज्ञान आधार एक्सेस अनुमतियाँ कॉन्फ़िगर करें",
- "dataset.acl.access_config": "ज्ञान आधार एक्सेस अनुमतियाँ कॉन्फ़िगर करें",
+ "dataset.acl.access_config": "ज्ञान आधार एक्सेस अनुमतियाँ देखें और प्रबंधित करें",
"dataset.acl.delete": "ज्ञान आधार हटाएं",
- "dataset.acl.delete_file": "ज्ञान आधार फ़ाइलें हटाएं",
- "dataset.acl.document_download": "दस्तावेज़ डाउनलोड करें",
- "dataset.acl.edit": "ज्ञान आधार संपादित करें",
- "dataset.acl.import_export_dsl": "ज्ञान पाइपलाइन DSL आयात / निर्यात करें",
- "dataset.acl.pipeline_release": "ज्ञान पाइपलाइन प्रकाशन और संस्करण प्रबंधन",
- "dataset.acl.pipeline_test": "पाइपलाइन परीक्षण",
+ "dataset.acl.delete_file": "ज्ञान आधार दस्तावेज़ हटाएं",
+ "dataset.acl.document_download": "ज्ञान आधार दस्तावेज़ डाउनलोड करें",
+ "dataset.acl.edit": "ज्ञान आधार सामग्री और सेटिंग्स संपादित करें",
+ "dataset.acl.import_export_dsl": "पाइपलाइन DSL आयात और निर्यात करें",
+ "dataset.acl.pipeline_release": "पाइपलाइन संस्करण प्रकाशित और प्रबंधित करें",
+ "dataset.acl.pipeline_test": "पाइपलाइन का परीक्षण करें",
"dataset.acl.preview": "ज्ञान आधार पूर्वावलोकन करें",
- "dataset.acl.readonly": "केवल-पढ़ने योग्य ज्ञान आधार",
- "dataset.acl.retrieval_recall": "ज्ञान आधार पुनर्प्राप्ति",
- "dataset.acl.use": "ज्ञान आधार में दस्तावेज़ जोड़ें",
+ "dataset.acl.readonly": "ज्ञान आधार सामग्री और सेटिंग्स देखें",
+ "dataset.acl.retrieval_recall": "पुनर्प्राप्ति परीक्षण देखें और चलाएं",
+ "dataset.acl.use": "ज्ञान आधार दस्तावेज़ अपलोड करें",
"dataset.api_key.manage": "ज्ञान आधार API कुंजियाँ प्रबंधित करें",
"dataset.create_and_management": "ज्ञान आधार बनाएं",
"dataset.external.connect": "बाहरी ज्ञान आधार कनेक्ट करें",
@@ -48,6 +48,10 @@
"plugin.install": "प्लगइन्स इंस्टॉल और अपडेट करें",
"plugin.model_config": "मॉडल कॉन्फ़िगर करें",
"plugin.plugin_preferences": "ऑटो अपडेट कॉन्फ़िगर करें",
+ "skill.delete": "Skill हटाएं",
+ "skill.edit": "Skill संपादित करें",
+ "skill.publish": "Skill प्रकाशित करें",
+ "skill.view": "Skill देखें",
"snippets.create_and_modify": "स्निपेट बनाएं और संशोधित करें",
"snippets.management": "स्निपेट प्रबंधित करें",
"tool.manage": "टूल प्रबंधित करें",
diff --git a/web/i18n/hi-IN/permission.json b/web/i18n/hi-IN/permission.json
index 41bcc61978d..023a3a91ced 100644
--- a/web/i18n/hi-IN/permission.json
+++ b/web/i18n/hi-IN/permission.json
@@ -1,14 +1,20 @@
{
+ "accessRule.accessPermission": "पहुँच अनुमति",
"accessRule.actions": "क्रियाएं",
- "accessRule.addException": "अपवाद जोड़ें",
"accessRule.addMemberAria": "{{name}} जोड़ें",
"accessRule.addMembersTitle": "सदस्य जोड़ें",
"accessRule.allPermittedMembers": "भूमिका अनुमतियों वाले सभी सदस्य",
"accessRule.allPermittedMembersDescription": "मिलती-जुलती भूमिका अनुमतियों वाले सदस्य इस संसाधन तक पहुंच सकते हैं।",
- "accessRule.appDescription": "नियंत्रित करें कि यह ऐप किसके लिए खुला है। सदस्यों को इसे देखने या संचालित करने के लिए अभी भी भूमिका अनुमतियों की आवश्यकता होती है।",
+ "accessRule.allowedMembers": "अनुमत सदस्य",
+ "accessRule.appDescription": "निर्धारित करें कि इस ऐप को कौन एक्सेस कर सकता है और पहुँच अनुमतियाँ कितनी विस्तृत होंगी।",
"accessRule.appTitle": "ऐप अनुमति सेट",
+ "accessRule.automaticallyIncludeWorkspaceMembers": "वर्कस्पेस सदस्यों को अपने-आप शामिल करें",
+ "accessRule.automaticallyIncludeWorkspaceMembersDescription": "वर्कस्पेस के सभी मौजूदा और भविष्य के सदस्य अपने-आप शामिल हो जाते हैं। भूमिका अनुमतियाँ अब भी तय करती हैं कि वे क्या कर सकते हैं।",
+ "accessRule.batchRemoveDescription": "चुने गए सदस्यों को अनुमत सदस्यों की सूची से हटा दिया जाएगा।",
+ "accessRule.batchRemoveTitle": "चुने गए सदस्यों को हटाएँ?",
"accessRule.changeOpenScopeDescription": "खुले दायरे को बदलने से इस संसाधन के लिए सभी सदस्य अनुमति अपवाद रीसेट हो जाएंगे। स्विच करने के बाद आपको सदस्य अनुमति अपवाद फिर से जोड़ने होंगे।",
"accessRule.changeOpenScopeTitle": "संसाधन का खुला दायरा बदलें?",
+ "accessRule.collaborator": "सहयोगी",
"accessRule.collapseSection": "{{title}} संक्षिप्त करें",
"accessRule.copied": "एक्सेस नियम सफलतापूर्वक कॉपी किया गया",
"accessRule.created": "एक्सेस नियम सफलतापूर्वक बनाया गया",
@@ -20,20 +26,17 @@
"accessRule.deleted": "एक्सेस नियम सफलतापूर्वक हटाया गया",
"accessRule.exceptionPermissionFor": "{{name}} के लिए अपवाद अनुमति",
"accessRule.expandSection": "{{title}} विस्तृत करें",
- "accessRule.individualPermissionSettings": "सदस्य अनुमति अपवाद",
- "accessRule.individualPermissionSettingsTip": "विशिष्ट सहयोगियों या समूहों के लिए अनुमति अपवाद सेट करें। ये सेटिंग्स उनकी भूमिका अनुमतियों को ओवरराइड करती हैं।",
"accessRule.maintainer": "रखरखावकर्ता",
- "accessRule.member": "अपवाद वाला सदस्य",
"accessRule.newPermissionSet": "नया अनुमति सेट",
"accessRule.noAvailableMembers": "जोड़ने के लिए कोई सदस्य उपलब्ध नहीं",
"accessRule.noDescription": "कोई विवरण नहीं",
"accessRule.noRules": "कोई एक्सेस नियम नहीं",
- "accessRule.noUserAccessSettings": "कोई सदस्य अनुमति अपवाद नहीं",
+ "accessRule.noUserAccessSettings": "किसी भी सदस्य को पहुँच की अनुमति नहीं है",
"accessRule.onlyMe": "केवल मैं",
"accessRule.onlyMeDescription": "केवल आप इस संसाधन तक पहुँच सकते हैं।",
- "accessRule.permission": "अपवाद अनुमति",
"accessRule.resourceOpenScope": "संसाधन का खुला दायरा",
"accessRule.resourceOpenScopeDescription": "चुनें कि यह संसाधन किसके लिए खुला है। भूमिका अनुमतियां अभी भी तय करती हैं कि प्रत्येक सदस्य क्या कर सकता है।",
+ "accessRule.selected": "चयनित",
"accessRule.specificMembersOnly": "केवल विशिष्ट सदस्य",
"accessRule.specificMembersOnlyDescription": "केवल चयनित सदस्य ही इस संसाधन तक पहुंच सकते हैं।",
"accessRule.summary_one": "{{count}} अनुमति सेट",
diff --git a/web/i18n/id-ID/permission-keys.json b/web/i18n/id-ID/permission-keys.json
index d44762b91bb..4b04ea96f00 100644
--- a/web/i18n/id-ID/permission-keys.json
+++ b/web/i18n/id-ID/permission-keys.json
@@ -2,21 +2,21 @@
"agent.manage": "Kelola Agents",
"api_extension.manage": "Kelola konfigurasi ekstensi API",
"app.access_config": "Konfigurasikan izin akses aplikasi",
- "app.acl.access_config": "Konfigurasikan izin akses aplikasi",
+ "app.acl.access_config": "Lihat dan kelola izin akses",
"app.acl.delete": "Hapus aplikasi",
"app.acl.deploy": "Deploy aplikasi",
- "app.acl.edit": "Edit dan orkestrasikan aplikasi",
- "app.acl.import_export_dsl": "Impor / ekspor DSL",
- "app.acl.log_and_annotation": "Akses log dan anotasi",
- "app.acl.monitor": "Akses halaman pemantauan",
+ "app.acl.edit": "Edit informasi aplikasi dan orkestrasikan aplikasi",
+ "app.acl.import_export_dsl": "Impor dan ekspor DSL aplikasi",
+ "app.acl.log_and_annotation": "Lihat dan kelola log serta anotasi",
+ "app.acl.monitor": "Lihat pemantauan aplikasi",
"app.acl.preview": "Pratinjau aplikasi",
- "app.acl.release_and_version": "Penerbitan aplikasi dan manajemen versi",
+ "app.acl.release_and_version": "Publikasikan dan kelola versi aplikasi",
"app.acl.test_and_run": "Uji dan gunakan aplikasi",
- "app.acl.tracing_config": "Konfigurasikan tracing eksternal",
- "app.acl.view_layout": "Halaman orkestrasi hanya-baca",
+ "app.acl.tracing_config": "Lihat dan konfigurasikan tracing pemantauan aplikasi",
+ "app.acl.view_layout": "Lihat orkestrasi aplikasi",
"app.create_and_management": "Buat aplikasi",
"app.tag.manage": "Kelola tag aplikasi",
- "app_library.access": "Akses Pustaka Aplikasi",
+ "app_library.access": "Lihat dan gunakan Pustaka Aplikasi",
"billing.manage": "Ubah paket langganan",
"billing.subscription.manage": "Kelola penagihan dan langganan di portal penagihan",
"billing.view": "Akses pengaturan Penagihan",
@@ -26,18 +26,18 @@
"customization.manage": "Kelola penyesuaian",
"data_source.manage": "Kelola konfigurasi sumber data",
"dataset.access_config": "Konfigurasikan izin akses basis pengetahuan",
- "dataset.acl.access_config": "Konfigurasikan izin akses basis pengetahuan",
+ "dataset.acl.access_config": "Lihat dan kelola izin akses basis pengetahuan",
"dataset.acl.delete": "Hapus basis pengetahuan",
- "dataset.acl.delete_file": "Hapus berkas basis pengetahuan",
- "dataset.acl.document_download": "Unduh dokumen",
- "dataset.acl.edit": "Edit basis pengetahuan",
- "dataset.acl.import_export_dsl": "Impor / ekspor DSL knowledge pipeline",
- "dataset.acl.pipeline_release": "Penerbitan knowledge pipeline dan manajemen versi",
- "dataset.acl.pipeline_test": "Pengujian pipeline",
+ "dataset.acl.delete_file": "Hapus dokumen basis pengetahuan",
+ "dataset.acl.document_download": "Unduh dokumen basis pengetahuan",
+ "dataset.acl.edit": "Edit konten dan pengaturan basis pengetahuan",
+ "dataset.acl.import_export_dsl": "Impor dan ekspor DSL pipeline",
+ "dataset.acl.pipeline_release": "Publikasikan dan kelola versi pipeline",
+ "dataset.acl.pipeline_test": "Uji pipeline",
"dataset.acl.preview": "Pratinjau basis pengetahuan",
- "dataset.acl.readonly": "Basis pengetahuan hanya-baca",
- "dataset.acl.retrieval_recall": "Pengambilan basis pengetahuan",
- "dataset.acl.use": "Tambahkan dokumen ke basis pengetahuan",
+ "dataset.acl.readonly": "Lihat konten dan pengaturan basis pengetahuan",
+ "dataset.acl.retrieval_recall": "Lihat dan jalankan tes pengambilan",
+ "dataset.acl.use": "Unggah dokumen basis pengetahuan",
"dataset.api_key.manage": "Kelola kunci API basis pengetahuan",
"dataset.create_and_management": "Buat basis pengetahuan",
"dataset.external.connect": "Hubungkan basis pengetahuan eksternal",
@@ -48,6 +48,10 @@
"plugin.install": "Instal dan perbarui plugin",
"plugin.model_config": "Konfigurasi model",
"plugin.plugin_preferences": "Konfigurasi pembaruan otomatis",
+ "skill.delete": "Hapus Skill",
+ "skill.edit": "Edit Skill",
+ "skill.publish": "Publikasikan Skill",
+ "skill.view": "Lihat Skill",
"snippets.create_and_modify": "Buat dan ubah snippet",
"snippets.management": "Kelola snippet",
"tool.manage": "Kelola alat",
diff --git a/web/i18n/id-ID/permission.json b/web/i18n/id-ID/permission.json
index 6a4fe45db7c..18750d8be96 100644
--- a/web/i18n/id-ID/permission.json
+++ b/web/i18n/id-ID/permission.json
@@ -1,14 +1,20 @@
{
+ "accessRule.accessPermission": "Izin akses",
"accessRule.actions": "Tindakan",
- "accessRule.addException": "Tambah pengecualian",
"accessRule.addMemberAria": "Tambahkan {{name}}",
"accessRule.addMembersTitle": "Tambahkan anggota",
"accessRule.allPermittedMembers": "Semua anggota dengan izin peran",
"accessRule.allPermittedMembersDescription": "Anggota dengan izin peran yang cocok dapat mengakses sumber daya ini.",
- "accessRule.appDescription": "Kontrol siapa yang dapat mengakses aplikasi ini. Anggota tetap memerlukan izin peran untuk melihat atau mengoperasikannya.",
+ "accessRule.allowedMembers": "Anggota yang diizinkan",
+ "accessRule.appDescription": "Atur siapa yang dapat mengakses aplikasi ini dan tingkat perincian izin aksesnya.",
"accessRule.appTitle": "Set izin Aplikasi",
+ "accessRule.automaticallyIncludeWorkspaceMembers": "Sertakan anggota ruang kerja secara otomatis",
+ "accessRule.automaticallyIncludeWorkspaceMembersDescription": "Semua anggota ruang kerja saat ini dan yang akan datang disertakan secara otomatis. Izin peran tetap menentukan apa yang dapat mereka lakukan.",
+ "accessRule.batchRemoveDescription": "Anggota yang dipilih akan dihapus dari daftar anggota yang diizinkan.",
+ "accessRule.batchRemoveTitle": "Hapus anggota yang dipilih?",
"accessRule.changeOpenScopeDescription": "Mengubah cakupan akses akan mengatur ulang semua pengecualian izin anggota untuk sumber daya ini. Anda perlu menambahkan kembali pengecualian izin anggota setelah beralih.",
"accessRule.changeOpenScopeTitle": "Ubah cakupan akses sumber daya?",
+ "accessRule.collaborator": "Kolaborator",
"accessRule.collapseSection": "Ciutkan {{title}}",
"accessRule.copied": "Aturan akses berhasil disalin",
"accessRule.created": "Aturan akses berhasil dibuat",
@@ -20,20 +26,17 @@
"accessRule.deleted": "Aturan akses berhasil dihapus",
"accessRule.exceptionPermissionFor": "Izin pengecualian untuk {{name}}",
"accessRule.expandSection": "Perluas {{title}}",
- "accessRule.individualPermissionSettings": "Pengecualian izin anggota",
- "accessRule.individualPermissionSettingsTip": "Tetapkan pengecualian izin untuk kolaborator atau grup tertentu. Pengaturan ini menggantikan izin peran mereka.",
"accessRule.maintainer": "Pengelola",
- "accessRule.member": "Anggota dengan pengecualian",
"accessRule.newPermissionSet": "Set izin baru",
"accessRule.noAvailableMembers": "Tidak ada anggota yang tersedia untuk ditambahkan",
"accessRule.noDescription": "Tidak ada deskripsi",
"accessRule.noRules": "Tidak ada aturan akses",
- "accessRule.noUserAccessSettings": "Tidak ada pengecualian izin anggota",
+ "accessRule.noUserAccessSettings": "Tidak ada anggota yang diizinkan mengakses",
"accessRule.onlyMe": "Hanya saya",
"accessRule.onlyMeDescription": "Hanya Anda yang dapat mengakses resource ini.",
- "accessRule.permission": "Izin pengecualian",
"accessRule.resourceOpenScope": "Cakupan akses sumber daya",
"accessRule.resourceOpenScopeDescription": "Pilih siapa yang dapat mengakses sumber daya ini. Izin peran tetap menentukan apa yang dapat dilakukan setiap anggota.",
+ "accessRule.selected": "Dipilih",
"accessRule.specificMembersOnly": "Hanya anggota tertentu",
"accessRule.specificMembersOnlyDescription": "Hanya anggota yang dipilih yang dapat mengakses sumber daya ini.",
"accessRule.summary_one": "{{count}} set izin",
diff --git a/web/i18n/it-IT/permission-keys.json b/web/i18n/it-IT/permission-keys.json
index 23f7b7d2090..899adce084b 100644
--- a/web/i18n/it-IT/permission-keys.json
+++ b/web/i18n/it-IT/permission-keys.json
@@ -2,21 +2,21 @@
"agent.manage": "Gestisci Agents",
"api_extension.manage": "Gestisci la configurazione delle estensioni API",
"app.access_config": "Configura i permessi di accesso all'app",
- "app.acl.access_config": "Configura i permessi di accesso all'app",
+ "app.acl.access_config": "Visualizza e gestisci i permessi di accesso",
"app.acl.delete": "Elimina app",
"app.acl.deploy": "Distribuisci app",
- "app.acl.edit": "Modifica e orchestra l'app",
- "app.acl.import_export_dsl": "Importa / esporta DSL",
- "app.acl.log_and_annotation": "Accedi a log e annotazioni",
- "app.acl.monitor": "Accedi alla pagina di monitoraggio",
+ "app.acl.edit": "Modifica le informazioni e orchestra l'app",
+ "app.acl.import_export_dsl": "Importa ed esporta il DSL dell'app",
+ "app.acl.log_and_annotation": "Visualizza e gestisci log e annotazioni",
+ "app.acl.monitor": "Visualizza il monitoraggio dell'app",
"app.acl.preview": "Anteprima app",
- "app.acl.release_and_version": "Pubblicazione dell'app e gestione delle versioni",
+ "app.acl.release_and_version": "Pubblica e gestisci le versioni dell'app",
"app.acl.test_and_run": "Testa e usa l'app",
- "app.acl.tracing_config": "Configura il tracing esterno",
- "app.acl.view_layout": "Pagina di orchestrazione in sola lettura",
+ "app.acl.tracing_config": "Visualizza e configura il tracing del monitoraggio dell'app",
+ "app.acl.view_layout": "Visualizza l'orchestrazione dell'app",
"app.create_and_management": "Crea app",
"app.tag.manage": "Gestisci i tag delle app",
- "app_library.access": "Accedi alla Libreria delle app",
+ "app_library.access": "Visualizza e usa la Libreria delle app",
"billing.manage": "Cambia i piani di abbonamento",
"billing.subscription.manage": "Gestisci fatturazione e abbonamenti nel portale di fatturazione",
"billing.view": "Accedi alle impostazioni di fatturazione",
@@ -26,18 +26,18 @@
"customization.manage": "Gestisci personalizzazione",
"data_source.manage": "Gestisci la configurazione delle origini dati",
"dataset.access_config": "Configura i permessi di accesso alla knowledge base",
- "dataset.acl.access_config": "Configura i permessi di accesso alla knowledge base",
+ "dataset.acl.access_config": "Visualizza e gestisci i permessi di accesso alla knowledge base",
"dataset.acl.delete": "Elimina knowledge base",
- "dataset.acl.delete_file": "Elimina i file della knowledge base",
- "dataset.acl.document_download": "Scarica documenti",
- "dataset.acl.edit": "Modifica knowledge base",
- "dataset.acl.import_export_dsl": "Importa / esporta DSL della knowledge pipeline",
- "dataset.acl.pipeline_release": "Pubblicazione della knowledge pipeline e gestione delle versioni",
- "dataset.acl.pipeline_test": "Test della pipeline",
+ "dataset.acl.delete_file": "Elimina i documenti della knowledge base",
+ "dataset.acl.document_download": "Scarica i documenti della knowledge base",
+ "dataset.acl.edit": "Modifica i contenuti e le impostazioni della knowledge base",
+ "dataset.acl.import_export_dsl": "Importa ed esporta il DSL della pipeline",
+ "dataset.acl.pipeline_release": "Pubblica e gestisci le versioni della pipeline",
+ "dataset.acl.pipeline_test": "Testa la pipeline",
"dataset.acl.preview": "Anteprima knowledge base",
- "dataset.acl.readonly": "Knowledge base in sola lettura",
- "dataset.acl.retrieval_recall": "Recupero dalla knowledge base",
- "dataset.acl.use": "Aggiungi documenti alla knowledge base",
+ "dataset.acl.readonly": "Visualizza i contenuti e le impostazioni della knowledge base",
+ "dataset.acl.retrieval_recall": "Visualizza ed esegui i test di recupero",
+ "dataset.acl.use": "Carica documenti nella knowledge base",
"dataset.api_key.manage": "Gestisci le chiavi API della knowledge base",
"dataset.create_and_management": "Crea knowledge base",
"dataset.external.connect": "Connetti knowledge base esterne",
@@ -48,6 +48,10 @@
"plugin.install": "Installa e aggiorna plugin",
"plugin.model_config": "Configura modelli",
"plugin.plugin_preferences": "Configura aggiornamenti automatici",
+ "skill.delete": "Elimina Skill",
+ "skill.edit": "Modifica Skill",
+ "skill.publish": "Pubblica Skill",
+ "skill.view": "Visualizza Skill",
"snippets.create_and_modify": "Crea e modifica snippet",
"snippets.management": "Gestisci snippet",
"tool.manage": "Gestisci strumenti",
diff --git a/web/i18n/it-IT/permission.json b/web/i18n/it-IT/permission.json
index f8ee96af75f..a10c3364d76 100644
--- a/web/i18n/it-IT/permission.json
+++ b/web/i18n/it-IT/permission.json
@@ -1,14 +1,20 @@
{
+ "accessRule.accessPermission": "Autorizzazione di accesso",
"accessRule.actions": "Azioni",
- "accessRule.addException": "Aggiungi eccezione",
"accessRule.addMemberAria": "Aggiungi {{name}}",
"accessRule.addMembersTitle": "Aggiungi membri",
"accessRule.allPermittedMembers": "Tutti i membri con permessi di ruolo",
"accessRule.allPermittedMembersDescription": "I membri con permessi di ruolo corrispondenti possono accedere a questa risorsa.",
- "accessRule.appDescription": "Controlla a chi è aperta questa app. I membri necessitano comunque dei permessi di ruolo per visualizzarla o utilizzarla.",
+ "accessRule.allowedMembers": "Membri autorizzati",
+ "accessRule.appDescription": "Imposta chi può accedere a questa app e il livello di granularità dei permessi di accesso.",
"accessRule.appTitle": "Set di permessi per app",
+ "accessRule.automaticallyIncludeWorkspaceMembers": "Includi automaticamente i membri dello spazio di lavoro",
+ "accessRule.automaticallyIncludeWorkspaceMembersDescription": "Tutti i membri attuali e futuri dello spazio di lavoro vengono inclusi automaticamente. Le autorizzazioni dei ruoli continuano a determinare cosa possono fare.",
+ "accessRule.batchRemoveDescription": "I membri selezionati verranno rimossi dall'elenco dei membri autorizzati.",
+ "accessRule.batchRemoveTitle": "Rimuovere i membri selezionati?",
"accessRule.changeOpenScopeDescription": "La modifica dell'ambito di apertura reimposterà tutte le eccezioni ai permessi dei membri per questa risorsa. Dovrai aggiungerle nuovamente dopo il cambio.",
"accessRule.changeOpenScopeTitle": "Modificare l'ambito di apertura della risorsa?",
+ "accessRule.collaborator": "Collaboratore",
"accessRule.collapseSection": "Comprimi {{title}}",
"accessRule.copied": "Regola di accesso copiata con successo",
"accessRule.created": "Regola di accesso creata con successo",
@@ -20,20 +26,17 @@
"accessRule.deleted": "Regola di accesso eliminata con successo",
"accessRule.exceptionPermissionFor": "Permesso di eccezione per {{name}}",
"accessRule.expandSection": "Espandi {{title}}",
- "accessRule.individualPermissionSettings": "Eccezioni ai permessi dei membri",
- "accessRule.individualPermissionSettingsTip": "Imposta eccezioni ai permessi per collaboratori o gruppi specifici. Queste impostazioni hanno la precedenza sui loro permessi di ruolo.",
"accessRule.maintainer": "Manutentore",
- "accessRule.member": "Membro con eccezione",
"accessRule.newPermissionSet": "Nuovo set di permessi",
"accessRule.noAvailableMembers": "Nessun membro disponibile da aggiungere",
"accessRule.noDescription": "Nessuna descrizione",
"accessRule.noRules": "Nessuna regola di accesso",
- "accessRule.noUserAccessSettings": "Nessuna eccezione ai permessi dei membri",
+ "accessRule.noUserAccessSettings": "Nessun membro è autorizzato ad accedere",
"accessRule.onlyMe": "Solo io",
"accessRule.onlyMeDescription": "Solo tu puoi accedere a questa risorsa.",
- "accessRule.permission": "Permesso di eccezione",
"accessRule.resourceOpenScope": "Ambito di apertura della risorsa",
"accessRule.resourceOpenScopeDescription": "Scegli a chi è aperta questa risorsa. I permessi di ruolo determinano comunque cosa può fare ciascun membro.",
+ "accessRule.selected": "Selezionati",
"accessRule.specificMembersOnly": "Solo membri specifici",
"accessRule.specificMembersOnlyDescription": "Solo i membri selezionati possono accedere a questa risorsa.",
"accessRule.summary_one": "{{count}} set di permessi",
diff --git a/web/i18n/ja-JP/permission-keys.json b/web/i18n/ja-JP/permission-keys.json
index bc3cb614fa9..1b0c567f0e8 100644
--- a/web/i18n/ja-JP/permission-keys.json
+++ b/web/i18n/ja-JP/permission-keys.json
@@ -2,21 +2,21 @@
"agent.manage": "Agentsを管理",
"api_extension.manage": "API拡張設定を管理",
"app.access_config": "アプリアクセス権限を設定",
- "app.acl.access_config": "アプリアクセス権限を設定",
+ "app.acl.access_config": "アクセス権限の表示と管理",
"app.acl.delete": "アプリを削除",
"app.acl.deploy": "アプリをデプロイ",
- "app.acl.edit": "アプリの編集とオーケストレーション",
- "app.acl.import_export_dsl": "DSLのインポート / エクスポート",
- "app.acl.log_and_annotation": "ログと注釈へのアクセス",
- "app.acl.monitor": "監視ページへのアクセス",
+ "app.acl.edit": "アプリ情報の編集とアプリのオーケストレーション",
+ "app.acl.import_export_dsl": "アプリ DSL のインポートとエクスポート",
+ "app.acl.log_and_annotation": "ログと注釈の表示と管理",
+ "app.acl.monitor": "アプリのモニタリングを表示",
"app.acl.preview": "アプリをプレビュー",
- "app.acl.release_and_version": "アプリ公開とバージョン管理",
+ "app.acl.release_and_version": "アプリバージョンの公開と管理",
"app.acl.test_and_run": "アプリのテストと使用",
- "app.acl.tracing_config": "外部トレーシングの設定",
- "app.acl.view_layout": "オーケストレーションページの読み取り専用",
+ "app.acl.tracing_config": "アプリのモニタリングトレースの表示と設定",
+ "app.acl.view_layout": "アプリのオーケストレーションを表示",
"app.create_and_management": "アプリを作成",
"app.tag.manage": "アプリタグを管理",
- "app_library.access": "アプリライブラリにアクセス",
+ "app_library.access": "アプリライブラリの表示と使用",
"billing.manage": "サブスクリプションプランを変更",
"billing.subscription.manage": "請求ポータルで請求とサブスクリプションを管理",
"billing.view": "設定の請求ページにアクセス",
@@ -26,18 +26,18 @@
"customization.manage": "カスタマイズを管理",
"data_source.manage": "データソース設定を管理",
"dataset.access_config": "ナレッジベースのアクセス権限を設定",
- "dataset.acl.access_config": "ナレッジベースのアクセス権限を設定",
+ "dataset.acl.access_config": "ナレッジベースのアクセス権限の表示と管理",
"dataset.acl.delete": "ナレッジベースを削除",
- "dataset.acl.delete_file": "ナレッジベースファイルを削除",
- "dataset.acl.document_download": "ドキュメントをダウンロード",
- "dataset.acl.edit": "ナレッジベースを編集",
- "dataset.acl.import_export_dsl": "ナレッジパイプライン DSL のインポート / エクスポート",
- "dataset.acl.pipeline_release": "ナレッジパイプライン公開とバージョン管理",
- "dataset.acl.pipeline_test": "パイプラインテスト",
+ "dataset.acl.delete_file": "ナレッジベースドキュメントを削除",
+ "dataset.acl.document_download": "ナレッジベースドキュメントをダウンロード",
+ "dataset.acl.edit": "ナレッジベースのコンテンツと設定を編集",
+ "dataset.acl.import_export_dsl": "パイプライン DSL のインポートとエクスポート",
+ "dataset.acl.pipeline_release": "パイプラインバージョンの公開と管理",
+ "dataset.acl.pipeline_test": "パイプラインをテスト",
"dataset.acl.preview": "ナレッジベースをプレビュー",
- "dataset.acl.readonly": "ナレッジベースの読み取り専用",
- "dataset.acl.retrieval_recall": "ナレッジベース検索リコール",
- "dataset.acl.use": "ナレッジベースにドキュメントを追加",
+ "dataset.acl.readonly": "ナレッジベースのコンテンツと設定を表示",
+ "dataset.acl.retrieval_recall": "検索テストの表示と実行",
+ "dataset.acl.use": "ナレッジベースドキュメントをアップロード",
"dataset.api_key.manage": "ナレッジベース API キーを管理",
"dataset.create_and_management": "ナレッジベースを作成",
"dataset.external.connect": "外部ナレッジベースに接続",
@@ -48,6 +48,10 @@
"plugin.install": "プラグインのインストールと更新",
"plugin.model_config": "モデルを設定",
"plugin.plugin_preferences": "自動更新を設定",
+ "skill.delete": "Skillを削除",
+ "skill.edit": "Skillを編集",
+ "skill.publish": "Skillを公開",
+ "skill.view": "Skillを表示",
"snippets.create_and_modify": "スニペットの作成と変更",
"snippets.management": "スニペットを管理",
"tool.manage": "ツールを管理",
diff --git a/web/i18n/ja-JP/permission.json b/web/i18n/ja-JP/permission.json
index 726bb466c1a..0dbd5e73369 100644
--- a/web/i18n/ja-JP/permission.json
+++ b/web/i18n/ja-JP/permission.json
@@ -1,14 +1,20 @@
{
+ "accessRule.accessPermission": "アクセス権限",
"accessRule.actions": "アクション",
- "accessRule.addException": "例外を追加",
"accessRule.addMemberAria": "{{name}} を追加",
"accessRule.addMembersTitle": "メンバーを追加",
"accessRule.allPermittedMembers": "ロール権限を持つすべてのメンバー",
"accessRule.allPermittedMembersDescription": "一致するロール権限を持つメンバーは、このリソースにアクセスできます。",
- "accessRule.appDescription": "このアプリを公開する対象を制御します。メンバーが表示または操作するには、引き続きロール権限が必要です。",
+ "accessRule.allowedMembers": "許可されたメンバー",
+ "accessRule.appDescription": "このアプリにアクセスできるメンバーと、アクセス権限の粒度を設定します。",
"accessRule.appTitle": "アプリ権限セット",
+ "accessRule.automaticallyIncludeWorkspaceMembers": "ワークスペースメンバーを自動的に含める",
+ "accessRule.automaticallyIncludeWorkspaceMembersDescription": "現在および今後のすべてのワークスペースメンバーが自動的に含まれます。各メンバーが実行できる操作は引き続きロール権限で決まります。",
+ "accessRule.batchRemoveDescription": "選択したメンバーは、許可されたメンバーの一覧から削除されます。",
+ "accessRule.batchRemoveTitle": "選択したメンバーを削除しますか?",
"accessRule.changeOpenScopeDescription": "公開範囲を変更すると、このリソースのすべてのメンバー例外権限がリセットされます。切り替え後、メンバー例外権限を再度追加する必要があります。",
"accessRule.changeOpenScopeTitle": "リソースの公開範囲を変更しますか?",
+ "accessRule.collaborator": "共同編集者",
"accessRule.collapseSection": "{{title}} を折りたたむ",
"accessRule.copied": "アクセスルールをコピーしました",
"accessRule.created": "アクセスルールを作成しました",
@@ -20,20 +26,17 @@
"accessRule.deleted": "アクセスルールを削除しました",
"accessRule.exceptionPermissionFor": "{{name}} の例外権限",
"accessRule.expandSection": "{{title}} を展開",
- "accessRule.individualPermissionSettings": "メンバーの例外権限",
- "accessRule.individualPermissionSettingsTip": "特定の共同編集者またはグループに権限の例外を設定します。これらの設定は、対象の共同編集者またはグループのロール権限を上書きします。",
"accessRule.maintainer": "メンテナー",
- "accessRule.member": "例外対象メンバー",
"accessRule.newPermissionSet": "新しい権限セット",
"accessRule.noAvailableMembers": "追加できるメンバーがいません",
"accessRule.noDescription": "説明なし",
"accessRule.noRules": "アクセスルールがありません",
- "accessRule.noUserAccessSettings": "メンバーの例外権限はありません",
+ "accessRule.noUserAccessSettings": "アクセスを許可されたメンバーはいません",
"accessRule.onlyMe": "自分のみ",
"accessRule.onlyMeDescription": "このリソースにアクセスできるのは自分だけです。",
- "accessRule.permission": "例外権限",
"accessRule.resourceOpenScope": "リソース公開範囲",
"accessRule.resourceOpenScopeDescription": "このリソースを公開する対象を選択します。各メンバーが実行できる操作はロール権限で決まります。",
+ "accessRule.selected": "選択済み",
"accessRule.specificMembersOnly": "指定メンバーのみ",
"accessRule.specificMembersOnlyDescription": "選択されたメンバーのみがこのリソースにアクセスできます。",
"accessRule.summary_one": "{{count}} 件の権限セット",
diff --git a/web/i18n/ko-KR/permission-keys.json b/web/i18n/ko-KR/permission-keys.json
index e5fa343f0a8..3a9981a602a 100644
--- a/web/i18n/ko-KR/permission-keys.json
+++ b/web/i18n/ko-KR/permission-keys.json
@@ -2,21 +2,21 @@
"agent.manage": "Agents 관리",
"api_extension.manage": "API 확장 구성 관리",
"app.access_config": "앱 접근 권한 구성",
- "app.acl.access_config": "앱 접근 권한 구성",
+ "app.acl.access_config": "접근 권한 보기 및 관리",
"app.acl.delete": "앱 삭제",
"app.acl.deploy": "앱 배포",
- "app.acl.edit": "앱 편집 및 오케스트레이션",
- "app.acl.import_export_dsl": "DSL 가져오기 / 내보내기",
- "app.acl.log_and_annotation": "로그 및 주석 접근",
- "app.acl.monitor": "모니터링 페이지 접근",
+ "app.acl.edit": "앱 정보 편집 및 앱 오케스트레이션",
+ "app.acl.import_export_dsl": "앱 DSL 가져오기 및 내보내기",
+ "app.acl.log_and_annotation": "로그 및 주석 보기 및 관리",
+ "app.acl.monitor": "앱 모니터링 보기",
"app.acl.preview": "앱 미리보기",
- "app.acl.release_and_version": "앱 게시 및 버전 관리",
+ "app.acl.release_and_version": "앱 버전 게시 및 관리",
"app.acl.test_and_run": "앱 테스트 및 사용",
- "app.acl.tracing_config": "외부 추적 구성",
- "app.acl.view_layout": "읽기 전용 오케스트레이션 페이지",
+ "app.acl.tracing_config": "앱 모니터링 추적 보기 및 구성",
+ "app.acl.view_layout": "앱 오케스트레이션 보기",
"app.create_and_management": "앱 생성",
"app.tag.manage": "앱 태그 관리",
- "app_library.access": "앱 라이브러리 접근",
+ "app_library.access": "앱 라이브러리 보기 및 사용",
"billing.manage": "구독 플랜 변경",
"billing.subscription.manage": "결제 포털에서 결제 및 구독 관리",
"billing.view": "결제 설정 접근",
@@ -26,18 +26,18 @@
"customization.manage": "사용자 정의 관리",
"data_source.manage": "데이터 소스 구성 관리",
"dataset.access_config": "지식 베이스 접근 권한 구성",
- "dataset.acl.access_config": "지식 베이스 접근 권한 구성",
+ "dataset.acl.access_config": "지식 베이스 접근 권한 보기 및 관리",
"dataset.acl.delete": "지식 베이스 삭제",
- "dataset.acl.delete_file": "지식 베이스 파일 삭제",
- "dataset.acl.document_download": "문서 다운로드",
- "dataset.acl.edit": "지식 베이스 편집",
- "dataset.acl.import_export_dsl": "지식 파이프라인 DSL 가져오기 / 내보내기",
- "dataset.acl.pipeline_release": "지식 파이프라인 게시 및 버전 관리",
- "dataset.acl.pipeline_test": "파이프라인 테스트",
+ "dataset.acl.delete_file": "지식 베이스 문서 삭제",
+ "dataset.acl.document_download": "지식 베이스 문서 다운로드",
+ "dataset.acl.edit": "지식 베이스 콘텐츠 및 설정 편집",
+ "dataset.acl.import_export_dsl": "파이프라인 DSL 가져오기 및 내보내기",
+ "dataset.acl.pipeline_release": "파이프라인 버전 게시 및 관리",
+ "dataset.acl.pipeline_test": "파이프라인 테스트 실행",
"dataset.acl.preview": "지식 베이스 미리보기",
- "dataset.acl.readonly": "읽기 전용 지식 베이스",
- "dataset.acl.retrieval_recall": "지식 베이스 검색",
- "dataset.acl.use": "지식 베이스에 문서 추가",
+ "dataset.acl.readonly": "지식 베이스 콘텐츠 및 설정 보기",
+ "dataset.acl.retrieval_recall": "검색 테스트 보기 및 실행",
+ "dataset.acl.use": "지식 베이스 문서 업로드",
"dataset.api_key.manage": "지식 베이스 API 키 관리",
"dataset.create_and_management": "지식 베이스 생성",
"dataset.external.connect": "외부 지식 베이스 연결",
@@ -48,6 +48,10 @@
"plugin.install": "플러그인 설치 및 업데이트",
"plugin.model_config": "모델 구성",
"plugin.plugin_preferences": "자동 업데이트 구성",
+ "skill.delete": "Skill 삭제",
+ "skill.edit": "Skill 편집",
+ "skill.publish": "Skill 게시",
+ "skill.view": "Skill 보기",
"snippets.create_and_modify": "스니펫 생성 및 수정",
"snippets.management": "스니펫 관리",
"tool.manage": "도구 관리",
diff --git a/web/i18n/ko-KR/permission.json b/web/i18n/ko-KR/permission.json
index 8495e6f98a5..d01e8b55df9 100644
--- a/web/i18n/ko-KR/permission.json
+++ b/web/i18n/ko-KR/permission.json
@@ -1,14 +1,20 @@
{
+ "accessRule.accessPermission": "액세스 권한",
"accessRule.actions": "작업",
- "accessRule.addException": "예외 추가",
"accessRule.addMemberAria": "{{name}} 추가",
"accessRule.addMembersTitle": "멤버 추가",
"accessRule.allPermittedMembers": "역할 권한이 있는 모든 멤버",
"accessRule.allPermittedMembersDescription": "일치하는 역할 권한이 있는 멤버가 이 리소스에 접근할 수 있습니다.",
- "accessRule.appDescription": "이 앱을 누구에게 공개할지 제어합니다. 멤버가 앱을 보거나 조작하려면 여전히 역할 권한이 필요합니다.",
+ "accessRule.allowedMembers": "허용된 멤버",
+ "accessRule.appDescription": "이 앱에 접근할 수 있는 대상과 접근 권한의 세분화 수준을 설정합니다.",
"accessRule.appTitle": "앱 권한 집합",
+ "accessRule.automaticallyIncludeWorkspaceMembers": "워크스페이스 멤버 자동 포함",
+ "accessRule.automaticallyIncludeWorkspaceMembersDescription": "현재 및 향후의 모든 워크스페이스 멤버가 자동으로 포함됩니다. 각 멤버가 수행할 수 있는 작업은 여전히 역할 권한에 따라 결정됩니다.",
+ "accessRule.batchRemoveDescription": "선택한 멤버가 허용된 멤버 목록에서 제거됩니다.",
+ "accessRule.batchRemoveTitle": "선택한 멤버를 제거하시겠습니까?",
"accessRule.changeOpenScopeDescription": "공개 범위를 변경하면 이 리소스의 모든 멤버 권한 예외가 초기화됩니다. 전환 후 멤버 권한 예외를 다시 추가해야 합니다.",
"accessRule.changeOpenScopeTitle": "리소스 공개 범위를 변경하시겠습니까?",
+ "accessRule.collaborator": "협업자",
"accessRule.collapseSection": "{{title}} 접기",
"accessRule.copied": "접근 규칙이 성공적으로 복사되었습니다",
"accessRule.created": "접근 규칙이 성공적으로 생성되었습니다",
@@ -20,20 +26,17 @@
"accessRule.deleted": "접근 규칙이 성공적으로 삭제되었습니다",
"accessRule.exceptionPermissionFor": "{{name}}에 대한 예외 권한",
"accessRule.expandSection": "{{title}} 펼치기",
- "accessRule.individualPermissionSettings": "멤버 권한 예외",
- "accessRule.individualPermissionSettingsTip": "특정 협업자 또는 그룹에 대한 권한 예외를 설정합니다. 이 설정은 해당 협업자 또는 그룹의 역할 권한을 재정의합니다.",
"accessRule.maintainer": "관리자",
- "accessRule.member": "예외 멤버",
"accessRule.newPermissionSet": "새 권한 집합",
"accessRule.noAvailableMembers": "추가할 수 있는 멤버가 없습니다",
"accessRule.noDescription": "설명 없음",
"accessRule.noRules": "접근 규칙 없음",
- "accessRule.noUserAccessSettings": "멤버 권한 예외 없음",
+ "accessRule.noUserAccessSettings": "접근이 허용된 멤버가 없습니다",
"accessRule.onlyMe": "나만",
"accessRule.onlyMeDescription": "이 리소스에는 본인만 접근할 수 있습니다.",
- "accessRule.permission": "예외 권한",
"accessRule.resourceOpenScope": "리소스 공개 범위",
"accessRule.resourceOpenScopeDescription": "이 리소스를 누구에게 공개할지 선택합니다. 각 멤버가 할 수 있는 작업은 여전히 역할 권한이 결정합니다.",
+ "accessRule.selected": "선택됨",
"accessRule.specificMembersOnly": "특정 멤버만",
"accessRule.specificMembersOnlyDescription": "선택한 멤버만 이 리소스에 접근할 수 있습니다.",
"accessRule.summary_one": "{{count}}개 권한 집합",
diff --git a/web/i18n/lo-LA/permission-keys.json b/web/i18n/lo-LA/permission-keys.json
index 7bc5f638def..bfba51cc7e2 100644
--- a/web/i18n/lo-LA/permission-keys.json
+++ b/web/i18n/lo-LA/permission-keys.json
@@ -2,21 +2,21 @@
"agent.manage": "ຈັດການຕົວແທນ (Agents)",
"api_extension.manage": "ຈັດການການຕັ້ງຄ່າ API extension",
"app.access_config": "ຕັ້ງຄ່າສິດການເຂົ້າເຖິງແອັບ",
- "app.acl.access_config": "ຕັ້ງຄ່າສິດການເຂົ້າເຖິງແອັບ",
+ "app.acl.access_config": "ເບິ່ງ ແລະ ຈັດການສິດການເຂົ້າເຖິງ",
"app.acl.delete": "ລຶບແອັບ",
"app.acl.deploy": "ຕິດຕັ້ງແອັບ",
- "app.acl.edit": "ແກ້ໄຂ ແລະ ຈັດການລະບົບແອັບ",
- "app.acl.import_export_dsl": "ນຳເຂົ້າ / ສົ່ງອອກ DSL",
- "app.acl.log_and_annotation": "ເຂົ້າເຖິງບັນທຶກ ແລະ ຄຳອະທິບາຍ (Logs & Annotations)",
- "app.acl.monitor": "ເຂົ້າເຖິງໜ້າຕິດຕາມການເຮັດວຽກ",
+ "app.acl.edit": "ແກ້ໄຂຂໍ້ມູນແອັບ ແລະ ຈັດການລະບົບແອັບ",
+ "app.acl.import_export_dsl": "ນຳເຂົ້າ ແລະ ສົ່ງອອກ DSL ຂອງແອັບ",
+ "app.acl.log_and_annotation": "ເບິ່ງ ແລະ ຈັດການບັນທຶກ ແລະ ຄຳອະທິບາຍ",
+ "app.acl.monitor": "ເບິ່ງການຕິດຕາມແອັບ",
"app.acl.preview": "ເບິ່ງຕົວຢ່າງແອັບ",
- "app.acl.release_and_version": "ການເຜີຍແຜ່ແອັບ ແລະ ຈັດການເວີຊັນ",
+ "app.acl.release_and_version": "ເຜີຍແຜ່ ແລະ ຈັດການເວີຊັນຂອງແອັບ",
"app.acl.test_and_run": "ທົດລອງ ແລະ ນຳໃຊ້ແອັບ",
- "app.acl.tracing_config": "ຕັ້ງຄ່າການຕິດຕາມ (Tracing) ພາຍນອກ",
- "app.acl.view_layout": "ໜ້າການຈັດການລະບົບແບບອ່ານຢ່າງດຽວ",
+ "app.acl.tracing_config": "ເບິ່ງ ແລະ ຕັ້ງຄ່າການຕິດຕາມ (Tracing) ຂອງແອັບ",
+ "app.acl.view_layout": "ເບິ່ງການຈັດການລະບົບແອັບ",
"app.create_and_management": "ສ້າງແອັບ",
"app.tag.manage": "ຈັດການແທັກຂອງແອັບ",
- "app_library.access": "ເຂົ້າເຖິງຄັງແອັບ (App Library)",
+ "app_library.access": "ເບິ່ງ ແລະ ນຳໃຊ້ຄັງແອັບ (App Library)",
"billing.manage": "ປ່ຽນແຜນການສະໝັກສະມາຊິກ",
"billing.subscription.manage": "ຈັດການການຊຳລະເງິນ ແລະ ການສະໝັກສະມາຊິກ",
"billing.view": "ເຂົ້າເຖິງການຕັ້ງຄ່າການຊຳລະເງິນ",
@@ -26,18 +26,18 @@
"customization.manage": "ຈັດການການປັບແຕ່ງ",
"data_source.manage": "ຈັດການການຕັ້ງຄ່າແຫຼ່ງຂໍ້ມູນ",
"dataset.access_config": "ຕັ້ງຄ່າສິດການເຂົ້າເຖິງຄັງຄວາມຮູ້",
- "dataset.acl.access_config": "ຕັ້ງຄ່າສິດການເຂົ້າເຖິງຄັງຄວາມຮູ້",
+ "dataset.acl.access_config": "ເບິ່ງ ແລະ ຈັດການສິດການເຂົ້າເຖິງຄັງຄວາມຮູ້",
"dataset.acl.delete": "ລຶບຄັງຄວາມຮູ້",
- "dataset.acl.delete_file": "ລຶບໄຟລ໌ໃນຄັງຄວາມຮູ້",
- "dataset.acl.document_download": "ດາວໂຫຼດເອກະສານ",
- "dataset.acl.edit": "ແກ້ໄຂຄັງຄວາມຮູ້",
- "dataset.acl.import_export_dsl": "ນຳເຂົ້າ / ສົ່ງອອກ DSL ຂອງຂັ້ນຕອນຄັງຄວາມຮູ້",
- "dataset.acl.pipeline_release": "ການເຜີຍແຜ່ ແລະ ຈັດການເວີຊັນຂອງ Pipeline ຄັງຄວາມຮູ້",
- "dataset.acl.pipeline_test": "ທົດສອບຂັ້ນຕອນການເຮັດວຽກ (Pipeline)",
+ "dataset.acl.delete_file": "ລຶບເອກະສານຄັງຄວາມຮູ້",
+ "dataset.acl.document_download": "ດາວໂຫຼດເອກະສານຄັງຄວາມຮູ້",
+ "dataset.acl.edit": "ແກ້ໄຂເນື້ອຫາ ແລະ ການຕັ້ງຄ່າຄັງຄວາມຮູ້",
+ "dataset.acl.import_export_dsl": "ນຳເຂົ້າ ແລະ ສົ່ງອອກ DSL ຂອງ Pipeline",
+ "dataset.acl.pipeline_release": "ເຜີຍແຜ່ ແລະ ຈັດການເວີຊັນຂອງ Pipeline",
+ "dataset.acl.pipeline_test": "ທົດສອບ Pipeline",
"dataset.acl.preview": "ເບິ່ງຕົວຢ່າງຄັງຄວາມຮູ້",
- "dataset.acl.readonly": "ຄັງຄວາມຮູ້ແບບອ່ານຢ່າງດຽວ",
- "dataset.acl.retrieval_recall": "ການດຶງຂໍ້ມູນຈາກຄັງຄວາມຮູ້",
- "dataset.acl.use": "ເພີ່ມເອກະສານເຂົ້າໃນຄັງຄວາມຮູ້",
+ "dataset.acl.readonly": "ເບິ່ງເນື້ອຫາ ແລະ ການຕັ້ງຄ່າຄັງຄວາມຮູ້",
+ "dataset.acl.retrieval_recall": "ເບິ່ງ ແລະ ດຳເນີນການທົດສອບການດຶງຂໍ້ມູນ",
+ "dataset.acl.use": "ອັບໂຫຼດເອກະສານເຂົ້າຄັງຄວາມຮູ້",
"dataset.api_key.manage": "ຈັດການ API keys ຂອງຄັງຄວາມຮູ້",
"dataset.create_and_management": "ສ້າງຄັງຄວາມຮູ້",
"dataset.external.connect": "ເຊື່ອມຕໍ່ຄັງຄວາມຮູ້ພາຍນອກ",
@@ -48,6 +48,10 @@
"plugin.install": "ຕິດຕັ້ງ ແລະ ອັບເດດປລັກອິນ",
"plugin.model_config": "ຕັ້ງຄ່າໂມເດວ",
"plugin.plugin_preferences": "ຕັ້ງຄ່າການອັບເດດອັດຕະໂນມັດ",
+ "skill.delete": "ລຶບ Skill",
+ "skill.edit": "ແກ້ໄຂ Skill",
+ "skill.publish": "ເຜີຍແຜ່ Skill",
+ "skill.view": "ເບິ່ງ Skill",
"snippets.create_and_modify": "ສ້າງ ແລະ ແກ້ໄຂສະນິບເປັດ (Snippets)",
"snippets.management": "ຈັດການສະນິບເປັດ (Snippets)",
"tool.manage": "ຈັດການເຄື່ອງມື",
diff --git a/web/i18n/lo-LA/permission.json b/web/i18n/lo-LA/permission.json
index 8e6d5ddef50..b5123abf8b9 100644
--- a/web/i18n/lo-LA/permission.json
+++ b/web/i18n/lo-LA/permission.json
@@ -1,14 +1,20 @@
{
+ "accessRule.accessPermission": "ສິດໃນການເຂົ້າເຖິງ",
"accessRule.actions": "ການຈັດການ",
- "accessRule.addException": "ເພີ່ມຂໍ້ຍົກເວັ້ນ",
"accessRule.addMemberAria": "ເພີ່ມ {{name}}",
"accessRule.addMembersTitle": "ເພີ່ມສະມາຊິກ",
"accessRule.allPermittedMembers": "ສະມາຊິກທັງໝົດທີ່ມີສິດຕາມບົດບາດ",
"accessRule.allPermittedMembersDescription": "ສະມາຊິກທີ່ມີສິດໃນບົດບາດທີ່ກົງກັນສາມາດເຂົ້າເຖິງຊັບພະຍາກອນນີ້ໄດ້.",
- "accessRule.appDescription": "ຄວບຄຸມການເຂົ້າເຖິງແອັບຯນີ້. ສະມາຊິກຍັງຈຳເປັນຕ້ອງມີສິດໃນບົດບາດເພື່ອເບິ່ງ ຫຼື ນຳໃຊ້.",
+ "accessRule.allowedMembers": "ສະມາຊິກທີ່ອະນຸຍາດ",
+ "accessRule.appDescription": "ກຳນົດວ່າໃຜສາມາດເຂົ້າເຖິງແອັບນີ້ໄດ້ ແລະ ລະດັບຄວາມລະອຽດຂອງສິດການເຂົ້າເຖິງ.",
"accessRule.appTitle": "ຊຸດການກຳນົດສິດແອັບຯ",
+ "accessRule.automaticallyIncludeWorkspaceMembers": "ລວມສະມາຊິກພື້ນທີ່ເຮັດວຽກອັດຕະໂນມັດ",
+ "accessRule.automaticallyIncludeWorkspaceMembersDescription": "ສະມາຊິກພື້ນທີ່ເຮັດວຽກທັງປັດຈຸບັນ ແລະ ໃນອະນາຄົດຈະຖືກລວມໂດຍອັດຕະໂນມັດ. ສິດຂອງບົດບາດຍັງຄົງກຳນົດສິ່ງທີ່ພວກເຂົາເຮັດໄດ້.",
+ "accessRule.batchRemoveDescription": "ສະມາຊິກທີ່ເລືອກຈະຖືກນຳອອກຈາກລາຍຊື່ສະມາຊິກທີ່ອະນຸຍາດ.",
+ "accessRule.batchRemoveTitle": "ນຳສະມາຊິກທີ່ເລືອກອອກບໍ?",
"accessRule.changeOpenScopeDescription": "ການປ່ຽນແປງຂອບເຂດການເປີດຈະລຶບການຕັ້ງຄ່າສິດສ່ວນບຸກຄົນທັງໝົດສຳລັບຊັບພະຍາກອນນີ້. ທ່ານຈະຕ້ອງເພີ່ມສິດສະເພາະຂອງສະມາຊິກຄືນໃໝ່ຫຼັງຈາກປ່ຽນແປງ.",
"accessRule.changeOpenScopeTitle": "ປ່ຽນຂອບເຂດການເປີດຊັບພະຍາກອນບໍ?",
+ "accessRule.collaborator": "ຜູ້ຮ່ວມງານ",
"accessRule.collapseSection": "ຫຍໍ້ {{title}}",
"accessRule.copied": "ຄັດລອກກົດລະບຽບການເຂົ້າເຖິງສຳເລັດແລ້ວ",
"accessRule.created": "ສ້າງກົດລະບຽບການເຂົ້າເຖິງສຳເລັດແລ້ວ",
@@ -20,20 +26,17 @@
"accessRule.deleted": "ລຶບກົດລະບຽບການເຂົ້າເຖິງສຳເລັດແລ້ວ",
"accessRule.exceptionPermissionFor": "ສິດຍົກເວັ້ນສຳລັບ {{name}}",
"accessRule.expandSection": "ຂະຫຍາຍ {{title}}",
- "accessRule.individualPermissionSettings": "ການຕັ້ງຄ່າສິດສ່ວນບຸກຄົນ",
- "accessRule.individualPermissionSettingsTip": "ກໍານົດການຍົກເວັ້ນສິດສໍາລັບຜູ້ຮ່ວມງານ ຫຼື ກຸ່ມສະເພາະ. ການຕັ້ງຄ່ານີ້ຈະຢູ່ເໜືອກວ່າສິດຂອງບົດບາດເຂົາເຈົ້າ.",
"accessRule.maintainer": "ຜູ້ດູແລ",
- "accessRule.member": "ສະມາຊິກ",
"accessRule.newPermissionSet": "ຊຸດສິດໃໝ່",
"accessRule.noAvailableMembers": "ບໍ່ມີສະມາຊິກທີ່ສາມາດເພີ່ມໄດ້",
"accessRule.noDescription": "ບໍ່ມີຄຳອະທິບາຍ",
"accessRule.noRules": "ບໍ່ມີກົດລະບຽບການເຂົ້າເຖິງ",
- "accessRule.noUserAccessSettings": "ບໍ່ມີການຕັ້ງຄ່າສິດສ່ວນບຸກຄົນ",
+ "accessRule.noUserAccessSettings": "ບໍ່ມີສະມາຊິກທີ່ໄດ້ຮັບອະນຸຍາດໃຫ້ເຂົ້າເຖິງ",
"accessRule.onlyMe": "ພຽງແຕ່ຂ້ອຍ",
"accessRule.onlyMeDescription": "ມີພຽງແຕ່ທ່ານເທົ່ານັ້ນທີ່ສາມາດເຂົ້າເຖິງຊັບພະຍາກອນນີ້ໄດ້.",
- "accessRule.permission": "ສິດການນຳໃຊ້",
"accessRule.resourceOpenScope": "ຂອບເຂດການເປີດຊັບພະຍາກອນ",
"accessRule.resourceOpenScopeDescription": "ເລືອກວ່າຈະເປີດຊັບພະຍາກອນນີ້ໃຫ້ໃຜ. ສິດຂອງບົດບາດຈະຍັງເປັນຕົວຕັດສິນວ່າແຕ່ລະສະມາຊິກສາມາດເຮັດຫຍັງໄດ້ແດ່.",
+ "accessRule.selected": "ເລືອກແລ້ວ",
"accessRule.specificMembersOnly": "ສະເພາະສະມາຊິກທີ່ເລືອກເທົ່ານັ້ນ",
"accessRule.specificMembersOnlyDescription": "ມີພຽງແຕ່ສະມາຊິກທີ່ຖືກເລືອກເທົ່ານັ້ນທີ່ສາມາດເຂົ້າເຖິງຊັບພະຍາກອນນີ້ໄດ້.",
"accessRule.summary_one": "{{count}} ຊຸດສິດ",
diff --git a/web/i18n/nl-NL/permission-keys.json b/web/i18n/nl-NL/permission-keys.json
index 628fd064686..94fdf9d182c 100644
--- a/web/i18n/nl-NL/permission-keys.json
+++ b/web/i18n/nl-NL/permission-keys.json
@@ -2,21 +2,21 @@
"agent.manage": "Agents beheren",
"api_extension.manage": "API-extensieconfiguratie beheren",
"app.access_config": "Toegangsrechten voor app configureren",
- "app.acl.access_config": "Toegangsrechten voor app configureren",
+ "app.acl.access_config": "Toegangsrechten bekijken en beheren",
"app.acl.delete": "App verwijderen",
"app.acl.deploy": "App implementeren",
- "app.acl.edit": "App bewerken en orkestreren",
- "app.acl.import_export_dsl": "DSL importeren / exporteren",
- "app.acl.log_and_annotation": "Logs en annotaties openen",
- "app.acl.monitor": "Monitoringpagina openen",
+ "app.acl.edit": "App-informatie bewerken en app orkestreren",
+ "app.acl.import_export_dsl": "App-DSL importeren en exporteren",
+ "app.acl.log_and_annotation": "Logs en annotaties bekijken en beheren",
+ "app.acl.monitor": "App-monitoring bekijken",
"app.acl.preview": "App voorbeeld bekijken",
- "app.acl.release_and_version": "App publiceren en versiebeheer",
+ "app.acl.release_and_version": "App-versies publiceren en beheren",
"app.acl.test_and_run": "App testen en gebruiken",
- "app.acl.tracing_config": "Externe tracing configureren",
- "app.acl.view_layout": "Alleen-lezen orkestratiepagina",
+ "app.acl.tracing_config": "App-monitoringtraces bekijken en configureren",
+ "app.acl.view_layout": "App-orkestratie bekijken",
"app.create_and_management": "Apps maken",
"app.tag.manage": "App-tags beheren",
- "app_library.access": "Toegang tot App-bibliotheek",
+ "app_library.access": "App-bibliotheek bekijken en gebruiken",
"billing.manage": "Abonnementen wijzigen",
"billing.subscription.manage": "Facturering en abonnementen beheren in het factureringsportaal",
"billing.view": "Toegang tot factureringsinstellingen",
@@ -26,18 +26,18 @@
"customization.manage": "Aanpassingen beheren",
"data_source.manage": "Configuratie van gegevensbron beheren",
"dataset.access_config": "Toegangsrechten voor kennisbank configureren",
- "dataset.acl.access_config": "Toegangsrechten voor kennisbank configureren",
+ "dataset.acl.access_config": "Toegangsrechten voor kennisbank bekijken en beheren",
"dataset.acl.delete": "Kennisbank verwijderen",
- "dataset.acl.delete_file": "Kennisbankbestanden verwijderen",
- "dataset.acl.document_download": "Documenten downloaden",
- "dataset.acl.edit": "Kennisbank bewerken",
- "dataset.acl.import_export_dsl": "DSL van kennispijplijn importeren / exporteren",
- "dataset.acl.pipeline_release": "Kennispijplijn publiceren en versiebeheer",
- "dataset.acl.pipeline_test": "Pijplijn testen",
+ "dataset.acl.delete_file": "Documenten uit kennisbank verwijderen",
+ "dataset.acl.document_download": "Documenten uit kennisbank downloaden",
+ "dataset.acl.edit": "Inhoud en instellingen van kennisbank bewerken",
+ "dataset.acl.import_export_dsl": "Pipeline-DSL importeren en exporteren",
+ "dataset.acl.pipeline_release": "Pipelineversies publiceren en beheren",
+ "dataset.acl.pipeline_test": "Pipeline testen",
"dataset.acl.preview": "Kennisbank voorbeeld bekijken",
- "dataset.acl.readonly": "Alleen-lezen kennisbank",
- "dataset.acl.retrieval_recall": "Kennisbank ophalen",
- "dataset.acl.use": "Documenten toevoegen aan kennisbank",
+ "dataset.acl.readonly": "Inhoud en instellingen van kennisbank bekijken",
+ "dataset.acl.retrieval_recall": "Retrievaltests bekijken en uitvoeren",
+ "dataset.acl.use": "Documenten uploaden naar kennisbank",
"dataset.api_key.manage": "API-sleutels van kennisbank beheren",
"dataset.create_and_management": "Kennisbanken maken",
"dataset.external.connect": "Externe kennisbanken verbinden",
@@ -48,6 +48,10 @@
"plugin.install": "Plug-ins installeren en bijwerken",
"plugin.model_config": "Modellen configureren",
"plugin.plugin_preferences": "Automatische updates configureren",
+ "skill.delete": "Skill verwijderen",
+ "skill.edit": "Skill bewerken",
+ "skill.publish": "Skill publiceren",
+ "skill.view": "Skill bekijken",
"snippets.create_and_modify": "Snippets maken en wijzigen",
"snippets.management": "Snippets beheren",
"tool.manage": "Tools beheren",
diff --git a/web/i18n/nl-NL/permission.json b/web/i18n/nl-NL/permission.json
index ce03b2ed0ae..0ff57357dbc 100644
--- a/web/i18n/nl-NL/permission.json
+++ b/web/i18n/nl-NL/permission.json
@@ -1,14 +1,20 @@
{
+ "accessRule.accessPermission": "Toegangsrecht",
"accessRule.actions": "Acties",
- "accessRule.addException": "Uitzondering toevoegen",
"accessRule.addMemberAria": "{{name}} toevoegen",
"accessRule.addMembersTitle": "Leden toevoegen",
"accessRule.allPermittedMembers": "Alle leden met rolrechten",
"accessRule.allPermittedMembersDescription": "Leden met overeenkomende rolrechten hebben toegang tot deze resource.",
- "accessRule.appDescription": "Bepaal voor wie deze app toegankelijk is. Leden hebben nog steeds rolrechten nodig om deze te bekijken of te bedienen.",
+ "accessRule.allowedMembers": "Toegestane leden",
+ "accessRule.appDescription": "Stel in wie toegang heeft tot deze app en hoe gedetailleerd de toegangsrechten zijn.",
"accessRule.appTitle": "App-rechtenset",
+ "accessRule.automaticallyIncludeWorkspaceMembers": "Workspaceleden automatisch opnemen",
+ "accessRule.automaticallyIncludeWorkspaceMembersDescription": "Alle huidige en toekomstige workspaceleden worden automatisch opgenomen. Rolrechten bepalen nog steeds wat zij kunnen doen.",
+ "accessRule.batchRemoveDescription": "De geselecteerde leden worden verwijderd uit de lijst met toegestane leden.",
+ "accessRule.batchRemoveTitle": "Geselecteerde leden verwijderen?",
"accessRule.changeOpenScopeDescription": "Het wijzigen van het toegangsbereik stelt alle rechtenuitzonderingen voor leden van deze resource opnieuw in. Je moet de rechtenuitzonderingen voor leden opnieuw toevoegen na het wisselen.",
"accessRule.changeOpenScopeTitle": "Toegangsbereik van resource wijzigen?",
+ "accessRule.collaborator": "Medewerker",
"accessRule.collapseSection": "{{title}} samenvouwen",
"accessRule.copied": "Toegangsregel succesvol gekopieerd",
"accessRule.created": "Toegangsregel succesvol gemaakt",
@@ -20,20 +26,17 @@
"accessRule.deleted": "Toegangsregel succesvol verwijderd",
"accessRule.exceptionPermissionFor": "Uitzonderingsrecht voor {{name}}",
"accessRule.expandSection": "{{title}} uitvouwen",
- "accessRule.individualPermissionSettings": "Rechtenuitzonderingen voor leden",
- "accessRule.individualPermissionSettingsTip": "Stel rechtenuitzonderingen in voor specifieke samenwerkers of groepen. Deze instellingen overschrijven hun rolrechten.",
"accessRule.maintainer": "Beheerder",
- "accessRule.member": "Lid met uitzondering",
"accessRule.newPermissionSet": "Nieuwe rechtenset",
"accessRule.noAvailableMembers": "Geen leden beschikbaar om toe te voegen",
"accessRule.noDescription": "Geen beschrijving",
"accessRule.noRules": "Geen toegangsregels",
- "accessRule.noUserAccessSettings": "Geen rechtenuitzonderingen voor leden",
+ "accessRule.noUserAccessSettings": "Geen leden met toegang",
"accessRule.onlyMe": "Alleen ik",
"accessRule.onlyMeDescription": "Alleen jij kunt toegang krijgen tot deze resource.",
- "accessRule.permission": "Uitzonderingsrecht",
"accessRule.resourceOpenScope": "Toegangsbereik van resource",
"accessRule.resourceOpenScopeDescription": "Kies voor wie deze resource toegankelijk is. Rolrechten bepalen nog steeds wat elk lid kan doen.",
+ "accessRule.selected": "Geselecteerd",
"accessRule.specificMembersOnly": "Alleen specifieke leden",
"accessRule.specificMembersOnlyDescription": "Alleen geselecteerde leden hebben toegang tot deze resource.",
"accessRule.summary_one": "{{count}} rechtenset",
diff --git a/web/i18n/pl-PL/permission-keys.json b/web/i18n/pl-PL/permission-keys.json
index 2801ce2650d..55619735f16 100644
--- a/web/i18n/pl-PL/permission-keys.json
+++ b/web/i18n/pl-PL/permission-keys.json
@@ -2,21 +2,21 @@
"agent.manage": "Zarządzaj Agents",
"api_extension.manage": "Zarządzaj konfiguracją rozszerzenia API",
"app.access_config": "Konfiguruj uprawnienia dostępu do aplikacji",
- "app.acl.access_config": "Konfiguruj uprawnienia dostępu do aplikacji",
+ "app.acl.access_config": "Wyświetlaj uprawnienia dostępu i zarządzaj nimi",
"app.acl.delete": "Usuń aplikację",
"app.acl.deploy": "Wdróż aplikację",
- "app.acl.edit": "Edytuj i orkiestruj aplikację",
- "app.acl.import_export_dsl": "Importuj / eksportuj DSL",
- "app.acl.log_and_annotation": "Dostęp do logów i adnotacji",
- "app.acl.monitor": "Dostęp do strony monitorowania",
+ "app.acl.edit": "Edytuj informacje o aplikacji i orkiestruj aplikację",
+ "app.acl.import_export_dsl": "Importuj i eksportuj DSL aplikacji",
+ "app.acl.log_and_annotation": "Wyświetlaj logi i adnotacje oraz zarządzaj nimi",
+ "app.acl.monitor": "Wyświetlaj monitoring aplikacji",
"app.acl.preview": "Podgląd aplikacji",
- "app.acl.release_and_version": "Publikowanie aplikacji i zarządzanie wersjami",
+ "app.acl.release_and_version": "Publikuj wersje aplikacji i zarządzaj nimi",
"app.acl.test_and_run": "Testuj i używaj aplikacji",
- "app.acl.tracing_config": "Konfiguruj zewnętrzne śledzenie",
- "app.acl.view_layout": "Strona orkiestracji tylko do odczytu",
+ "app.acl.tracing_config": "Wyświetlaj i konfiguruj śledzenie monitoringu aplikacji",
+ "app.acl.view_layout": "Wyświetlaj orkiestrację aplikacji",
"app.create_and_management": "Twórz aplikacje",
"app.tag.manage": "Zarządzaj tagami aplikacji",
- "app_library.access": "Dostęp do Biblioteki aplikacji",
+ "app_library.access": "Wyświetlaj Bibliotekę aplikacji i korzystaj z niej",
"billing.manage": "Zmień plany subskrypcji",
"billing.subscription.manage": "Zarządzaj rozliczeniami i subskrypcjami w portalu rozliczeniowym",
"billing.view": "Dostęp do ustawień rozliczeń",
@@ -26,18 +26,18 @@
"customization.manage": "Zarządzaj dostosowywaniem",
"data_source.manage": "Zarządzaj konfiguracją źródła danych",
"dataset.access_config": "Konfiguruj uprawnienia dostępu do bazy wiedzy",
- "dataset.acl.access_config": "Konfiguruj uprawnienia dostępu do bazy wiedzy",
+ "dataset.acl.access_config": "Wyświetlaj uprawnienia dostępu do bazy wiedzy i zarządzaj nimi",
"dataset.acl.delete": "Usuń bazę wiedzy",
- "dataset.acl.delete_file": "Usuń pliki bazy wiedzy",
- "dataset.acl.document_download": "Pobierz dokumenty",
- "dataset.acl.edit": "Edytuj bazę wiedzy",
- "dataset.acl.import_export_dsl": "Importuj / eksportuj DSL potoku wiedzy",
- "dataset.acl.pipeline_release": "Publikowanie potoku wiedzy i zarządzanie wersjami",
- "dataset.acl.pipeline_test": "Testowanie potoku",
+ "dataset.acl.delete_file": "Usuwaj dokumenty z bazy wiedzy",
+ "dataset.acl.document_download": "Pobieraj dokumenty z bazy wiedzy",
+ "dataset.acl.edit": "Edytuj zawartość i ustawienia bazy wiedzy",
+ "dataset.acl.import_export_dsl": "Importuj i eksportuj DSL potoku",
+ "dataset.acl.pipeline_release": "Publikuj wersje potoku i zarządzaj nimi",
+ "dataset.acl.pipeline_test": "Testuj potok",
"dataset.acl.preview": "Podgląd bazy wiedzy",
- "dataset.acl.readonly": "Baza wiedzy tylko do odczytu",
- "dataset.acl.retrieval_recall": "Wyszukiwanie w bazie wiedzy",
- "dataset.acl.use": "Dodaj dokumenty do bazy wiedzy",
+ "dataset.acl.readonly": "Wyświetlaj zawartość i ustawienia bazy wiedzy",
+ "dataset.acl.retrieval_recall": "Wyświetlaj i wykonuj testy odzyskiwania",
+ "dataset.acl.use": "Przesyłaj dokumenty do bazy wiedzy",
"dataset.api_key.manage": "Zarządzaj kluczami API bazy wiedzy",
"dataset.create_and_management": "Twórz bazy wiedzy",
"dataset.external.connect": "Połącz zewnętrzne bazy wiedzy",
@@ -48,6 +48,10 @@
"plugin.install": "Instaluj i aktualizuj wtyczki",
"plugin.model_config": "Konfiguruj modele",
"plugin.plugin_preferences": "Konfiguruj automatyczne aktualizacje",
+ "skill.delete": "Usuń Skill",
+ "skill.edit": "Edytuj Skill",
+ "skill.publish": "Opublikuj Skill",
+ "skill.view": "Wyświetl Skill",
"snippets.create_and_modify": "Twórz i modyfikuj fragmenty kodu",
"snippets.management": "Zarządzaj fragmentami kodu",
"tool.manage": "Zarządzaj narzędziami",
diff --git a/web/i18n/pl-PL/permission.json b/web/i18n/pl-PL/permission.json
index 937ef8e7546..22a3bd77153 100644
--- a/web/i18n/pl-PL/permission.json
+++ b/web/i18n/pl-PL/permission.json
@@ -1,14 +1,20 @@
{
+ "accessRule.accessPermission": "Uprawnienie dostępu",
"accessRule.actions": "Akcje",
- "accessRule.addException": "Dodaj wyjątek",
"accessRule.addMemberAria": "Dodaj {{name}}",
"accessRule.addMembersTitle": "Dodaj członków",
"accessRule.allPermittedMembers": "Wszyscy członkowie z uprawnieniami ról",
"accessRule.allPermittedMembersDescription": "Członkowie z pasującymi uprawnieniami ról mogą uzyskać dostęp do tego zasobu.",
- "accessRule.appDescription": "Kontroluj, dla kogo ta aplikacja jest otwarta. Członkowie nadal potrzebują uprawnień ról, aby ją przeglądać lub obsługiwać.",
+ "accessRule.allowedMembers": "Dozwoleni członkowie",
+ "accessRule.appDescription": "Określ, kto może uzyskać dostęp do tej aplikacji, oraz poziom szczegółowości uprawnień dostępu.",
"accessRule.appTitle": "Zestaw uprawnień aplikacji",
+ "accessRule.automaticallyIncludeWorkspaceMembers": "Automatycznie uwzględniaj członków obszaru roboczego",
+ "accessRule.automaticallyIncludeWorkspaceMembersDescription": "Wszyscy obecni i przyszli członkowie obszaru roboczego są uwzględniani automatycznie. Uprawnienia ról nadal określają, co mogą robić.",
+ "accessRule.batchRemoveDescription": "Wybrani członkowie zostaną usunięci z listy dozwolonych członków.",
+ "accessRule.batchRemoveTitle": "Usunąć wybranych członków?",
"accessRule.changeOpenScopeDescription": "Zmiana zakresu otwarcia zresetuje wszystkie wyjątki uprawnień członków dla tego zasobu. Po zmianie trzeba będzie ponownie dodać wyjątki uprawnień członków.",
"accessRule.changeOpenScopeTitle": "Zmienić zakres otwarcia zasobu?",
+ "accessRule.collaborator": "Współpracownik",
"accessRule.collapseSection": "Zwiń {{title}}",
"accessRule.copied": "Pomyślnie skopiowano regułę dostępu",
"accessRule.created": "Pomyślnie utworzono regułę dostępu",
@@ -20,20 +26,17 @@
"accessRule.deleted": "Pomyślnie usunięto regułę dostępu",
"accessRule.exceptionPermissionFor": "Wyjątkowe uprawnienie dla {{name}}",
"accessRule.expandSection": "Rozwiń {{title}}",
- "accessRule.individualPermissionSettings": "Wyjątki uprawnień członków",
- "accessRule.individualPermissionSettingsTip": "Ustaw wyjątki uprawnień dla określonych współpracowników lub grup. Te ustawienia zastępują uprawnienia ich ról.",
"accessRule.maintainer": "Opiekun",
- "accessRule.member": "Członek z wyjątkiem",
"accessRule.newPermissionSet": "Nowy zestaw uprawnień",
"accessRule.noAvailableMembers": "Brak członków dostępnych do dodania",
"accessRule.noDescription": "Brak opisu",
"accessRule.noRules": "Brak reguł dostępu",
- "accessRule.noUserAccessSettings": "Brak wyjątków uprawnień członków",
+ "accessRule.noUserAccessSettings": "Brak członków z dostępem",
"accessRule.onlyMe": "Tylko ja",
"accessRule.onlyMeDescription": "Tylko Ty możesz uzyskać dostęp do tego zasobu.",
- "accessRule.permission": "Uprawnienie wyjątkowe",
"accessRule.resourceOpenScope": "Zakres otwarcia zasobu",
"accessRule.resourceOpenScopeDescription": "Wybierz, dla kogo ten zasób jest otwarty. Uprawnienia ról nadal decydują o tym, co każdy członek może robić.",
+ "accessRule.selected": "Wybrano",
"accessRule.specificMembersOnly": "Tylko określeni członkowie",
"accessRule.specificMembersOnlyDescription": "Tylko wybrani członkowie mogą uzyskać dostęp do tego zasobu.",
"accessRule.summary_one": "{{count}} zestaw uprawnień",
diff --git a/web/i18n/pt-BR/permission-keys.json b/web/i18n/pt-BR/permission-keys.json
index 77f4487ce67..32dda95b517 100644
--- a/web/i18n/pt-BR/permission-keys.json
+++ b/web/i18n/pt-BR/permission-keys.json
@@ -2,21 +2,21 @@
"agent.manage": "Gerenciar Agents",
"api_extension.manage": "Gerenciar configuração de extensão de API",
"app.access_config": "Configurar permissões de acesso ao aplicativo",
- "app.acl.access_config": "Configurar permissões de acesso ao aplicativo",
+ "app.acl.access_config": "Visualizar e gerenciar permissões de acesso",
"app.acl.delete": "Excluir aplicativo",
"app.acl.deploy": "Implantar aplicativo",
- "app.acl.edit": "Editar e orquestrar aplicativo",
- "app.acl.import_export_dsl": "Importar / exportar DSL",
- "app.acl.log_and_annotation": "Acessar logs e anotações",
- "app.acl.monitor": "Acessar página de monitoramento",
+ "app.acl.edit": "Editar informações e orquestrar o aplicativo",
+ "app.acl.import_export_dsl": "Importar e exportar o DSL do aplicativo",
+ "app.acl.log_and_annotation": "Visualizar e gerenciar logs e anotações",
+ "app.acl.monitor": "Visualizar o monitoramento do aplicativo",
"app.acl.preview": "Visualizar aplicativo",
- "app.acl.release_and_version": "Publicação de aplicativo e gerenciamento de versões",
+ "app.acl.release_and_version": "Publicar e gerenciar versões do aplicativo",
"app.acl.test_and_run": "Testar e usar aplicativo",
- "app.acl.tracing_config": "Configurar rastreamento externo",
- "app.acl.view_layout": "Página de orquestração somente leitura",
+ "app.acl.tracing_config": "Visualizar e configurar o rastreamento de monitoramento do aplicativo",
+ "app.acl.view_layout": "Visualizar a orquestração do aplicativo",
"app.create_and_management": "Criar aplicativos",
"app.tag.manage": "Gerenciar tags de aplicativo",
- "app_library.access": "Acessar a Biblioteca de Aplicativos",
+ "app_library.access": "Visualizar e usar a Biblioteca de Aplicativos",
"billing.manage": "Alterar planos de assinatura",
"billing.subscription.manage": "Gerenciar faturamento e assinaturas no portal de faturamento",
"billing.view": "Acessar configurações de Faturamento",
@@ -26,18 +26,18 @@
"customization.manage": "Gerenciar personalização",
"data_source.manage": "Gerenciar configuração de fonte de dados",
"dataset.access_config": "Configurar permissões de acesso ao Conhecimento",
- "dataset.acl.access_config": "Configurar permissões de acesso ao Conhecimento",
+ "dataset.acl.access_config": "Visualizar e gerenciar permissões de acesso ao Conhecimento",
"dataset.acl.delete": "Excluir Conhecimento",
- "dataset.acl.delete_file": "Excluir arquivos do Conhecimento",
- "dataset.acl.document_download": "Baixar documentos",
- "dataset.acl.edit": "Editar Conhecimento",
- "dataset.acl.import_export_dsl": "Importar / exportar DSL de pipeline de conhecimento",
- "dataset.acl.pipeline_release": "Publicação de pipeline de conhecimento e gerenciamento de versões",
- "dataset.acl.pipeline_test": "Teste de pipeline",
+ "dataset.acl.delete_file": "Excluir documentos do Conhecimento",
+ "dataset.acl.document_download": "Baixar documentos do Conhecimento",
+ "dataset.acl.edit": "Editar conteúdo e configurações do Conhecimento",
+ "dataset.acl.import_export_dsl": "Importar e exportar o DSL do pipeline",
+ "dataset.acl.pipeline_release": "Publicar e gerenciar versões do pipeline",
+ "dataset.acl.pipeline_test": "Testar o pipeline",
"dataset.acl.preview": "Visualizar Conhecimento",
- "dataset.acl.readonly": "Conhecimento somente leitura",
- "dataset.acl.retrieval_recall": "Recuperação do Conhecimento",
- "dataset.acl.use": "Adicionar documentos ao Conhecimento",
+ "dataset.acl.readonly": "Visualizar conteúdo e configurações do Conhecimento",
+ "dataset.acl.retrieval_recall": "Visualizar e executar testes de recuperação",
+ "dataset.acl.use": "Fazer upload de documentos para o Conhecimento",
"dataset.api_key.manage": "Gerenciar chaves de API do Conhecimento",
"dataset.create_and_management": "Criar Conhecimentos",
"dataset.external.connect": "Conectar Conhecimentos externos",
@@ -48,6 +48,10 @@
"plugin.install": "Instalar e atualizar plug-ins",
"plugin.model_config": "Configurar modelos",
"plugin.plugin_preferences": "Configurar atualizações automáticas",
+ "skill.delete": "Excluir Skill",
+ "skill.edit": "Editar Skill",
+ "skill.publish": "Publicar Skill",
+ "skill.view": "Visualizar Skill",
"snippets.create_and_modify": "Criar e modificar snippets",
"snippets.management": "Gerenciar snippets",
"tool.manage": "Gerenciar ferramentas",
diff --git a/web/i18n/pt-BR/permission.json b/web/i18n/pt-BR/permission.json
index a3aa19045d0..cdfd047b628 100644
--- a/web/i18n/pt-BR/permission.json
+++ b/web/i18n/pt-BR/permission.json
@@ -1,14 +1,20 @@
{
+ "accessRule.accessPermission": "Permissão de acesso",
"accessRule.actions": "Ações",
- "accessRule.addException": "Adicionar exceção",
"accessRule.addMemberAria": "Adicionar {{name}}",
"accessRule.addMembersTitle": "Adicionar membros",
"accessRule.allPermittedMembers": "Todos os membros com permissões de função",
"accessRule.allPermittedMembersDescription": "Membros com permissões de função correspondentes podem acessar este recurso.",
- "accessRule.appDescription": "Controle para quem este aplicativo está aberto. Os membros ainda precisam de permissões de função para visualizá-lo ou operá-lo.",
+ "accessRule.allowedMembers": "Membros permitidos",
+ "accessRule.appDescription": "Defina quem pode acessar este aplicativo e o nível de granularidade das permissões de acesso.",
"accessRule.appTitle": "Conjunto de permissões de Aplicativo",
+ "accessRule.automaticallyIncludeWorkspaceMembers": "Incluir automaticamente membros do espaço de trabalho",
+ "accessRule.automaticallyIncludeWorkspaceMembersDescription": "Todos os membros atuais e futuros do espaço de trabalho são incluídos automaticamente. As permissões de função ainda determinam o que eles podem fazer.",
+ "accessRule.batchRemoveDescription": "Os membros selecionados serão removidos da lista de membros permitidos.",
+ "accessRule.batchRemoveTitle": "Remover os membros selecionados?",
"accessRule.changeOpenScopeDescription": "Alterar o escopo de abertura redefinirá todas as exceções de permissão dos membros para este recurso. Você precisará adicioná-las novamente após a alteração.",
"accessRule.changeOpenScopeTitle": "Alterar escopo de abertura do recurso?",
+ "accessRule.collaborator": "Colaborador",
"accessRule.collapseSection": "Recolher {{title}}",
"accessRule.copied": "Regra de acesso copiada com sucesso",
"accessRule.created": "Regra de acesso criada com sucesso",
@@ -20,20 +26,17 @@
"accessRule.deleted": "Regra de acesso excluída com sucesso",
"accessRule.exceptionPermissionFor": "Permissão de exceção para {{name}}",
"accessRule.expandSection": "Expandir {{title}}",
- "accessRule.individualPermissionSettings": "Exceções de permissão dos membros",
- "accessRule.individualPermissionSettingsTip": "Defina exceções de permissão para colaboradores ou grupos específicos. Essas configurações substituem suas permissões de função.",
"accessRule.maintainer": "Mantenedor",
- "accessRule.member": "Membro com exceção",
"accessRule.newPermissionSet": "Novo conjunto de permissões",
"accessRule.noAvailableMembers": "Nenhum membro disponível para adicionar",
"accessRule.noDescription": "Sem descrição",
"accessRule.noRules": "Sem regras de acesso",
- "accessRule.noUserAccessSettings": "Nenhuma exceção de permissão dos membros",
+ "accessRule.noUserAccessSettings": "Nenhum membro tem acesso",
"accessRule.onlyMe": "Somente eu",
"accessRule.onlyMeDescription": "Somente você pode acessar este recurso.",
- "accessRule.permission": "Permissão de exceção",
"accessRule.resourceOpenScope": "Escopo de abertura do recurso",
"accessRule.resourceOpenScopeDescription": "Escolha para quem este recurso está aberto. As permissões de função ainda determinam o que cada membro pode fazer.",
+ "accessRule.selected": "Selecionados",
"accessRule.specificMembersOnly": "Apenas membros específicos",
"accessRule.specificMembersOnlyDescription": "Apenas os membros selecionados podem acessar este recurso.",
"accessRule.summary_one": "{{count}} conjunto de permissões",
diff --git a/web/i18n/ro-RO/permission-keys.json b/web/i18n/ro-RO/permission-keys.json
index 7c1bc3cd266..2610e185492 100644
--- a/web/i18n/ro-RO/permission-keys.json
+++ b/web/i18n/ro-RO/permission-keys.json
@@ -2,21 +2,21 @@
"agent.manage": "Gestionează Agents",
"api_extension.manage": "Gestionează configurația extensiei API",
"app.access_config": "Configurează permisiunile de acces ale aplicației",
- "app.acl.access_config": "Configurează permisiunile de acces ale aplicației",
+ "app.acl.access_config": "Vizualizează și gestionează permisiunile de acces",
"app.acl.delete": "Șterge aplicația",
"app.acl.deploy": "Implementează aplicația",
- "app.acl.edit": "Editează și orchestrează aplicația",
- "app.acl.import_export_dsl": "Importă / exportă DSL",
- "app.acl.log_and_annotation": "Accesează jurnale și adnotări",
- "app.acl.monitor": "Accesează pagina de monitorizare",
+ "app.acl.edit": "Editează informațiile aplicației și orchestrează aplicația",
+ "app.acl.import_export_dsl": "Importă și exportă DSL-ul aplicației",
+ "app.acl.log_and_annotation": "Vizualizează și gestionează jurnalele și adnotările",
+ "app.acl.monitor": "Vizualizează monitorizarea aplicației",
"app.acl.preview": "Previzualizează aplicația",
- "app.acl.release_and_version": "Publicarea aplicației și gestionarea versiunilor",
+ "app.acl.release_and_version": "Publică și gestionează versiunile aplicației",
"app.acl.test_and_run": "Testează și utilizează aplicația",
- "app.acl.tracing_config": "Configurează tracing extern",
- "app.acl.view_layout": "Pagină de orchestrare doar pentru citire",
+ "app.acl.tracing_config": "Vizualizează și configurează tracing-ul monitorizării aplicației",
+ "app.acl.view_layout": "Vizualizează orchestrarea aplicației",
"app.create_and_management": "Creează aplicații",
"app.tag.manage": "Gestionează etichetele aplicațiilor",
- "app_library.access": "Accesează Biblioteca de aplicații",
+ "app_library.access": "Vizualizează și utilizează Biblioteca de aplicații",
"billing.manage": "Schimbă planurile de abonament",
"billing.subscription.manage": "Gestionează facturarea și abonamentele în portalul de facturare",
"billing.view": "Accesează setările de Facturare",
@@ -26,18 +26,18 @@
"customization.manage": "Gestionează personalizarea",
"data_source.manage": "Gestionează configurația sursei de date",
"dataset.access_config": "Configurează permisiunile de acces ale bazei de cunoștințe",
- "dataset.acl.access_config": "Configurează permisiunile de acces ale bazei de cunoștințe",
+ "dataset.acl.access_config": "Vizualizează și gestionează permisiunile de acces ale bazei de cunoștințe",
"dataset.acl.delete": "Șterge baza de cunoștințe",
- "dataset.acl.delete_file": "Șterge fișierele bazei de cunoștințe",
- "dataset.acl.document_download": "Descarcă documente",
- "dataset.acl.edit": "Editează baza de cunoștințe",
- "dataset.acl.import_export_dsl": "Importă / exportă DSL-ul pipeline-ului de cunoștințe",
- "dataset.acl.pipeline_release": "Publicarea pipeline-ului de cunoștințe și gestionarea versiunilor",
- "dataset.acl.pipeline_test": "Testarea pipeline-ului",
+ "dataset.acl.delete_file": "Șterge documentele bazei de cunoștințe",
+ "dataset.acl.document_download": "Descarcă documentele bazei de cunoștințe",
+ "dataset.acl.edit": "Editează conținutul și setările bazei de cunoștințe",
+ "dataset.acl.import_export_dsl": "Importă și exportă DSL-ul pipeline-ului",
+ "dataset.acl.pipeline_release": "Publică și gestionează versiunile pipeline-ului",
+ "dataset.acl.pipeline_test": "Testează pipeline-ul",
"dataset.acl.preview": "Previzualizează baza de cunoștințe",
- "dataset.acl.readonly": "Bază de cunoștințe doar pentru citire",
- "dataset.acl.retrieval_recall": "Recuperare din baza de cunoștințe",
- "dataset.acl.use": "Adaugă documente în baza de cunoștințe",
+ "dataset.acl.readonly": "Vizualizează conținutul și setările bazei de cunoștințe",
+ "dataset.acl.retrieval_recall": "Vizualizează și execută testele de recuperare",
+ "dataset.acl.use": "Încarcă documente în baza de cunoștințe",
"dataset.api_key.manage": "Gestionează cheile API ale bazei de cunoștințe",
"dataset.create_and_management": "Creează baze de cunoștințe",
"dataset.external.connect": "Conectează baze de cunoștințe externe",
@@ -48,6 +48,10 @@
"plugin.install": "Instalează și actualizează plugin-uri",
"plugin.model_config": "Configurează modele",
"plugin.plugin_preferences": "Configurează actualizările automate",
+ "skill.delete": "Șterge Skill",
+ "skill.edit": "Editează Skill",
+ "skill.publish": "Publică Skill",
+ "skill.view": "Vizualizează Skill",
"snippets.create_and_modify": "Creează și modifică fragmente",
"snippets.management": "Gestionează fragmente",
"tool.manage": "Gestionează instrumente",
diff --git a/web/i18n/ro-RO/permission.json b/web/i18n/ro-RO/permission.json
index cc3ee502923..73c26ba997b 100644
--- a/web/i18n/ro-RO/permission.json
+++ b/web/i18n/ro-RO/permission.json
@@ -1,14 +1,20 @@
{
+ "accessRule.accessPermission": "Permisiune de acces",
"accessRule.actions": "Acțiuni",
- "accessRule.addException": "Adaugă excepție",
"accessRule.addMemberAria": "Adaugă {{name}}",
"accessRule.addMembersTitle": "Adaugă membri",
"accessRule.allPermittedMembers": "Toți membrii cu permisiuni de rol",
"accessRule.allPermittedMembersDescription": "Membrii cu permisiuni de rol corespunzătoare pot accesa această resursă.",
- "accessRule.appDescription": "Controlează cui îi este deschisă această aplicație. Membrii au în continuare nevoie de permisiuni de rol pentru a o vizualiza sau opera.",
+ "accessRule.allowedMembers": "Membri permiși",
+ "accessRule.appDescription": "Stabilește cine poate accesa această aplicație și nivelul de granularitate al permisiunilor de acces.",
"accessRule.appTitle": "Set de permisiuni pentru aplicație",
+ "accessRule.automaticallyIncludeWorkspaceMembers": "Include automat membrii spațiului de lucru",
+ "accessRule.automaticallyIncludeWorkspaceMembersDescription": "Toți membrii actuali și viitori ai spațiului de lucru sunt incluși automat. Permisiunile rolurilor stabilesc în continuare ce pot face.",
+ "accessRule.batchRemoveDescription": "Membrii selectați vor fi eliminați din lista membrilor permiși.",
+ "accessRule.batchRemoveTitle": "Elimini membrii selectați?",
"accessRule.changeOpenScopeDescription": "Modificarea domeniului de deschidere va reseta toate excepțiile de permisiuni pentru membri pentru această resursă. Va trebui să le adaugi din nou după comutare.",
"accessRule.changeOpenScopeTitle": "Schimbi domeniul de deschidere al resursei?",
+ "accessRule.collaborator": "Colaborator",
"accessRule.collapseSection": "Restrânge {{title}}",
"accessRule.copied": "Regula de acces a fost copiată cu succes",
"accessRule.created": "Regula de acces a fost creată cu succes",
@@ -20,20 +26,17 @@
"accessRule.deleted": "Regula de acces a fost ștearsă cu succes",
"accessRule.exceptionPermissionFor": "Permisiune de excepție pentru {{name}}",
"accessRule.expandSection": "Extinde {{title}}",
- "accessRule.individualPermissionSettings": "Excepții de permisiuni pentru membri",
- "accessRule.individualPermissionSettingsTip": "Setează excepții de permisiuni pentru colaboratori sau grupuri specifice. Aceste setări înlocuiesc permisiunile rolurilor lor.",
"accessRule.maintainer": "Întreținător",
- "accessRule.member": "Membru cu excepție",
"accessRule.newPermissionSet": "Set nou de permisiuni",
"accessRule.noAvailableMembers": "Niciun membru disponibil pentru adăugare",
"accessRule.noDescription": "Fără descriere",
"accessRule.noRules": "Fără reguli de acces",
- "accessRule.noUserAccessSettings": "Nu există excepții de permisiuni pentru membri",
+ "accessRule.noUserAccessSettings": "Niciun membru nu are acces",
"accessRule.onlyMe": "Doar eu",
"accessRule.onlyMeDescription": "Numai tu poți accesa această resursă.",
- "accessRule.permission": "Permisiune de excepție",
"accessRule.resourceOpenScope": "Domeniul de deschidere al resursei",
"accessRule.resourceOpenScopeDescription": "Alege cui îi este deschisă această resursă. Permisiunile de rol decid în continuare ce poate face fiecare membru.",
+ "accessRule.selected": "Selectați",
"accessRule.specificMembersOnly": "Doar membri specifici",
"accessRule.specificMembersOnlyDescription": "Doar membrii selectați pot accesa această resursă.",
"accessRule.summary_one": "{{count}} set de permisiuni",
diff --git a/web/i18n/ru-RU/permission-keys.json b/web/i18n/ru-RU/permission-keys.json
index 40c8513332f..574f0e96add 100644
--- a/web/i18n/ru-RU/permission-keys.json
+++ b/web/i18n/ru-RU/permission-keys.json
@@ -2,21 +2,21 @@
"agent.manage": "Управление Agents",
"api_extension.manage": "Управление конфигурацией API-расширений",
"app.access_config": "Настройка прав доступа к приложению",
- "app.acl.access_config": "Настройка прав доступа к приложению",
+ "app.acl.access_config": "Просмотр и управление правами доступа",
"app.acl.delete": "Удаление приложения",
"app.acl.deploy": "Развертывание приложения",
- "app.acl.edit": "Редактирование и оркестрация приложения",
- "app.acl.import_export_dsl": "Импорт / экспорт DSL",
- "app.acl.log_and_annotation": "Доступ к журналам и аннотациям",
- "app.acl.monitor": "Доступ к странице мониторинга",
+ "app.acl.edit": "Редактирование информации о приложении и оркестрация приложения",
+ "app.acl.import_export_dsl": "Импорт и экспорт DSL приложения",
+ "app.acl.log_and_annotation": "Просмотр и управление журналами и аннотациями",
+ "app.acl.monitor": "Просмотр мониторинга приложения",
"app.acl.preview": "Предпросмотр приложения",
- "app.acl.release_and_version": "Публикация приложения и управление версиями",
+ "app.acl.release_and_version": "Публикация и управление версиями приложения",
"app.acl.test_and_run": "Тестирование и использование приложения",
- "app.acl.tracing_config": "Настройка внешнего трассинга",
- "app.acl.view_layout": "Страница оркестрации только для чтения",
+ "app.acl.tracing_config": "Просмотр и настройка трассировки мониторинга приложения",
+ "app.acl.view_layout": "Просмотр оркестрации приложения",
"app.create_and_management": "Создание приложений",
"app.tag.manage": "Управление тегами приложений",
- "app_library.access": "Доступ к библиотеке приложений",
+ "app_library.access": "Просмотр и использование библиотеки приложений",
"billing.manage": "Изменение тарифных планов",
"billing.subscription.manage": "Управление оплатой и подписками в биллинг-портале",
"billing.view": "Доступ к настройкам биллинга",
@@ -26,18 +26,18 @@
"customization.manage": "Управление кастомизацией",
"data_source.manage": "Управление конфигурацией источников данных",
"dataset.access_config": "Настройка прав доступа к базе знаний",
- "dataset.acl.access_config": "Настройка прав доступа к базе знаний",
+ "dataset.acl.access_config": "Просмотр и управление правами доступа к базе знаний",
"dataset.acl.delete": "Удаление базы знаний",
- "dataset.acl.delete_file": "Удаление файлов базы знаний",
- "dataset.acl.document_download": "Скачивание документов",
- "dataset.acl.edit": "Редактирование базы знаний",
- "dataset.acl.import_export_dsl": "Импорт / экспорт DSL конвейера знаний",
- "dataset.acl.pipeline_release": "Публикация конвейера знаний и управление версиями",
- "dataset.acl.pipeline_test": "Тестирование конвейера",
+ "dataset.acl.delete_file": "Удаление документов базы знаний",
+ "dataset.acl.document_download": "Скачивание документов базы знаний",
+ "dataset.acl.edit": "Редактирование содержимого и настроек базы знаний",
+ "dataset.acl.import_export_dsl": "Импорт и экспорт DSL конвейера",
+ "dataset.acl.pipeline_release": "Публикация и управление версиями конвейера",
+ "dataset.acl.pipeline_test": "Тестировать конвейер",
"dataset.acl.preview": "Предпросмотр базы знаний",
- "dataset.acl.readonly": "База знаний только для чтения",
- "dataset.acl.retrieval_recall": "Извлечение из базы знаний",
- "dataset.acl.use": "Добавление документов в базу знаний",
+ "dataset.acl.readonly": "Просмотр содержимого и настроек базы знаний",
+ "dataset.acl.retrieval_recall": "Просмотр и запуск тестов поиска",
+ "dataset.acl.use": "Загрузка документов в базу знаний",
"dataset.api_key.manage": "Управление API-ключами базы знаний",
"dataset.create_and_management": "Создание баз знаний",
"dataset.external.connect": "Подключение внешних баз знаний",
@@ -48,6 +48,10 @@
"plugin.install": "Установка и обновление плагинов",
"plugin.model_config": "Настройка моделей",
"plugin.plugin_preferences": "Настройка автообновлений",
+ "skill.delete": "Удаление Skill",
+ "skill.edit": "Редактирование Skill",
+ "skill.publish": "Публикация Skill",
+ "skill.view": "Просмотр Skill",
"snippets.create_and_modify": "Создание и изменение сниппетов",
"snippets.management": "Управление сниппетами",
"tool.manage": "Управление инструментами",
diff --git a/web/i18n/ru-RU/permission.json b/web/i18n/ru-RU/permission.json
index 265b8e1bfe4..4f7216e19b6 100644
--- a/web/i18n/ru-RU/permission.json
+++ b/web/i18n/ru-RU/permission.json
@@ -1,14 +1,20 @@
{
+ "accessRule.accessPermission": "Разрешение на доступ",
"accessRule.actions": "Действия",
- "accessRule.addException": "Добавить исключение",
"accessRule.addMemberAria": "Добавить {{name}}",
"accessRule.addMembersTitle": "Добавить участников",
"accessRule.allPermittedMembers": "Все участники с правами роли",
"accessRule.allPermittedMembersDescription": "Участники с соответствующими правами роли могут получить доступ к этому ресурсу.",
- "accessRule.appDescription": "Управляйте тем, кому открыто это приложение. Участникам по-прежнему нужны права роли для просмотра или работы с ним.",
+ "accessRule.allowedMembers": "Разрешённые участники",
+ "accessRule.appDescription": "Настройте, кто может получить доступ к этому приложению, и степень детализации прав доступа.",
"accessRule.appTitle": "Набор прав приложения",
+ "accessRule.automaticallyIncludeWorkspaceMembers": "Автоматически включать участников рабочего пространства",
+ "accessRule.automaticallyIncludeWorkspaceMembersDescription": "Все текущие и будущие участники рабочего пространства включаются автоматически. Разрешения ролей по-прежнему определяют, что они могут делать.",
+ "accessRule.batchRemoveDescription": "Выбранные участники будут удалены из списка разрешённых участников.",
+ "accessRule.batchRemoveTitle": "Удалить выбранных участников?",
"accessRule.changeOpenScopeDescription": "Изменение области открытости сбросит все исключения из прав участников для этого ресурса. После переключения потребуется снова добавить исключения из прав участников.",
"accessRule.changeOpenScopeTitle": "Изменить область открытости ресурса?",
+ "accessRule.collaborator": "Соавтор",
"accessRule.collapseSection": "Свернуть {{title}}",
"accessRule.copied": "Правило доступа успешно скопировано",
"accessRule.created": "Правило доступа успешно создано",
@@ -20,20 +26,17 @@
"accessRule.deleted": "Правило доступа успешно удалено",
"accessRule.exceptionPermissionFor": "Исключение из прав для {{name}}",
"accessRule.expandSection": "Развернуть {{title}}",
- "accessRule.individualPermissionSettings": "Исключения из прав участников",
- "accessRule.individualPermissionSettingsTip": "Задайте исключения из прав для определенных участников или групп. Эти настройки переопределяют права их ролей.",
"accessRule.maintainer": "Сопровождающий",
- "accessRule.member": "Участник с исключением",
"accessRule.newPermissionSet": "Новый набор прав",
"accessRule.noAvailableMembers": "Нет участников для добавления",
"accessRule.noDescription": "Без описания",
"accessRule.noRules": "Нет правил доступа",
- "accessRule.noUserAccessSettings": "Нет исключений из прав участников",
+ "accessRule.noUserAccessSettings": "Нет участников с доступом",
"accessRule.onlyMe": "Только я",
"accessRule.onlyMeDescription": "Только вы можете получить доступ к этому ресурсу.",
- "accessRule.permission": "Исключение из прав",
"accessRule.resourceOpenScope": "Область открытости ресурса",
"accessRule.resourceOpenScopeDescription": "Выберите, кому открыт этот ресурс. Права роли по-прежнему определяют, что может делать каждый участник.",
+ "accessRule.selected": "Выбрано",
"accessRule.specificMembersOnly": "Только определенные участники",
"accessRule.specificMembersOnlyDescription": "Доступ к этому ресурсу могут получить только выбранные участники.",
"accessRule.summary_one": "{{count}} набор прав",
diff --git a/web/i18n/sl-SI/permission-keys.json b/web/i18n/sl-SI/permission-keys.json
index df83b21f21a..544c6f92a8d 100644
--- a/web/i18n/sl-SI/permission-keys.json
+++ b/web/i18n/sl-SI/permission-keys.json
@@ -2,21 +2,21 @@
"agent.manage": "Upravljanje Agents",
"api_extension.manage": "Upravljanje konfiguracije razširitve API",
"app.access_config": "Konfiguracija dovoljenj za dostop do aplikacije",
- "app.acl.access_config": "Konfiguracija dovoljenj za dostop do aplikacije",
+ "app.acl.access_config": "Ogled in upravljanje dovoljenj za dostop",
"app.acl.delete": "Izbriši aplikacijo",
"app.acl.deploy": "Uvedi aplikacijo",
- "app.acl.edit": "Uredi in orkestriraj aplikacijo",
- "app.acl.import_export_dsl": "Uvozi / izvozi DSL",
- "app.acl.log_and_annotation": "Dostop do dnevnikov in opomb",
- "app.acl.monitor": "Dostop do strani za spremljanje",
+ "app.acl.edit": "Uredi podatke o aplikaciji in orkestriraj aplikacijo",
+ "app.acl.import_export_dsl": "Uvozi in izvozi DSL aplikacije",
+ "app.acl.log_and_annotation": "Ogled in upravljanje dnevnikov in opomb",
+ "app.acl.monitor": "Ogled spremljanja aplikacije",
"app.acl.preview": "Predogled aplikacije",
- "app.acl.release_and_version": "Objavljanje aplikacije in upravljanje različic",
+ "app.acl.release_and_version": "Objavi in upravljaj različice aplikacije",
"app.acl.test_and_run": "Preizkusi in uporabi aplikacijo",
- "app.acl.tracing_config": "Konfiguracija zunanjega sledenja",
- "app.acl.view_layout": "Stran za orkestracijo samo za branje",
+ "app.acl.tracing_config": "Ogled in konfiguracija sledenja spremljanju aplikacije",
+ "app.acl.view_layout": "Ogled orkestracije aplikacije",
"app.create_and_management": "Ustvarjanje aplikacij",
"app.tag.manage": "Upravljanje oznak aplikacij",
- "app_library.access": "Dostop do knjižnice aplikacij",
+ "app_library.access": "Ogled in uporaba knjižnice aplikacij",
"billing.manage": "Spremeni naročniške načrte",
"billing.subscription.manage": "Upravljanje obračunavanja in naročnin v portalu za obračunavanje",
"billing.view": "Dostop do nastavitev obračunavanja",
@@ -26,18 +26,18 @@
"customization.manage": "Upravljanje prilagoditev",
"data_source.manage": "Upravljanje konfiguracije vira podatkov",
"dataset.access_config": "Konfiguracija dovoljenj za dostop do baze znanja",
- "dataset.acl.access_config": "Konfiguracija dovoljenj za dostop do baze znanja",
+ "dataset.acl.access_config": "Ogled in upravljanje dovoljenj za dostop do baze znanja",
"dataset.acl.delete": "Izbriši bazo znanja",
- "dataset.acl.delete_file": "Izbriši datoteke baze znanja",
- "dataset.acl.document_download": "Prenesi dokumente",
- "dataset.acl.edit": "Uredi bazo znanja",
- "dataset.acl.import_export_dsl": "Uvozi / izvozi DSL cevovoda znanja",
- "dataset.acl.pipeline_release": "Objavljanje cevovoda znanja in upravljanje različic",
- "dataset.acl.pipeline_test": "Preizkušanje cevovoda",
+ "dataset.acl.delete_file": "Izbriši dokumente baze znanja",
+ "dataset.acl.document_download": "Prenesi dokumente baze znanja",
+ "dataset.acl.edit": "Uredi vsebino in nastavitve baze znanja",
+ "dataset.acl.import_export_dsl": "Uvozi in izvozi DSL cevovoda",
+ "dataset.acl.pipeline_release": "Objavi in upravljaj različice cevovoda",
+ "dataset.acl.pipeline_test": "Preizkusi cevovod",
"dataset.acl.preview": "Predogled baze znanja",
- "dataset.acl.readonly": "Baza znanja samo za branje",
- "dataset.acl.retrieval_recall": "Pridobivanje iz baze znanja",
- "dataset.acl.use": "Dodaj dokumente v bazo znanja",
+ "dataset.acl.readonly": "Ogled vsebine in nastavitev baze znanja",
+ "dataset.acl.retrieval_recall": "Ogled in izvajanje preizkusov pridobivanja",
+ "dataset.acl.use": "Naloži dokumente v bazo znanja",
"dataset.api_key.manage": "Upravljanje API ključev baze znanja",
"dataset.create_and_management": "Ustvarjanje baz znanja",
"dataset.external.connect": "Poveži zunanje baze znanja",
@@ -48,6 +48,10 @@
"plugin.install": "Namesti in posodobi vtičnike",
"plugin.model_config": "Konfiguriranje modelov",
"plugin.plugin_preferences": "Konfiguriranje samodejnih posodobitev",
+ "skill.delete": "Brisanje Skill",
+ "skill.edit": "Urejanje Skill",
+ "skill.publish": "Objavljanje Skill",
+ "skill.view": "Ogled Skill",
"snippets.create_and_modify": "Ustvarjanje in spreminjanje izsekov",
"snippets.management": "Upravljanje izsekov",
"tool.manage": "Upravljanje orodij",
diff --git a/web/i18n/sl-SI/permission.json b/web/i18n/sl-SI/permission.json
index 0c7aaa281b2..c2e5d268eaa 100644
--- a/web/i18n/sl-SI/permission.json
+++ b/web/i18n/sl-SI/permission.json
@@ -1,14 +1,20 @@
{
+ "accessRule.accessPermission": "Dovoljenje za dostop",
"accessRule.actions": "Dejanja",
- "accessRule.addException": "Dodaj izjemo",
"accessRule.addMemberAria": "Dodaj {{name}}",
"accessRule.addMembersTitle": "Dodaj člane",
"accessRule.allPermittedMembers": "Vsi člani z dovoljenji vlog",
"accessRule.allPermittedMembersDescription": "Člani z ustreznimi dovoljenji vlog lahko dostopajo do tega vira.",
- "accessRule.appDescription": "Nadzorujte, komu je ta aplikacija na voljo. Člani še vedno potrebujejo dovoljenja vlog za ogled ali upravljanje.",
+ "accessRule.allowedMembers": "Dovoljeni člani",
+ "accessRule.appDescription": "Določite, kdo lahko dostopa do te aplikacije, in raven podrobnosti dovoljenj za dostop.",
"accessRule.appTitle": "Nabor dovoljenj za aplikacijo",
+ "accessRule.automaticallyIncludeWorkspaceMembers": "Samodejno vključi člane delovnega prostora",
+ "accessRule.automaticallyIncludeWorkspaceMembersDescription": "Vsi trenutni in prihodnji člani delovnega prostora so samodejno vključeni. Dovoljenja vlog še vedno določajo, kaj lahko počnejo.",
+ "accessRule.batchRemoveDescription": "Izbrani člani bodo odstranjeni s seznama dovoljenih članov.",
+ "accessRule.batchRemoveTitle": "Odstranim izbrane člane?",
"accessRule.changeOpenScopeDescription": "Sprememba obsega odprtosti bo ponastavila vse izjeme dovoljenj za člane tega vira. Po preklopu boste morali znova dodati izjeme dovoljenj za člane.",
"accessRule.changeOpenScopeTitle": "Spremeni obseg odprtosti vira?",
+ "accessRule.collaborator": "Sodelavec",
"accessRule.collapseSection": "Strni {{title}}",
"accessRule.copied": "Pravilo za dostop uspešno kopirano",
"accessRule.created": "Pravilo za dostop uspešno ustvarjeno",
@@ -20,20 +26,17 @@
"accessRule.deleted": "Pravilo za dostop uspešno izbrisano",
"accessRule.exceptionPermissionFor": "Izjemno dovoljenje za {{name}}",
"accessRule.expandSection": "Razširi {{title}}",
- "accessRule.individualPermissionSettings": "Izjeme dovoljenj za člane",
- "accessRule.individualPermissionSettingsTip": "Nastavite izjeme dovoljenj za določene sodelavce ali skupine. Te nastavitve preglasijo dovoljenja njihovih vlog.",
"accessRule.maintainer": "Vzdrževalec",
- "accessRule.member": "Član z izjemo",
"accessRule.newPermissionSet": "Nov nabor dovoljenj",
"accessRule.noAvailableMembers": "Ni članov, ki bi jih bilo mogoče dodati",
"accessRule.noDescription": "Brez opisa",
"accessRule.noRules": "Brez pravil za dostop",
- "accessRule.noUserAccessSettings": "Ni izjem dovoljenj za člane",
+ "accessRule.noUserAccessSettings": "Noben član nima dostopa",
"accessRule.onlyMe": "Samo jaz",
"accessRule.onlyMeDescription": "Do tega vira lahko dostopate samo vi.",
- "accessRule.permission": "Izjemno dovoljenje",
"accessRule.resourceOpenScope": "Obseg odprtosti vira",
"accessRule.resourceOpenScopeDescription": "Izberite, komu je ta vir na voljo. Dovoljenja vlog še vedno določajo, kaj lahko vsak član počne.",
+ "accessRule.selected": "Izbrano",
"accessRule.specificMembersOnly": "Samo določeni člani",
"accessRule.specificMembersOnlyDescription": "Do tega vira lahko dostopajo samo izbrani člani.",
"accessRule.summary_one": "{{count}} nabor dovoljenj",
diff --git a/web/i18n/th-TH/permission-keys.json b/web/i18n/th-TH/permission-keys.json
index a6e41059915..b7b9854abf0 100644
--- a/web/i18n/th-TH/permission-keys.json
+++ b/web/i18n/th-TH/permission-keys.json
@@ -2,21 +2,21 @@
"agent.manage": "จัดการ Agents",
"api_extension.manage": "จัดการการกําหนดค่าส่วนขยาย API",
"app.access_config": "กําหนดค่าสิทธิ์การเข้าถึงแอป",
- "app.acl.access_config": "กําหนดค่าสิทธิ์การเข้าถึงแอป",
+ "app.acl.access_config": "ดูและจัดการสิทธิ์การเข้าถึง",
"app.acl.delete": "ลบแอป",
"app.acl.deploy": "ปรับใช้แอป",
- "app.acl.edit": "แก้ไขและจัดวางแอป",
- "app.acl.import_export_dsl": "นําเข้า / ส่งออก DSL",
- "app.acl.log_and_annotation": "เข้าถึงบันทึกและคำอธิบายประกอบ",
- "app.acl.monitor": "เข้าถึงหน้าการตรวจสอบ",
+ "app.acl.edit": "แก้ไขข้อมูลแอปและจัดวางแอป",
+ "app.acl.import_export_dsl": "นำเข้าและส่งออก DSL ของแอป",
+ "app.acl.log_and_annotation": "ดูและจัดการบันทึกและคำอธิบายประกอบ",
+ "app.acl.monitor": "ดูการตรวจสอบแอป",
"app.acl.preview": "ดูตัวอย่างแอป",
- "app.acl.release_and_version": "การเผยแพร่แอปและการจัดการเวอร์ชัน",
+ "app.acl.release_and_version": "เผยแพร่และจัดการเวอร์ชันแอป",
"app.acl.test_and_run": "ทดสอบและใช้งานแอป",
- "app.acl.tracing_config": "กำหนดค่าการติดตามภายนอก",
- "app.acl.view_layout": "หน้าจัดวางแบบอ่านอย่างเดียว",
+ "app.acl.tracing_config": "ดูและกำหนดค่าการติดตามการตรวจสอบแอป",
+ "app.acl.view_layout": "ดูการจัดวางแอป",
"app.create_and_management": "สร้างแอป",
"app.tag.manage": "จัดการแท็กแอป",
- "app_library.access": "เข้าถึงคลังแอป",
+ "app_library.access": "ดูและใช้คลังแอป",
"billing.manage": "เปลี่ยนแผนการสมัครสมาชิก",
"billing.subscription.manage": "จัดการการเรียกเก็บเงินและการสมัครสมาชิกในพอร์ทัลการเรียกเก็บเงิน",
"billing.view": "เข้าถึงการตั้งค่าการเรียกเก็บเงิน",
@@ -26,18 +26,18 @@
"customization.manage": "จัดการการปรับแต่ง",
"data_source.manage": "จัดการการกําหนดค่าแหล่งข้อมูล",
"dataset.access_config": "กําหนดค่าสิทธิ์การเข้าถึงฐานความรู้",
- "dataset.acl.access_config": "กําหนดค่าสิทธิ์การเข้าถึงฐานความรู้",
+ "dataset.acl.access_config": "ดูและจัดการสิทธิ์การเข้าถึงฐานความรู้",
"dataset.acl.delete": "ลบฐานความรู้",
- "dataset.acl.delete_file": "ลบไฟล์ฐานความรู้",
- "dataset.acl.document_download": "ดาวน์โหลดเอกสาร",
- "dataset.acl.edit": "แก้ไขฐานความรู้",
- "dataset.acl.import_export_dsl": "นําเข้า / ส่งออก DSL ของไปป์ไลน์ความรู้",
- "dataset.acl.pipeline_release": "การเผยแพร่ไปป์ไลน์ความรู้และการจัดการเวอร์ชัน",
- "dataset.acl.pipeline_test": "การทดสอบไปป์ไลน์",
+ "dataset.acl.delete_file": "ลบเอกสารฐานความรู้",
+ "dataset.acl.document_download": "ดาวน์โหลดเอกสารฐานความรู้",
+ "dataset.acl.edit": "แก้ไขเนื้อหาและการตั้งค่าฐานความรู้",
+ "dataset.acl.import_export_dsl": "นำเข้าและส่งออก DSL ของไปป์ไลน์",
+ "dataset.acl.pipeline_release": "เผยแพร่และจัดการเวอร์ชันไปป์ไลน์",
+ "dataset.acl.pipeline_test": "ทดสอบไปป์ไลน์",
"dataset.acl.preview": "ดูตัวอย่างฐานความรู้",
- "dataset.acl.readonly": "ฐานความรู้แบบอ่านอย่างเดียว",
- "dataset.acl.retrieval_recall": "การดึงข้อมูลจากฐานความรู้",
- "dataset.acl.use": "เพิ่มเอกสารลงในฐานความรู้",
+ "dataset.acl.readonly": "ดูเนื้อหาและการตั้งค่าฐานความรู้",
+ "dataset.acl.retrieval_recall": "ดูและดำเนินการทดสอบการดึงข้อมูล",
+ "dataset.acl.use": "อัปโหลดเอกสารฐานความรู้",
"dataset.api_key.manage": "จัดการคีย์ API ของฐานความรู้",
"dataset.create_and_management": "สร้างฐานความรู้",
"dataset.external.connect": "เชื่อมต่อฐานความรู้ภายนอก",
@@ -48,6 +48,10 @@
"plugin.install": "ติดตั้งและอัปเดตปลั๊กอิน",
"plugin.model_config": "กำหนดค่าโมเดล",
"plugin.plugin_preferences": "กำหนดค่าการอัปเดตอัตโนมัติ",
+ "skill.delete": "ลบ Skill",
+ "skill.edit": "แก้ไข Skill",
+ "skill.publish": "เผยแพร่ Skill",
+ "skill.view": "ดู Skill",
"snippets.create_and_modify": "สร้างและแก้ไขสนิปเปต",
"snippets.management": "จัดการสนิปเปต",
"tool.manage": "จัดการเครื่องมือ",
diff --git a/web/i18n/th-TH/permission.json b/web/i18n/th-TH/permission.json
index 29fca093b18..767c2f329d9 100644
--- a/web/i18n/th-TH/permission.json
+++ b/web/i18n/th-TH/permission.json
@@ -1,14 +1,20 @@
{
+ "accessRule.accessPermission": "สิทธิ์การเข้าถึง",
"accessRule.actions": "การดําเนินการ",
- "accessRule.addException": "เพิ่มข้อยกเว้น",
"accessRule.addMemberAria": "เพิ่ม {{name}}",
"accessRule.addMembersTitle": "เพิ่มสมาชิก",
"accessRule.allPermittedMembers": "สมาชิกทั้งหมดที่มีสิทธิ์ตามบทบาท",
"accessRule.allPermittedMembersDescription": "สมาชิกที่มีสิทธิ์ตามบทบาทที่ตรงกันสามารถเข้าถึงทรัพยากรนี้ได้",
- "accessRule.appDescription": "ควบคุมว่าแอปนี้เปิดให้ใครเข้าถึง สมาชิกยังคงต้องมีสิทธิ์ตามบทบาทเพื่อดูหรือใช้งาน",
+ "accessRule.allowedMembers": "สมาชิกที่ได้รับอนุญาต",
+ "accessRule.appDescription": "กำหนดว่าใครสามารถเข้าถึงแอปนี้ได้ และระดับความละเอียดของสิทธิ์การเข้าถึง",
"accessRule.appTitle": "ชุดสิทธิ์แอป",
+ "accessRule.automaticallyIncludeWorkspaceMembers": "รวมสมาชิกพื้นที่ทำงานโดยอัตโนมัติ",
+ "accessRule.automaticallyIncludeWorkspaceMembersDescription": "สมาชิกพื้นที่ทำงานทั้งปัจจุบันและในอนาคตจะถูกรวมโดยอัตโนมัติ สิทธิ์ตามบทบาทยังคงกำหนดสิ่งที่พวกเขาทำได้",
+ "accessRule.batchRemoveDescription": "สมาชิกที่เลือกจะถูกนำออกจากรายชื่อสมาชิกที่ได้รับอนุญาต",
+ "accessRule.batchRemoveTitle": "นำสมาชิกที่เลือกออกหรือไม่",
"accessRule.changeOpenScopeDescription": "การเปลี่ยนขอบเขตการเปิดจะรีเซ็ตข้อยกเว้นสิทธิ์ของสมาชิกทั้งหมดสําหรับทรัพยากรนี้ คุณจะต้องเพิ่มข้อยกเว้นสิทธิ์ของสมาชิกอีกครั้งหลังจากเปลี่ยน",
"accessRule.changeOpenScopeTitle": "เปลี่ยนขอบเขตการเปิดของทรัพยากรหรือไม่",
+ "accessRule.collaborator": "ผู้ร่วมงาน",
"accessRule.collapseSection": "ยุบ {{title}}",
"accessRule.copied": "คัดลอกกฎการเข้าถึงสําเร็จ",
"accessRule.created": "สร้างกฎการเข้าถึงสําเร็จ",
@@ -20,20 +26,17 @@
"accessRule.deleted": "ลบกฎการเข้าถึงสําเร็จ",
"accessRule.exceptionPermissionFor": "สิทธิ์ข้อยกเว้นสําหรับ {{name}}",
"accessRule.expandSection": "ขยาย {{title}}",
- "accessRule.individualPermissionSettings": "ข้อยกเว้นสิทธิ์ของสมาชิก",
- "accessRule.individualPermissionSettingsTip": "ตั้งค่าข้อยกเว้นสิทธิ์สําหรับผู้ร่วมงานหรือกลุ่มที่เฉพาะเจาะจง การตั้งค่าเหล่านี้จะแทนที่สิทธิ์ตามบทบาทของพวกเขา",
"accessRule.maintainer": "ผู้ดูแล",
- "accessRule.member": "สมาชิกที่มีข้อยกเว้น",
"accessRule.newPermissionSet": "ชุดสิทธิ์ใหม่",
"accessRule.noAvailableMembers": "ไม่มีสมาชิกที่จะเพิ่มได้",
"accessRule.noDescription": "ไม่มีคําอธิบาย",
"accessRule.noRules": "ไม่มีกฎการเข้าถึง",
- "accessRule.noUserAccessSettings": "ไม่มีข้อยกเว้นสิทธิ์ของสมาชิก",
+ "accessRule.noUserAccessSettings": "ไม่มีสมาชิกที่ได้รับอนุญาตให้เข้าถึง",
"accessRule.onlyMe": "ฉันเท่านั้น",
"accessRule.onlyMeDescription": "เฉพาะคุณเท่านั้นที่เข้าถึงทรัพยากรนี้ได้",
- "accessRule.permission": "สิทธิ์ข้อยกเว้น",
"accessRule.resourceOpenScope": "ขอบเขตการเปิดของทรัพยากร",
"accessRule.resourceOpenScopeDescription": "เลือกว่าทรัพยากรนี้เปิดให้ใครเข้าถึง สิทธิ์ตามบทบาทยังคงเป็นตัวกําหนดว่าสมาชิกแต่ละคนทําอะไรได้บ้าง",
+ "accessRule.selected": "เลือกแล้ว",
"accessRule.specificMembersOnly": "เฉพาะสมาชิกที่ระบุเท่านั้น",
"accessRule.specificMembersOnlyDescription": "เฉพาะสมาชิกที่เลือกเท่านั้นที่สามารถเข้าถึงทรัพยากรนี้ได้",
"accessRule.summary_one": "ชุดสิทธิ์ {{count}} ชุด",
diff --git a/web/i18n/tr-TR/permission-keys.json b/web/i18n/tr-TR/permission-keys.json
index a02450808a7..36ba8ec9709 100644
--- a/web/i18n/tr-TR/permission-keys.json
+++ b/web/i18n/tr-TR/permission-keys.json
@@ -2,21 +2,21 @@
"agent.manage": "Agents'ı yönet",
"api_extension.manage": "API uzantısı yapılandırmasını yönet",
"app.access_config": "Uygulama erişim izinlerini yapılandır",
- "app.acl.access_config": "Uygulama erişim izinlerini yapılandır",
+ "app.acl.access_config": "Erişim izinlerini görüntüle ve yönet",
"app.acl.delete": "Uygulamayı sil",
"app.acl.deploy": "Uygulamayı dağıt",
- "app.acl.edit": "Uygulamayı düzenle ve düzenle",
- "app.acl.import_export_dsl": "DSL içe / dışa aktar",
- "app.acl.log_and_annotation": "Günlüklere ve açıklamalara eriş",
- "app.acl.monitor": "İzleme sayfasına eriş",
+ "app.acl.edit": "Uygulama bilgilerini düzenle ve uygulamayı orkestre et",
+ "app.acl.import_export_dsl": "Uygulama DSL'sini içe ve dışa aktar",
+ "app.acl.log_and_annotation": "Günlükleri ve açıklamaları görüntüle ve yönet",
+ "app.acl.monitor": "Uygulama izlemeyi görüntüle",
"app.acl.preview": "Uygulamayı önizle",
- "app.acl.release_and_version": "Uygulama yayınlama ve sürüm yönetimi",
+ "app.acl.release_and_version": "Uygulama sürümlerini yayınla ve yönet",
"app.acl.test_and_run": "Uygulamayı test et ve kullan",
- "app.acl.tracing_config": "Harici izlemeyi yapılandır",
- "app.acl.view_layout": "Salt okunur düzenleme sayfası",
+ "app.acl.tracing_config": "Uygulama izleme izlerini görüntüle ve yapılandır",
+ "app.acl.view_layout": "Uygulama orkestrasyonunu görüntüle",
"app.create_and_management": "Uygulama oluştur",
"app.tag.manage": "Uygulama etiketlerini yönet",
- "app_library.access": "Uygulama Kitaplığına eriş",
+ "app_library.access": "Uygulama Kitaplığını görüntüle ve kullan",
"billing.manage": "Abonelik planlarını değiştir",
"billing.subscription.manage": "Faturalandırma portalında faturalandırmayı ve abonelikleri yönet",
"billing.view": "Faturalandırma ayarlarına eriş",
@@ -26,18 +26,18 @@
"customization.manage": "Özelleştirmeyi yönet",
"data_source.manage": "Veri kaynağı yapılandırmasını yönet",
"dataset.access_config": "Bilgi tabanı erişim izinlerini yapılandır",
- "dataset.acl.access_config": "Bilgi tabanı erişim izinlerini yapılandır",
+ "dataset.acl.access_config": "Bilgi tabanı erişim izinlerini görüntüle ve yönet",
"dataset.acl.delete": "Bilgi tabanını sil",
- "dataset.acl.delete_file": "Bilgi tabanı dosyalarını sil",
- "dataset.acl.document_download": "Belgeleri indir",
- "dataset.acl.edit": "Bilgi tabanını düzenle",
- "dataset.acl.import_export_dsl": "Bilgi işlem hattı DSL'sini içe / dışa aktar",
- "dataset.acl.pipeline_release": "Bilgi işlem hattı yayınlama ve sürüm yönetimi",
- "dataset.acl.pipeline_test": "İşlem hattı testi",
+ "dataset.acl.delete_file": "Bilgi tabanı belgelerini sil",
+ "dataset.acl.document_download": "Bilgi tabanı belgelerini indir",
+ "dataset.acl.edit": "Bilgi tabanı içeriğini ve ayarlarını düzenle",
+ "dataset.acl.import_export_dsl": "İşlem hattı DSL'sini içe ve dışa aktar",
+ "dataset.acl.pipeline_release": "İşlem hattı sürümlerini yayınla ve yönet",
+ "dataset.acl.pipeline_test": "İşlem hattını test et",
"dataset.acl.preview": "Bilgi tabanını önizle",
- "dataset.acl.readonly": "Salt okunur bilgi tabanı",
- "dataset.acl.retrieval_recall": "Bilgi tabanı geri alımı",
- "dataset.acl.use": "Bilgi tabanına belge ekle",
+ "dataset.acl.readonly": "Bilgi tabanı içeriğini ve ayarlarını görüntüle",
+ "dataset.acl.retrieval_recall": "Geri alım testlerini görüntüle ve çalıştır",
+ "dataset.acl.use": "Bilgi tabanı belgelerini yükle",
"dataset.api_key.manage": "Bilgi tabanı API anahtarlarını yönet",
"dataset.create_and_management": "Bilgi tabanı oluştur",
"dataset.external.connect": "Harici bilgi tabanlarına bağlan",
@@ -48,6 +48,10 @@
"plugin.install": "Eklentileri yükle ve güncelle",
"plugin.model_config": "Modelleri yapılandır",
"plugin.plugin_preferences": "Otomatik güncellemeleri yapılandır",
+ "skill.delete": "Skill'i sil",
+ "skill.edit": "Skill'i düzenle",
+ "skill.publish": "Skill'i yayınla",
+ "skill.view": "Skill'i görüntüle",
"snippets.create_and_modify": "Snippet oluştur ve değiştir",
"snippets.management": "Snippet'leri yönet",
"tool.manage": "Araçları yönet",
diff --git a/web/i18n/tr-TR/permission.json b/web/i18n/tr-TR/permission.json
index cf58bdb3e90..f164724b816 100644
--- a/web/i18n/tr-TR/permission.json
+++ b/web/i18n/tr-TR/permission.json
@@ -1,14 +1,20 @@
{
+ "accessRule.accessPermission": "Erişim izni",
"accessRule.actions": "Eylemler",
- "accessRule.addException": "İstisna ekle",
"accessRule.addMemberAria": "{{name}} ekle",
"accessRule.addMembersTitle": "Üye ekle",
"accessRule.allPermittedMembers": "Rol izinlerine sahip tüm üyeler",
"accessRule.allPermittedMembersDescription": "Eşleşen rol izinlerine sahip üyeler bu kaynağa erişebilir.",
- "accessRule.appDescription": "Bu uygulamanın kime açık olduğunu kontrol edin. Üyelerin yine de onu görüntülemek veya işletmek için rol izinlerine ihtiyacı vardır.",
+ "accessRule.allowedMembers": "İzin verilen üyeler",
+ "accessRule.appDescription": "Bu uygulamaya kimlerin erişebileceğini ve erişim izinlerinin ayrıntı düzeyini ayarlayın.",
"accessRule.appTitle": "Uygulama izin kümesi",
+ "accessRule.automaticallyIncludeWorkspaceMembers": "Çalışma alanı üyelerini otomatik olarak dahil et",
+ "accessRule.automaticallyIncludeWorkspaceMembersDescription": "Mevcut ve gelecekteki tüm çalışma alanı üyeleri otomatik olarak dahil edilir. Rol izinleri, neler yapabileceklerini belirlemeye devam eder.",
+ "accessRule.batchRemoveDescription": "Seçilen üyeler izin verilen üyeler listesinden kaldırılacak.",
+ "accessRule.batchRemoveTitle": "Seçilen üyeler kaldırılsın mı?",
"accessRule.changeOpenScopeDescription": "Açık kapsamı değiştirmek bu kaynak için tüm üye izin istisnalarını sıfırlar. Geçiş yaptıktan sonra üye izin istisnalarını yeniden eklemeniz gerekir.",
"accessRule.changeOpenScopeTitle": "Kaynak açık kapsamı değiştirilsin mi?",
+ "accessRule.collaborator": "İşbirlikçi",
"accessRule.collapseSection": "{{title}} daralt",
"accessRule.copied": "Erişim kuralı başarıyla kopyalandı",
"accessRule.created": "Erişim kuralı başarıyla oluşturuldu",
@@ -20,20 +26,17 @@
"accessRule.deleted": "Erişim kuralı başarıyla silindi",
"accessRule.exceptionPermissionFor": "{{name}} için istisna izni",
"accessRule.expandSection": "{{title}} genişlet",
- "accessRule.individualPermissionSettings": "Üye izin istisnaları",
- "accessRule.individualPermissionSettingsTip": "Belirli işbirlikçiler veya gruplar için izin istisnaları ayarlayın. Bu ayarlar onların rol izinlerini geçersiz kılar.",
"accessRule.maintainer": "Bakımcı",
- "accessRule.member": "İstisnalı üye",
"accessRule.newPermissionSet": "Yeni izin kümesi",
"accessRule.noAvailableMembers": "Eklenecek uygun üye yok",
"accessRule.noDescription": "Açıklama yok",
"accessRule.noRules": "Erişim kuralı yok",
- "accessRule.noUserAccessSettings": "Üye izin istisnası yok",
+ "accessRule.noUserAccessSettings": "Erişim izni verilen üye yok",
"accessRule.onlyMe": "Yalnızca ben",
"accessRule.onlyMeDescription": "Bu kaynağa yalnızca siz erişebilirsiniz.",
- "accessRule.permission": "İstisna izni",
"accessRule.resourceOpenScope": "Kaynak açık kapsamı",
"accessRule.resourceOpenScopeDescription": "Bu kaynağın kime açık olduğunu seçin. Her üyenin ne yapabileceğine yine de rol izinleri karar verir.",
+ "accessRule.selected": "Seçildi",
"accessRule.specificMembersOnly": "Yalnızca belirli üyeler",
"accessRule.specificMembersOnlyDescription": "Bu kaynağa yalnızca seçilen üyeler erişebilir.",
"accessRule.summary_one": "{{count}} izin kümesi",
diff --git a/web/i18n/uk-UA/permission-keys.json b/web/i18n/uk-UA/permission-keys.json
index 3de62f8e280..861c83a4367 100644
--- a/web/i18n/uk-UA/permission-keys.json
+++ b/web/i18n/uk-UA/permission-keys.json
@@ -2,21 +2,21 @@
"agent.manage": "Керування Agents",
"api_extension.manage": "Керування конфігурацією розширення API",
"app.access_config": "Налаштування дозволів доступу до застосунку",
- "app.acl.access_config": "Налаштування дозволів доступу до застосунку",
+ "app.acl.access_config": "Переглядати дозволи доступу та керувати ними",
"app.acl.delete": "Видалити застосунок",
"app.acl.deploy": "Розгорнути застосунок",
- "app.acl.edit": "Редагувати та оркеструвати застосунок",
- "app.acl.import_export_dsl": "Імпорт / експорт DSL",
- "app.acl.log_and_annotation": "Доступ до журналів і анотацій",
- "app.acl.monitor": "Доступ до сторінки моніторингу",
+ "app.acl.edit": "Редагувати інформацію про застосунок та оркеструвати застосунок",
+ "app.acl.import_export_dsl": "Імпортувати та експортувати DSL застосунку",
+ "app.acl.log_and_annotation": "Переглядати журнали й анотації та керувати ними",
+ "app.acl.monitor": "Переглядати моніторинг застосунку",
"app.acl.preview": "Попередній перегляд застосунку",
- "app.acl.release_and_version": "Публікація застосунку та керування версіями",
+ "app.acl.release_and_version": "Публікувати версії застосунку та керувати ними",
"app.acl.test_and_run": "Тестувати та використовувати застосунок",
- "app.acl.tracing_config": "Налаштування зовнішнього трасування",
- "app.acl.view_layout": "Сторінка оркестрації лише для читання",
+ "app.acl.tracing_config": "Переглядати й налаштовувати трасування моніторингу застосунку",
+ "app.acl.view_layout": "Переглядати оркестрацію застосунку",
"app.create_and_management": "Створювати застосунки",
"app.tag.manage": "Керування тегами застосунків",
- "app_library.access": "Доступ до бібліотеки застосунків",
+ "app_library.access": "Переглядати й використовувати бібліотеку застосунків",
"billing.manage": "Зміна планів підписки",
"billing.subscription.manage": "Керування рахунками та підписками в порталі оплати",
"billing.view": "Доступ до налаштувань оплати",
@@ -26,18 +26,18 @@
"customization.manage": "Керування налаштуванням вигляду",
"data_source.manage": "Керування конфігурацією джерела даних",
"dataset.access_config": "Налаштування дозволів доступу до бази знань",
- "dataset.acl.access_config": "Налаштування дозволів доступу до бази знань",
+ "dataset.acl.access_config": "Переглядати дозволи доступу до бази знань та керувати ними",
"dataset.acl.delete": "Видалити базу знань",
- "dataset.acl.delete_file": "Видалити файли бази знань",
- "dataset.acl.document_download": "Завантажувати документи",
- "dataset.acl.edit": "Редагувати базу знань",
- "dataset.acl.import_export_dsl": "Імпорт / експорт DSL конвеєра знань",
- "dataset.acl.pipeline_release": "Публікація конвеєра знань та керування версіями",
- "dataset.acl.pipeline_test": "Тестування конвеєра",
+ "dataset.acl.delete_file": "Видаляти документи бази знань",
+ "dataset.acl.document_download": "Завантажувати документи з бази знань",
+ "dataset.acl.edit": "Редагувати вміст і налаштування бази знань",
+ "dataset.acl.import_export_dsl": "Імпортувати та експортувати DSL конвеєра",
+ "dataset.acl.pipeline_release": "Публікувати версії конвеєра та керувати ними",
+ "dataset.acl.pipeline_test": "Тестувати конвеєр",
"dataset.acl.preview": "Попередній перегляд бази знань",
- "dataset.acl.readonly": "База знань лише для читання",
- "dataset.acl.retrieval_recall": "Пошук у базі знань",
- "dataset.acl.use": "Додавати документи до бази знань",
+ "dataset.acl.readonly": "Переглядати вміст і налаштування бази знань",
+ "dataset.acl.retrieval_recall": "Переглядати та виконувати тести вибірки",
+ "dataset.acl.use": "Завантажувати документи до бази знань",
"dataset.api_key.manage": "Керування ключами API бази знань",
"dataset.create_and_management": "Створювати бази знань",
"dataset.external.connect": "Підключати зовнішні бази знань",
@@ -48,6 +48,10 @@
"plugin.install": "Встановлення та оновлення плагінів",
"plugin.model_config": "Налаштування моделей",
"plugin.plugin_preferences": "Налаштування автоматичних оновлень",
+ "skill.delete": "Видалення Skill",
+ "skill.edit": "Редагування Skill",
+ "skill.publish": "Публікація Skill",
+ "skill.view": "Перегляд Skill",
"snippets.create_and_modify": "Створювати та змінювати фрагменти",
"snippets.management": "Керування фрагментами",
"tool.manage": "Керування інструментами",
diff --git a/web/i18n/uk-UA/permission.json b/web/i18n/uk-UA/permission.json
index 53bd59a24b4..cb128b8b822 100644
--- a/web/i18n/uk-UA/permission.json
+++ b/web/i18n/uk-UA/permission.json
@@ -1,14 +1,20 @@
{
+ "accessRule.accessPermission": "Дозвіл на доступ",
"accessRule.actions": "Дії",
- "accessRule.addException": "Додати виняток",
"accessRule.addMemberAria": "Додати {{name}}",
"accessRule.addMembersTitle": "Додати учасників",
"accessRule.allPermittedMembers": "Усі учасники з дозволами ролей",
"accessRule.allPermittedMembersDescription": "Учасники з відповідними дозволами ролей можуть отримати доступ до цього ресурсу.",
- "accessRule.appDescription": "Контролюйте, кому відкрито цей застосунок. Учасникам усе одно потрібні дозволи ролей, щоб переглядати його чи працювати з ним.",
+ "accessRule.allowedMembers": "Дозволені учасники",
+ "accessRule.appDescription": "Налаштуйте, хто може отримати доступ до цього застосунку, і рівень деталізації дозволів доступу.",
"accessRule.appTitle": "Набір дозволів застосунку",
+ "accessRule.automaticallyIncludeWorkspaceMembers": "Автоматично включати учасників робочого простору",
+ "accessRule.automaticallyIncludeWorkspaceMembersDescription": "Усі поточні й майбутні учасники робочого простору включаються автоматично. Дозволи ролей і надалі визначають, що вони можуть робити.",
+ "accessRule.batchRemoveDescription": "Вибраних учасників буде вилучено зі списку дозволених учасників.",
+ "accessRule.batchRemoveTitle": "Вилучити вибраних учасників?",
"accessRule.changeOpenScopeDescription": "Зміна сфери відкритості скине всі винятки дозволів для учасників цього ресурсу. Після перемикання вам потрібно буде знову додати винятки дозволів для учасників.",
"accessRule.changeOpenScopeTitle": "Змінити сферу відкритості ресурсу?",
+ "accessRule.collaborator": "Співавтор",
"accessRule.collapseSection": "Згорнути {{title}}",
"accessRule.copied": "Правило доступу успішно скопійовано",
"accessRule.created": "Правило доступу успішно створено",
@@ -20,20 +26,17 @@
"accessRule.deleted": "Правило доступу успішно видалено",
"accessRule.exceptionPermissionFor": "Винятковий дозвіл для {{name}}",
"accessRule.expandSection": "Розгорнути {{title}}",
- "accessRule.individualPermissionSettings": "Винятки дозволів для учасників",
- "accessRule.individualPermissionSettingsTip": "Установіть винятки дозволів для конкретних співавторів або груп. Ці налаштування перевизначають дозволи їхніх ролей.",
"accessRule.maintainer": "Супроводжувач",
- "accessRule.member": "Учасник із винятком",
"accessRule.newPermissionSet": "Новий набір дозволів",
"accessRule.noAvailableMembers": "Немає доступних учасників для додавання",
"accessRule.noDescription": "Немає опису",
"accessRule.noRules": "Немає правил доступу",
- "accessRule.noUserAccessSettings": "Немає винятків дозволів для учасників",
+ "accessRule.noUserAccessSettings": "Немає учасників із доступом",
"accessRule.onlyMe": "Лише я",
"accessRule.onlyMeDescription": "Лише ви можете отримати доступ до цього ресурсу.",
- "accessRule.permission": "Винятковий дозвіл",
"accessRule.resourceOpenScope": "Сфера відкритості ресурсу",
"accessRule.resourceOpenScopeDescription": "Виберіть, кому відкрито цей ресурс. Дозволи ролей усе одно визначають, що може робити кожен учасник.",
+ "accessRule.selected": "Вибрано",
"accessRule.specificMembersOnly": "Лише певні учасники",
"accessRule.specificMembersOnlyDescription": "Доступ до цього ресурсу можуть отримати лише вибрані учасники.",
"accessRule.summary_one": "{{count}} набір дозволів",
diff --git a/web/i18n/vi-VN/permission-keys.json b/web/i18n/vi-VN/permission-keys.json
index 006aafaa69c..1e6662a9304 100644
--- a/web/i18n/vi-VN/permission-keys.json
+++ b/web/i18n/vi-VN/permission-keys.json
@@ -2,21 +2,21 @@
"agent.manage": "Quản lý Agents",
"api_extension.manage": "Quản lý cấu hình phần mở rộng API",
"app.access_config": "Cấu hình quyền truy cập ứng dụng",
- "app.acl.access_config": "Cấu hình quyền truy cập ứng dụng",
+ "app.acl.access_config": "Xem và quản lý quyền truy cập",
"app.acl.delete": "Xóa ứng dụng",
"app.acl.deploy": "Triển khai ứng dụng",
- "app.acl.edit": "Chỉnh sửa và điều phối ứng dụng",
- "app.acl.import_export_dsl": "Nhập / xuất DSL",
- "app.acl.log_and_annotation": "Truy cập nhật ký và chú thích",
- "app.acl.monitor": "Truy cập trang giám sát",
+ "app.acl.edit": "Chỉnh sửa thông tin và điều phối ứng dụng",
+ "app.acl.import_export_dsl": "Nhập và xuất DSL ứng dụng",
+ "app.acl.log_and_annotation": "Xem và quản lý nhật ký và chú thích",
+ "app.acl.monitor": "Xem giám sát ứng dụng",
"app.acl.preview": "Xem trước ứng dụng",
- "app.acl.release_and_version": "Phát hành ứng dụng và quản lý phiên bản",
+ "app.acl.release_and_version": "Phát hành và quản lý phiên bản ứng dụng",
"app.acl.test_and_run": "Kiểm thử và sử dụng ứng dụng",
- "app.acl.tracing_config": "Cấu hình tracing bên ngoài",
- "app.acl.view_layout": "Trang điều phối chỉ đọc",
+ "app.acl.tracing_config": "Xem và cấu hình truy vết giám sát ứng dụng",
+ "app.acl.view_layout": "Xem điều phối ứng dụng",
"app.create_and_management": "Tạo ứng dụng",
"app.tag.manage": "Quản lý thẻ ứng dụng",
- "app_library.access": "Truy cập Thư viện ứng dụng",
+ "app_library.access": "Xem và sử dụng Thư viện ứng dụng",
"billing.manage": "Thay đổi gói đăng ký",
"billing.subscription.manage": "Quản lý thanh toán và đăng ký trong cổng thanh toán",
"billing.view": "Truy cập cài đặt Thanh toán",
@@ -26,18 +26,18 @@
"customization.manage": "Quản lý tùy chỉnh",
"data_source.manage": "Quản lý cấu hình nguồn dữ liệu",
"dataset.access_config": "Cấu hình quyền truy cập cơ sở tri thức",
- "dataset.acl.access_config": "Cấu hình quyền truy cập cơ sở tri thức",
+ "dataset.acl.access_config": "Xem và quản lý quyền truy cập cơ sở tri thức",
"dataset.acl.delete": "Xóa cơ sở tri thức",
- "dataset.acl.delete_file": "Xóa tệp cơ sở tri thức",
- "dataset.acl.document_download": "Tải xuống tài liệu",
- "dataset.acl.edit": "Chỉnh sửa cơ sở tri thức",
- "dataset.acl.import_export_dsl": "Nhập / xuất DSL quy trình tri thức",
- "dataset.acl.pipeline_release": "Phát hành quy trình tri thức và quản lý phiên bản",
- "dataset.acl.pipeline_test": "Kiểm thử quy trình",
+ "dataset.acl.delete_file": "Xóa tài liệu cơ sở tri thức",
+ "dataset.acl.document_download": "Tải xuống tài liệu cơ sở tri thức",
+ "dataset.acl.edit": "Chỉnh sửa nội dung và cấu hình cơ sở tri thức",
+ "dataset.acl.import_export_dsl": "Nhập và xuất DSL quy trình",
+ "dataset.acl.pipeline_release": "Phát hành và quản lý phiên bản quy trình",
+ "dataset.acl.pipeline_test": "Kiểm tra quy trình",
"dataset.acl.preview": "Xem trước cơ sở tri thức",
- "dataset.acl.readonly": "Cơ sở tri thức chỉ đọc",
- "dataset.acl.retrieval_recall": "Truy xuất cơ sở tri thức",
- "dataset.acl.use": "Thêm tài liệu vào cơ sở tri thức",
+ "dataset.acl.readonly": "Xem nội dung và cấu hình cơ sở tri thức",
+ "dataset.acl.retrieval_recall": "Xem và thực hiện kiểm tra truy vấn",
+ "dataset.acl.use": "Tải tài liệu lên cơ sở tri thức",
"dataset.api_key.manage": "Quản lý khóa API cơ sở tri thức",
"dataset.create_and_management": "Tạo cơ sở tri thức",
"dataset.external.connect": "Kết nối cơ sở tri thức bên ngoài",
@@ -48,6 +48,10 @@
"plugin.install": "Cài đặt và cập nhật plugin",
"plugin.model_config": "Cấu hình mô hình",
"plugin.plugin_preferences": "Cấu hình cập nhật tự động",
+ "skill.delete": "Xóa Skill",
+ "skill.edit": "Chỉnh sửa Skill",
+ "skill.publish": "Xuất bản Skill",
+ "skill.view": "Xem Skill",
"snippets.create_and_modify": "Tạo và chỉnh sửa đoạn mã",
"snippets.management": "Quản lý đoạn mã",
"tool.manage": "Quản lý công cụ",
diff --git a/web/i18n/vi-VN/permission.json b/web/i18n/vi-VN/permission.json
index 46f22911fe8..bb6555b1a05 100644
--- a/web/i18n/vi-VN/permission.json
+++ b/web/i18n/vi-VN/permission.json
@@ -1,14 +1,20 @@
{
+ "accessRule.accessPermission": "Quyền truy cập",
"accessRule.actions": "Hành động",
- "accessRule.addException": "Thêm ngoại lệ",
"accessRule.addMemberAria": "Thêm {{name}}",
"accessRule.addMembersTitle": "Thêm thành viên",
"accessRule.allPermittedMembers": "Tất cả thành viên có quyền vai trò",
"accessRule.allPermittedMembersDescription": "Các thành viên có quyền vai trò phù hợp có thể truy cập tài nguyên này.",
- "accessRule.appDescription": "Kiểm soát ứng dụng này được mở cho ai. Các thành viên vẫn cần quyền vai trò để xem hoặc vận hành nó.",
+ "accessRule.allowedMembers": "Thành viên được phép",
+ "accessRule.appDescription": "Thiết lập ai có thể truy cập ứng dụng này và mức độ chi tiết của quyền truy cập.",
"accessRule.appTitle": "Bộ quyền ứng dụng",
+ "accessRule.automaticallyIncludeWorkspaceMembers": "Tự động bao gồm thành viên không gian làm việc",
+ "accessRule.automaticallyIncludeWorkspaceMembersDescription": "Tất cả thành viên hiện tại và tương lai của không gian làm việc sẽ được tự động bao gồm. Quyền theo vai trò vẫn quyết định những gì họ có thể làm.",
+ "accessRule.batchRemoveDescription": "Các thành viên đã chọn sẽ bị xóa khỏi danh sách thành viên được phép.",
+ "accessRule.batchRemoveTitle": "Xóa các thành viên đã chọn?",
"accessRule.changeOpenScopeDescription": "Việc thay đổi phạm vi mở sẽ đặt lại tất cả ngoại lệ quyền của thành viên cho tài nguyên này. Bạn sẽ cần thêm lại các ngoại lệ quyền của thành viên sau khi chuyển đổi.",
"accessRule.changeOpenScopeTitle": "Thay đổi phạm vi mở của tài nguyên?",
+ "accessRule.collaborator": "Cộng tác viên",
"accessRule.collapseSection": "Thu gọn {{title}}",
"accessRule.copied": "Đã sao chép quy tắc truy cập thành công",
"accessRule.created": "Đã tạo quy tắc truy cập thành công",
@@ -20,20 +26,17 @@
"accessRule.deleted": "Đã xóa quy tắc truy cập thành công",
"accessRule.exceptionPermissionFor": "Quyền ngoại lệ cho {{name}}",
"accessRule.expandSection": "Mở rộng {{title}}",
- "accessRule.individualPermissionSettings": "Ngoại lệ quyền của thành viên",
- "accessRule.individualPermissionSettingsTip": "Đặt các ngoại lệ về quyền cho các cộng tác viên hoặc nhóm cụ thể. Các cài đặt này sẽ ghi đè quyền vai trò của họ.",
"accessRule.maintainer": "Người bảo trì",
- "accessRule.member": "Thành viên có ngoại lệ",
"accessRule.newPermissionSet": "Bộ quyền mới",
"accessRule.noAvailableMembers": "Không có thành viên nào để thêm",
"accessRule.noDescription": "Không có mô tả",
"accessRule.noRules": "Không có quy tắc truy cập",
- "accessRule.noUserAccessSettings": "Không có ngoại lệ quyền của thành viên",
+ "accessRule.noUserAccessSettings": "Không có thành viên nào được phép truy cập",
"accessRule.onlyMe": "Chỉ mình tôi",
"accessRule.onlyMeDescription": "Chỉ bạn có thể truy cập tài nguyên này.",
- "accessRule.permission": "Quyền ngoại lệ",
"accessRule.resourceOpenScope": "Phạm vi mở của tài nguyên",
"accessRule.resourceOpenScopeDescription": "Chọn tài nguyên này được mở cho ai. Quyền vai trò vẫn quyết định mỗi thành viên có thể làm gì.",
+ "accessRule.selected": "Đã chọn",
"accessRule.specificMembersOnly": "Chỉ các thành viên cụ thể",
"accessRule.specificMembersOnlyDescription": "Chỉ các thành viên được chọn mới có thể truy cập tài nguyên này.",
"accessRule.summary_one": "{{count}} bộ quyền",
diff --git a/web/i18n/zh-Hans/permission-keys.json b/web/i18n/zh-Hans/permission-keys.json
index 864941f7f59..91d9afb2cc8 100644
--- a/web/i18n/zh-Hans/permission-keys.json
+++ b/web/i18n/zh-Hans/permission-keys.json
@@ -2,21 +2,21 @@
"agent.manage": "管理 Agents",
"api_extension.manage": "管理API扩展",
"app.access_config": "配置应用访问权限",
- "app.acl.access_config": "配置应用访问权限",
+ "app.acl.access_config": "查看与管理访问权限",
"app.acl.delete": "删除应用",
"app.acl.deploy": "部署应用",
- "app.acl.edit": "编辑与编排应用",
- "app.acl.import_export_dsl": "导入 / 导出 DSL",
- "app.acl.log_and_annotation": "访问日志与标注",
- "app.acl.monitor": "访问监测页面",
+ "app.acl.edit": "编辑应用信息与编排应用",
+ "app.acl.import_export_dsl": "导入与导出应用 DSL",
+ "app.acl.log_and_annotation": "查看与管理日志与标注",
+ "app.acl.monitor": "查看应用监测",
"app.acl.preview": "预览应用",
- "app.acl.release_and_version": "应用发布与版本管理",
+ "app.acl.release_and_version": "发布与管理应用版本",
"app.acl.test_and_run": "测试与使用应用",
- "app.acl.tracing_config": "配置外部追踪",
- "app.acl.view_layout": "编排页只读",
+ "app.acl.tracing_config": "查看与配置应用监测追踪",
+ "app.acl.view_layout": "查看应用编排",
"app.create_and_management": "创建应用",
"app.tag.manage": "管理应用标签",
- "app_library.access": "访问应用库",
+ "app_library.access": "查看与使用应用库",
"billing.manage": "更换订阅套餐",
"billing.subscription.manage": "在账单门户管理账单与订阅方案",
"billing.view": "在设置中访问账单页面",
@@ -26,18 +26,18 @@
"customization.manage": "管理定制",
"data_source.manage": "管理数据来源",
"dataset.access_config": "配置知识库访问权限",
- "dataset.acl.access_config": "配置知识库访问权限",
+ "dataset.acl.access_config": "查看与管理知识库访问权限",
"dataset.acl.delete": "删除知识库",
- "dataset.acl.delete_file": "删除知识库文件",
- "dataset.acl.document_download": "文档下载",
- "dataset.acl.edit": "知识库编辑",
- "dataset.acl.import_export_dsl": "从 DSL 导入 / 导出知识流水线 DSL",
- "dataset.acl.pipeline_release": "知识库流水线发布与版本管理",
- "dataset.acl.pipeline_test": "流水线测试",
+ "dataset.acl.delete_file": "删除知识库文档",
+ "dataset.acl.document_download": "下载知识库文档",
+ "dataset.acl.edit": "编辑知识库内容与配置",
+ "dataset.acl.import_export_dsl": "导入与导出流水线 DSL",
+ "dataset.acl.pipeline_release": "发布与管理流水线版本",
+ "dataset.acl.pipeline_test": "测试流水线",
"dataset.acl.preview": "预览知识库",
- "dataset.acl.readonly": "知识库只读",
- "dataset.acl.retrieval_recall": "知识库检索召回",
- "dataset.acl.use": "向知识库新增文件",
+ "dataset.acl.readonly": "查看知识库内容与配置",
+ "dataset.acl.retrieval_recall": "查看与执行召回测试",
+ "dataset.acl.use": "上传知识库文档",
"dataset.api_key.manage": "管理知识库 API Key",
"dataset.create_and_management": "创建知识库",
"dataset.external.connect": "连接外部知识库",
@@ -48,6 +48,10 @@
"plugin.install": "安装与更新插件",
"plugin.model_config": "配置模型",
"plugin.plugin_preferences": "配置自动更新",
+ "skill.delete": "删除 Skill",
+ "skill.edit": "编辑 Skill",
+ "skill.publish": "发布 Skill",
+ "skill.view": "查看 Skill",
"snippets.create_and_modify": "创建和修改 Snippets",
"snippets.management": "管理 Snippets",
"tool.manage": "管理工具",
diff --git a/web/i18n/zh-Hans/permission.json b/web/i18n/zh-Hans/permission.json
index 5f1496cc041..41f9a51eea6 100644
--- a/web/i18n/zh-Hans/permission.json
+++ b/web/i18n/zh-Hans/permission.json
@@ -1,14 +1,20 @@
{
+ "accessRule.accessPermission": "访问权限",
"accessRule.actions": "操作",
- "accessRule.addException": "添加例外",
"accessRule.addMemberAria": "添加 {{name}}",
"accessRule.addMembersTitle": "添加成员",
"accessRule.allPermittedMembers": "全部成员",
"accessRule.allPermittedMembersDescription": "所有具备对应角色权限的成员均可访问",
- "accessRule.appDescription": "设置谁可以访问此应用,以及个别成员的权限例外",
+ "accessRule.allowedMembers": "允许访问的成员",
+ "accessRule.appDescription": "设置谁可以访问此应用,以及访问权限粒度",
"accessRule.appTitle": "应用权限集",
+ "accessRule.automaticallyIncludeWorkspaceMembers": "自动包含工作空间成员",
+ "accessRule.automaticallyIncludeWorkspaceMembersDescription": "自动包含当前及未来加入的所有工作空间成员。角色权限仍决定他们可执行的操作。",
+ "accessRule.batchRemoveDescription": "所选成员将从允许访问的成员列表中移除。",
+ "accessRule.batchRemoveTitle": "移除所选成员?",
"accessRule.changeOpenScopeDescription": "更改开放范围会重置此资源的所有成员例外权限。切换后,你需要重新添加成员例外权限。",
"accessRule.changeOpenScopeTitle": "更改资源开放范围?",
+ "accessRule.collaborator": "协作者",
"accessRule.collapseSection": "折叠 {{title}}",
"accessRule.copied": "访问规则已复制",
"accessRule.created": "访问规则已创建",
@@ -20,20 +26,17 @@
"accessRule.deleted": "访问规则已删除",
"accessRule.exceptionPermissionFor": "{{name}} 的例外权限",
"accessRule.expandSection": "展开 {{title}}",
- "accessRule.individualPermissionSettings": "成员例外权限",
- "accessRule.individualPermissionSettingsTip": "为指定协作者或群组设置权限例外。这些设置会覆盖其角色权限。",
"accessRule.maintainer": "维护者",
- "accessRule.member": "例外成员",
"accessRule.newPermissionSet": "新建权限集",
"accessRule.noAvailableMembers": "暂无可添加成员",
"accessRule.noDescription": "无描述",
"accessRule.noRules": "暂无访问规则",
- "accessRule.noUserAccessSettings": "暂无成员例外权限",
+ "accessRule.noUserAccessSettings": "无允许访问的成员",
"accessRule.onlyMe": "仅自己",
"accessRule.onlyMeDescription": "仅你自己可以访问此资源。",
- "accessRule.permission": "例外权限",
"accessRule.resourceOpenScope": "访问范围",
"accessRule.resourceOpenScopeDescription": "选择此资源对哪些成员开放。角色权限仍决定每位成员可执行的操作。",
+ "accessRule.selected": "已选择",
"accessRule.specificMembersOnly": "指定成员",
"accessRule.specificMembersOnlyDescription": "仅被添加到下方列表的成员可访问",
"accessRule.summary_one": "{{count}} 个权限集",
diff --git a/web/i18n/zh-Hant/permission-keys.json b/web/i18n/zh-Hant/permission-keys.json
index b367bf03753..43350a59ada 100644
--- a/web/i18n/zh-Hant/permission-keys.json
+++ b/web/i18n/zh-Hant/permission-keys.json
@@ -2,21 +2,21 @@
"agent.manage": "管理 Agents",
"api_extension.manage": "管理API擴充配置",
"app.access_config": "配置應用訪問權限",
- "app.acl.access_config": "配置應用訪問權限",
+ "app.acl.access_config": "檢視與管理存取權限",
"app.acl.delete": "刪除應用",
"app.acl.deploy": "部署應用",
- "app.acl.edit": "編輯與編排應用",
- "app.acl.import_export_dsl": "匯入 / 匯出 DSL",
- "app.acl.log_and_annotation": "訪問日誌與標註",
- "app.acl.monitor": "訪問監測頁面",
+ "app.acl.edit": "編輯應用資訊與編排應用",
+ "app.acl.import_export_dsl": "匯入與匯出應用 DSL",
+ "app.acl.log_and_annotation": "檢視與管理日誌與標註",
+ "app.acl.monitor": "檢視應用監測",
"app.acl.preview": "預覽應用",
- "app.acl.release_and_version": "應用發布與版本管理",
+ "app.acl.release_and_version": "發布與管理應用版本",
"app.acl.test_and_run": "測試與使用應用",
- "app.acl.tracing_config": "配置外部追蹤",
- "app.acl.view_layout": "編排頁唯讀",
+ "app.acl.tracing_config": "檢視與配置應用監測追蹤",
+ "app.acl.view_layout": "檢視應用編排",
"app.create_and_management": "建立應用",
"app.tag.manage": "管理應用標籤",
- "app_library.access": "訪問應用庫",
+ "app_library.access": "檢視與使用應用庫",
"billing.manage": "更換訂閱套餐",
"billing.subscription.manage": "在帳單入口網站管理帳單與訂閱方案",
"billing.view": "在設定中訪問帳單頁面",
@@ -26,18 +26,18 @@
"customization.manage": "管理自訂",
"data_source.manage": "管理資料來源配置",
"dataset.access_config": "配置知識庫訪問權限",
- "dataset.acl.access_config": "配置知識庫訪問權限",
+ "dataset.acl.access_config": "檢視與管理知識庫存取權限",
"dataset.acl.delete": "刪除知識庫",
- "dataset.acl.delete_file": "刪除知識庫檔案",
- "dataset.acl.document_download": "文件下載",
- "dataset.acl.edit": "知識庫編輯",
- "dataset.acl.import_export_dsl": "從 DSL 匯入 / 匯出知識流水線 DSL",
- "dataset.acl.pipeline_release": "知識庫流水線發布與版本管理",
- "dataset.acl.pipeline_test": "流水線測試",
+ "dataset.acl.delete_file": "刪除知識庫文件",
+ "dataset.acl.document_download": "下載知識庫文件",
+ "dataset.acl.edit": "編輯知識庫內容與配置",
+ "dataset.acl.import_export_dsl": "匯入與匯出流水線 DSL",
+ "dataset.acl.pipeline_release": "發布與管理流水線版本",
+ "dataset.acl.pipeline_test": "測試流水線",
"dataset.acl.preview": "預覽知識庫",
- "dataset.acl.readonly": "知識庫唯讀",
- "dataset.acl.retrieval_recall": "知識庫檢索召回",
- "dataset.acl.use": "向知識庫新增檔案",
+ "dataset.acl.readonly": "檢視知識庫內容與配置",
+ "dataset.acl.retrieval_recall": "檢視與執行檢索測試",
+ "dataset.acl.use": "上傳知識庫文件",
"dataset.api_key.manage": "管理知識庫 API Key",
"dataset.create_and_management": "建立知識庫",
"dataset.external.connect": "連接外部知識庫",
@@ -48,6 +48,10 @@
"plugin.install": "安裝與更新插件",
"plugin.model_config": "設定模型",
"plugin.plugin_preferences": "設定自動更新",
+ "skill.delete": "刪除 Skill",
+ "skill.edit": "編輯 Skill",
+ "skill.publish": "發布 Skill",
+ "skill.view": "檢視 Skill",
"snippets.create_and_modify": "建立和修改 Snippets",
"snippets.management": "管理 Snippets",
"tool.manage": "管理工具",
diff --git a/web/i18n/zh-Hant/permission.json b/web/i18n/zh-Hant/permission.json
index bad2554a895..217e7a108da 100644
--- a/web/i18n/zh-Hant/permission.json
+++ b/web/i18n/zh-Hant/permission.json
@@ -1,14 +1,20 @@
{
+ "accessRule.accessPermission": "存取權限",
"accessRule.actions": "操作",
- "accessRule.addException": "新增例外",
"accessRule.addMemberAria": "新增 {{name}}",
"accessRule.addMembersTitle": "新增成員",
"accessRule.allPermittedMembers": "全部成員",
"accessRule.allPermittedMembersDescription": "所有具備對應角色權限的成員均可訪問",
- "accessRule.appDescription": "設定誰可以訪問此應用,以及個別成員的權限例外",
+ "accessRule.allowedMembers": "允許存取的成員",
+ "accessRule.appDescription": "設定誰可以存取此應用,以及存取權限粒度",
"accessRule.appTitle": "應用權限集",
+ "accessRule.automaticallyIncludeWorkspaceMembers": "自動包含工作空間成員",
+ "accessRule.automaticallyIncludeWorkspaceMembersDescription": "自動包含目前及未來加入的所有工作空間成員。角色權限仍決定他們可執行的操作。",
+ "accessRule.batchRemoveDescription": "所選成員將從允許存取的成員列表中移除。",
+ "accessRule.batchRemoveTitle": "移除所選成員?",
"accessRule.changeOpenScopeDescription": "更改開放範圍會重置此資源的所有成員例外權限。切換後,你需要重新新增成員例外權限。",
"accessRule.changeOpenScopeTitle": "更改資源開放範圍?",
+ "accessRule.collaborator": "協作者",
"accessRule.collapseSection": "折疊 {{title}}",
"accessRule.copied": "訪問規則已複製",
"accessRule.created": "訪問規則已建立",
@@ -20,20 +26,17 @@
"accessRule.deleted": "訪問規則已刪除",
"accessRule.exceptionPermissionFor": "{{name}} 的例外權限",
"accessRule.expandSection": "展開 {{title}}",
- "accessRule.individualPermissionSettings": "成員例外權限",
- "accessRule.individualPermissionSettingsTip": "為指定協作者或群組設定權限例外。這些設定會覆蓋其角色權限。",
"accessRule.maintainer": "維護者",
- "accessRule.member": "例外成員",
"accessRule.newPermissionSet": "新增權限集",
"accessRule.noAvailableMembers": "暫無可新增成員",
"accessRule.noDescription": "無描述",
"accessRule.noRules": "暫無訪問規則",
- "accessRule.noUserAccessSettings": "暫無成員例外權限",
+ "accessRule.noUserAccessSettings": "無允許存取的成員",
"accessRule.onlyMe": "僅自己",
"accessRule.onlyMeDescription": "僅你自己可以存取此資源。",
- "accessRule.permission": "例外權限",
"accessRule.resourceOpenScope": "訪問範圍",
"accessRule.resourceOpenScopeDescription": "選擇此資源對哪些成員開放。角色權限仍決定每位成員可執行的操作。",
+ "accessRule.selected": "已選取",
"accessRule.specificMembersOnly": "指定成員",
"accessRule.specificMembersOnlyDescription": "僅被新增到下方列表的成員可訪問",
"accessRule.summary_one": "{{count}} 個權限集",
diff --git a/web/models/access-control.ts b/web/models/access-control.ts
index 0148b261814..e41869f4091 100644
--- a/web/models/access-control.ts
+++ b/web/models/access-control.ts
@@ -225,7 +225,7 @@ export type ResourceUserAccessSetting = {
type ResourceUserAccessSettingsResponse = {
data: ResourceUserAccessSetting[]
- scope: ResourceOpenScope
+ pagination: Pagination
}
export type GetMembersOfRoleResponse = {
@@ -256,5 +256,3 @@ export type RemoveAppAccessPolicyMemberBindingsRequest =
export type RemoveDatasetAccessPolicyMemberBindingsRequest =
RemoveResourceAccessPolicyMemberBindingsRequest
-
-export type ResourceOpenScope = 'all' | 'only_me' | 'specific'
diff --git a/web/service/access-control/__tests__/normalizers.spec.ts b/web/service/access-control/__tests__/normalizers.spec.ts
index 8a21b64e046..624147fccaf 100644
--- a/web/service/access-control/__tests__/normalizers.spec.ts
+++ b/web/service/access-control/__tests__/normalizers.spec.ts
@@ -5,19 +5,28 @@ const createResourceUserAccessPoliciesResponse = (
overrides: Partial<ResourceUserAccessPoliciesResponse> = {},
): ResourceUserAccessPoliciesResponse => ({
data: [],
- scope: 'specific',
...overrides,
})
describe('access-control normalizers', () => {
- // Resource access scope values come from the RBAC whitelist enum and must not be collapsed.
describe('Resource user access policies', () => {
- it('should preserve only-me open scope when normalizing app user access policies', () => {
+ it('should preserve pagination metadata', () => {
const response = createResourceUserAccessPoliciesResponse({
- scope: 'only_me',
+ pagination: {
+ current_page: 2,
+ per_page: 20,
+ total_count: 45,
+ total_pages: 3,
+ },
})
+ const result = normalizeAppUserAccessPolicies(response)
- expect(normalizeAppUserAccessPolicies(response).scope).toBe('only_me')
+ expect(result.pagination).toEqual({
+ current_page: 2,
+ per_page: 20,
+ total_count: 45,
+ total_pages: 3,
+ })
})
})
})
diff --git a/web/service/access-control/__tests__/resource-access-config.spec.tsx b/web/service/access-control/__tests__/resource-access-config.spec.tsx
new file mode 100644
index 00000000000..f289aae76b4
--- /dev/null
+++ b/web/service/access-control/__tests__/resource-access-config.spec.tsx
@@ -0,0 +1,365 @@
+import type { ReactNode } from 'react'
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
+import { act, renderHook, waitFor } from '@testing-library/react'
+import {
+ useAppResourceWhitelist,
+ useAppResourceWhitelistConfig,
+ useAppUserAccessSettings,
+ useRemoveAppAccessPolicyMemberBindings,
+ useUpdateAppAutomaticIncludeWorkspaceMembers,
+} from '../use-app-access-config'
+import {
+ useDatasetResourceWhitelistConfig,
+ useDatasetUserAccessSettings,
+ useRemoveDatasetAccessPolicyMemberBindings,
+ useUpdateDatasetAutomaticIncludeWorkspaceMembers,
+} from '../use-dataset-access-config'
+
+const mocks = vi.hoisted(() => ({
+ appPut: vi.fn(),
+ datasetPut: vi.fn(),
+ appDeleteMemberBindings: vi.fn(),
+ datasetDeleteMemberBindings: vi.fn(),
+ appUserGet: vi.fn(),
+ datasetUserGet: vi.fn(),
+ appWhitelistGet: vi.fn(),
+ appWhitelistConfigGet: vi.fn(),
+ datasetWhitelistConfigGet: vi.fn(),
+ appUserQueryOptions: vi.fn(),
+ datasetUserQueryOptions: vi.fn(),
+ appWhitelistQueryOptions: vi.fn(),
+ appWhitelistConfigQueryOptions: vi.fn(),
+ datasetWhitelistConfigQueryOptions: vi.fn(),
+}))
+
+vi.mock('@/service/client', () => ({
+ consoleClient: {
+ workspaces: {
+ current: {
+ rbac: {
+ apps: {
+ byAppId: {
+ accessPolicies: {
+ byPolicyId: {
+ memberBindings: { delete: mocks.appDeleteMemberBindings },
+ },
+ },
+ whitelist: { put: mocks.appPut },
+ },
+ },
+ datasets: {
+ byDatasetId: {
+ accessPolicies: {
+ byPolicyId: {
+ memberBindings: { delete: mocks.datasetDeleteMemberBindings },
+ },
+ },
+ whitelist: { put: mocks.datasetPut },
+ },
+ },
+ },
+ },
+ },
+ },
+ consoleQuery: {
+ workspaces: {
+ current: {
+ rbac: {
+ apps: {
+ byAppId: {
+ accessPolicy: { get: { key: () => ['app-access-policy'] } },
+ userAccessPolicies: {
+ get: {
+ key: () => ['app-user-access-policies'],
+ queryOptions: mocks.appUserQueryOptions,
+ },
+ },
+ whitelist: {
+ get: {
+ key: () => ['app-whitelist'],
+ queryOptions: mocks.appWhitelistQueryOptions,
+ },
+ },
+ whitelistConfig: {
+ get: {
+ key: () => ['app-whitelist-config'],
+ queryOptions: mocks.appWhitelistConfigQueryOptions,
+ },
+ },
+ },
+ },
+ datasets: {
+ byDatasetId: {
+ accessPolicy: { get: { key: () => ['dataset-access-policy'] } },
+ userAccessPolicies: {
+ get: {
+ key: () => ['dataset-user-access-policies'],
+ queryOptions: mocks.datasetUserQueryOptions,
+ },
+ },
+ whitelist: {
+ get: { key: () => ['dataset-whitelist'] },
+ },
+ whitelistConfig: {
+ get: {
+ key: () => ['dataset-whitelist-config'],
+ queryOptions: mocks.datasetWhitelistConfigQueryOptions,
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+}))
+
+const createHarness = () => {
+ const queryClient = new QueryClient({
+ defaultOptions: {
+ mutations: { retry: false },
+ queries: { retry: false },
+ },
+ })
+ const wrapper = ({ children }: { children: ReactNode }) => (
+ <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
+ )
+
+ return { queryClient, wrapper }
+}
+
+describe('resource access config queries and mutations', () => {
+ beforeEach(() => {
+ vi.clearAllMocks()
+ mocks.appUserGet.mockResolvedValue({
+ data: [],
+ pagination: {
+ current_page: 3,
+ per_page: 20,
+ total_count: 45,
+ total_pages: 3,
+ },
+ })
+ mocks.appWhitelistGet.mockResolvedValue({
+ account_ids: ['account-1'],
+ })
+ mocks.datasetUserGet.mockResolvedValue({
+ data: [],
+ pagination: {
+ current_page: 2,
+ per_page: 20,
+ total_count: 25,
+ total_pages: 2,
+ },
+ })
+ mocks.appUserQueryOptions.mockImplementation(({ input }) => ({
+ queryKey: ['app-user-access-policies', input],
+ queryFn: mocks.appUserGet,
+ }))
+ mocks.appWhitelistQueryOptions.mockImplementation(({ input }) => ({
+ queryKey: ['app-whitelist', input],
+ queryFn: mocks.appWhitelistGet,
+ }))
+ mocks.appWhitelistConfigGet.mockResolvedValue({
+ automatic_include_workspace_members: true,
+ })
+ mocks.appWhitelistConfigQueryOptions.mockImplementation(({ input }) => ({
+ queryKey: ['app-whitelist-config', input],
+ queryFn: mocks.appWhitelistConfigGet,
+ }))
+ mocks.datasetUserQueryOptions.mockImplementation(({ input }) => ({
+ queryKey: ['dataset-user-access-policies', input],
+ queryFn: mocks.datasetUserGet,
+ }))
+ mocks.datasetWhitelistConfigGet.mockResolvedValue({
+ automatic_include_workspace_members: false,
+ })
+ mocks.datasetWhitelistConfigQueryOptions.mockImplementation(({ input }) => ({
+ queryKey: ['dataset-whitelist-config', input],
+ queryFn: mocks.datasetWhitelistConfigGet,
+ }))
+ mocks.appPut.mockResolvedValue({
+ account_ids: [],
+ })
+ mocks.datasetPut.mockResolvedValue({
+ account_ids: [],
+ })
+ mocks.appDeleteMemberBindings.mockResolvedValue({ account_ids: [] })
+ mocks.datasetDeleteMemberBindings.mockResolvedValue({ account_ids: [] })
+ })
+
+ it('should request one stable page of app member policies', async () => {
+ const { wrapper } = createHarness()
+ const { result } = renderHook(() => useAppUserAccessSettings('app-1', 'en', 3, 50), {
+ wrapper,
+ })
+
+ await waitFor(() => expect(result.current.isSuccess).toBe(true))
+
+ expect(mocks.appUserQueryOptions).toHaveBeenCalledWith({
+ input: {
+ params: { app_id: 'app-1' },
+ query: { language: 'en', limit: 50, page: 3, reverse: false },
+ },
+ })
+ expect(result.current.data?.pagination.current_page).toBe(3)
+ })
+
+ it('should read full account ids from the app whitelist', async () => {
+ const { wrapper } = createHarness()
+ const { result } = renderHook(() => useAppResourceWhitelist('app-1'), { wrapper })
+
+ await waitFor(() => expect(result.current.isSuccess).toBe(true))
+
+ expect(mocks.appWhitelistQueryOptions).toHaveBeenCalledWith({
+ input: { params: { app_id: 'app-1' } },
+ })
+ expect(result.current.data).toEqual({
+ account_ids: ['account-1'],
+ })
+ })
+
+ it('should read app automatic inclusion from the whitelist config', async () => {
+ const { wrapper } = createHarness()
+ const { result } = renderHook(() => useAppResourceWhitelistConfig('app-1'), { wrapper })
+
+ await waitFor(() => expect(result.current.isSuccess).toBe(true))
+
+ expect(mocks.appWhitelistConfigQueryOptions).toHaveBeenCalledWith({
+ input: { params: { app_id: 'app-1' } },
+ })
+ expect(result.current.data).toEqual({
+ automatic_include_workspace_members: true,
+ })
+ })
+
+ it('should request one stable page of dataset member policies', async () => {
+ const { wrapper } = createHarness()
+ const { result } = renderHook(() => useDatasetUserAccessSettings('dataset-1', 'en', 2, 25), {
+ wrapper,
+ })
+
+ await waitFor(() => expect(result.current.isSuccess).toBe(true))
+
+ expect(mocks.datasetUserQueryOptions).toHaveBeenCalledWith({
+ input: {
+ params: { dataset_id: 'dataset-1' },
+ query: { language: 'en', limit: 25, page: 2, reverse: false },
+ },
+ })
+ })
+
+ it('should read dataset automatic inclusion from the whitelist config', async () => {
+ const { wrapper } = createHarness()
+ const { result } = renderHook(
+ () => useDatasetResourceWhitelistConfig('dataset-1', { enabled: true }),
+ { wrapper },
+ )
+
+ await waitFor(() => expect(result.current.isSuccess).toBe(true))
+
+ expect(mocks.datasetWhitelistConfigQueryOptions).toHaveBeenCalledWith({
+ input: { params: { dataset_id: 'dataset-1' } },
+ })
+ expect(result.current.data).toEqual({
+ automatic_include_workspace_members: false,
+ })
+ })
+
+ it('should update automatic inclusion and invalidate the app member list and whitelist data', async () => {
+ const { queryClient, wrapper } = createHarness()
+ const invalidateQueries = vi.spyOn(queryClient, 'invalidateQueries').mockResolvedValue()
+ const { result } = renderHook(() => useUpdateAppAutomaticIncludeWorkspaceMembers('app-1'), {
+ wrapper,
+ })
+
+ await act(async () => result.current.mutateAsync(true))
+
+ expect(mocks.appPut).toHaveBeenCalledWith({
+ params: { app_id: 'app-1' },
+ body: { automatic_include_workspace_members: true },
+ })
+ expect(invalidateQueries).toHaveBeenCalledTimes(3)
+ expect(invalidateQueries).toHaveBeenCalledWith({ queryKey: ['app-user-access-policies'] })
+ expect(invalidateQueries).toHaveBeenCalledWith({ queryKey: ['app-whitelist'] })
+ expect(invalidateQueries).toHaveBeenCalledWith({ queryKey: ['app-whitelist-config'] })
+ })
+
+ it('should update automatic inclusion and invalidate the dataset member list and whitelist data', async () => {
+ const { queryClient, wrapper } = createHarness()
+ const invalidateQueries = vi.spyOn(queryClient, 'invalidateQueries').mockResolvedValue()
+ const { result } = renderHook(
+ () => useUpdateDatasetAutomaticIncludeWorkspaceMembers('dataset-1'),
+ { wrapper },
+ )
+
+ await act(async () => result.current.mutateAsync(false))
+
+ expect(mocks.datasetPut).toHaveBeenCalledWith({
+ params: { dataset_id: 'dataset-1' },
+ body: { automatic_include_workspace_members: false },
+ })
+ expect(invalidateQueries).toHaveBeenCalledTimes(3)
+ expect(invalidateQueries).toHaveBeenCalledWith({ queryKey: ['dataset-user-access-policies'] })
+ expect(invalidateQueries).toHaveBeenCalledWith({ queryKey: ['dataset-whitelist'] })
+ expect(invalidateQueries).toHaveBeenCalledWith({ queryKey: ['dataset-whitelist-config'] })
+ })
+
+ it('should remove app member bindings in one mutation and invalidate queries once', async () => {
+ const { queryClient, wrapper } = createHarness()
+ const invalidateQueries = vi.spyOn(queryClient, 'invalidateQueries').mockResolvedValue()
+ const { result } = renderHook(() => useRemoveAppAccessPolicyMemberBindings('app-1'), {
+ wrapper,
+ })
+
+ await act(async () =>
+ result.current.mutateAsync([
+ { accessPolicyId: 'policy-1', accountIds: ['account-1', 'account-2'] },
+ { accessPolicyId: 'default', accountIds: ['account-3'] },
+ ]),
+ )
+
+ expect(mocks.appDeleteMemberBindings).toHaveBeenCalledTimes(2)
+ expect(mocks.appDeleteMemberBindings).toHaveBeenNthCalledWith(1, {
+ params: { app_id: 'app-1', policy_id: 'policy-1' },
+ body: { account_ids: ['account-1', 'account-2'] },
+ })
+ expect(mocks.appDeleteMemberBindings).toHaveBeenNthCalledWith(2, {
+ params: { app_id: 'app-1', policy_id: 'default' },
+ body: { account_ids: ['account-3'] },
+ })
+ expect(invalidateQueries).toHaveBeenCalledTimes(3)
+ expect(invalidateQueries).toHaveBeenCalledWith({ queryKey: ['app-user-access-policies'] })
+ expect(invalidateQueries).toHaveBeenCalledWith({ queryKey: ['app-access-policy'] })
+ expect(invalidateQueries).toHaveBeenCalledWith({ queryKey: ['app-whitelist'] })
+ })
+
+ it('should remove dataset member bindings in one mutation and invalidate queries once', async () => {
+ const { queryClient, wrapper } = createHarness()
+ const invalidateQueries = vi.spyOn(queryClient, 'invalidateQueries').mockResolvedValue()
+ const { result } = renderHook(() => useRemoveDatasetAccessPolicyMemberBindings('dataset-1'), {
+ wrapper,
+ })
+
+ await act(async () =>
+ result.current.mutateAsync([
+ { accessPolicyId: 'policy-1', accountIds: ['account-1', 'account-2'] },
+ { accessPolicyId: 'default', accountIds: ['account-3'] },
+ ]),
+ )
+
+ expect(mocks.datasetDeleteMemberBindings).toHaveBeenCalledTimes(2)
+ expect(mocks.datasetDeleteMemberBindings).toHaveBeenNthCalledWith(1, {
+ params: { dataset_id: 'dataset-1', policy_id: 'policy-1' },
+ body: { account_ids: ['account-1', 'account-2'] },
+ })
+ expect(mocks.datasetDeleteMemberBindings).toHaveBeenNthCalledWith(2, {
+ params: { dataset_id: 'dataset-1', policy_id: 'default' },
+ body: { account_ids: ['account-3'] },
+ })
+ expect(invalidateQueries).toHaveBeenCalledTimes(3)
+ expect(invalidateQueries).toHaveBeenCalledWith({ queryKey: ['dataset-user-access-policies'] })
+ expect(invalidateQueries).toHaveBeenCalledWith({ queryKey: ['dataset-access-policy'] })
+ expect(invalidateQueries).toHaveBeenCalledWith({ queryKey: ['dataset-whitelist'] })
+ })
+})
diff --git a/web/service/access-control/constants.ts b/web/service/access-control/constants.ts
new file mode 100644
index 00000000000..0746fbabeff
--- /dev/null
+++ b/web/service/access-control/constants.ts
@@ -0,0 +1,2 @@
+export const RESOURCE_ACCESS_SETTINGS_PAGE_SIZE_OPTIONS = [10, 25, 50] as const
+export const RESOURCE_ACCESS_SETTINGS_PAGE_SIZE = RESOURCE_ACCESS_SETTINGS_PAGE_SIZE_OPTIONS[0]
diff --git a/web/service/access-control/normalizers.ts b/web/service/access-control/normalizers.ts
index e30d844d707..b30b1eeaf42 100644
--- a/web/service/access-control/normalizers.ts
+++ b/web/service/access-control/normalizers.ts
@@ -6,7 +6,6 @@ import type {
GetAppUserAccessSettingsResponse,
GetDatasetAccessPolicyByDatasetIdResponse,
GetDatasetUserAccessSettingsResponse,
- ResourceOpenScope,
ResourceUserAccessSetting,
Role,
} from '@/models/access-control'
@@ -25,8 +24,6 @@ type GeneratedDatasetAccessMatrix =
type GeneratedRbacRole = import('@dify/contracts/api/console/workspaces/types.gen').RbacRole
type GeneratedRbacRoleAccount =
import('@dify/contracts/api/console/workspaces/types.gen').RbacRoleAccount
-type GeneratedResourceOpenScope =
- import('@dify/contracts/api/console/workspaces/types.gen').RbacResourceWhitelistScope
type GeneratedResourceUserAccessPoliciesResponse =
import('@dify/contracts/api/console/workspaces/types.gen').ResourceUserAccessPoliciesResponse
type GeneratedResourceUserAccessPolicies = NonNullable<
@@ -112,17 +109,6 @@ const isAccessPolicyWithBindings = (
return item !== null
}
-const normalizeResourceOpenScope = (scope: GeneratedResourceOpenScope): ResourceOpenScope => {
- switch (scope) {
- case 'all':
- return 'all'
- case 'only_me':
- return 'only_me'
- case 'specific':
- return 'specific'
- }
-}
-
const normalizeAccount = (
account: GeneratedRbacRoleAccount,
): ResourceUserAccessSetting['account'] => ({
@@ -159,7 +145,12 @@ const normalizeResourceUserAccessPolicies = (
data: (response.data ?? []).map((setting) =>
normalizeResourceUserAccessSetting(setting, fallbackResourceType),
),
- scope: normalizeResourceOpenScope(response.scope),
+ pagination: {
+ total_count: response.pagination?.total_count ?? response.data?.length ?? 0,
+ per_page: response.pagination?.per_page ?? response.data?.length ?? 0,
+ current_page: response.pagination?.current_page ?? 1,
+ total_pages: response.pagination?.total_pages ?? (response.data?.length ? 1 : 0),
+ },
})
export const normalizeAppAccessMatrix = (
diff --git a/web/service/access-control/use-app-access-config.ts b/web/service/access-control/use-app-access-config.ts
index 009360320c6..ca9b5f1b6df 100644
--- a/web/service/access-control/use-app-access-config.ts
+++ b/web/service/access-control/use-app-access-config.ts
@@ -1,10 +1,9 @@
import type { AccessControlTemplateLanguage } from '@/i18n-config/language'
import type {
RemoveAppAccessPolicyMemberBindingsRequest,
- ResourceOpenScope,
UpdateAppUserAccessSettingsRequest,
} from '@/models/access-control'
-import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
+import { keepPreviousData, useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
import { consoleClient, consoleQuery } from '@/service/client'
import { normalizeAppAccessMatrix, normalizeAppUserAccessPolicies } from './normalizers'
@@ -31,6 +30,8 @@ export const useAppAccessRules = (appId: string, language: AccessControlTemplate
export const useAppUserAccessSettings = (
appId: string,
language: AccessControlTemplateLanguage,
+ page: number,
+ pageSize: number,
) => {
return useQuery({
...appRbacContract.userAccessPolicies.get.queryOptions({
@@ -40,13 +41,41 @@ export const useAppUserAccessSettings = (
},
query: {
language,
+ limit: pageSize,
+ page,
+ reverse: false,
},
},
}),
+ placeholderData: keepPreviousData,
select: normalizeAppUserAccessPolicies,
})
}
+export const useAppResourceWhitelist = (appId: string) => {
+ return useQuery(
+ appRbacContract.whitelist.get.queryOptions({
+ input: {
+ params: {
+ app_id: appId,
+ },
+ },
+ }),
+ )
+}
+
+export const useAppResourceWhitelistConfig = (appId: string) => {
+ return useQuery(
+ appRbacContract.whitelistConfig.get.queryOptions({
+ input: {
+ params: {
+ app_id: appId,
+ },
+ },
+ }),
+ )
+}
+
export const useUpdateAppUserAccessSettings = (appId: string) => {
const queryClient = useQueryClient()
@@ -70,6 +99,9 @@ export const useUpdateAppUserAccessSettings = (appId: string) => {
queryClient.invalidateQueries({
queryKey: appRbacContract.accessPolicy.get.key({ type: 'query' }),
}),
+ queryClient.invalidateQueries({
+ queryKey: appRbacContract.whitelist.get.key({ type: 'query' }),
+ }),
])
},
})
@@ -80,16 +112,20 @@ export const useRemoveAppAccessPolicyMemberBindings = (appId: string) => {
return useMutation({
mutationKey: [NAME_SPACE, 'remove-app-access-policy-member-bindings', appId],
- mutationFn: (payload: RemoveAppAccessPolicyMemberBindingsRequest) =>
- appRbacClient.accessPolicies.byPolicyId.memberBindings.delete({
- params: {
- app_id: appId,
- policy_id: payload.accessPolicyId,
- },
- body: {
- account_ids: payload.accountIds,
- },
- }),
+ mutationFn: (removals: RemoveAppAccessPolicyMemberBindingsRequest[]) =>
+ Promise.all(
+ removals.map((removal) =>
+ appRbacClient.accessPolicies.byPolicyId.memberBindings.delete({
+ params: {
+ app_id: appId,
+ policy_id: removal.accessPolicyId,
+ },
+ body: {
+ account_ids: removal.accountIds,
+ },
+ }),
+ ),
+ ),
onSuccess: async () => {
await Promise.all([
queryClient.invalidateQueries({
@@ -98,23 +134,26 @@ export const useRemoveAppAccessPolicyMemberBindings = (appId: string) => {
queryClient.invalidateQueries({
queryKey: appRbacContract.accessPolicy.get.key({ type: 'query' }),
}),
+ queryClient.invalidateQueries({
+ queryKey: appRbacContract.whitelist.get.key({ type: 'query' }),
+ }),
])
},
})
}
-export const useUpdateAppOpenScope = (appId: string) => {
+export const useUpdateAppAutomaticIncludeWorkspaceMembers = (appId: string) => {
const queryClient = useQueryClient()
return useMutation({
- mutationKey: [NAME_SPACE, 'update-app-open-scope', appId],
- mutationFn: (openScope: ResourceOpenScope) =>
+ mutationKey: [NAME_SPACE, 'update-app-automatic-include-workspace-members', appId],
+ mutationFn: (automaticIncludeWorkspaceMembers: boolean) =>
appRbacClient.whitelist.put({
params: {
app_id: appId,
},
body: {
- scope: openScope,
+ automatic_include_workspace_members: automaticIncludeWorkspaceMembers,
},
}),
onSuccess: async () => {
@@ -122,6 +161,12 @@ export const useUpdateAppOpenScope = (appId: string) => {
queryClient.invalidateQueries({
queryKey: appRbacContract.userAccessPolicies.get.key({ type: 'query' }),
}),
+ queryClient.invalidateQueries({
+ queryKey: appRbacContract.whitelist.get.key({ type: 'query' }),
+ }),
+ queryClient.invalidateQueries({
+ queryKey: appRbacContract.whitelistConfig.get.key({ type: 'query' }),
+ }),
])
},
})
diff --git a/web/service/access-control/use-dataset-access-config.ts b/web/service/access-control/use-dataset-access-config.ts
index 6a6dd96e871..d3bb990c8ac 100644
--- a/web/service/access-control/use-dataset-access-config.ts
+++ b/web/service/access-control/use-dataset-access-config.ts
@@ -1,10 +1,9 @@
import type { AccessControlTemplateLanguage } from '@/i18n-config/language'
import type {
RemoveDatasetAccessPolicyMemberBindingsRequest,
- ResourceOpenScope,
UpdateDatasetUserAccessSettingsRequest,
} from '@/models/access-control'
-import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
+import { keepPreviousData, useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
import { consoleClient, consoleQuery } from '@/service/client'
import { normalizeDatasetAccessMatrix, normalizeDatasetUserAccessPolicies } from './normalizers'
@@ -40,6 +39,8 @@ export const useDatasetAccessRules = (
export const useDatasetUserAccessSettings = (
datasetId: string,
language: AccessControlTemplateLanguage,
+ page: number,
+ pageSize: number,
options?: DatasetAccessConfigQueryOptions,
) => {
return useQuery({
@@ -50,14 +51,50 @@ export const useDatasetUserAccessSettings = (
},
query: {
language,
+ limit: pageSize,
+ page,
+ reverse: false,
},
},
}),
enabled: options?.enabled ?? true,
+ placeholderData: keepPreviousData,
select: normalizeDatasetUserAccessPolicies,
})
}
+export const useDatasetResourceWhitelist = (
+ datasetId: string,
+ options?: DatasetAccessConfigQueryOptions,
+) => {
+ return useQuery({
+ ...datasetRbacContract.whitelist.get.queryOptions({
+ input: {
+ params: {
+ dataset_id: datasetId,
+ },
+ },
+ }),
+ enabled: options?.enabled ?? true,
+ })
+}
+
+export const useDatasetResourceWhitelistConfig = (
+ datasetId: string,
+ options?: DatasetAccessConfigQueryOptions,
+) => {
+ return useQuery({
+ ...datasetRbacContract.whitelistConfig.get.queryOptions({
+ input: {
+ params: {
+ dataset_id: datasetId,
+ },
+ },
+ }),
+ enabled: options?.enabled ?? true,
+ })
+}
+
export const useUpdateDatasetUserAccessSettings = (datasetId: string) => {
const queryClient = useQueryClient()
@@ -81,6 +118,9 @@ export const useUpdateDatasetUserAccessSettings = (datasetId: string) => {
queryClient.invalidateQueries({
queryKey: datasetRbacContract.accessPolicy.get.key({ type: 'query' }),
}),
+ queryClient.invalidateQueries({
+ queryKey: datasetRbacContract.whitelist.get.key({ type: 'query' }),
+ }),
])
},
})
@@ -91,16 +131,20 @@ export const useRemoveDatasetAccessPolicyMemberBindings = (datasetId: string) =>
return useMutation({
mutationKey: [NAME_SPACE, 'remove-dataset-access-policy-member-bindings', datasetId],
- mutationFn: (payload: RemoveDatasetAccessPolicyMemberBindingsRequest) =>
- datasetRbacClient.accessPolicies.byPolicyId.memberBindings.delete({
- params: {
- dataset_id: datasetId,
- policy_id: payload.accessPolicyId,
- },
- body: {
- account_ids: payload.accountIds,
- },
- }),
+ mutationFn: (removals: RemoveDatasetAccessPolicyMemberBindingsRequest[]) =>
+ Promise.all(
+ removals.map((removal) =>
+ datasetRbacClient.accessPolicies.byPolicyId.memberBindings.delete({
+ params: {
+ dataset_id: datasetId,
+ policy_id: removal.accessPolicyId,
+ },
+ body: {
+ account_ids: removal.accountIds,
+ },
+ }),
+ ),
+ ),
onSuccess: async () => {
await Promise.all([
queryClient.invalidateQueries({
@@ -109,23 +153,26 @@ export const useRemoveDatasetAccessPolicyMemberBindings = (datasetId: string) =>
queryClient.invalidateQueries({
queryKey: datasetRbacContract.accessPolicy.get.key({ type: 'query' }),
}),
+ queryClient.invalidateQueries({
+ queryKey: datasetRbacContract.whitelist.get.key({ type: 'query' }),
+ }),
])
},
})
}
-export const useUpdateDatasetOpenScope = (datasetId: string) => {
+export const useUpdateDatasetAutomaticIncludeWorkspaceMembers = (datasetId: string) => {
const queryClient = useQueryClient()
return useMutation({
- mutationKey: [NAME_SPACE, 'update-dataset-open-scope', datasetId],
- mutationFn: (openScope: ResourceOpenScope) =>
+ mutationKey: [NAME_SPACE, 'update-dataset-automatic-include-workspace-members', datasetId],
+ mutationFn: (automaticIncludeWorkspaceMembers: boolean) =>
datasetRbacClient.whitelist.put({
params: {
dataset_id: datasetId,
},
body: {
- scope: openScope,
+ automatic_include_workspace_members: automaticIncludeWorkspaceMembers,
},
}),
onSuccess: async () => {
@@ -133,6 +180,12 @@ export const useUpdateDatasetOpenScope = (datasetId: string) => {
queryClient.invalidateQueries({
queryKey: datasetRbacContract.userAccessPolicies.get.key({ type: 'query' }),
}),
+ queryClient.invalidateQueries({
+ queryKey: datasetRbacContract.whitelist.get.key({ type: 'query' }),
+ }),
+ queryClient.invalidateQueries({
+ queryKey: datasetRbacContract.whitelistConfig.get.key({ type: 'query' }),
+ }),
])
},
})