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

Load tools with collection type source attributes into the workflow editor #4514

Merged
merged 3 commits into from Aug 31, 2017

Conversation

Projects
None yet
3 participants
@jmchilton
Copy link
Member

commented Aug 29, 2017

Should allow using filter failed and merge collection tools within workflows.

This is really a very rough first order approximation of how the editor should be reasoning about the collection types and mapping for these tools - the way it reasons about format_source for datatypes for non-collection connections - but it is probably better than just excluding such connections?

Fixes #4509 ... at least partially.

jmchilton added some commits Aug 29, 2017

Load tools with collection type source attributes into the workflow e…
…ditor.

Should allow using filter failed and merge collection tools within workflows.
@mvdbeek

This comment has been minimized.

Copy link
Member

commented Aug 30, 2017

This works nicely, and it actually also makes other (in my instance all!) collection operation tools available in the workflow editor.

@mvdbeek
Copy link
Member

left a comment

Looks good to me.

this.collectionType = new CollectionTypeDescription( attr.collection_type );
} else {
var collectionTypeSource = attr.collection_type_source;
if(! collectionTypeSource) {

This comment has been minimized.

Copy link
@mvdbeek

mvdbeek Aug 30, 2017

Member

Here and in the update function there is a space missing before the closing parens.

@jmchilton

This comment has been minimized.

Copy link
Member Author

commented Aug 31, 2017

I adjusted the style a bit - but I'm not sure we want that extra space. I get that it is inconsistent right now - hopefully we will be applying a fixed style soon.

Otherwise - thanks for the detailed review @mvdbeek - I really appreciate it and I'm glad it worked.

@mvdbeek mvdbeek merged commit 49f2438 into galaxyproject:dev Aug 31, 2017

6 checks passed

api test Build finished. 284 tests run, 0 skipped, 0 failed.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
framework test Build finished. 161 tests run, 0 skipped, 0 failed.
Details
integration test Build finished. 44 tests run, 0 skipped, 0 failed.
Details
lgtm analysis: JavaScript No alert changes
Details
toolshed test Build finished. 579 tests run, 0 skipped, 0 failed.
Details
@mvdbeek

This comment has been minimized.

Copy link
Member

commented Aug 31, 2017

Thanks a lot @jmchilton !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.