Commit 8f91d6ae authored by Duggan, John's avatar Duggan, John
Browse files

Remove skip_init parameter

parent 9feb0615

src/nova/trame/view/components/data_selector.py

+0 −4
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ class DataSelector(datagrid.VGrid): 
        extensions: Optional[List[str]] = None,

        prefix: str = "",

        select_strategy: str = "all",

        skip_init: bool = False,

        **kwargs: Any,

    ) -> None:

        """Constructor for DataSelector.
@@ -81,9 +80,6 @@ class DataSelector(datagrid.VGrid): 
        ).exec

        self._reset_state = client.JSEval(exec=f"{self._v_model} = []; {self._flush_state}").exec



        if skip_init:

            return



        self.create_model()

        self.create_viewmodel()

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

+4 −9
Original line number Diff line number Diff line
@@ -65,8 +65,6 @@ class NeutronDataSelector(DataSelector): 
        -------

        None

        """

        super().__init__(v_model, "", extensions, prefix, select_strategy, skip_init=True, **kwargs)



        if facility and allow_custom_directories:

            warn("allow_custom_directories will be ignored since the facility parameter is set.", stacklevel=1)
@@ -78,22 +76,19 @@ class NeutronDataSelector(DataSelector): 
        self._instruments_name = f"nova__neutrondataselector_{self._next_id}_instruments"

        self._experiments_name = f"nova__neutrondataselector_{self._next_id}_experiments"



        self.create_model()

        self.create_viewmodel()



        self.create_ui(facility, instrument, **kwargs)

        super().__init__(v_model, "", extensions, prefix, select_strategy, **kwargs)



    def create_ui(self, facility: str, instrument: str, **kwargs: Any) -> None:

    def create_ui(self, **kwargs: Any) -> None:

        super().create_ui(**kwargs)

        with self._layout.filter:

            with GridLayout(columns=3):

                columns = 3

                if facility == "":

                if self._facility == "":

                    columns -= 1

                    InputField(

                        v_model=f"{self._state_name}.facility", items=(self._facilities_name,), type="autocomplete"

                    )

                if instrument == "":

                if self._instrument == "":

                    columns -= 1

                    InputField(

                        v_if=f"{self._state_name}.facility !== '{CUSTOM_DIRECTORIES_LABEL}'",