zhuchaowe/maxkb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: application knowledge list (#3365)

Browse Source
This commit is contained in:
shaohuzhang1 2025-06-24 13:45:36 +08:00 committed by GitHub
parent 3a91562289
commit af6f88a616
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 38 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apps/application/serializers/application.py
View File

@ -295,7 +295,7 @@ class Query(serializers.Serializer):
workspace_id = serializers.CharField(required=False, label=_('Workspace ID')) workspace_id = serializers.CharField(required=False, label=_('Workspace ID'))
user_id = serializers.UUIDField(required=True, label=_("User ID")) user_id = serializers.UUIDField(required=True, label=_("User ID"))
def get_query_set(self, instance: Dict, workspace_manage: bool, is_x_pack_ee: bool): def get_query_set(self, instance: Dict, workspace_manage):
folder_query_set = QuerySet(ApplicationFolder) folder_query_set = QuerySet(ApplicationFolder)
application_query_set = QuerySet(Application) application_query_set = QuerySet(Application)
workspace_id = self.data.get('workspace_id') workspace_id = self.data.get('workspace_id')
@ -317,13 +317,8 @@ class Query(serializers.Serializer):
application_query_set = application_query_set.filter(desc__contains=desc) application_query_set = application_query_set.filter(desc__contains=desc)
application_custom_sql_query_set = application_query_set application_custom_sql_query_set = application_query_set
application_query_set = application_query_set.order_by("-update_time") application_query_set = application_query_set.order_by("-update_time")
workspace_user_role_mapping_model = DatabaseModelManage.get_model('workspace_user_role_mapping')
return {'folder_query_set': folder_query_set, return {'folder_query_set': folder_query_set,
'application_query_set': application_query_set, 'application_query_set': application_query_set} if not workspace_manage else {
'user_query_set': QuerySet(
workspace_user_role_mapping_model).filter(
user_id=user_id, workspace_id=workspace_id)} if (not workspace_manage and is_x_pack_ee) else {
'folder_query_set': folder_query_set, 'folder_query_set': folder_query_set,
'application_query_set': application_query_set, 'application_query_set': application_query_set,
'application_custom_sql': application_custom_sql_query_set 'application_custom_sql': application_custom_sql_query_set
@ -341,12 +336,11 @@ class Query(serializers.Serializer):
user_id = self.data.get("user_id") user_id = self.data.get("user_id")
ApplicationQueryRequest(data=instance).is_valid(raise_exception=True) ApplicationQueryRequest(data=instance).is_valid(raise_exception=True)
workspace_manage = is_workspace_manage(user_id, workspace_id) workspace_manage = is_workspace_manage(user_id, workspace_id)
is_x_pack_ee = self.is_x_pack_ee() return native_search(self.get_query_set(instance, workspace_manage),
return native_search(self.get_query_set(instance, workspace_manage, is_x_pack_ee),
select_string=get_file_content( select_string=get_file_content(
os.path.join(PROJECT_DIR, "apps", "application", 'sql', os.path.join(PROJECT_DIR, "apps", "application", 'sql',
'list_application.sql' if workspace_manage else ( 'list_application.sql' if workspace_manage else (
'list_application_user_ee.sql' if is_x_pack_ee else 'list_application_user.sql') 'list_application_user_ee.sql' if self.is_x_pack_ee() else 'list_application_user.sql')
))) )))
def page(self, current_page: int, page_size: int, instance: Dict): def page(self, current_page: int, page_size: int, instance: Dict):
@ -355,12 +349,11 @@ class Query(serializers.Serializer):
workspace_id = self.data.get('workspace_id') workspace_id = self.data.get('workspace_id')
user_id = self.data.get("user_id") user_id = self.data.get("user_id")
workspace_manage = is_workspace_manage(user_id, workspace_id) workspace_manage = is_workspace_manage(user_id, workspace_id)
is_x_pack_ee = self.is_x_pack_ee() return native_page_search(current_page, page_size, self.get_query_set(instance, workspace_manage),
return native_page_search(current_page, page_size, self.get_query_set(instance, workspace_manage, is_x_pack_ee),
get_file_content( get_file_content(
os.path.join(PROJECT_DIR, "apps", "application", 'sql', os.path.join(PROJECT_DIR, "apps", "application", 'sql',
'list_application.sql' if workspace_manage else ( 'list_application.sql' if workspace_manage else (
'list_application_user_ee.sql' if is_x_pack_ee else 'list_application_user.sql'))), 'list_application_user_ee.sql' if self.is_x_pack_ee() else 'list_application_user.sql'))),
) )

5
apps/application/sql/list_application_user_ee.sql
View File

@ -17,11 +17,14 @@ from (select application."id"::text,
where auth_target_type = 'APPLICATION' where auth_target_type = 'APPLICATION'
and case and case
when auth_type = 'ROLE' then when auth_type = 'ROLE' then
'ROLE' = any (permission_list)
and
'APPLICATION:READ' in (select (case when user_role_relation.role_id = any (array ['USER']) THEN 'APPLICATION:READ' else role_permission.permission_id END) 'APPLICATION:READ' in (select (case when user_role_relation.role_id = any (array ['USER']) THEN 'APPLICATION:READ' else role_permission.permission_id END)
from role_permission role_permission from role_permission role_permission
right join user_role_relation user_role_relation right join user_role_relation user_role_relation
on user_role_relation.role_id=role_permission.role_id on user_role_relation.role_id=role_permission.role_id
${user_query_set}) where user_role_relation.user_id=workspace_user_resource_permission.user_id
and user_role_relation.workspace_id=workspace_user_resource_permission.workspace_id)
else else
'VIEW' = any (permission_list) 'VIEW' = any (permission_list)

14
apps/knowledge/serializers/knowledge.py
View File

@ -120,7 +120,7 @@ class KnowledgeSerializer(serializers.Serializer):
role_permission_mapping_model = DatabaseModelManage.get_model("role_permission_mapping_model") role_permission_mapping_model = DatabaseModelManage.get_model("role_permission_mapping_model")
return workspace_user_role_mapping_model is not None and role_permission_mapping_model is not None return workspace_user_role_mapping_model is not None and role_permission_mapping_model is not None
def get_query_set(self, workspace_manage, is_x_pack_ee): def get_query_set(self):
workspace_id = self.data.get("workspace_id") workspace_id = self.data.get("workspace_id")
query_set_dict = {} query_set_dict = {}
query_set = QuerySet(model=get_dynamics_model({ query_set = QuerySet(model=get_dynamics_model({
@ -157,10 +157,6 @@ class KnowledgeSerializer(serializers.Serializer):
'knowledge.workspace_id': models.CharField(), 'knowledge.workspace_id': models.CharField(),
})).filter(**{'knowledge.workspace_id': workspace_id}) })).filter(**{'knowledge.workspace_id': workspace_id})
query_set_dict['folder_query_set'] = folder_query_set query_set_dict['folder_query_set'] = folder_query_set
workspace_user_role_mapping_model = DatabaseModelManage.get_model('workspace_user_role_mapping')
if not workspace_manage and is_x_pack_ee:
query_set_dict['user_query_set'] = QuerySet(workspace_user_role_mapping_model).filter(
user_id=self.data.get("user_id"), workspace_id=workspace_id)
return query_set_dict return query_set_dict
def page(self, current_page: int, page_size: int): def page(self, current_page: int, page_size: int):
@ -171,18 +167,17 @@ class KnowledgeSerializer(serializers.Serializer):
if not root: if not root:
raise serializers.ValidationError(_('Folder not found')) raise serializers.ValidationError(_('Folder not found'))
workspace_manage = is_workspace_manage(self.data.get('user_id'), self.data.get('workspace_id')) workspace_manage = is_workspace_manage(self.data.get('user_id'), self.data.get('workspace_id'))
is_x_pack_ee = self.is_x_pack_ee()
return native_page_search( return native_page_search(
current_page, current_page,
page_size, page_size,
self.get_query_set(workspace_manage, is_x_pack_ee), self.get_query_set(),
select_string=get_file_content( select_string=get_file_content(
os.path.join( os.path.join(
PROJECT_DIR, PROJECT_DIR,
"apps", "apps",
"knowledge", 'sql', "knowledge", 'sql',
'list_knowledge.sql' if workspace_manage else ( 'list_knowledge.sql' if workspace_manage else (
'list_knowledge_user_ee.sql' if is_x_pack_ee else 'list_knowledge_user.sql' 'list_knowledge_user_ee.sql' if self.is_x_pack_ee() else 'list_knowledge_user.sql'
) )
) )
), ),
@ -196,9 +191,8 @@ class KnowledgeSerializer(serializers.Serializer):
if not root: if not root:
raise serializers.ValidationError(_('Folder not found')) raise serializers.ValidationError(_('Folder not found'))
workspace_manage = is_workspace_manage(self.data.get('user_id'), self.data.get('workspace_id')) workspace_manage = is_workspace_manage(self.data.get('user_id'), self.data.get('workspace_id'))
is_x_pack_ee = self.is_x_pack_ee()
return native_search( return native_search(
self.get_query_set(workspace_manage, is_x_pack_ee), self.get_query_set(),
select_string=get_file_content( select_string=get_file_content(
os.path.join( os.path.join(
PROJECT_DIR, PROJECT_DIR,

5
apps/knowledge/sql/list_knowledge_user_ee.sql
View File

@ -25,11 +25,14 @@ FROM (SELECT "temp_knowledge".id::text, "temp_knowledge".name,
where auth_target_type = 'KNOWLEDGE' where auth_target_type = 'KNOWLEDGE'
and case and case
when auth_type = 'ROLE' then when auth_type = 'ROLE' then
'ROLE' = any (permission_list)
and
'KNOWLEDGE:READ' in (select (case when user_role_relation.role_id = any (array ['USER']) THEN 'KNOWLEDGE:READ' else role_permission.permission_id END) 'KNOWLEDGE:READ' in (select (case when user_role_relation.role_id = any (array ['USER']) THEN 'KNOWLEDGE:READ' else role_permission.permission_id END)
from role_permission role_permission from role_permission role_permission
right join user_role_relation user_role_relation right join user_role_relation user_role_relation
on user_role_relation.role_id=role_permission.role_id on user_role_relation.role_id=role_permission.role_id
${user_query_set}) where user_role_relation.user_id=workspace_user_resource_permission.user_id
and user_role_relation.workspace_id=workspace_user_resource_permission.workspace_id)
else else
'VIEW' = any (permission_list) 'VIEW' = any (permission_list)
end end

5
ui/src/views/system/resource-authorization/component/PermissionSetting.vue
View File

@ -186,8 +186,7 @@ const radioRole = computed({
get: () => props.isRole, get: () => props.isRole,
set: (v: boolean) => { set: (v: boolean) => {
emit('update:isRole', v) emit('update:isRole', v)
},
}
}) })
const isKnowledge = computed(() => props.type === AuthorizationEnum.KNOWLEDGE) const isKnowledge = computed(() => props.type === AuthorizationEnum.KNOWLEDGE)
const isApplication = computed(() => props.type === AuthorizationEnum.APPLICATION) const isApplication = computed(() => props.type === AuthorizationEnum.APPLICATION)
@ -214,8 +213,6 @@ const dfsPermission = (arr: any = [], Name: string | number, e: boolean, idArr:
}) })
} }
const filterText = ref('') const filterText = ref('')
const filterData = computed(() => const filterData = computed(() =>

11
ui/src/views/system/resource-authorization/index.vue
View File

@ -150,7 +150,8 @@ const flotTree = (tree: Array<any>, result: Array<any>) => {
return result return result
} }
function submitPermissions() { function submitPermissions() {
const user_resource_permission_list = settingTags.map((item: any, index: number) => { const user_resource_permission_list = settingTags
.map((item: any, index: number) => {
return flotTree(item.data, []) return flotTree(item.data, [])
.filter((v: any) => !v.isFolder) .filter((v: any) => !v.isFolder)
.map((v: any) => { .map((v: any) => {
@ -161,8 +162,8 @@ function submitPermissions() {
auth_type: item.isRole ? 'ROLE' : 'RESOURCE_PERMISSION_GROUP', auth_type: item.isRole ? 'ROLE' : 'RESOURCE_PERMISSION_GROUP',
} }
}) })
})
}).reduce((pre: any, next: any) => [...pre, ...next], []) .reduce((pre: any, next: any) => [...pre, ...next], [])
AuthorizationApi.putResourceAuthorization( AuthorizationApi.putResourceAuthorization(
currentWorkspaceId.value || 'default', currentWorkspaceId.value || 'default',
@ -294,7 +295,9 @@ const getWholeTree = async (user_id: string) => {
let folderIdMap = [] let folderIdMap = []
const folderTree = cloneDeep((parentRes as unknown as any).data) const folderTree = cloneDeep((parentRes as unknown as any).data)
if (Object.keys(childrenRes.data).indexOf(item.value) !== -1) { if (Object.keys(childrenRes.data).indexOf(item.value) !== -1) {
item.isRole = childrenRes.data[item.value].length>0 && childrenRes.data[item.value][0].permission.ROLE item.isRole =
childrenRes.data[item.value].length > 0 &&
childrenRes.data[item.value][0].auth_type == 'ROLE'
folderIdMap = getFolderIdMap(childrenRes.data[item.value]) folderIdMap = getFolderIdMap(childrenRes.data[item.value])
dfsFolder(folderTree, folderIdMap) dfsFolder(folderTree, folderIdMap)
const permissionHalf = { const permissionHalf = {