Commit 01cbf7b0 authored by Duggan, John's avatar Duggan, John
Browse files

Fix conflicts with merged origin/main

parent 7a731ce2

src/nova/trame/model/ornl/analysis_data_selector.py

+2 −2
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ class AnalysisDataSelectorModel(NeutronDataSelectorModel): 


        return self.get_directories_from_path(base_path)



    def get_datafiles(self, *args: Any, **kwargs: Any) -> List[str]:

    def get_datafiles(self, *args: Any, **kwargs: Any) -> List[Any]:

        using_custom_directory = self.state.facility == CUSTOM_DIRECTORIES_LABEL

        if self.state.experiment:

            base_path = Path("/") / self.state.facility / self.get_instrument_dir() / self.state.experiment
@@ -163,4 +163,4 @@ class AnalysisDataSelectorModel(NeutronDataSelectorModel): 
        else:

            return []



        return self.get_datafiles_from_path(base_path)
 
        return [{"path": path} for path in self.get_datafiles_from_path(base_path)]

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

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ class RevoGrid { 
        const modelValue = _.get(trameState, this.modelKey)

        const availableData = _.get(trameState, this.dataKey)

        const selectAllCheckbox = this.grid.querySelector(".header-content input")

        const rowCheckboxes = this.grid.querySelectorAll(".rgCell")

        const rowCheckboxes = this.grid.querySelectorAll(".rgCell:first-child")



        if (selectAllCheckbox === null) {

            return