From 8cbc5978a777c625c2741982910b57eac10d40b3 Mon Sep 17 00:00:00 2001 From: Laila Los <44241786+ElectronicBlueberry@users.noreply.github.com> Date: Wed, 24 Aug 2022 15:23:42 +0200 Subject: [PATCH] pass edam to EdamToolPanelView directly --- lib/galaxy/tool_util/toolbox/base.py | 2 +- lib/galaxy/tool_util/toolbox/views/edam.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/galaxy/tool_util/toolbox/base.py b/lib/galaxy/tool_util/toolbox/base.py index 0ac52890acd..ee9af7eed53 100644 --- a/lib/galaxy/tool_util/toolbox/base.py +++ b/lib/galaxy/tool_util/toolbox/base.py @@ -193,7 +193,7 @@ class AbstractToolBox(Dictifiable, ManagesIntegratedToolPanelMixin): for edam_view in listify(self.app.config.edam_panel_views): mode = EdamPanelMode[edam_view] - tool_panel_views_list.append(EdamToolPanelView(self.app.datatypes_registry, mode=mode)) + tool_panel_views_list.append(EdamToolPanelView(self.app.datatypes_registry.edam, mode=mode)) if view_sources is not None: for definition in view_sources.get_definitions(): diff --git a/lib/galaxy/tool_util/toolbox/views/edam.py b/lib/galaxy/tool_util/toolbox/views/edam.py index 0f5a7b25005..0df472e592f 100644 --- a/lib/galaxy/tool_util/toolbox/views/edam.py +++ b/lib/galaxy/tool_util/toolbox/views/edam.py @@ -6,7 +6,6 @@ from typing import ( Tuple, ) -from galaxy.datatypes.registry import Registry from galaxy.tool_util.edam_util import ( ROOT_OPERATION, ROOT_TOPIC, @@ -34,8 +33,8 @@ class EdamPanelMode(str, Enum): class EdamToolPanelView(ToolPanelView): - def __init__(self, datatypes_registry: Registry, mode: EdamPanelMode = EdamPanelMode.merged): - self.edam = datatypes_registry.edam + def __init__(self, edam: Dict[str, Dict], mode: EdamPanelMode = EdamPanelMode.merged): + self.edam = edam self.mode = mode self.include_topics = mode in [EdamPanelMode.merged, EdamPanelMode.topics] self.include_operations = mode in [EdamPanelMode.merged, EdamPanelMode.operations]