Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow connecting text param into data column parameter #18674

Merged
merged 1 commit into from
Aug 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion client/src/components/Workflow/Editor/modules/terminals.ts
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,18 @@ export class InputParameterTerminal extends BaseInputTerminal {
}

effectiveType(parameterType: string) {
return parameterType == "select" ? "text" : parameterType;
let newType: string;
switch (parameterType) {
case "select":
newType = "text";
break;
case "data_column":
newType = "integer";
break;
default:
newType = parameterType;
}
return newType;
}
attachable(other: BaseOutputTerminal) {
const effectiveThisType = this.effectiveType(this.type);
Expand Down
15 changes: 15 additions & 0 deletions lib/galaxy_test/workflow/integer_into_data_column.gxwf-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
- doc: |
Test to verify text parameter can be connected to data column param
job:
input:
type: File
value: 2.tabular
file_type: tabular
column:
value: "2"
type: raw
outputs:
output:
asserts:
- that: has_line
line: "parameter: 2"
15 changes: 15 additions & 0 deletions lib/galaxy_test/workflow/integer_into_data_column.gxwf.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
class: GalaxyWorkflow
inputs:
input:
type: data
column:
type: integer
outputs:
output:
outputSource: data_column_step/output
steps:
data_column_step:
tool_id: gx_data_column
in:
ref_parameter: input
parameter: column
Loading