Merge pull request galaxyproject#17192 from ahmedhamidawan/fix_tool_p…

…anel_missing_tools_bug [23.2] Fix tools missing in panel bug
ahmedhamidawan · Dec 14, 2023 · c4c8d7b · c4c8d7b
2 parents faaff5e + 54865ce
commit c4c8d7b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/client/src/components/Panels/utilities.ts b/client/src/components/Panels/utilities.ts
@@ -158,22 +158,13 @@ export function getValidToolsInCurrentView(
     isWorkflowPanel = false,
     excludedSectionIds: string[] = []
 ) {
-    const addedToolTexts: string[] = [];
     const toolEntries = Object.entries(toolsById).filter(([, tool]) => {
-        // filter out duplicate tools (different ids, same exact name+description)
-        // related ticket: https://github.com/galaxyproject/galaxy/issues/16145
-        const toolText = tool.name + tool.description;
-        if (addedToolTexts.includes(toolText)) {
-            return false;
-        } else {
-            addedToolTexts.push(toolText);
-        }
         // filter on non-hidden, non-disabled, and workflow compatibile (based on props.workflow)
         return (
             !tool.hidden &&
             tool.disabled !== true &&
             !(isWorkflowPanel && !tool.is_workflow_compatible) &&
-            !excludedSectionIds.includes(tool.panel_section_id || "")
+            !excludedSectionIds.includes(tool.panel_section_id)
         );
     });
     return Object.fromEntries(toolEntries);

diff --git a/client/src/stores/toolStore.ts b/client/src/stores/toolStore.ts
@@ -27,7 +27,7 @@ export interface Tool {
     link: string;
     min_width: number;
     target: string;
-    panel_section_id: string | null;
+    panel_section_id: string;
     panel_section_name: string | null;
     form_style: string;
     disabled?: boolean;