🎨 make folders optional + improvements ⚠️

services/web/server/src/simcore_service_webserver/application_settings_utils.py

@@ -180,6 +180,7 @@ def convert_to_app_config(app_settings: ApplicationSettings) -> dict[str, Any]:
         "users": {"enabled": app_settings.WEBSERVER_USERS is not None},
         "version_control": {"enabled": app_settings.WEBSERVER_VERSION_CONTROL},
         "wallets": {"enabled": app_settings.WEBSERVER_WALLETS},
+        "folders": {"enabled": app_settings.WEBSERVER_FOLDERS},
     }
 
 
@@ -323,6 +324,7 @@ def _set_if_disabled(field_name, section):
         "WEBSERVER_USERS",
         "WEBSERVER_VERSION_CONTROL",
         "WEBSERVER_WALLETS",
+        "WEBSERVER_FOLDERS",
     ):
         section_name = settings_name.replace("WEBSERVER_", "").lower()
         if section := cfg.get(section_name):

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

@@ -90,6 +90,13 @@ def validate_order_by_field(cls, v):
     class Config:
         extra = Extra.forbid
 
+    @validator("folder_id", pre=True, always=True)
+    @classmethod
+    def convert_null_to_none(cls, v):
+        if v is None or v in ["null", "none"]:
+            return None
+        return v
+
 
 @routes.post(f"/{VTAG}/folders", name="create_folder")
 @login_required

services/web/server/src/simcore_service_webserver/projects/_crud_api_read.py

@@ -16,6 +16,7 @@
 from servicelib.utils import logged_gather
 from simcore_postgres_database.webserver_models import ProjectType as ProjectTypeDB
 
+from ..application_settings import get_application_settings
 from ..catalog.client import get_services_for_user_in_product
 from . import projects_api
 from ._permalink_api import update_or_pop_permalink_in_project
@@ -59,6 +60,7 @@ async def list_projects(
     folder_id: FolderID | None,
 ) -> tuple[list[ProjectDict], int]:
     app = request.app
+    settings = get_application_settings(app)
     db = ProjectDBAPI.get_from_app_context(app)
 
     user_available_services: list[dict] = await get_services_for_user_in_product(
@@ -68,6 +70,7 @@ async def list_projects(
     db_projects, db_project_types, total_number_projects = await db.list_projects(
         user_id=user_id,
         product_name=product_name,
+        settings=settings,
         filter_by_project_type=ProjectTypeAPI.to_project_type_db(project_type),
         filter_by_services=user_available_services,
         offset=offset,

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

@@ -10,6 +10,7 @@
 from servicelib.mimetype_constants import MIMETYPE_APPLICATION_JSON
 
 from .._meta import api_version_prefix as VTAG
+from ..application_settings import get_application_settings
 from ..login.decorators import login_required
 from ..security.decorators import permission_required
 from . import _folders_api, projects_api
@@ -63,6 +64,10 @@ async def replace_project_folder(request: web.Request):
     req_ctx = RequestContext.parse_obj(request)
     path_params = parse_request_path_parameters_as(_ProjectsFoldersPathParams, request)
 
+    settings = get_application_settings(request.app)
+    if not settings.WEBSERVER_FOLDERS:
+        raise RuntimeError("Webserver folders plugin disabled")
+
     # ensure the project exists
     await projects_api.get_project_for_user(
         request.app,

services/web/server/src/simcore_service_webserver/projects/db.py

@@ -57,6 +57,7 @@
 from tenacity.asyncio import AsyncRetrying
 from tenacity.retry import retry_if_exception_type
 
+from ..application_settings import ApplicationSettings
 from ..db.models import projects_to_wallet, study_tags
 from ..utils import now_str
 from ._comments_db import (
@@ -322,6 +323,7 @@ async def list_projects(  # pylint: disable=too-many-arguments
         user_id: PositiveInt,
         *,
         product_name: str,
+        settings: ApplicationSettings,
         filter_by_project_type: ProjectType | None = None,
         filter_by_services: list[dict] | None = None,
         only_published: bool | None = False,
@@ -368,6 +370,10 @@ async def list_projects(  # pylint: disable=too-many-arguments
                     projects.join(projects_to_products, isouter=True)
                     .join(access_rights_subquery, isouter=True)
                     .join(folders_to_projects, isouter=True)
+                    if settings.WEBSERVER_FOLDERS
+                    else projects.join(projects_to_products, isouter=True).join(
+                        access_rights_subquery, isouter=True
+                    )
                 )
                 .where(
                     (
@@ -396,13 +402,15 @@ async def list_projects(  # pylint: disable=too-many-arguments
                         # This was added for backward compatibility, including old projects not in the projects_to_products table.
                         | (projects_to_products.c.product_name.is_(None))
                     )
-                    & (
-                        (folders_to_projects.c.folder_id == f"{folder_id}")
-                        if folder_id
-                        else (folders_to_projects.c.folder_id.is_(None))
-                    )
                 )
             )
+            if settings.WEBSERVER_FOLDERS:
+                query = query.where(
+                    folders_to_projects.c.folder_id == f"{folder_id}"
+                    if folder_id
+                    else folders_to_projects.c.folder_id.is_(None)
+                )
+
             if search:
                 query = query.join(users, isouter=True)
                 query = query.where(