nova-trame 1.0.0rc5__py3-none-any.whl → 1.1.0__py3-none-any.whl

nova/trame/model/data_selector.py

@@ -2,7 +2,7 @@
 
 import os
 from pathlib import Path
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, List, Optional, Tuple
 
 from natsort import natsorted
 from pydantic import BaseModel, Field
@@ -13,6 +13,11 @@ class DataSelectorState(BaseModel, validate_assignment=True):
 
     directory: str = Field(default="")
     extensions: List[str] = Field(default=[])
+    search: str = Field(default="", title="Search")
+    # True: A->Z, False: Z->A, None: no order
+    sort_alpha: Optional[bool] = Field(default=None)
+    # True: Recent modifications first, False: Older modifications first, None: no order
+    sort_time: Optional[bool] = Field(default=None)
     subdirectory: str = Field(default="")
 
 
@@ -95,18 +100,25 @@ class DataSelectorModel:
             datafile_path = base_path / self.state.subdirectory
 
             for entry in os.scandir(datafile_path):
+                can_add = False
                 if entry.is_file():
                     if self.state.extensions:
                         for extension in self.state.extensions:
                             if entry.path.lower().endswith(extension):
-                                datafiles.append(entry.path)
+                                can_add = True
                                 break
                     else:
-                        datafiles.append(entry.path)
+                        can_add = True
+
+                if self.state.search and self.state.search.lower() not in entry.path.lower():
+                    can_add = False
+
+                if can_add:
+                    datafiles.append((entry.path, entry.stat().st_mtime))
         except OSError:
             pass
 
-        return natsorted(datafiles)
+        return self.sort_datafiles(datafiles)
 
     def get_datafiles(self) -> List[str]:
         base_path = Path(self.state.directory)
@@ -115,3 +127,33 @@ class DataSelectorModel:
 
     def set_subdirectory(self, subdirectory_path: str) -> None:
         self.state.subdirectory = subdirectory_path
+
+    def sort_datafiles(self, files: List[Tuple[str, float]]) -> List[str]:
+        if self.state.sort_alpha is not None:
+            files = natsorted(files, key=lambda x: x[0].lower(), reverse=not self.state.sort_alpha)
+        elif self.state.sort_time is not None:
+            files = sorted(files, key=lambda x: x[1], reverse=self.state.sort_time)
+
+        return [file[0] for file in files]
+
+    def toggle_alpha_sort(self) -> None:
+        # Reset the time sort since we've changed alpha sort more recently
+        self.state.sort_time = None
+
+        if self.state.sort_alpha is None:
+            self.state.sort_alpha = True
+        elif self.state.sort_alpha:
+            self.state.sort_alpha = False
+        else:
+            self.state.sort_alpha = None
+
+    def toggle_time_sort(self) -> None:
+        # Reset the alpha sort since we've changed time sort more recently
+        self.state.sort_alpha = None
+
+        if self.state.sort_time is None:
+            self.state.sort_time = True
+        elif self.state.sort_time:
+            self.state.sort_time = False
+        else:
+            self.state.sort_time = None

nova/trame/view/components/data_selector.py

@@ -11,7 +11,7 @@ from trame_server.core import State
 
 from nova.mvvm._internal.utils import rgetdictvalue
 from nova.mvvm.trame_binding import TrameBinding
-from nova.trame._internal.utils import get_state_param, set_state_param
+from nova.trame._internal.utils import get_state_name, get_state_param, set_state_param
 from nova.trame.model.data_selector import DataSelectorModel, DataSelectorState
 from nova.trame.view.layouts import GridLayout, HBoxLayout, VBoxLayout
 from nova.trame.view_model.data_selector import DataSelectorViewModel
@@ -28,6 +28,7 @@ class DataSelector(datagrid.VGrid):
         self,
         v_model: Union[str, Tuple],
         directory: Union[str, Tuple],
+        clear_selection_on_directory_change: Union[bool, Tuple] = True,
         extensions: Union[List[str], Tuple, None] = None,
         prefix: Union[str, Tuple] = "",
         subdirectory: Union[str, Tuple] = "",
@@ -45,6 +46,8 @@ class DataSelector(datagrid.VGrid):
         directory : Union[str, Tuple]
             The top-level folder to expose to users. Only contents of this directory and its children will be exposed to
             users.
+        clear_selection_on_directory_change: Union[bool, Tuple], optional
+            Whether or not to clear the selected files when the directory is changed.
         extensions : Union[List[str], Tuple], optional
             A list of file extensions to restrict selection to. If unset, then all files will be shown.
         prefix : Union[str, Tuple], optional
@@ -96,6 +99,7 @@ class DataSelector(datagrid.VGrid):
         else:
             self._v_model_name_in_state = v_model[0].split(".")[0]
 
+        self._clear_selection = clear_selection_on_directory_change
         self._directory = directory
         self._last_directory = get_state_param(self.state, self._directory)
         self._extensions = extensions if extensions is not None else []
@@ -129,6 +133,8 @@ class DataSelector(datagrid.VGrid):
         return get_server(None, client_type="vue3").state
 
     def create_ui(self, *args: Any, **kwargs: Any) -> None:
+        show_directories = isinstance(self._subdirectory, tuple) or not self._subdirectory
+
         with VBoxLayout(classes="nova-data-selector", stretch=True) as self._layout:
             with HBoxLayout(valign="center"):
                 self._layout.filter = html.Div(classes="flex-1-1")
@@ -139,7 +145,7 @@ class DataSelector(datagrid.VGrid):
                     vuetify.VTooltip("Refresh Contents", activator="parent")
 
             with GridLayout(columns=2, stretch=True):
-                if isinstance(self._subdirectory, tuple) or not self._subdirectory:
+                if show_directories:
                     with VBoxLayout(stretch=True):
                         vuetify.VListSubheader("Available Directories", classes="flex-0-1 justify-center px-0")
                         vuetify.VTreeview(
@@ -155,51 +161,113 @@ class DataSelector(datagrid.VGrid):
                         )
                         vuetify.VListItem("No directories found", classes="flex-0-1 text-center", v_else=True)
 
-                if "columns" in kwargs:
-                    columns = kwargs.pop("columns")
-                else:
-                    columns = (
-                        "[{"
-                        "    cellTemplate: (createElement, props) =>"
-                        f"       window.grid_manager.get('{self._revogrid_id}').cellTemplate(createElement, props),"
-                        "    columnTemplate: (createElement) =>"
-                        f"       window.grid_manager.get('{self._revogrid_id}').columnTemplate(createElement),"
-                        "    name: 'Available Datafiles',"
-                        "    prop: 'title',"
-                        "}]",
-                    )
+                with VBoxLayout(column_span=1 if show_directories else 2, stretch=True):
+                    with VBoxLayout(classes="mx-2", gap="0.5em"):
+                        with HBoxLayout(gap="0.25em", valign="center"):
+                            if isinstance(self._extensions, tuple):
+                                extensions_name = f"{get_state_name(self._extensions[0])}.extensions"
+                            else:
+                                extensions_name = f"{self._state_name}.extensions"
+
+                            InputField(v_model=f"{self._state_name}.search")
+                            with vuetify.VBtn(classes="icon-btn", icon=True, click=self._vm.toggle_alpha_sort):
+                                vuetify.VTooltip(
+                                    "Sorting A->Z",
+                                    activator="parent",
+                                    v_if=f"{self._state_name}.sort_alpha === true",
+                                )
+                                vuetify.VTooltip(
+                                    "Sorting Z->A",
+                                    activator="parent",
+                                    v_else_if=f"{self._state_name}.sort_alpha === false",
+                                )
+                                vuetify.VTooltip("Click to sort alphanumerically", activator="parent", v_else=True)
+
+                                vuetify.VIcon(
+                                    "mdi-sort-alphabetical-ascending",
+                                    size=16,
+                                    v_if=f"{self._state_name}.sort_alpha === true",
+                                )
+                                vuetify.VIcon(
+                                    "mdi-sort-alphabetical-descending",
+                                    size=16,
+                                    v_else_if=f"{self._state_name}.sort_alpha === false",
+                                )
+                                vuetify.VIcon("mdi-order-alphabetical-ascending", size=16, v_else=True)
+                            with vuetify.VBtn(classes="icon-btn", icon=True, click=self._vm.toggle_time_sort):
+                                vuetify.VTooltip(
+                                    "Newest modification times first",
+                                    activator="parent",
+                                    v_if=f"{self._state_name}.sort_time === true",
+                                )
+                                vuetify.VTooltip(
+                                    "Oldest modification times first",
+                                    activator="parent",
+                                    v_else_if=f"{self._state_name}.sort_time === false",
+                                )
+                                vuetify.VTooltip("Click to sort by modification times", activator="parent", v_else=True)
+
+                                vuetify.VIcon(
+                                    "mdi-sort-clock-ascending",
+                                    size=16,
+                                    v_if=f"{self._state_name}.sort_time === true",
+                                )
+                                vuetify.VIcon(
+                                    "mdi-sort-clock-descending",
+                                    size=16,
+                                    v_else_if=f"{self._state_name}.sort_time === false",
+                                )
+                                vuetify.VIcon("mdi-clock", size=16, v_else=True)
+
+                        html.P(
+                            f"Showing {{{{ {extensions_name}.join(',') }}}} files",
+                            v_if=f"{extensions_name}.length > 0",
+                        )
 
-                super().__init__(
-                    v_model=self._v_model,
-                    can_focus=False,
-                    columns=columns,
-                    column_span=1 if isinstance(self._subdirectory, tuple) or not self._subdirectory else 2,
-                    frame_size=10,
-                    hide_attribution=True,
-                    id=self._revogrid_id,
-                    readonly=True,
-                    stretch=True,
-                    source=(self._datafiles_name,),
-                    theme="compact",
-                    **kwargs,
-                )
-                if self._label:
-                    self.label = self._label
-                if "update_modelValue" not in kwargs:
-                    self.update_modelValue = self._flush_state
-
-                # Sets up some JavaScript event handlers when the component is mounted.
-                with self:
-                    client.ClientTriggers(
-                        mounted=(
-                            "window.grid_manager.add("
-                            f"  '{self._revogrid_id}',"
-                            f"  '{self._v_model}',"
-                            f"  '{self._datafiles_name}',"
-                            f"  '{self._v_model_name_in_state}'"
-                            ")"
+                    if "columns" in kwargs:
+                        columns = kwargs.pop("columns")
+                    else:
+                        columns = (
+                            "[{"
+                            "    cellTemplate: (createElement, props) =>"
+                            f"       window.grid_manager.get('{self._revogrid_id}').cellTemplate(createElement, props),"
+                            "    columnTemplate: (createElement) =>"
+                            f"       window.grid_manager.get('{self._revogrid_id}').columnTemplate(createElement),"
+                            "    name: 'Available Datafiles',"
+                            "    prop: 'title',"
+                            "}]",
                         )
+
+                    super().__init__(
+                        v_model=self._v_model,
+                        can_focus=False,
+                        columns=columns,
+                        frame_size=10,
+                        hide_attribution=True,
+                        id=self._revogrid_id,
+                        readonly=True,
+                        stretch=True,
+                        source=(self._datafiles_name,),
+                        theme="compact",
+                        **kwargs,
                     )
+                    if self._label:
+                        self.label = self._label
+                    if "update_modelValue" not in kwargs:
+                        self.update_modelValue = self._flush_state
+
+                    # Sets up some JavaScript event handlers when the component is mounted.
+                    with self:
+                        client.ClientTriggers(
+                            mounted=(
+                                "window.grid_manager.add("
+                                f"  '{self._revogrid_id}',"
+                                f"  '{self._v_model}',"
+                                f"  '{self._datafiles_name}',"
+                                f"  '{self._v_model_name_in_state}'"
+                                ")"
+                            )
+                        )
 
             with cast(
                 vuetify.VSelect,
@@ -240,8 +308,9 @@ class DataSelector(datagrid.VGrid):
         self._vm.update_view(refresh_directories=True)
 
     def reset(self, _: Any = None) -> None:
-        self._reset_state()
-        self._reset_rv_grid()
+        if bool(get_state_param(self.state, self._clear_selection)):
+            self._reset_state()
+            self._reset_rv_grid()
 
     def set_subdirectory(self, subdirectory_path: str = "") -> None:
         set_state_param(self.state, self._subdirectory, subdirectory_path)

nova/trame/view/components/ornl/neutron_data_selector.py

@@ -31,6 +31,7 @@ class NeutronDataSelector(DataSelector):
         self,
         v_model: Union[str, Tuple],
         allow_custom_directories: Union[bool, Tuple] = False,
+        clear_selection_on_experiment_change: Union[bool, Tuple] = True,
         data_source: Literal["filesystem", "oncat"] = "filesystem",
         facility: Union[str, Tuple] = "",
         instrument: Union[str, Tuple] = "",
@@ -52,6 +53,8 @@ class NeutronDataSelector(DataSelector):
         allow_custom_directories : Union[bool, Tuple], optional
             Whether or not to allow users to provide their own directories to search for datafiles in. Ignored if the
             facility parameter is set.
+        clear_selection_on_experiment_change: Union[bool, Tuple], optional
+            Whether or not to clear the selected files when the user changes the facility, instrument, or experiment.
         data_source : Literal["filesystem", "oncat"], optional
             The source from which to pull datafiles. Defaults to "filesystem". If using ONCat, you will need to set the
             following environment variables for local development: `ONCAT_CLIENT_ID` and `ONCAT_CLIENT_SECRET`. Note
@@ -91,7 +94,7 @@ class NeutronDataSelector(DataSelector):
         if data_source == "oncat" and subdirectory:
             warn("subdirectory will be ignored since data will be pulled from ONCat.", stacklevel=1)
 
-        if isinstance(facility, str) and allow_custom_directories:
+        if isinstance(facility, str) and facility and allow_custom_directories:
             warn("allow_custom_directories will be ignored since the facility parameter is fixed.", stacklevel=1)
 
         self._facility = facility
@@ -119,6 +122,7 @@ class NeutronDataSelector(DataSelector):
         super().__init__(
             v_model,
             "",
+            clear_selection_on_directory_change=clear_selection_on_experiment_change,
             extensions=extensions,
             subdirectory=subdirectory if data_source == "filesystem" else "oncat",
             refresh_rate=refresh_rate,
@@ -319,3 +323,9 @@ class NeutronDataSelector(DataSelector):
             experiment=set_state_param(self.state, (self._selected_experiment_name,), experiment),
         )
         self._vm.reset()
+
+    def set_state(self, *args: Any, **kwargs: Any) -> None:
+        raise TypeError(
+            "The set_state method has been removed. Please use update_facility, update_instrument, and "
+            "update_experiment instead."
+        )

nova/trame/view/components/visualization/matplotlib_figure.py

@@ -13,7 +13,7 @@ from warnings import warn
 
 import tornado
 from aiohttp import ClientSession, WSMsgType, web
-from matplotlib import get_data_path
+from matplotlib import get_data_path, rcParams
 from matplotlib.backends.backend_webagg import FigureManagerWebAgg, new_figure_manager_given_figure  # type: ignore
 from matplotlib.figure import Figure
 from trame.app import get_server
@@ -56,7 +56,10 @@ class _MPLApplication(tornado.web.Application):
                 self.supports_binary = message["value"]
             else:
                 manager = self.application.manager  # type: ignore
-                manager.handle_json(message)
+                try:
+                    manager.handle_json(message)
+                except Exception:
+                    manager.refresh_all()
 
         def send_json(self, content: Any) -> None:
             set_event_loop(self.application.loop)  # type: ignore
@@ -229,7 +232,6 @@ class MatplotlibFigure(matplotlib.Figure):
         else:
             kwargs["classes"] = "flex-1-1"
         if webagg:
-            self._initial_resize = True
             if "id" in kwargs:
                 kwargs.pop("id")
                 warn("id parameter to MatplotlibFigure is ignored when webagg=True.", stacklevel=1)
@@ -264,7 +266,7 @@ class MatplotlibFigure(matplotlib.Figure):
             f"window.document.querySelectorAll('.nova-mpl').forEach((item) => {{ item.style.display = ''; }});"
             "window.trame.trigger("
             f"  '{self._id}_resize',"
-            f"  [height, width, window.devicePixelRatio]"
+            f"  [height, width]"
             ");"
         )
         self._resize_figure = client.JSEval(exec=self._trigger).exec
@@ -280,29 +282,21 @@ class MatplotlibFigure(matplotlib.Figure):
         ).exec
 
         @self._server.controller.trigger(f"{self._id}_resize")
-        def resize_figure(height: int, width: int, device_pixel_ratio: float) -> None:
+        def resize_figure(height: int, width: int) -> None:
             if self._figure:
-                # This is the browser standard assumption for DPI.
-                dpi = 96
-
                 if self._webagg:
                     # Reserve space for the controls injected by webagg.
                     height -= 48
                     width -= 4
 
-                    if not self._initial_resize:
-                        # Handle device pixel ratio for retina displays
-                        dpi = int(dpi * device_pixel_ratio)
-                        height = int(height * device_pixel_ratio)
-                        width = int(width * device_pixel_ratio)
-
                 if height <= 0 or width <= 0:
                     return
 
                 if self._webagg:
-                    self._initial_resize = False
-
-                self._figure.set_dpi(dpi)
+                    # Webagg does not respect the Figure object's DPI.
+                    dpi = rcParams["figure.dpi"]
+                else:
+                    dpi = self._figure.get_dpi()
                 new_width = width / dpi
                 new_height = height / dpi
                 current_size = self._figure.get_size_inches()

nova/trame/view/layouts/grid.py

@@ -74,7 +74,7 @@ class GridLayout(html.Div):
         classes = kwargs.pop("classes", [])
         if isinstance(classes, list):
             classes = " ".join(classes)
-        classes += " d-grid"
+
         if stretch:
             if valign:
                 warn("Ignoring valign parameter to GridLayout since stretch=True.", stacklevel=1)
@@ -83,6 +83,12 @@ class GridLayout(html.Div):
         else:
             classes += " flex-0-1"
 
+        v_show = kwargs.get("v_show", None)
+        if v_show:
+            classes = (f"{v_show} ? '{classes} d-grid' : '{classes}'",)
+        else:
+            classes += " d-grid"
+
         widget_style = self.get_root_styles(columns, height, width, halign, valign, gap)
         user_style = kwargs.pop("style", {})
 

nova/trame/view/layouts/hbox.py

@@ -63,12 +63,18 @@ class HBoxLayout(html.Div):
         classes = kwargs.pop("classes", [])
         if isinstance(classes, list):
             classes = " ".join(classes)
-        classes += " d-flex flex-row"
+
         if stretch:
             classes += " flex-1-1 overflow-y-auto"
         else:
             classes += " flex-0-1"
 
+        v_show = kwargs.get("v_show", None)
+        if v_show:
+            classes = (f"{v_show} ? '{classes} d-flex flex-row' : '{classes}'",)
+        else:
+            classes += " d-flex flex-row"
+
         widget_style = self.get_root_styles(height, width, halign, valign, gap, vspace)
         user_style = kwargs.pop("style", {})
 

nova/trame/view/layouts/vbox.py

@@ -63,12 +63,18 @@ class VBoxLayout(html.Div):
         classes = kwargs.pop("classes", [])
         if isinstance(classes, list):
             classes = " ".join(classes)
-        classes += " d-flex flex-column"
+
         if stretch:
             classes += " flex-1-1 overflow-y-auto"
         else:
             classes += " flex-0-1"
 
+        v_show = kwargs.get("v_show", None)
+        if v_show:
+            classes = (f"{v_show} ? '{classes} d-flex flex-column' : '{classes}'",)
+        else:
+            classes += " d-flex flex-column"
+
         widget_style = self.get_root_styles(height, width, halign, valign, gap, vspace)
         user_style = kwargs.pop("style", {})
 

nova/trame/view/theme/assets/core_style.scss

@@ -12,6 +12,13 @@ html {
     box-shadow: none !important;
 }
 
+.exit-button {
+    .v-btn__content,
+    .v-btn__prepend i {
+        font-size: 0.875rem !important;
+    }
+}
+
 .mpl-message, .ui-dialog-titlebar {
     display: none !important;
 }
@@ -20,6 +27,10 @@ html {
     white-space: pre-wrap;
 }
 
+.nova-pre-content:empty {
+    margin-bottom: 12px !important;
+}
+
 .nova-data-selector {
     .v-list-group {
         --prepend-width: 12px !important;
@@ -47,11 +58,27 @@ html {
             cursor: pointer;
             margin-right: 0.25em;
         }
+
+        p {
+            line-height: 1;
+            margin-top: 1em;
+            white-space: normal;
+        }
+    }
+
+    .rgCell label {
+        cursor: pointer;
+    }
+
+    .rv-row-text {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
     }
 
     .header-content {
         font-weight: 500;
-        height: 40px;
+        height: fit-content;
     }
 
     .inner-content-table {
@@ -86,6 +113,8 @@ html {
 
 @media only screen and (max-width: 959px) {
     .d-grid {
+        /* This forces all grid rows to have the same height. If one doesn't want this to happen, then they should use the box layouts. :) */
+        grid-auto-rows: 1fr;
         grid-template-columns: repeat(1, 1fr) !important;
     }
 
@@ -183,7 +212,7 @@ html {
         font-size: 1rem;
     }
 
-    .v-btn {
+    .v-btn:not(.exit-button) {
         min-width: 0px !important;
         padding: 5px 5px !important;
         box-shadow: none !important;
@@ -244,6 +273,14 @@ html {
             }
         }
     }
+
+    .v-treeview.hide-actions .v-list-item .v-list-item__prepend {
+        width: unset;
+    }
+
+    .nova-data-selector .icon-btn {
+        height: 28px;
+    }
 }
 
 

nova/trame/view/theme/assets/js/revo_grid.js

@@ -4,11 +4,15 @@ class RevoGrid {
         this.modelKey = modelKey
         this.dataKey = dataKey
         this.stateKey = stateKey
+        this.lastSelection = null
+        this.shiftPressed = false
 
         this.grid = document.querySelector(`#${this.id}`)
         this.grid.addEventListener('viewportscroll', () => {
             this.updateCheckboxes()
         })
+
+        this.initShiftKeyListeners()
     }
 
     updateCheckboxes() {
@@ -66,11 +70,32 @@ class RevoGrid {
                 const path = props.data[props.rowIndex].path
                 const index = modelValue.indexOf(path)
 
-                // We need to assign instead of modifying in place in order for the Trame watcher to pick up changes.
+                // I use _.set instead of modifying the modelValue in place in order for the Trame watcher to properly detect the change.
                 if (e.target.checked && index < 0) {
-                    _.set(trameState, this.modelKey, _.concat(modelValue, path))
+                    const newIndex = props.data.findIndex((entry) => entry.path === path)
+
+                    if (this.shiftPressed && this.lastSelection !== null) {
+                        let newPaths = []
+                        // JavaScript doesn't allow a backwards step during slice, so we need to order the start/stop correctly.
+                        if (this.lastSelection < newIndex) {
+                            newPaths = props.data.slice(this.lastSelection, newIndex + 1)
+                        } else {
+                            newPaths = props.data.slice(newIndex, this.lastSelection)
+                        }
+                        // Exclude paths that are already selected to avoid duplicates.
+                        newPaths = newPaths.map((entry) => entry.path).filter((path) => !modelValue.includes(path))
+
+                        _.set(trameState, this.modelKey, _.concat(modelValue, newPaths))
+                    } else {
+                        _.set(trameState, this.modelKey, _.concat(modelValue, path))
+                    }
+
+                    this.lastSelection = newIndex
                 } else if (index >= 0) {
                     _.set(trameState, this.modelKey, modelValue.toSpliced(index, 1))
+
+                    // Only allow range selection if the last action was to select a file.
+                    this.lastSelection = null
                 }
 
                 // Update the UI
@@ -79,16 +104,18 @@ class RevoGrid {
             },
         })
 
-        return createElement('label', undefined, inputVNode, props.model[props.prop])
+        const spanNode = createElement('span', {'class': 'cursor-pointer rv-row-text'}, props.model[props.prop])
+
+        return createElement('label', { 'title': props.model[props.prop] }, inputVNode, spanNode)
     }
 
     columnTemplate(createElement) {
+        const trameState = window.trame.state.state
+        const availableData = _.get(trameState, this.dataKey)
+
         const inputVNode = createElement('input', {
             type: 'checkbox',
             onChange: (e) => {
-                const trameState = window.trame.state.state
-                const availableData = _.get(trameState, this.dataKey)
-
                 if (e.target.checked) {
                     _.set(trameState, this.modelKey, availableData.map((item) => item.path))
                 } else {
@@ -100,8 +127,26 @@ class RevoGrid {
                 window.trame.state.dirty(this.stateKey)
             },
         })
+        const header = createElement('div', {'class': 'd-flex'}, inputVNode, 'Available Datafiles')
 
-        return [inputVNode, 'Available Datafiles']
+        let controls = null
+        if (availableData.length < 1) {
+            controls = createElement('p', {}, 'No files found. Select a directory with files on the left.')
+        }
+
+        return createElement('div', {'class': 'd-flex flex-column'}, header, controls)
+    }
+
+    initShiftKeyListeners() {
+        window.document.addEventListener('keydown', (e) => {
+            this.shiftPressed = e.shiftKey
+        })
+
+        window.document.addEventListener('keyup', (e) => {
+            if (e.key === 'Shift') {
+                this.shiftPressed = false
+            }
+        })
     }
 }
 

nova/trame/view/theme/exit_button.py

@@ -1,9 +1,11 @@
 """Components used to control the lifecycle of a Themed Application."""
 
 import logging
+from asyncio import sleep
 from typing import Any
 
 from trame.app import get_server
+from trame.widgets import client
 from trame.widgets import vuetify3 as vuetify
 
 logger = logging.getLogger(__name__)
@@ -20,6 +22,10 @@ class ExitButton:
         self.server.state.nova_show_stop_jobs_on_exit_checkbox = False
         self.server.state.nova_running_jobs = []
         self.server.state.nova_show_exit_progress = False
+        # Note that window.close() will fail in many situations due to security concerns: https://developer.mozilla.org/en-US/docs/Web/API/Window/close
+        # This is simply a best effort to close the tab. My hope is that it will generally work when people are running
+        # applications through our dashboard since tabs are opened via target="_blank" links.
+        self.close_browser = client.JSEval(exec="window.close();").exec
         self.exit_application_callback = exit_callback
         self.job_status_callback = job_status_callback
         self.create_ui()
@@ -28,9 +34,10 @@ class ExitButton:
         with vuetify.VBtn(
             "Exit",
             prepend_icon="mdi-close-box",
-            classes="mr-4 bg-error",
+            classes="exit-button mr-4 bg-secondary",
             id="shutdown_app_theme_button",
             color="white",
+            size="default",
             click=self.open_exit_dialog,
         ):
             with vuetify.VDialog(v_model="nova_show_exit_dialog", persistent="true"):
@@ -51,7 +58,7 @@ class ExitButton:
                     with vuetify.VCardActions(v_if="!nova_show_exit_progress"):
                         vuetify.VBtn(
                             "Exit App",
-                            click=self.exit_application_callback,
+                            click=self.exit_application,
                             color="error",
                         )
                         vuetify.VBtn(
@@ -65,6 +72,13 @@ class ExitButton:
                         )
                         vuetify.VProgressCircular(indeterminate=True)
 
+    async def exit_application(self) -> None:
+        self.close_browser()
+
+        # sleep gives time for the Trame server to communicate the close request to the browser.
+        await sleep(0.1)
+        await self.exit_application_callback()
+
     async def open_exit_dialog(self) -> None:
         self.server.state.nova_show_exit_dialog = True
         await self.job_status_callback()

nova/trame/view/theme/theme.py

@@ -3,6 +3,7 @@
 import asyncio
 import json
 import logging
+import os
 import sys
 from asyncio import create_task
 from functools import partial
@@ -210,6 +211,10 @@ class ThemedApp:
         -------
         `trame_client.ui.core.AbstractLayout <https://trame.readthedocs.io/en/latest/core.ui.html#trame_client.ui.core.AbstractLayout>`_
         """
+        # This detects if Poetry is running Python so that we can show links to NOVA resources during development.
+        # Poetry should not be used in production.
+        show_nova_resources = os.environ.get("VIRTUAL_ENV") is not None
+
         with VAppLayout(self.server, vuetify_config=self.vuetify_config) as layout:
             self.local_storage = LocalStorageManager(self.server.controller)
 
@@ -225,8 +230,32 @@ class ThemedApp:
                     with vuetify.VAppBar() as toolbar:
                         layout.toolbar = toolbar
 
-                        with vuetify.VAppBarTitle() as toolbar_title:
+                        with vuetify.VAppBarTitle(classes="flex-0-1") as toolbar_title:
                             layout.toolbar_title = toolbar_title
+
+                        if show_nova_resources:
+                            vuetify.VBtn(
+                                "NOVA Examples",
+                                classes="ml-4",
+                                href="https://github.com/nova-model/nova-examples/",
+                                __properties=["target"],
+                                target="_blank",
+                            )
+                            html.Div("·", classes="mx-1")
+                            vuetify.VBtn(
+                                "NOVA Tutorial",
+                                href="https://nova.ornl.gov/tutorial/",
+                                __properties=["target"],
+                                target="_blank",
+                            )
+                            html.Div("·", classes="mx-1")
+                            vuetify.VBtn(
+                                "NOVA Documentation",
+                                href="https://nova-application-development.readthedocs.io/en/latest/",
+                                __properties=["target"],
+                                target="_blank",
+                            )
+
                         vuetify.VSpacer()
                         with html.Div(classes="mr-2") as actions:
                             layout.actions = actions
@@ -259,7 +288,7 @@ class ThemedApp:
 
                     with vuetify.VMain(classes="align-stretch d-flex flex-column h-screen"):
                         # [slot override example]
-                        layout.pre_content = vuetify.VSheet(classes="bg-background flex-0-1 mt-1 ")
+                        layout.pre_content = vuetify.VSheet(classes="bg-background flex-0-1 mt-1 nova-pre-content ")
                         # [slot override example complete]
                         with vuetify.VContainer(classes="flex-1-1 overflow-hidden pt-0 pb-2", fluid=True):
                             layout.content = vuetify.VCard(

nova/trame/view_model/data_selector.py

@@ -56,7 +56,9 @@ class DataSelectorViewModel:
             self.expand_directory(paths)
 
     def on_state_updated(self, results: Dict[str, Any]) -> None:
-        pass
+        for result in results.get("updated", []):
+            if result == "search":
+                self.update_view()
 
     def set_binding_parameters(self, **kwargs: Any) -> None:
         self.model.set_binding_parameters(**kwargs)
@@ -66,6 +68,14 @@ class DataSelectorViewModel:
         self.model.set_subdirectory(subdirectory_path)
         self.update_view()
 
+    def toggle_alpha_sort(self) -> None:
+        self.model.toggle_alpha_sort()
+        self.update_view()
+
+    def toggle_time_sort(self) -> None:
+        self.model.toggle_time_sort()
+        self.update_view()
+
     def transform_datafiles(self, datafiles: List[Any]) -> List[Dict[str, str]]:
         return [{"path": datafile, "title": os.path.basename(datafile)} for datafile in datafiles]
 

nova/trame/view_model/ornl/neutron_data_selector.py

@@ -33,6 +33,8 @@ class NeutronDataSelectorViewModel(DataSelectorViewModel):
                 case "custom_directory":
                     self.reset()
                     self.update_view()
+                case "search":
+                    self.update_view()
 
     def transform_datafiles(self, datafiles: List[Any]) -> List[Dict[str, str]]:
         return [{"title": os.path.basename(datafile["path"]), **datafile} for datafile in datafiles]

{nova_trame-1.0.0rc5.dist-info → nova_trame-1.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nova-trame
-Version: 1.0.0rc5
+Version: 1.1.0
 Summary: A Python Package for injecting curated themes and custom components into Trame applications
 License-Expression: MIT
 License-File: LICENSE
@@ -38,7 +38,7 @@ Description-Content-Type: text/markdown
 nova-trame
 ==========
 
-`nova-trame` is a Python package for streamlining development of Trame applications used in the NOVA project.
+`nova-trame` is a Python package for streamlining development of Trame applications used in the NOVA framework.
 
 You can install this package directly with
 
@@ -46,6 +46,13 @@ You can install this package directly with
 pip install nova-trame
 ```
 
+Once installed, you can check that it's working by running the widget gallery we use for visually testing components available through NOVA and Trame. We use [Poetry](https://python-poetry.org/) internally and recommend it for running the gallery.
+
+```commandline
+poetry install
+poetry run app
+```
+
 A user guide, examples, and a full API for this package can be found at [https://nova-application-development.readthedocs.io/en/stable/](https://nova-application-development.readthedocs.io/projects/nova-trame/en/stable/).
 
 Developers: please read [this document](DEVELOPMENT.md)

{nova_trame-1.0.0rc5.dist-info → nova_trame-1.1.0.dist-info}/RECORD

@@ -1,47 +1,47 @@
 nova/__init__.py,sha256=ED6jHcYiuYpr_0vjGz0zx2lrrmJT9sDJCzIljoDfmlM,65
 nova/trame/__init__.py,sha256=gFrAg1qva5PIqR5TjvPzAxLx103IKipJLqp3XXvrQL8,59
 nova/trame/_internal/utils.py,sha256=lTTJnfqbbIe21Tg2buf5MXqKUEUop7Va5PZgpWMzRkI,1381
-nova/trame/model/data_selector.py,sha256=hPPk1wiJc52jMXP_7XlEur38_vSi9tRUNKIa_gNmblc,4501
+nova/trame/model/data_selector.py,sha256=_pGKvKoz9QheY4Zyi5dy9XjHuo75MoiN1J928J09dSo,6180
 nova/trame/model/ornl/analysis_data_selector.py,sha256=P7IEJdqCAUsEOCof4c2JantPXd9vz0EtvhryEKvscbw,5544
 nova/trame/model/ornl/neutron_data_selector.py,sha256=YMoNEpDKgjP_y18oYj-N9IjkxtqwHz9JYMlURQA4BCE,2148
 nova/trame/model/ornl/oncat_data_selector.py,sha256=3JEkWGMU-esWA9DUTglju9hEP9LyZ7EUXLj1yO5BIDs,4755
 nova/trame/model/remote_file_input.py,sha256=eAk7ZsFgNKcnpJ6KmOQDhiI6pPZpcrr1GMKkRLEWht8,4338
 nova/trame/view/components/__init__.py,sha256=60BeS69aOrFnkptjuD17rfPE1f4Z35iBH56TRmW5MW8,451
-nova/trame/view/components/data_selector.py,sha256=ByZ1RTyJRfmHNfN-nFi_Ihljo0yjbyfa_El-jHl9oyM,14907
+nova/trame/view/components/data_selector.py,sha256=yQSxlotZX21pEZsKJKFEVQytN5PbjUCBMHPsROa4tjI,19127
 nova/trame/view/components/execution_buttons.py,sha256=Br6uAmE5bY67TTYc5ZTHECNJ_RJqKmv17HAKPpQtbeg,4576
 nova/trame/view/components/file_upload.py,sha256=WOaFXeNNwN0DYZJr-W6vWdBiTpr7m-lq3WKJaHmeMe8,4560
 nova/trame/view/components/input_field.py,sha256=xzCmNEoB4ljGx99-gGgTV0UwriwtS8ce22zPA4QneZw,17372
 nova/trame/view/components/ornl/__init__.py,sha256=HnxzzSsxw0vQSDCVFfWsAxx1n3HnU37LMuQkfiewmSU,90
-nova/trame/view/components/ornl/neutron_data_selector.py,sha256=duiPbROIYsU6h0oZP27wSce6BJuW1mdT8mGoxY05lyw,16542
+nova/trame/view/components/ornl/neutron_data_selector.py,sha256=m_XAXdqTelUj6x1kj0kBq2dClVytTQqZ4a6fgNxGloA,17149
 nova/trame/view/components/progress_bar.py,sha256=zhbJwPy_HPQ8YL-ISN8sCRUQ7qY6qqo9wiV59BmvL8I,3038
 nova/trame/view/components/remote_file_input.py,sha256=mcz_bmI2rD8gdmIOKLhlzfj-XoWBwC99T9ZgQORaKqE,14674
 nova/trame/view/components/tool_outputs.py,sha256=IbYV4VjrkWAE354Bh5KH76SPsxGLIkOXChijS4-ce_Y,2408
 nova/trame/view/components/visualization/__init__.py,sha256=reqkkbhD5uSksHHlhVMy1qNUCwSekS5HlXk6wCREYxU,152
 nova/trame/view/components/visualization/interactive_2d_plot.py,sha256=z2s1janxAclpMEdDJk3z-CQ6r3KPNoR_SXPx9ppWnuQ,3481
-nova/trame/view/components/visualization/matplotlib_figure.py,sha256=GYfX7hlEWQ4Dghk8Z1dmUQr6jgktWirhOYb0drtonM4,16297
+nova/trame/view/components/visualization/matplotlib_figure.py,sha256=8JgbF6elZC8EFZn-c2mLqGSyg0Lb4NLVAKJVSBb9-5g,16010
 nova/trame/view/layouts/__init__.py,sha256=cMrlB5YMUoK8EGB83b34UU0kPTVrH8AxsYvKRtpUNEc,141
-nova/trame/view/layouts/grid.py,sha256=DU5u5JTE0ulzCaJsEWyTenBH9lOQD7mtoC6RZXxDTPE,6110
-nova/trame/view/layouts/hbox.py,sha256=w6ow7Qzmq4slODz_9f7kEigCVPE2PhUmPODedYH34f4,3850
+nova/trame/view/layouts/grid.py,sha256=3zm9rVa-cexqKCJXZPIGpfrZIbi7qaAGYSmUg7njTS4,6265
+nova/trame/view/layouts/hbox.py,sha256=EOh-GT2rkt5qsvpBLjtrwdHlOA3hopcpFo7_TpxDOVs,4014
 nova/trame/view/layouts/utils.py,sha256=Hg34VQWTG3yHBsgNvmfatR4J-uL3cko7UxSJpT-h3JI,376
-nova/trame/view/layouts/vbox.py,sha256=Kkci79zDKF6qNH4HeDPYquJcixXx3BS63NVmS3FlOiw,3851
+nova/trame/view/layouts/vbox.py,sha256=DrhBjDe2m4V42JV7Ma2YSPkJyaI6k74Yc9U1MgyuFfQ,4018
 nova/trame/view/theme/__init__.py,sha256=70_marDlTigIcPEOGiJb2JTs-8b2sGM5SlY7XBPtBDM,54
-nova/trame/view/theme/assets/core_style.scss,sha256=lZK8zghy4ExmNuFI-rfq7qt2S7bqObzM_MBviOlWP5c,4481
-nova/trame/view/theme/assets/favicon.png,sha256=Xbp1nUmhcBDeObjsebEbEAraPDZ_M163M_ZLtm5AbQc,1927
+nova/trame/view/theme/assets/core_style.scss,sha256=IR3xekkhiJen1HVYOjbb2wB8JG80_7INzDtgosAdkOU,5290
+nova/trame/view/theme/assets/favicon.png,sha256=F5r6SjZet8uARzESJgwRZGK_Q7pDguDG11hyOWIBOc4,11812
 nova/trame/view/theme/assets/js/delay_manager.js,sha256=BN4OL88QsyZG4XQ1sTorHpN1rwD4GnWoVKHvl5F5ydo,776
 nova/trame/view/theme/assets/js/lodash.min.js,sha256=KCyAYJ-fsqtp_HMwbjhy6IKjlA5lrVrtWt1JdMsC57k,73016
-nova/trame/view/theme/assets/js/revo_grid.js,sha256=fbuEWO8etw-xgo9tjJGjJXdd5wL8qpgabPmrnU6Jp8k,4081
+nova/trame/view/theme/assets/js/revo_grid.js,sha256=KSUc8fOoX_BrOVtzIHcLscAiS4qLUclrbo1ndD2cj-A,6128
 nova/trame/view/theme/assets/vuetify_config.json,sha256=a0FSgpLYWGFlRGSMhMq61MyDFBEBwvz55G4qjkM08cs,5627
-nova/trame/view/theme/exit_button.py,sha256=Kqv1GVJZGrSsj6_JFjGU3vm3iNuMolLC2T1x2IsdmV0,3094
-nova/trame/view/theme/theme.py,sha256=Jeoi-qrokSO-dDYpEvicbqfwzalhhbG-4HplD8NFj6s,13269
+nova/trame/view/theme/exit_button.py,sha256=GrgCMLytIrDTWAMtkuFv5JaIBpslFrmI5k2izklSqQs,3872
+nova/trame/view/theme/theme.py,sha256=YecxrUw5I-7NDTyC8jrVdpb49U1TMzIbwO7jDid_jN0,14715
 nova/trame/view/utilities/local_storage.py,sha256=vD8f2VZIpxhIKjZwEaD7siiPCTZO4cw9AfhwdawwYLY,3218
-nova/trame/view_model/data_selector.py,sha256=jAtq5hpohQ6YiLBbgLJfNUzWZBpN2bjCG_c_FCJu2ns,3186
+nova/trame/view_model/data_selector.py,sha256=Z_aLHcxatxneyjUBwrus79p_4YQcolmYohNktlraI9k,3507
 nova/trame/view_model/execution_buttons.py,sha256=MfKSp95D92EqpD48C15cBo6dLO0Yld4FeRZMJNxJf7Y,3551
-nova/trame/view_model/ornl/neutron_data_selector.py,sha256=PIKQyzcHpwu81DNk3d8AfgobDbxbdb9ppRLpEvdPgpw,1778
+nova/trame/view_model/ornl/neutron_data_selector.py,sha256=PcnUUNN3S1i-Tc9G4ZZP6NPGcVhHtA0tx9cwlZ5g_5Y,1848
 nova/trame/view_model/progress_bar.py,sha256=6AUKHF3hfzbdsHqNEnmHRgDcBKY5TT8ywDx9S6ovnsc,2854
 nova/trame/view_model/remote_file_input.py,sha256=zWOflmCDJYYR_pacHphwzricV667GSRokh-mlxpBAOo,3646
 nova/trame/view_model/tool_outputs.py,sha256=ev6LY7fJ0H2xAJn9f5ww28c8Kpom2SYc2FbvFcoN4zg,829
-nova_trame-1.0.0rc5.dist-info/METADATA,sha256=E07ThBY0ho0JJE66zWp3IQJadp1e-nydsrAnUz93BTo,1798
-nova_trame-1.0.0rc5.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-nova_trame-1.0.0rc5.dist-info/entry_points.txt,sha256=J2AmeSwiTYZ4ZqHHp9HO6v4MaYQTTBPbNh6WtoqOT58,42
-nova_trame-1.0.0rc5.dist-info/licenses/LICENSE,sha256=Iu5QiDbwNbREg75iYaxIJ_V-zppuv4QFuBhAW-qiAlM,1061
-nova_trame-1.0.0rc5.dist-info/RECORD,,
+nova_trame-1.1.0.dist-info/METADATA,sha256=zhUMQdY9OepYShQefWIQ_zwhLP197w9ecz0_G_QSDPU,2096
+nova_trame-1.1.0.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+nova_trame-1.1.0.dist-info/entry_points.txt,sha256=J2AmeSwiTYZ4ZqHHp9HO6v4MaYQTTBPbNh6WtoqOT58,42
+nova_trame-1.1.0.dist-info/licenses/LICENSE,sha256=Iu5QiDbwNbREg75iYaxIJ_V-zppuv4QFuBhAW-qiAlM,1061
+nova_trame-1.1.0.dist-info/RECORD,,