connected trash in folders

Author: pcrespov

services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml

@@ -8509,6 +8509,10 @@ components:
           title: Modifiedat
           type: string
           format: date-time
+        trashedAt:
+          title: Trashedat
+          type: string
+          format: date-time
         owner:
           title: Owner
           exclusiveMinimum: true

services/web/server/src/simcore_service_webserver/folders/_folders_api.py

@@ -148,6 +148,7 @@ async def list_folders(
     product_name: ProductName,
     folder_id: FolderID | None,
     workspace_id: WorkspaceID | None,
+    trashed: bool | None,
     offset: NonNegativeInt,
     limit: int,
     order_by: OrderBy,
@@ -182,6 +183,7 @@ async def list_folders(
         user_id=user_id if workspace_is_private else None,
         workspace_id=workspace_id,
         product_name=product_name,
+        trashed=trashed,
         offset=offset,
         limit=limit,
         order_by=order_by,

services/web/server/src/simcore_service_webserver/folders/_folders_db.py

@@ -81,6 +81,7 @@ async def list_(
     user_id: UserID | None,
     workspace_id: WorkspaceID | None,
     product_name: ProductName,
+    trashed: bool | None,
     offset: NonNegativeInt,
     limit: int,
     order_by: OrderBy,
@@ -107,6 +108,13 @@ async def list_(
         assert workspace_id  # nosec
         base_query = base_query.where(folders_v2.c.workspace_id == workspace_id)
 
+    if trashed is not None:
+        base_query = base_query.where(
+            folders_v2.c.trashed_at.is_not(None)
+            if trashed
+            else folders_v2.c.trashed_at.is_(None)
+        )
+
     # Select total count from base_query
     subquery = base_query.subquery()
     count_query = select(func.count()).select_from(subquery)

services/web/server/src/simcore_service_webserver/folders/_folders_handlers.py

@@ -27,6 +27,7 @@
 from . import _folders_api
 from ._exceptions_handling import handle_plugin_requests_exceptions
 from ._models import (
+    FolderFilters,
     FolderListWithJsonStrQueryParams,
     FoldersPathParams,
     FoldersRequestContext,
@@ -68,12 +69,16 @@ async def list_folders(request: web.Request):
         FolderListWithJsonStrQueryParams, request
     )
 
+    if not query_params.filters:
+        query_params.filters = FolderFilters()
+
     folders: FolderGetPage = await _folders_api.list_folders(
         app=request.app,
         user_id=req_ctx.user_id,
         product_name=req_ctx.product_name,
         folder_id=query_params.folder_id,
         workspace_id=query_params.workspace_id,
+        trashed=query_params.filters.trashed,
         offset=query_params.offset,
         limit=query_params.limit,
         order_by=parse_obj_as(OrderBy, query_params.order_by),

services/web/server/src/simcore_service_webserver/folders/_models.py

@@ -2,6 +2,7 @@
 
 from models_library.basic_types import IDStr
 from models_library.folders import FolderID
+from models_library.rest_filters import Filters, FiltersQueryParameters
 from models_library.rest_ordering import OrderBy, OrderDirection
 from models_library.rest_pagination import PageQueryParameters
 from models_library.users import UserID
@@ -25,7 +26,16 @@ class FoldersPathParams(StrictRequestParams):
     folder_id: FolderID
 
 
-class FolderListWithJsonStrQueryParams(PageQueryParameters):
+class FolderFilters(Filters):
+    trashed: bool | None = Field(
+        default=False,
+        description="Set to true to list trashed, false to list non-trashed (default), None to list all",
+    )
+
+
+class FolderListWithJsonStrQueryParams(
+    PageQueryParameters, FiltersQueryParameters[FolderFilters]
+):
     # pylint: disable=unsubscriptable-object
     order_by: Json[OrderBy] = Field(
         default=OrderBy(field=IDStr("modified"), direction=OrderDirection.DESC),