Skip to content

Commit

Permalink
[23.2] Fix tools missing in panel bug
Browse files Browse the repository at this point in the history
Some tools would be filtered out from the tool panel needlessly
when organizing the `ToolPanel` in `Panels/utilities.ts`.
  • Loading branch information
ahmedhamidawan committed Dec 14, 2023
1 parent 1fd9cf3 commit 54865ce
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 11 deletions.
11 changes: 1 addition & 10 deletions client/src/components/Panels/utilities.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion client/src/stores/toolStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 54865ce

Please sign in to comment.