feature(studies): add has_children flag to non study folder

antarest/study/model.py

@@ -332,6 +332,7 @@ class NonStudyFolderDTO(AntaresBaseModel):
     path: Path
     workspace: str
     name: str
+    has_children: bool  # true when has non study folder children (false when has no children or only study children)
 
     @computed_field(alias="parentPath")
     def parent_path(self) -> Path:

antarest/study/storage/explorer_service.py

@@ -18,8 +18,8 @@
 from antarest.study.storage.utils import (
     get_folder_from_workspace,
     get_workspace_from_config,
-    is_study_folder,
-    should_ignore_folder_for_scan,
+    has_non_study_folder,
+    is_non_study_folder,
 )
 
 logger = logging.getLogger(__name__)
@@ -41,10 +41,15 @@ def list_dir(
         directory_path = get_folder_from_workspace(workspace, workspace_directory_path)
         directories = []
         for child in directory_path.iterdir():
-            if child.is_dir() and not is_study_folder(child) and not should_ignore_folder_for_scan(child):
+            if is_non_study_folder(child):
                 # we don't want to expose the full absolute path on the server
                 child_rel_path = child.relative_to(workspace.path)
-                directories.append(NonStudyFolderDTO(path=child_rel_path, workspace=workspace_name, name=child.name))
+                has_children = has_non_study_folder(child)
+                directories.append(
+                    NonStudyFolderDTO(
+                        path=child_rel_path, workspace=workspace_name, name=child.name, has_children=has_children
+                    )
+                )
         return directories
 
     def list_workspaces(

antarest/study/storage/utils.py

@@ -477,3 +477,14 @@ def should_ignore_folder_for_scan(path: Path) -> bool:
         return True
 
     return False
+
+
+def has_non_study_folder(path: Path) -> bool:
+    for sub_path in path.iterdir():
+        if is_non_study_folder(sub_path):
+            return True
+    return False
+
+
+def is_non_study_folder(path: Path) -> bool:
+    return path.is_dir() and not is_study_folder(path) and not should_ignore_folder_for_scan(path)

tests/integration/explorer_blueprint/test_explorer.py

@@ -67,11 +67,7 @@ def test_explorer(client: TestClient, admin_access_token: str, study_tree: Path)
     directories_res = res.json()
     directories_res = [NonStudyFolderDTO(**d) for d in directories_res]
     directorires_expected = [
-        NonStudyFolderDTO(
-            path=Path("folder/trash"),
-            workspace="ext",
-            name="trash",
-        )
+        NonStudyFolderDTO(path=Path("folder/trash"), workspace="ext", name="trash", has_children=False)
     ]
     assert directories_res == directorires_expected
 

tests/storage/business/test_explorer_service.py

@@ -85,7 +85,7 @@ def test_list_dir_empty_string(config_scenario_a: Config):
     result = explorer.list_dir("diese", "")
 
     assert len(result) == 1
-    assert result[0] == NonStudyFolderDTO(path=Path("folder"), workspace="diese", name="folder")
+    assert result[0] == NonStudyFolderDTO(path=Path("folder"), workspace="diese", name="folder", has_children=True)
 
 
 @pytest.mark.unit_test
@@ -95,9 +95,18 @@ def test_list_dir_several_subfolders(config_scenario_a: Config):
 
     assert len(result) == 3
     folder_path = Path("folder")
-    assert NonStudyFolderDTO(path=(folder_path / "subfolder1"), workspace="diese", name="subfolder1") in result
-    assert NonStudyFolderDTO(path=(folder_path / "subfolder2"), workspace="diese", name="subfolder2") in result
-    assert NonStudyFolderDTO(path=(folder_path / "subfolder3"), workspace="diese", name="subfolder3") in result
+    assert (
+        NonStudyFolderDTO(path=(folder_path / "subfolder1"), workspace="diese", name="subfolder1", has_children=False)
+        in result
+    )
+    assert (
+        NonStudyFolderDTO(path=(folder_path / "subfolder2"), workspace="diese", name="subfolder2", has_children=False)
+        in result
+    )
+    assert (
+        NonStudyFolderDTO(path=(folder_path / "subfolder3"), workspace="diese", name="subfolder3", has_children=False)
+        in result
+    )
 
 
 @pytest.mark.unit_test