merge master into 1848-add-permission-rights-to-async-jobs

Author: bisgaard-itis

api/specs/web-server/_storage.py

@@ -17,6 +17,7 @@
     FileUploadCompletionBody,
     FileUploadSchema,
     LinkType,
+    PathMetaDataGet,
     PresignedLink,
 )
 from models_library.api_schemas_webserver.storage import (
@@ -58,7 +59,7 @@ async def list_storage_locations():
 
 @router.get(
     "/storage/locations/{location_id}/paths",
-    response_model=CursorPage[FileMetaDataGet],
+    response_model=CursorPage[PathMetaDataGet],
 )
 async def list_storage_paths(
     _path: Annotated[StorageLocationPathParams, Depends()],

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

@@ -6071,7 +6071,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/CursorPage_FileMetaDataGet_'
+                $ref: '#/components/schemas/CursorPage_PathMetaDataGet_'
   /v0/storage/locations/{location_id}/datasets:
     get:
       tags:
@@ -8410,11 +8410,11 @@ components:
       required:
       - priceDollars
       title: CreateWalletPayment
-    CursorPage_FileMetaDataGet_:
+    CursorPage_PathMetaDataGet_:
       properties:
         items:
           items:
-            $ref: '#/components/schemas/FileMetaDataGet'
+            $ref: '#/components/schemas/PathMetaDataGet'
           type: array
           title: Items
         total:
@@ -8450,7 +8450,7 @@ components:
       type: object
       required:
       - items
-      title: CursorPage[FileMetaDataGet]
+      title: CursorPage[PathMetaDataGet]
     DatCoreFileLink:
       properties:
         store:
@@ -12426,6 +12426,29 @@ components:
       required:
       - value
       title: PatchRequestBody
+    PathMetaDataGet:
+      properties:
+        path:
+          type: string
+          format: path
+          title: Path
+          description: the path to the current path
+        display_path:
+          type: string
+          format: path
+          title: Display Path
+          description: the path to display with UUID replaced
+        file_meta_data:
+          anyOf:
+          - $ref: '#/components/schemas/FileMetaDataGet'
+          - type: 'null'
+          description: if filled, this is the file meta data of the s3 object
+      additionalProperties: false
+      type: object
+      required:
+      - path
+      - display_path
+      title: PathMetaDataGet
     PaymentMethodGet:
       properties:
         idr: