Skip to content

Don't display outputs that aren't going to be produced in workflow editor#7466

Merged
jmchilton merged 4 commits intogalaxyproject:devfrom
mvdbeek:filter_outputs_in_wf_editor
Mar 5, 2019
Merged

Don't display outputs that aren't going to be produced in workflow editor#7466
jmchilton merged 4 commits intogalaxyproject:devfrom
mvdbeek:filter_outputs_in_wf_editor

Conversation

@mvdbeek
Copy link
Member

@mvdbeek mvdbeek commented Mar 5, 2019

This obviously doesn't work (yet) with filters that work on the input dataset, but this already removes a lot of outputs that are not going to be produced based on static options. Since exceptions default to producing the dataset this isn't much harm.

output_filter

@galaxybot galaxybot added this to the 19.05 milestone Mar 5, 2019
mvdbeek added 2 commits March 5, 2019 11:26
This obviously doesn't work (yet) with filters that work
on the input dataset, but this already removes a lot of
outputs that arent' going to be produced based on static
options. Since exceptions default to priduing the dataset
this isn't much harm.
@mvdbeek
Copy link
Member Author

mvdbeek commented Mar 5, 2019

Fixes #5661 and #1724, except for when the filter is determined using an input dataset.

Otherwise state inputs contain history datasets.
This is a bug that might result in non-deterministic tool module
behavior.
@dannon
Copy link
Member

dannon commented Mar 5, 2019

Great idea, and way more concise to implement than I'd have thought.

@mvdbeek
Copy link
Member Author

mvdbeek commented Mar 5, 2019

Yeah, I was also expecting that it might be harder than that ...

@mvdbeek mvdbeek force-pushed the filter_outputs_in_wf_editor branch from e2d6479 to 5c521e1 Compare March 5, 2019 13:59
@mvdbeek mvdbeek marked this pull request as ready for review March 5, 2019 15:33
@jmchilton jmchilton merged commit 503e9fd into galaxyproject:dev Mar 5, 2019
@jmchilton
Copy link
Member

Marvelous!

@mvdbeek mvdbeek changed the title Simple filter_output Don't display outputs that aren't going to be produced in workflow editor Mar 5, 2019
@nsoranzo nsoranzo deleted the filter_outputs_in_wf_editor branch March 5, 2019 19:20
Builds module models for the workflow editor.
"""
inputs = payload.get('inputs', {})
trans.workflow_build_mode = workflow_building_modes.ENABLED
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mvdbeek Did you mean trans.workflow_building_mode ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Exactly, and was half expecting this wouldn't work because we may also use this when building the workflow run form. Which it may not after all. Thanks for checking @nsoranzo !

'label',
)

@skip_without_tool('output_filter')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
@skip_without_tool('output_filter')
@skip_without_tool('output_filter_with_input')

assert outputs[1]['name'] == 'out_2'
assert outputs[2]['name'] == 'out_3'

@skip_without_tool('output_filter_with_input')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
@skip_without_tool('output_filter_with_input')
@skip_without_tool('output_filter_exception_1')

dannon added a commit that referenced this pull request Mar 22, 2019
[19.01] Backport #7466: Don't display outputs that aren't going to be produced in workflow editor
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants