nova-trame 0.19.0.dev2__py3-none-any.whl → 0.19.0.dev4__py3-none-any.whl

nova/trame/model/data_selector.py

@@ -129,6 +129,17 @@ class DataSelectorModel:
 
         return sorted(experiments)
 
+    def sort_directories(self, directories: List[Any]) -> List[Any]:
+        # Sort the current level of dictionaries
+        sorted_dirs = sorted(directories, key=lambda x: x["title"])
+
+        # Process each sorted item to sort their children
+        for item in sorted_dirs:
+            if "children" in item and isinstance(item["children"], list):
+                item["children"] = self.sort_directories(item["children"])
+
+        return sorted_dirs
+
     def get_directories(self) -> List[Any]:
         if not self.state.experiment:
             return []
@@ -162,7 +173,7 @@ class DataSelectorModel:
         except OSError:
             pass
 
-        return directories
+        return self.sort_directories(directories)
 
     def get_datafiles(self) -> List[str]:
         datafiles = []

nova/trame/view/components/data_selector.py

@@ -78,66 +78,72 @@ class DataSelector(vuetify.VDataTable):
         self.create_ui(facility, instrument, **kwargs)
 
     def create_ui(self, facility: str, instrument: str, **kwargs: Any) -> None:
-        with GridLayout(columns=3):
-            columns = 3
-            if facility == "":
-                columns -= 1
-                InputField(v_model=f"{self._state_name}.facility", items=(self._facilities_name,), type="autocomplete")
-            if instrument == "":
-                columns -= 1
+        with html.Div():
+            with GridLayout(columns=3):
+                columns = 3
+                if facility == "":
+                    columns -= 1
+                    InputField(
+                        v_model=f"{self._state_name}.facility", items=(self._facilities_name,), type="autocomplete"
+                    )
+                if instrument == "":
+                    columns -= 1
+                    InputField(
+                        v_model=f"{self._state_name}.instrument", items=(self._instruments_name,), type="autocomplete"
+                    )
                 InputField(
-                    v_model=f"{self._state_name}.instrument", items=(self._instruments_name,), type="autocomplete"
+                    v_model=f"{self._state_name}.experiment",
+                    column_span=columns,
+                    items=(self._experiments_name,),
+                    type="autocomplete",
+                )
+
+            with GridLayout(columns=3, height="500px", valign="start"):
+                if not self._prefix:
+                    with html.Div(classes="overflow-y-auto", style="max-height: 500px"):
+                        vuetify.VListSubheader("Available Directories", classes="justify-center px-0")
+                        vuetify.VTreeview(
+                            v_if=(f"{self._directories_name}.length > 0",),
+                            activatable=True,
+                            active_strategy="single-independent",
+                            item_value="path",
+                            items=(self._directories_name,),
+                            update_activated=(self._vm.set_directory, "$event"),
+                        )
+                        vuetify.VListItem("No directories found", v_else=True)
+
+                super().__init__(
+                    v_model=self._v_model,
+                    column_span=3 if self._prefix else 2,
+                    headers=("[{ align: 'center', key: 'title', title: 'Available Datafiles' }]",),
+                    item_title="title",
+                    item_value="path",
+                    select_strategy=self._select_strategy,
+                    show_select=True,
+                    **kwargs,
                 )
-            InputField(
-                v_model=f"{self._state_name}.experiment",
-                column_span=columns,
-                items=(self._experiments_name,),
-                type="autocomplete",
-            )
-
-        with GridLayout(columns=3, valign="start"):
-            if not self._prefix:
-                with html.Div():
-                    vuetify.VListSubheader("Available Directories", classes="justify-center px-0")
-                    vuetify.VTreeview(
-                        v_if=(f"{self._directories_name}.length > 0",),
-                        activatable=True,
-                        active_strategy="single-independent",
-                        item_value="path",
-                        items=(self._directories_name,),
-                        update_activated=(self._vm.set_directory, "$event"),
+                self.items = (self._datafiles_name,)
+                if "update_modelValue" not in kwargs:
+                    self.update_modelValue = f"flushState('{self._v_model.split('.')[0]}')"
+
+            with cast(
+                vuetify.VSelect,
+                InputField(
+                    v_show=f"{self._v_model}.length > 0",
+                    v_model=self._v_model,
+                    classes="nova-readonly",
+                    clearable=True,
+                    label=self._label,
+                    readonly=True,
+                    type="select",
+                    click_clear=f"{self._v_model} = []; flushState('{self._v_model.split('.')[0]}');",
+                ),
+            ):
+                with vuetify.Template(raw_attrs=['v-slot:selection="{ item, index }"']):
+                    vuetify.VChip("{{ item.title }}", v_if="index < 2")
+                    html.Span(
+                        f"(+{{{{ {self._v_model}.length - 2 }}}} others)", v_if="index === 2", classes="text-caption"
                     )
-                    vuetify.VListItem("No directories found", v_else=True)
-
-            super().__init__(
-                v_model=self._v_model,
-                column_span=3 if self._prefix else 2,
-                headers=("[{ align: 'center', key: 'title', title: 'Available Datafiles' }]",),
-                item_title="title",
-                item_value="path",
-                select_strategy=self._select_strategy,
-                show_select=True,
-                **kwargs,
-            )
-            self.items = (self._datafiles_name,)
-            if "update_modelValue" not in kwargs:
-                self.update_modelValue = f"flushState('{self._v_model.split('.')[0]}')"
-
-        with cast(
-            vuetify.VSelect,
-            InputField(
-                v_if=f"{self._v_model}.length > 0",
-                v_model=self._v_model,
-                classes="nova-readonly",
-                clearable=True,
-                label=self._label,
-                readonly=True,
-                type="select",
-            ),
-        ):
-            with vuetify.Template(raw_attrs=['v-slot:selection="{ item, index }"']):
-                vuetify.VChip("{{ item.title }}", v_if="index < 2")
-                html.Span(f"(+{{{{ {self._v_model}.length - 2 }}}} others)", v_if="index === 2", classes="text-caption")
 
     def create_model(self, facility: str, instrument: str) -> None:
         self._model = DataSelectorModel(facility, instrument, self._prefix)

{nova_trame-0.19.0.dev2.dist-info → nova_trame-0.19.0.dev4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nova-trame
-Version: 0.19.0.dev2
+Version: 0.19.0.dev4
 Summary: A Python Package for injecting curated themes and custom components into Trame applications
 License: MIT
 Keywords: NDIP,Python,Trame,Vuetify

{nova_trame-0.19.0.dev2.dist-info → nova_trame-0.19.0.dev4.dist-info}/RECORD

@@ -1,9 +1,9 @@
 nova/__init__.py,sha256=ED6jHcYiuYpr_0vjGz0zx2lrrmJT9sDJCzIljoDfmlM,65
 nova/trame/__init__.py,sha256=gFrAg1qva5PIqR5TjvPzAxLx103IKipJLqp3XXvrQL8,59
-nova/trame/model/data_selector.py,sha256=8BnnPvdYZTmCOJFuWOs_RhQ1NvYqWFdPmWP09WWP5oA,6689
+nova/trame/model/data_selector.py,sha256=6tH5E7PmPMc6Cc7utFqe7MUpKsUP15_2jU0plygeqn0,7168
 nova/trame/model/remote_file_input.py,sha256=9KAf31ZHzpsh_aXUrNcF81Q5jvUZDWCzW1QATKls-Jk,3675
 nova/trame/view/components/__init__.py,sha256=u8yzshFp_TmuC1g9TRxKjy_BdGWMIzPQouI52hzcr2U,234
-nova/trame/view/components/data_selector.py,sha256=vRbN2FlcfnUWpmL4MFfRqrbhXQWip2_QLMoMg9KFXCs,7584
+nova/trame/view/components/data_selector.py,sha256=L9AzHrg1IH_SwlOTjQiZNeN_mEVsCj0xgKIeYLVnFH4,8102
 nova/trame/view/components/file_upload.py,sha256=XbiSx2txpdohwxGyP-ecTbIgMPv6siUARJ7nXhXaiAc,2827
 nova/trame/view/components/input_field.py,sha256=ncVVSzdJwH_-KP24I2rCqcb6v3J2hPhNTXr8Lb1EZ_U,15931
 nova/trame/view/components/remote_file_input.py,sha256=lFchhhoMo9EgSr7pSlh2LEm8NZO1XXrBcfh_BLGZBV0,9492
@@ -25,8 +25,8 @@ nova/trame/view/theme/theme.py,sha256=OFUtq1IWriFcDu-346J67ZrSES8IOI9PTY_4Vwg7bZ
 nova/trame/view/utilities/local_storage.py,sha256=vD8f2VZIpxhIKjZwEaD7siiPCTZO4cw9AfhwdawwYLY,3218
 nova/trame/view_model/data_selector.py,sha256=Bpkfjd78ZIkexHNF_aA9PfizRBzkeOuoSE7ZsBFcSOs,1749
 nova/trame/view_model/remote_file_input.py,sha256=ojEOJ8ZPkajpbAaZi9VLj7g-uBjhb8BMrTdMmwf_J6A,3367
-nova_trame-0.19.0.dev2.dist-info/LICENSE,sha256=Iu5QiDbwNbREg75iYaxIJ_V-zppuv4QFuBhAW-qiAlM,1061
-nova_trame-0.19.0.dev2.dist-info/METADATA,sha256=7HZZEW7-Vs_z1Oo0T1AUeIUOodsk5Z0sE60yloyGXns,1451
-nova_trame-0.19.0.dev2.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-nova_trame-0.19.0.dev2.dist-info/entry_points.txt,sha256=J2AmeSwiTYZ4ZqHHp9HO6v4MaYQTTBPbNh6WtoqOT58,42
-nova_trame-0.19.0.dev2.dist-info/RECORD,,
+nova_trame-0.19.0.dev4.dist-info/LICENSE,sha256=Iu5QiDbwNbREg75iYaxIJ_V-zppuv4QFuBhAW-qiAlM,1061
+nova_trame-0.19.0.dev4.dist-info/METADATA,sha256=_hm3UBkHt6w5rNkzy_v089JWk_nn94RocwvVNtrsnys,1451
+nova_trame-0.19.0.dev4.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+nova_trame-0.19.0.dev4.dist-info/entry_points.txt,sha256=J2AmeSwiTYZ4ZqHHp9HO6v4MaYQTTBPbNh6WtoqOT58,42
+nova_trame-0.19.0.dev4.dist-info/RECORD,,