Skip to content

fix: Workspace manager folder #4267

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 27, 2025
+2 −1
Merged

fix: Workspace manager folder #4267

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
2 changes: 1 addition & 1 deletion apps/folders/views/folder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class FolderView(APIView):
tags=[_('Folder')] # type: ignore
)
@has_permissions(
lambda r, kwargs: Permission(group=Group(f"{kwargs.get('source')}_FOLDER"), operate=Operate.EDIT,
lambda r, kwargs: Permission(group=Group(f"{kwargs.get('source')}_FOLDER"), operate=Operate.CREATE,
resource_path=f"/WORKSPACE/{kwargs.get('workspace_id')}/{kwargs.get('source')}/{r.data.get('parent_id')}"),
lambda r, kwargs: Permission(group=Group(kwargs.get('source')), operate=Operate.EDIT,
resource_path=f"/WORKSPACE/{kwargs.get('workspace_id')}:ROLE/WORKSPACE_MANAGE"
Copy link
Contributor Author

@shaohuzhang1 shaohuzhang1 Oct 27, 2025

Choose a reason for hiding this comment

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

There seems to be an error in the code snippet you provided. In the @has_permissions decorators:

  1. The operation being checked is mixed between Operation.UPDATE and OPERATE.CREATE. Typically, one should use either UPDATE or CREATE, not both.
lambda r, kwargs: Permission(group=Group(f"{kwargs.get('source')}_FOLDER"), operate=Operate.CREATE,
                              resource_ path=f"/WORKSPACE/{kwargs.get('workspace_id')}/{kwargs.get('source')}/{r.data.get('parent_id')}"),

lambda r, kwargs: Permission(group=Group(kwargs.get('source')), operate=Operate.EDIT,
                            resource_path=f"/WORKSPACE/{kwargs.get('workspace_id')}:ROLE/WORKSPACE_MANAGE")

This will result in an inconsistency and might lead to unexpected behavior in your application.

  1. Ensure that all parameters used ('source', 'workspace_id', 'parent_id') are correctly set before accessing them with .get(). Using these values directly without setting it first could throw a KeyError if those keys do not exist in the request data.

  2. Consider whether the logic for checking permissions should be more specific or general based on additional fields or context within your application.

  3. If you intend to perform different operations depending on certain conditions, ensure that each decorator uses the appropriate constants from your library (e.g., Permission.Operation.UPDATE vs. Permission.Operate.CREATE).

Expand Down
1 change: 1 addition & 0 deletions ui/src/views/tool/component/ToolListContainer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,7 @@ const toolStoreDescDrawerRef = ref<InstanceType<typeof ToolStoreDescDrawer>>()
function openCreateDialog(data?: any) {
// mcp工具
if (data?.tool_type === 'MCP') {
bus.emit('select_node', data.folder_id)
openCreateMcpDialog(data)
return
}
Copy link
Contributor Author

@shaohuzhang1 shaohuzhang1 Oct 27, 2025

Choose a reason for hiding this comment

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

The code looks mostly correct but can be simplified for better readability and maintainability. Here's an optimized version:

function openCreateDialog(data?: any) {
  if (!data || !this.isToolTypeSupported(data.tool_type)) {
    return;
  }

  this.selectNodeFromData(data);
  this.openCreateMcpDialog(data);

  this.handlePostOpenCreateDialog();
}

handlePostOpenCreateDialog() {
  // Add any additional cleanup or logging here
}

Optimization Suggestions:

  1. Early Return: The early return after checking !data || !this.isToolTypeSupported(data.tool_type) ensures that unnecessary checks are skipped when the input data is insufficient.

  2. Code Clarity: Breaking complex logic into separate methods (selectNodeFromData, openCreateMcpDialog) improves code modularity and clarity.

  3. Method Name Clarification: The method name could be made more descriptive, such as prepareAndOpenDialog.

  4. Add Additional Checks: If necessary, you may want to add more robust error handling or validation of data.

Expand Down
Loading