Skip to content

fix: Error workspace id in resource manage #5075

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
Apr 9, 2026
Merged

fix: Error workspace id in resource manage #5075

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
8 changes: 5 additions & 3 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 @@ -368,6 +368,7 @@ const handleSelectionChange = (val: any[]) => {
}

const dialogVisible = ref(false)
const rowWorkspaceId = ref<string | null>(null)
const singleSelectDialogVisible = ref(false)
const pendingPermissionChange = ref<{ val: any; row: any } | null>(null)
const radioPermission = ref('')
Expand Down Expand Up @@ -431,7 +432,7 @@ function permissionsHandle(val: any, row: any) {
}

function submitPermissions(obj: any) {
const workspaceId = user.getWorkspaceId() || 'default'
const workspaceId = rowWorkspaceId.value ?? user.getWorkspaceId() ?? 'default'
loadSharedApi({ type: 'resourceAuthorization', systemType: apiType.value })
.putResourceAuthorization(workspaceId, targetId.value, props.type, obj, loading)
.then(() => {
Expand All @@ -440,7 +441,7 @@ function submitPermissions(obj: any) {
})
}
const getPermissionList = () => {
const workspaceId = user.getWorkspaceId() || 'default'
const workspaceId = rowWorkspaceId.value ?? user.getWorkspaceId() ?? 'default'
const params: any = {}
if (searchForm.value[searchType.value]) {
params[searchType.value] = searchForm.value[searchType.value]
Expand All @@ -466,9 +467,10 @@ const getPermissionList = () => {
})
}

const open = (id: string, folder_data?: any) => {
const open = (id: string, folder_data?: any, workspace_id?: string) => {
targetId.value = id
folderData.value = folder_data
rowWorkspaceId.value = workspace_id ?? null
drawerVisible.value = true
getPermissionList()
}
Expand Down
2 changes: 1 addition & 1 deletion ui/src/views/system-resource-management/ApplicationResourceIndex.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ const openTriggerDrawer = (data: any) => {
const ResourceAuthorizationDrawerRef = ref()

function openAuthorization(item: any) {
ResourceAuthorizationDrawerRef.value.open(item.id)
ResourceAuthorizationDrawerRef.value.open(item.id, undefined, item.workspace_id)
}

const apiInputParams = ref([])
Expand Down
2 changes: 1 addition & 1 deletion ui/src/views/system-resource-management/KnowledgeResourceIndex.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ const paginationConfig = reactive({
const ResourceAuthorizationDrawerRef = ref()

function openAuthorization(item: any) {
ResourceAuthorizationDrawerRef.value.open(item.id)
ResourceAuthorizationDrawerRef.value.open(item.id, undefined, item.workspace_id)
}

const exportKnowledge = (item: any) => {
Expand Down
2 changes: 1 addition & 1 deletion ui/src/views/system-resource-management/ModelResourceIndex.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ const MoreFilledPermission = () => {
const ResourceAuthorizationDrawerRef = ref()

function openAuthorization(item: any) {
ResourceAuthorizationDrawerRef.value.open(item.id)
ResourceAuthorizationDrawerRef.value.open(item.id, undefined, item.workspace_id)
}

const deleteModel = (row: any) => {
Expand Down
2 changes: 1 addition & 1 deletion ui/src/views/system-resource-management/ToolResourceIndex.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@ const openTriggerDrawer = (data: any) => {
const ResourceAuthorizationDrawerRef = ref()

function openAuthorization(item: any) {
ResourceAuthorizationDrawerRef.value.open(item.id)
ResourceAuthorizationDrawerRef.value.open(item.id, undefined, item.workspace_id)
}

function exportTool(row: any) {
Expand Down
Loading