55from aiohttp import web
66from models_library .access_rights import AccessRights
77from models_library .api_schemas_webserver .folders_v2 import FolderGet , FolderGetPage
8- from models_library .folders import FolderID , FolderQuery , FolderScope
8+ from models_library .folders import FolderID
99from models_library .products import ProductName
1010from models_library .projects import ProjectID
1111from models_library .rest_ordering import OrderBy
1212from models_library .users import UserID
13- from models_library .workspaces import WorkspaceID , WorkspaceQuery , WorkspaceScope
13+ from models_library .workspaces import WorkspaceID
1414from pydantic import NonNegativeInt
1515from servicelib .aiohttp .application_keys import APP_FIRE_AND_FORGET_TASKS_KEY
1616from servicelib .common_headers import UNDEFINED_DEFAULT_SIMCORE_USER_AGENT_VALUE
@@ -166,11 +166,6 @@ async def list_folders(
166166 )
167167 workspace_is_private = False
168168 user_folder_access_rights = user_workspace_access_rights .my_access_rights
169- _workspace_query = WorkspaceQuery (
170- workspace_scope = WorkspaceScope .SHARED , workspace_id = workspace_id
171- )
172- else :
173- _workspace_query = WorkspaceQuery (workspace_scope = WorkspaceScope .PRIVATE )
174169
175170 if folder_id :
176171 # Check user access to folder
@@ -181,19 +176,14 @@ async def list_folders(
181176 user_id = user_id if workspace_is_private else None ,
182177 workspace_id = workspace_id ,
183178 )
184- _folder_query = FolderQuery (
185- folder_scope = FolderScope .SPECIFIC , folder_id = folder_id
186- )
187- else :
188- _folder_query = FolderQuery (folder_scope = FolderScope .ROOT )
189179
190180 total_count , folders = await folders_db .list_ (
191181 app ,
182+ content_of_folder_id = folder_id ,
183+ user_id = user_id if workspace_is_private else None ,
184+ workspace_id = workspace_id ,
192185 product_name = product_name ,
193- user_id = user_id ,
194- folder_query = _folder_query ,
195- workspace_query = _workspace_query ,
196- filter_trashed = trashed ,
186+ trashed = trashed ,
197187 offset = offset ,
198188 limit = limit ,
199189 order_by = order_by ,
0 commit comments