From f3f89287865857d95a01b69dad03e7db61f30976 Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Sat, 29 Jun 2024 21:52:35 +0200 Subject: [PATCH] Make `default_panel_view` a `_by_host` option --- lib/galaxy/config/schemas/config_schema.yml | 1 + lib/galaxy/tool_util/toolbox/base.py | 9 ++++++--- lib/galaxy/webapps/galaxy/api/tools.py | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/galaxy/config/schemas/config_schema.yml b/lib/galaxy/config/schemas/config_schema.yml index e18dc2aa28e8..aa7f4891936d 100644 --- a/lib/galaxy/config/schemas/config_schema.yml +++ b/lib/galaxy/config/schemas/config_schema.yml @@ -2903,6 +2903,7 @@ mapping: type: str default: default required: false + per_host: true desc: | Default tool panel view for the current Galaxy configuration. This should refer to an id of a panel view defined using the panel_views or panel_views_dir configuration options or an diff --git a/lib/galaxy/tool_util/toolbox/base.py b/lib/galaxy/tool_util/toolbox/base.py index f70d2978b4f2..03eae4522a4d 100644 --- a/lib/galaxy/tool_util/toolbox/base.py +++ b/lib/galaxy/tool_util/toolbox/base.py @@ -156,7 +156,7 @@ def __init__( Create a toolbox from the config files named by `config_filenames`, using `tool_root_dir` as the base directory for finding individual tool config files. """ - self._default_panel_view = default_panel_view + self.__default_panel_view = default_panel_view # The _dynamic_tool_confs list contains dictionaries storing # information about the tools defined in each shed-related # shed_tool_conf.xml file. @@ -238,6 +238,9 @@ def to_model(self) -> ToolPanelViewModel: if save_integrated_tool_panel: self._save_integrated_tool_panel() + def _default_panel_view(self, trans): + return self.app.config.config_value_for_host("default_panel_view", trans.host) or self.__default_panel_view + def create_tool(self, config_file, tool_shed_repository=None, guid=None, **kwds): raise NotImplementedError() @@ -1275,7 +1278,7 @@ def find_section_id(self, tool_panel_section_id): def tool_panel_contents(self, trans, view=None, **kwds): """Filter tool_panel contents for displaying for user.""" if view is None: - view = self._default_panel_view + view = self._default_panel_view(trans) if view not in self._tool_panel_view_rendered: raise RequestParameterInvalidException(f"No panel view {view} found.") filter_method = self._build_filter_method(trans) @@ -1338,7 +1341,7 @@ def to_panel_view(self, trans, view="default_panel_view", **kwds): {section_id: { section but with .tools=List[all tool ids] }, ...}} """ if view == "default_panel_view": - view = self._default_panel_view + view = self._default_panel_view(trans) view_contents: Dict[str, Dict] = {} panel_elts = self.tool_panel_contents(trans, view=view, **kwds) for elt in panel_elts: diff --git a/lib/galaxy/webapps/galaxy/api/tools.py b/lib/galaxy/webapps/galaxy/api/tools.py index 38f346bffe8e..ea78cd9f5696 100644 --- a/lib/galaxy/webapps/galaxy/api/tools.py +++ b/lib/galaxy/webapps/galaxy/api/tools.py @@ -185,7 +185,7 @@ def panel_views(self, trans: GalaxyWebTransaction, **kwds): """ rval = {} - rval["default_panel_view"] = self.app.toolbox._default_panel_view + rval["default_panel_view"] = self.app.toolbox._default_panel_view(trans) rval["views"] = self.app.toolbox.panel_view_dicts() return rval