Skip to content

feat: Folder authorization frontend #4186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zhanweizhang7 merged 1 commit into from
Oct 14, 2025
Merged

feat: Folder authorization frontend #4186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions ui/src/api/system/resource-authorization.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,11 @@ const getResourceAuthorization: (
workspace_id: string,
user_id: string,
resource: string,
page: pageRequest,
params?: any,
loading?: Ref<boolean>,
) => Promise<Result<any>> = (workspace_id, user_id, resource, page, params, loading) => {
) => Promise<Result<any>> = (workspace_id, user_id, resource, params, loading) => {
return get(
`${prefix}/${workspace_id}/user_resource_permission/user/${user_id}/resource/${resource}/${page.current_page}/${page.page_size}`,
`${prefix}/${workspace_id}/user_resource_permission/user/${user_id}/resource/${resource}`,
params,
loading,
)
Expand Down
31 changes: 26 additions & 5 deletions ui/src/components/folder-tree/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,38 +48,45 @@
</div>

<div
v-if="canOperation"
v-if="canOperation && permissionPrecise.folderManage(data.id)"
@click.stop
v-show="hoverNodeId === data.id"
@mouseenter.stop="handleMouseEnter(data)"
@mouseleave.stop="handleMouseleave"
class="mr-16"
>
<el-dropdown trigger="click" :teleported="false">
<el-button text class="w-full" v-if="MoreFilledPermission(node)">
<el-button text class="w-full" v-if="permissionPrecise.folderManage(data.id)">
<AppIcon iconName="app-more"></AppIcon>
</el-button>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item
@click.stop="openCreateFolder(data)"
v-if="node.level !== 3 && permissionPrecise.folderCreate()"
v-if="node.level !== 3 && permissionPrecise.folderManage(data.id)"
>
<AppIcon iconName="app-add-folder" class="color-secondary"></AppIcon>
{{ $t('components.folder.addChildFolder') }}
</el-dropdown-item>
<el-dropdown-item
@click.stop="openEditFolder(data)"
v-if="permissionPrecise.folderEdit()"
v-if="permissionPrecise.folderManage(data.id)"
>
<AppIcon iconName="app-edit" class="color-secondary"></AppIcon>
{{ $t('common.edit') }}
</el-dropdown-item>
<el-dropdown-item
@click.stop="openAuthorization(data)"
v-if="permissionPrecise.folderManage(data.id)"
>
<AppIcon iconName="app-resource-authorization" class="color-secondary"></AppIcon>
{{ $t('views.system.resourceAuthorization.title') }}
</el-dropdown-item>
<el-dropdown-item
divided
@click.stop="deleteFolder(data)"
:disabled="!data.parent_id"
v-if="permissionPrecise.folderDelete()"
v-if="permissionPrecise.folderManage(data.id)"
>
<AppIcon iconName="app-delete" class="color-secondary"></AppIcon>
{{ $t('common.delete') }}
Expand All @@ -94,6 +101,12 @@
</el-scrollbar>
</div>
<CreateFolderDialog ref="CreateFolderDialogRef" @refresh="refreshFolder" :title="title" />
<ResourceAuthorizationDrawer
:type="props.source"
:is-folder="true"
:is-root-folder="!currentNode?.parent_id"
ref="ResourceAuthorizationDrawerRef"
/>
</div>
</template>

Expand All @@ -102,6 +115,7 @@ import { computed, onUnmounted, ref, watch } from 'vue'
import { onBeforeRouteLeave } from 'vue-router'
import type { TreeInstance } from 'element-plus'
import CreateFolderDialog from '@/components/folder-tree/CreateFolderDialog.vue'
import ResourceAuthorizationDrawer from '@/components/resource-authorization-drawer/index.vue'
import { t } from '@/locales'
import { i18n_name } from '@/utils/common'
import folderApi from '@/api/folder'
Expand Down Expand Up @@ -255,6 +269,13 @@ function openEditFolder(row: Tree) {
CreateFolderDialogRef.value.open(props.source, row.id, row)
}

const currentNode = ref<Tree | null>(null)
const ResourceAuthorizationDrawerRef = ref()
function openAuthorization(data: any) {
currentNode.value = data
ResourceAuthorizationDrawerRef.value.open(data.id)
}

function refreshFolder() {
emit('refreshTree')
}
Copy link
Contributor Author

@shaohuzhang1 shaohuzhang1 Oct 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The provided code is clean and well-organized. Here are some minor improvements and suggestions:

  1. Type Annotations: Since currentNode is used within template expressions, it should be declared with a type annotation (ref<(...args: any[]) => void>).

  2. Arrow Function Shorthand: The arrow function for openAuthorization can be simplified if this. is not needed.

After these changes, the code looks like this:

<div id="file-list-container">
  <el-scrollbar style="height: calc(100vh - 35px);">
    <!-- Existing JSX content -->
  </el-scrollbar>
</div>

<CreateFolderDialog ref="CreateFolderDialogRef" @refresh="refreshFolder" :title="title" />

<ResourceAuthorizationDrawer
  :type="props.source"
  :is-folder="true"
  :is-root-folder="!currentNode?.parent_id"
  ref="ResourceAuthorizationDrawerRef"
/>

Additional Suggestion:
Consider adding more descriptive variable names to help clarify their purpose. For example:

  • currentFolder: Instead of using data, which could be ambiguous due to its use in other contexts.
  • resourceAuthdrawerInstance: Describes the instance being managed by the drawer component.

These small adjustments make the code easier to read and maintain.

Expand Down
29 changes: 27 additions & 2 deletions ui/src/components/resource-authorization-drawer/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
v-model="row.permission"
@change="(val: any) => permissionsHandle(val, row)"
>
<template v-for="(item, index) in permissionOptions" :key="index">
<template v-for="(item, index) in getFolderPermissionOptions()" :key="index">
<el-radio :value="item.value" class="mr-16">{{ item.label }}</el-radio>
</template>
</el-radio-group>
Expand Down Expand Up @@ -157,6 +157,8 @@ import useStore from '@/stores'
const { user } = useStore()
const props = defineProps<{
type: string
isFolder?: boolean
isRootFolder?: boolean
}>()

const apiType = computed(() => {
Expand All @@ -166,6 +168,24 @@ const apiType = computed(() => {
return 'workspace'
}
})

const permissionOptionMap = computed(() => {
return {
rootFolder: getPermissionOptions(true, true),
folder: getPermissionOptions(true, false),
}
})

const getFolderPermissionOptions = () => {
if (props.isRootFolder) {
return permissionOptionMap.value.rootFolder
}
if (props.isFolder) {
return permissionOptionMap.value.folder
}
return getPermissionOptions(false, false)
}

const permissionOptions = computed(() => {
return getPermissionOptions()
})
Expand Down Expand Up @@ -281,7 +301,12 @@ const getPermissionList = () => {
loading,
)
.then((res: any) => {
permissionData.value = res.data.records || []
permissionData.value = res.data.records.map((item: any) => {
if (props.isRootFolder && item.permission === 'NOT_AUTH') {
return {...item, permission: 'VIEW'}
}
return item
}) || []
paginationConfig.total = res.data.total || 0
})
}
Copy link
Contributor Author

@shaohuzhang1 shaohuzhang1 Oct 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your code has several improvements and optimizations:

  1. Template Refactoring: The permissionOptions template loop is replaced with calling a new method getFolderPermissionOptions(). This modularization makes the component easier to maintain and reduces repetition.

  2. Optimization of Permission Retrieval:

    • A map (permissionOptionMap) is introduced to store options based on whether it's a root or regular folder.
    • getFolderPermissionOptions() determines which set of options should be used based on the provided prop values (isRootFolder or isFolder).

  3. Handling Special Case:

    • If props.isRootFolder and an item’s permission is 'NOT_AUTH', it returns 'VIEW'.

These changes improve readability and efficiency by encapsulating logic related to handling different types of folders into separate methods, reducing redundant repeated code, and providing better control over when certain conditions apply.

Expand Down
2 changes: 2 additions & 0 deletions ui/src/permission/application/system-manage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ const systemManage = {
'OR'
),
folderEdit: () => false,
folderRead: () => false,
folderManage: () => false,
export: () =>
hasPermission(
[
Expand Down
20 changes: 20 additions & 0 deletions ui/src/permission/application/workspace.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,26 @@ const workspace = {
],
'OR'
),
folderRead: (folder_id: string) =>
hasPermission(
[
new ComplexPermission([RoleConst.USER],[PermissionConst.APPLICATION.getApplicationWorkspaceResourcePermission(folder_id)],[],'AND'),
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
PermissionConst.APPLICATION_FOLDER_READ.getApplicationWorkspaceResourcePermission(folder_id),
PermissionConst.APPLICATION_FOLDER_READ.getWorkspacePermissionWorkspaceManageRole,
],
'OR'
),
folderManage: (folder_id: string) =>
hasPermission(
[
new ComplexPermission([RoleConst.USER],[PermissionConst.APPLICATION.getApplicationWorkspaceResourcePermission(folder_id)],[],'AND'),
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
PermissionConst.APPLICATION_FOLDER_EDIT.getApplicationWorkspaceResourcePermission(folder_id),
PermissionConst.APPLICATION_EDIT.getWorkspacePermissionWorkspaceManageRole,
],
'OR'
),
edit: (source_id:string) =>
hasPermission(
[
Expand Down
2 changes: 2 additions & 0 deletions ui/src/permission/knowledge/system-manage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ const systemManage = {
PermissionConst.RESOURCE_KNOWLEDGE_AUTH
],'OR'
),
folderRead: () => false,
folderManage: () => false,
folderCreate: () => false,
folderEdit: () => false,
folderDelete: () => false,
Expand Down
2 changes: 2 additions & 0 deletions ui/src/permission/knowledge/system-share.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,8 @@ const share = {
chat_user_edit: () =>false,

auth: () => false,
folderRead: () => false,
folderManage: () => false,
folderCreate: () => false,
folderEdit: () => false,
folderDelete: () => false,
Expand Down
2 changes: 2 additions & 0 deletions ui/src/permission/knowledge/workspace-share.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ const workspaceShare = {
problem_edit: () => false,
chat_user_edit: () =>false,

folderRead: () => false,
folderManage: () => false,
folderCreate: () => false,
folderEdit: () => false,
folderDelete: () => false,
Expand Down
2 changes: 2 additions & 0 deletions ui/src/permission/knowledge/workspace.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ const workspace = {
],
'OR',
),
folderRead: () => true,
folderManage: () => true,
folderCreate: () =>
hasPermission(
[
Expand Down
5 changes: 4 additions & 1 deletion ui/src/permission/model/system-manage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ const systemManage = {
hasPermission([RoleConst.ADMIN, PermissionConst.RESOURCE_MODEL_DELETE], 'OR'),

auth: () =>
hasPermission([RoleConst.ADMIN, PermissionConst.RESOURCE_MODEL_AUTH], 'OR'),
hasPermission([RoleConst.ADMIN, PermissionConst.RESOURCE_MODEL_AUTH], 'OR'),

folderRead: () => false,
folderManage: () => false,
folderCreate: () => false,
folderEdit: () => false,
folderDelete: () => false,
Expand Down
2 changes: 2 additions & 0 deletions ui/src/permission/model/system-share.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ const share = {
'OR',
),
auth: () => false,
folderRead: () => false,
folderManage: () => false,
folderCreate: () => false,
folderEdit: () => false,
folderDelete: () => false,
Expand Down
2 changes: 2 additions & 0 deletions ui/src/permission/model/workspace.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ const workspace = {
],
'OR'
),
folderRead: () => true,
folderManage: () => true,
folderCreate: () =>
hasPermission(
[
Expand Down
3 changes: 3 additions & 0 deletions ui/src/permission/tool/system-manage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ const systemManage = {
],
'OR',
),

folderRead: () => false,
folderManage: () => false,
folderCreate: () => false,
folderEdit: () => false,
folderDelete: () => false,
Expand Down
3 changes: 3 additions & 0 deletions ui/src/permission/tool/system-share.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ const share = {
),

auth: () => false,

folderRead: () => false,
folderManage: () => false,
folderCreate: () => false,
folderEdit: () => false,
folderDelete: () => false,
Expand Down
2 changes: 2 additions & 0 deletions ui/src/permission/tool/workspace.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ const workspace = {
],
'OR'
),
folderRead: () => true,
folderManage: () => true,
folderCreate: () =>
hasPermission(
[
Expand Down
7 changes: 7 additions & 0 deletions ui/src/utils/permission/data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,13 @@ const PermissionConst = {
ROLE_ADD_MEMBER: new Permission('ROLE:READ+ADD_MEMBER'),
ROLE_REMOVE_MEMBER: new Permission('ROLE:READ+REMOVE_MEMBER'),

APPLICATION_FOLDER_READ: new Permission('APPLICATION_FOLDER:READ'),
APPLICATION_FOLDER_EDIT: new Permission('APPLICATION_FOLDER:READ+EDIT'),
KNOWLEDGE_FOLDER_READ: new Permission('APPLICATION_FOLDER:READ'),
KNOWLEDGE_FOLDER_EDIT: new Permission('APPLICATION_FOLDER:READ+EDIT'),
TOOL_FOLDER_READ: new Permission('APPLICATION_FOLDER:READ'),
TOOL_FOLDER_EDIT: new Permission('APPLICATION_FOLDER:READ+EDIT'),

KNOWLEDGE_READ: new Permission('KNOWLEDGE:READ'),
KNOWLEDGE_CREATE: new Permission('KNOWLEDGE:READ+CREATE'),
KNOWLEDGE_SYNC: new Permission('KNOWLEDGE:READ+SYNC'),
Expand Down
28 changes: 26 additions & 2 deletions ui/src/views/system/resource-authorization/component/PermissionTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,10 @@
<el-table-column prop="name" :label="$t('common.name')">
<template #default="{ row }">
<el-space :size="8">
<!--  文件夹 icon -->
<AppIcon v-if="row.resource_type === 'folder'" iconName="app-folder" style="font-size: 20px"></AppIcon>
<!--  知识库 icon -->
<KnowledgeIcon :size="20" v-if="isKnowledge" :type="row.icon" />
<KnowledgeIcon :size="20" v-else-if="isKnowledge" :type="row.icon" />
<!--  应用/工具 自定义 icon -->
<el-avatar
v-else-if="isAppIcon(row?.icon) && !isModel"
Expand Down Expand Up @@ -100,7 +102,7 @@
v-model="row.permission"
@change="(val: any) => submitPermissions(val, row)"
>
<template v-for="(item, index) in permissionOptions" :key="index">
<template v-for="(item, index) in getRowPermissionOptions(row)" :key="index">
<el-radio :value="item.value" class="mr-16">{{ item.label }}</el-radio>
</template>
</el-radio-group>
Expand Down Expand Up @@ -154,6 +156,28 @@ const props = defineProps<{
}>()
const emit = defineEmits(['submitPermissions'])

const permissionOptionMap = computed(() => {
return {
rootFolder: getPermissionOptions(true, true),
folder: getPermissionOptions(true, false),
resource: getPermissionOptions(false, false),
}
})


const getRowPermissionOptions = (row: any) => {
const isFolder = row.resource_type === 'folder'
const isRoot = isFolder && row.folder_id === null
if (isRoot) {
return permissionOptionMap.value.rootFolder
}
if (isFolder) {
return permissionOptionMap.value.folder
}
return permissionOptionMap.value.resource

}

const permissionOptions = computed(() => {
return getPermissionOptions()
})
Expand Down
10 changes: 9 additions & 1 deletion ui/src/views/system/resource-authorization/constant.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,15 @@ const permissionOptions = [
]


const getPermissionOptions=()=>{
const getPermissionOptions = (isFodler = false, isRootFolder = false) => {
if (isFodler && isRootFolder) {
return permissionOptions.filter(
item => item.value === AuthorizationEnum.VIEW || item.value === AuthorizationEnum.MANAGE
)
}
if (isFodler) {
return permissionOptions
}
if (hasPermission([EditionConst.IS_EE, EditionConst.IS_PE], 'OR')) {
return [...permissionOptions,{
label: t('views.system.resourceAuthorization.setting.role'),
Expand Down
Loading
Loading