opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-11-04 23:43:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15418 from mvdbeek/dont_display_tooltip

Browse Source 
[23.0] Don't display tooltip if connection is acceptable
This commit is contained in:
Marius van den Beek
2023-01-26 17:12:37 +01:00
committed by GitHub
parent 7deeb2edda 8118c1906e
commit 2bde0ff73f
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/components/Workflow/Editor/modules/terminals.test.ts
+2
View File
@@ -205,6 +205,8 @@ describe("canAccept", () => {
const integerInputParam = terminals["multi data"]["advanced|advanced_threshold"] as InputParameterTerminal;
const integerOutputParam = terminals["integer parameter input"]["output"] as OutputParameterTerminal;
expect(integerInputParam.canAccept(integerOutputParam).canAccept).toBe(true);
// regression test for https://github.com/galaxyproject/galaxy/issues/15417
expect(integerInputParam.canAccept(integerOutputParam).reason).toBe(null);
});
it("rejects text to integer parameter connection", () => {
const integerInputParam = terminals["multi data"]["advanced|advanced_threshold"] as InputParameterTerminal;
client/src/components/Workflow/Editor/modules/terminals.ts
+3 -2
View File
@@ -465,9 +465,10 @@ export class InputParameterTerminal extends BaseInputTerminal {
const effectiveThisType = this.effectiveType(this.type);
const otherType = ("type" in other && other.type) || "data";
const effectiveOtherType = this.effectiveType(otherType);
const canAccept = effectiveThisType === effectiveOtherType
return new ConnectionAcceptable(
effectiveThisType == effectiveOtherType,
`Cannot attach a ${effectiveOtherType} parameter to a ${effectiveThisType} input`
canAccept,
canAccept ? null: `Cannot attach a ${effectiveOtherType} parameter to a ${effectiveThisType} input`
);
}
}