Skip to content

Commit 5c1f105

Browse files
committed
feat: update resource management permissions and localization strings
1 parent eae2b3e commit 5c1f105

File tree

4 files changed

+76
-65
lines changed

4 files changed

+76
-65
lines changed

apps/common/constants/permission_constants.py

Lines changed: 66 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,11 @@ class SystemGroup(Enum):
9090
USER_MANAGEMENT = "USER_MANAGEMENT"
9191
ROLE = "ROLE"
9292
WORKSPACE = "WORKSPACE"
93-
RESOURCE_APPLICATION = "RESOURCE_APPLICATION"
94-
RESOURCE_KNOWLEDGE = "RESOURCE_KNOWLEDGE"
95-
RESOURCE_TOOL = "RESOURCE_TOOL"
96-
RESOURCE_MODEL = "RESOURCE_MODEL"
93+
RESOURCE = "RESOURCE"
94+
# RESOURCE_APPLICATION = "RESOURCE_APPLICATION"
95+
# RESOURCE_KNOWLEDGE = "RESOURCE_KNOWLEDGE"
96+
# RESOURCE_TOOL = "RESOURCE_TOOL"
97+
# RESOURCE_MODEL = "RESOURCE_MODEL"
9798
RESOURCE_PERMISSION = "RESOURCE_PERMISSION"
9899
SHARED_KNOWLEDGE = "SHARED_KNOWLEDGE"
99100
SHARED_MODEL = "SHARED_MODEL"
@@ -278,10 +279,10 @@ def get_workspace_role(self):
278279
SystemGroup.USER_MANAGEMENT.value: _("User Management"),
279280
SystemGroup.ROLE.value: _("Role"),
280281
SystemGroup.WORKSPACE.value: _("Workspace"),
281-
SystemGroup.RESOURCE_APPLICATION.value: _("Resource Application"),
282-
SystemGroup.RESOURCE_KNOWLEDGE.value: _("Resource Knowledge"),
283-
SystemGroup.RESOURCE_TOOL.value: _("Resource Tool"),
284-
SystemGroup.RESOURCE_MODEL.value: _("Resource Model"),
282+
# SystemGroup.RESOURCE_APPLICATION.value: _("Resource Application"),
283+
# SystemGroup.RESOURCE_KNOWLEDGE.value: _("Resource Knowledge"),
284+
# SystemGroup.RESOURCE_TOOL.value: _("Resource Tool"),
285+
# SystemGroup.RESOURCE_MODEL.value: _("Resource Model"),
285286
SystemGroup.RESOURCE_PERMISSION.value: _("Resource Permission"),
286287
SystemGroup.SHARED_KNOWLEDGE.value: _("Shared Knowledge"),
287288
SystemGroup.SHARED_MODEL.value: _("Shared Model"),
@@ -362,6 +363,7 @@ def get_workspace_role(self):
362363
Group.MODEL_WORKSPACE_USER_RESOURCE_PERMISSION.value: _("Model"),
363364
Group.TOOL_WORKSPACE_USER_RESOURCE_PERMISSION.value: _("Tool"),
364365
Group.SYSTEM_RES_APPLICATION.value: _("Application"),
366+
SystemGroup.RESOURCE.value: _("Resource"),
365367
}
366368

367369

@@ -1190,129 +1192,130 @@ class PermissionConstants(Enum):
11901192
group=Group.SYSTEM_MODEL, operate=Operate.DELETE, role_list=[RoleConstants.ADMIN, RoleConstants.USER],
11911193
parent_group=[SystemGroup.SHARED_MODEL]
11921194
)
1193-
RESOURCE_MODEL_READ = Permission(
1194-
group=Group.SYSTEM_RES_MODEL, operate=Operate.READ, role_list=[RoleConstants.ADMIN],
1195-
parent_group=[SystemGroup.RESOURCE_MODEL]
1196-
)
11971195
RESOURCE_APPLICATION_READ = Permission(
11981196
group=Group.SYSTEM_RES_APPLICATION, operate=Operate.READ, role_list=[RoleConstants.ADMIN],
1199-
parent_group=[SystemGroup.RESOURCE_APPLICATION]
1200-
)
1201-
RESOURCE_TOOL_READ = Permission(
1202-
group=Group.SYSTEM_RES_TOOL, operate=Operate.READ, role_list=[RoleConstants.ADMIN],
1203-
parent_group=[SystemGroup.RESOURCE_TOOL]
1204-
)
1205-
RESOURCE_TOOL_CREATE = Permission(
1206-
group=Group.SYSTEM_RES_TOOL, operate=Operate.CREATE, role_list=[RoleConstants.ADMIN],
1207-
parent_group=[SystemGroup.RESOURCE_TOOL], is_show=False
1208-
)
1209-
RESOURCE_TOOL_EDIT = Permission(
1210-
group=Group.SYSTEM_RES_TOOL, operate=Operate.EDIT, role_list=[RoleConstants.ADMIN],
1211-
parent_group=[SystemGroup.RESOURCE_TOOL], is_show=False
1212-
)
1213-
RESOURCE_TOOL_DELETE = Permission(
1214-
group=Group.SYSTEM_RES_TOOL, operate=Operate.DELETE, role_list=[RoleConstants.ADMIN],
1215-
parent_group=[SystemGroup.RESOURCE_TOOL], is_show=False
1216-
)
1217-
RESOURCE_TOOL_IMPORT = Permission(
1218-
group=Group.SYSTEM_RES_TOOL, operate=Operate.IMPORT, role_list=[RoleConstants.ADMIN],
1219-
parent_group=[SystemGroup.RESOURCE_TOOL], is_show=False
1220-
)
1221-
RESOURCE_TOOL_EXPORT = Permission(
1222-
group=Group.SYSTEM_RES_TOOL, operate=Operate.EXPORT, role_list=[RoleConstants.ADMIN],
1223-
parent_group=[SystemGroup.RESOURCE_TOOL], is_show=False
1224-
)
1225-
RESOURCE_TOOL_DEBUG = Permission(
1226-
group=Group.SYSTEM_RES_TOOL, operate=Operate.DEBUG, role_list=[RoleConstants.ADMIN],
1227-
parent_group=[SystemGroup.RESOURCE_TOOL], is_show=False
1197+
parent_group=[SystemGroup.RESOURCE]
12281198
)
1199+
12291200
RESOURCE_KNOWLEDGE_READ = Permission(
12301201
group=Group.SYSTEM_RES_KNOWLEDGE, operate=Operate.READ, role_list=[RoleConstants.ADMIN],
1231-
parent_group=[SystemGroup.RESOURCE_KNOWLEDGE]
1202+
parent_group=[SystemGroup.RESOURCE]
12321203
)
12331204
RESOURCE_KNOWLEDGE_CREATE = Permission(
12341205
group=Group.SYSTEM_RES_KNOWLEDGE, operate=Operate.CREATE, role_list=[RoleConstants.ADMIN],
1235-
parent_group=[SystemGroup.RESOURCE_KNOWLEDGE], is_show=False
1206+
parent_group=[SystemGroup.RESOURCE], is_show=False
12361207
)
12371208
RESOURCE_KNOWLEDGE_EDIT = Permission(
12381209
group=Group.SYSTEM_RES_KNOWLEDGE, operate=Operate.EDIT, role_list=[RoleConstants.ADMIN],
1239-
parent_group=[SystemGroup.RESOURCE_KNOWLEDGE], is_show=False
1210+
parent_group=[SystemGroup.RESOURCE], is_show=False
12401211
)
12411212
RESOURCE_KNOWLEDGE_SYNC = Permission(
12421213
group=Group.SYSTEM_RES_KNOWLEDGE, operate=Operate.SYNC, role_list=[RoleConstants.ADMIN],
1243-
parent_group=[SystemGroup.RESOURCE_KNOWLEDGE], is_show=False
1214+
parent_group=[SystemGroup.RESOURCE], is_show=False
12441215
)
12451216
RESOURCE_KNOWLEDGE_VECTOR = Permission(
12461217
group=Group.SYSTEM_RES_KNOWLEDGE, operate=Operate.VECTOR, role_list=[RoleConstants.ADMIN],
1247-
parent_group=[SystemGroup.RESOURCE_KNOWLEDGE], is_show=False
1218+
parent_group=[SystemGroup.RESOURCE], is_show=False
12481219
)
12491220
RESOURCE_KNOWLEDGE_EXPORT = Permission(
12501221
group=Group.SYSTEM_RES_KNOWLEDGE, operate=Operate.EXPORT, role_list=[RoleConstants.ADMIN],
1251-
parent_group=[SystemGroup.RESOURCE_KNOWLEDGE], is_show=False
1222+
parent_group=[SystemGroup.RESOURCE], is_show=False
12521223
)
12531224
RESOURCE_KNOWLEDGE_GENERATE = Permission(
12541225
group=Group.SYSTEM_RES_KNOWLEDGE, operate=Operate.GENERATE, role_list=[RoleConstants.ADMIN],
1255-
parent_group=[SystemGroup.RESOURCE_KNOWLEDGE], is_show=False
1226+
parent_group=[SystemGroup.RESOURCE], is_show=False
12561227
)
12571228
RESOURCE_KNOWLEDGE_DELETE = Permission(
12581229
group=Group.SYSTEM_RES_KNOWLEDGE, operate=Operate.DELETE, role_list=[RoleConstants.ADMIN],
1259-
parent_group=[SystemGroup.RESOURCE_KNOWLEDGE], is_show=False
1230+
parent_group=[SystemGroup.RESOURCE], is_show=False
12601231
)
12611232
RESOURCE_KNOWLEDGE_DOCUMENT_READ = Permission(
12621233
group=Group.SYSTEM_RES_KNOWLEDGE_DOCUMENT, operate=Operate.READ, role_list=[RoleConstants.ADMIN],
1263-
parent_group=[SystemGroup.RESOURCE_KNOWLEDGE], is_show=False
1234+
parent_group=[SystemGroup.RESOURCE], is_show=False
12641235
)
12651236
RESOURCE_KNOWLEDGE_DOCUMENT_CREATE = Permission(
12661237
group=Group.SYSTEM_RES_KNOWLEDGE_DOCUMENT, operate=Operate.CREATE, role_list=[RoleConstants.ADMIN],
1267-
parent_group=[SystemGroup.RESOURCE_KNOWLEDGE], is_show=False
1238+
parent_group=[SystemGroup.RESOURCE], is_show=False
12681239
)
12691240
RESOURCE_KNOWLEDGE_DOCUMENT_EDIT = Permission(
12701241
group=Group.SYSTEM_RES_KNOWLEDGE_DOCUMENT, operate=Operate.EDIT, role_list=[RoleConstants.ADMIN],
1271-
parent_group=[SystemGroup.RESOURCE_KNOWLEDGE], is_show=False
1242+
parent_group=[SystemGroup.RESOURCE], is_show=False
12721243
)
12731244
RESOURCE_KNOWLEDGE_DOCUMENT_DELETE = Permission(
12741245
group=Group.SYSTEM_RES_KNOWLEDGE_DOCUMENT, operate=Operate.DELETE, role_list=[RoleConstants.ADMIN],
1275-
parent_group=[SystemGroup.RESOURCE_KNOWLEDGE], is_show=False
1246+
parent_group=[SystemGroup.RESOURCE], is_show=False
12761247
)
12771248
RESOURCE_KNOWLEDGE_DOCUMENT_SYNC = Permission(
12781249
group=Group.SYSTEM_RES_KNOWLEDGE_DOCUMENT, operate=Operate.SYNC, role_list=[RoleConstants.ADMIN],
1279-
parent_group=[SystemGroup.RESOURCE_KNOWLEDGE], is_show=False
1250+
parent_group=[SystemGroup.RESOURCE], is_show=False
12801251
)
12811252
RESOURCE_KNOWLEDGE_DOCUMENT_EXPORT = Permission(
12821253
group=Group.SYSTEM_RES_KNOWLEDGE_DOCUMENT, operate=Operate.EXPORT, role_list=[RoleConstants.ADMIN],
1283-
parent_group=[SystemGroup.RESOURCE_KNOWLEDGE], is_show=False
1254+
parent_group=[SystemGroup.RESOURCE], is_show=False
12841255
)
12851256
RESOURCE_KNOWLEDGE_DOCUMENT_DOWNLOAD_SOURCE_FILE = Permission(
12861257
group=Group.SYSTEM_RES_KNOWLEDGE_DOCUMENT, operate=Operate.DOWNLOAD, role_list=[RoleConstants.ADMIN],
1287-
parent_group=[SystemGroup.RESOURCE_KNOWLEDGE], is_show=False
1258+
parent_group=[SystemGroup.RESOURCE], is_show=False
12881259
)
12891260
RESOURCE_KNOWLEDGE_DOCUMENT_VECTOR = Permission(
12901261
group=Group.SYSTEM_RES_KNOWLEDGE_DOCUMENT, operate=Operate.VECTOR, role_list=[RoleConstants.ADMIN],
1291-
parent_group=[SystemGroup.RESOURCE_KNOWLEDGE], is_show=False
1262+
parent_group=[SystemGroup.RESOURCE], is_show=False
12921263
)
12931264
RESOURCE_KNOWLEDGE_DOCUMENT_GENERATE = Permission(
12941265
group=Group.SYSTEM_RES_KNOWLEDGE_DOCUMENT, operate=Operate.GENERATE, role_list=[RoleConstants.ADMIN],
1295-
parent_group=[SystemGroup.RESOURCE_KNOWLEDGE], is_show=False
1266+
parent_group=[SystemGroup.RESOURCE], is_show=False
12961267
)
12971268
RESOURCE_KNOWLEDGE_DOCUMENT_MIGRATE = Permission(
12981269
group=Group.SYSTEM_RES_KNOWLEDGE_DOCUMENT, operate=Operate.MIGRATE, role_list=[RoleConstants.ADMIN],
1299-
parent_group=[SystemGroup.RESOURCE_KNOWLEDGE], is_show=False
1270+
parent_group=[SystemGroup.RESOURCE], is_show=False
13001271
)
13011272
RESOURCE_KNOWLEDGE_PROBLEM_READ = Permission(
13021273
group=Group.SYSTEM_RES_KNOWLEDGE_PROBLEM, operate=Operate.READ, role_list=[RoleConstants.ADMIN],
1303-
parent_group=[SystemGroup.RESOURCE_KNOWLEDGE], is_show=False
1274+
parent_group=[SystemGroup.RESOURCE], is_show=False
13041275
)
13051276
RESOURCE_KNOWLEDGE_PROBLEM_CREATE = Permission(
13061277
group=Group.SYSTEM_RES_KNOWLEDGE_PROBLEM, operate=Operate.CREATE, role_list=[RoleConstants.ADMIN],
1307-
parent_group=[SystemGroup.RESOURCE_KNOWLEDGE], is_show=False
1278+
parent_group=[SystemGroup.RESOURCE], is_show=False
13081279
)
13091280
RESOURCE_KNOWLEDGE_PROBLEM_EDIT = Permission(
13101281
group=Group.SYSTEM_RES_KNOWLEDGE_PROBLEM, operate=Operate.EDIT, role_list=[RoleConstants.ADMIN],
1311-
parent_group=[SystemGroup.RESOURCE_KNOWLEDGE], is_show=False
1282+
parent_group=[SystemGroup.RESOURCE], is_show=False
13121283
)
13131284
RESOURCE_KNOWLEDGE_PROBLEM_DELETE = Permission(
13141285
group=Group.SYSTEM_RES_KNOWLEDGE_PROBLEM, operate=Operate.DELETE, role_list=[RoleConstants.ADMIN],
1315-
parent_group=[SystemGroup.RESOURCE_KNOWLEDGE], is_show=False
1286+
parent_group=[SystemGroup.RESOURCE], is_show=False
1287+
)
1288+
RESOURCE_TOOL_READ = Permission(
1289+
group=Group.SYSTEM_RES_TOOL, operate=Operate.READ, role_list=[RoleConstants.ADMIN],
1290+
parent_group=[SystemGroup.RESOURCE]
1291+
)
1292+
RESOURCE_TOOL_CREATE = Permission(
1293+
group=Group.SYSTEM_RES_TOOL, operate=Operate.CREATE, role_list=[RoleConstants.ADMIN],
1294+
parent_group=[SystemGroup.RESOURCE], is_show=False
1295+
)
1296+
RESOURCE_TOOL_EDIT = Permission(
1297+
group=Group.SYSTEM_RES_TOOL, operate=Operate.EDIT, role_list=[RoleConstants.ADMIN],
1298+
parent_group=[SystemGroup.RESOURCE], is_show=False
1299+
)
1300+
RESOURCE_TOOL_DELETE = Permission(
1301+
group=Group.SYSTEM_RES_TOOL, operate=Operate.DELETE, role_list=[RoleConstants.ADMIN],
1302+
parent_group=[SystemGroup.RESOURCE], is_show=False
1303+
)
1304+
RESOURCE_TOOL_IMPORT = Permission(
1305+
group=Group.SYSTEM_RES_TOOL, operate=Operate.IMPORT, role_list=[RoleConstants.ADMIN],
1306+
parent_group=[SystemGroup.RESOURCE], is_show=False
1307+
)
1308+
RESOURCE_TOOL_EXPORT = Permission(
1309+
group=Group.SYSTEM_RES_TOOL, operate=Operate.EXPORT, role_list=[RoleConstants.ADMIN],
1310+
parent_group=[SystemGroup.RESOURCE], is_show=False
1311+
)
1312+
RESOURCE_TOOL_DEBUG = Permission(
1313+
group=Group.SYSTEM_RES_TOOL, operate=Operate.DEBUG, role_list=[RoleConstants.ADMIN],
1314+
parent_group=[SystemGroup.RESOURCE], is_show=False
1315+
)
1316+
RESOURCE_MODEL_READ = Permission(
1317+
group=Group.SYSTEM_RES_MODEL, operate=Operate.READ, role_list=[RoleConstants.ADMIN],
1318+
parent_group=[SystemGroup.RESOURCE]
13161319
)
13171320
OPERATION_LOG_READ = Permission(
13181321
group=Group.OPERATION_LOG, operate=Operate.READ, role_list=[RoleConstants.ADMIN],

apps/locales/en_US/LC_MESSAGES/django.po

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8504,4 +8504,7 @@ msgid "Modify application access token"
85048504
msgstr ""
85058505

85068506
msgid "File not exist. Only manually uploaded documents are supported"
8507-
msgstr ""
8507+
msgstr ""
8508+
8509+
msgid "Resource"
8510+
msgstr "Resource Management"

apps/locales/zh_CN/LC_MESSAGES/django.po

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8630,4 +8630,7 @@ msgid "Modify application access token"
86308630
msgstr "修改应用程序访问令牌"
86318631

86328632
msgid "File not exist. Only manually uploaded documents are supported"
8633-
msgstr "文件不存在, 仅支持手动上传的文档"
8633+
msgstr "文件不存在, 仅支持手动上传的文档"
8634+
8635+
msgid "Resource"
8636+
msgstr "资源管理"

apps/locales/zh_Hant/LC_MESSAGES/django.po

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8632,3 +8632,5 @@ msgstr "修改應用程序訪問權杖"
86328632
msgid "File not exist. Only manually uploaded documents are supported"
86338633
msgstr "文件不存在, 僅支持手動上傳的文檔"
86348634

8635+
msgid "Resource"
8636+
msgstr "資源管理"

0 commit comments

Comments
 (0)