trash settings

Author: pcrespov

services/static-webserver/client/source/class/osparc/store/StaticInfo.js

@@ -70,9 +70,9 @@ qx.Class.define("osparc.store.StaticInfo", {
     },
 
     getTrashRetentionDays: function() {
-      const staticKey = "webserverProjects";
+      const staticKey = "webserverTrash";
       const wsStaticData = this.getValue(staticKey);
-      const key = "PROJECTS_TRASH_RETENTION_DAYS";
+      const key = "TRASH_RETENTION_DAYS";
       if (key in wsStaticData) {
         return wsStaticData[key];
       }

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

@@ -266,15 +266,13 @@ class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
     WEBSERVER_RABBITMQ: Annotated[
         RabbitSettings | None,
         Field(
-            description="rabbitmq plugin",
             json_schema_extra={"auto_default_from_env": True},
         ),
     ]
 
     WEBSERVER_USERS: Annotated[
         UsersSettings | None,
         Field(
-            description="users plugin",
             json_schema_extra={"auto_default_from_env": True},
         ),
     ]
@@ -455,7 +453,9 @@ def to_client_statics(self) -> dict[str, Any]:
                 "SWARM_STACK_NAME": True,
                 "WEBSERVER_PROJECTS": {
                     "PROJECTS_MAX_NUM_RUNNING_DYNAMIC_NODES",
-                    "PROJECTS_TRASH_RETENTION_DAYS",
+                },
+                "WEBSERVER_TRASH": {
+                    "TRASH_RETENTION_DAYS",
                 },
                 "WEBSERVER_LOGIN": {
                     "LOGIN_ACCOUNT_DELETION_RETENTION_DAYS",

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

@@ -23,10 +23,6 @@ class ProjectsSettings(BaseCustomSettings):
         description="interval after which services need to be idle in order to be considered inactive",
     )
 
-    PROJECTS_TRASH_RETENTION_DAYS: NonNegativeInt = Field(
-        default=7, description="Trashed items will be deleted after this time"
-    )
-
 
 def get_plugin_settings(app: web.Application) -> ProjectsSettings:
     settings = app[APP_SETTINGS_KEY].WEBSERVER_PROJECTS

services/web/server/src/simcore_service_webserver/trash/_service.py

@@ -24,7 +24,7 @@ async def empty_trash(app: web.Application, product_name: ProductName, user_id:
 
 async def prune_trash(app: web.Application) -> list[str]:
     settings = get_plugin_settings(app)
-    retention = timedelta(days=settings.PROJECTS_TRASH_RETENTION_DAYS)
+    retention = timedelta(days=settings.TRASH_RETENTION_DAYS)
 
     _logger.debug(
         "CODE PLACEHOLDER: **ALL** projects marked as trashed during %s days are deleted",

services/web/server/src/simcore_service_webserver/trash/settings.py

@@ -7,7 +7,9 @@
 
 class TrashSettings(BaseCustomSettings):
     TRASH_RETENTION_DAYS: NonNegativeInt = Field(
-        default=7, description="Trashed items will be deleted after this time"
+        default=7,
+        description="Trashed items will be deleted after this time",
+        alias="PROJECTS_TRASH_RETENTION_DAYS",
     )