Unverified Commit 2b450df9 authored by John Chilton's avatar John Chilton Committed by GitHub
Browse files

Merge pull request #14563 from mvdbeek/fix_workflow_parameter_connectability 

[22.05] Fix workflow parameter connectability
parents cd651357 0abd9576

client/src/components/Workflow/Editor/modules/terminals.js

+5 −0
Original line number Diff line number Diff line
@@ -333,6 +333,11 @@ class BaseInputTerminal extends Terminal { 
    }

    _producesAcceptableDatatype(other) {

        // other is a non-collection output...



        if (other instanceof OutputParameterTerminal) {

            return new ConnectionAcceptable(false, "Cannot connect workflow parameter to data input.");

        }



        for (const t in this.datatypes) {

            const thisDatatype = this.datatypes[t];

            if (thisDatatype == "input") {

lib/galaxy_test/selenium/test_workflow_editor.py

+3 −0
Original line number Diff line number Diff line
@@ -241,6 +241,9 @@ steps: 
    label: tool_exec

    in:

      inttest: input_int

  cat1:

    # regression test, ensures connecting works in the presence of data input terminals

    tool_id: cat1

"""

        )

        self.screenshot("workflow_editor_parameter_connection_simple")