Commit Graph
2930 Commits
Author SHA1 Message Date
guerler 12014cc225 Show correct subworkflow name 2015-12-16 17:12:23 -05:00
guerler b4bfde4089 Fix attribute 2015-12-16 15:24:02 +00:00
guerler f10b968075 Build section dom in js 2015-12-16 15:22:25 +00:00
guerler f88ad8d4e3 Fix Change type label in editor form 2015-12-16 15:22:18 +00:00
John Chilton 157939aa8f Implement nested workflows.
Details:

 - Add a new workflow module describing subworkflows.
 - Add workflow list to editor side panel - with options to link in a subworkflow module or copy the target workflow into the workflow being editted node for node.
 - Update workflow, workflow step, and workflow invocation models to track subworkflow connections and execution.
 - Extend workflow outputs with concepts of labels (and UUIDs while I'm there) to match workflow inputs. This allow us to have something to label outputs with in the workflow editor and to reference in the format 2 workflow description language.
 - Extend workflow editor UI to allow labeling workflow outputs (and enforce that these are unique across a workflow).
 - Extend workflow invocation and progress tracking to allow invoking a subworkflow as part of another workflow invocation.
 - Extend workflow import and export code to allow a nested representation of workflows.
 - Update format 2 workflow description to allow testing nested workflows.

Most relevant new and modified test cases can be run using the following commands:

```
./run_tests.sh -api test/api/test_workflows.py:WorkflowsApiTestCase.test_run_subworkflow_simple
./run_tests.sh -api test/api/test_workflows_from_yaml.py:WorkflowsFromYamlApiTestCase.test_subworkflow_simple
./run_tests.sh -api test/api/test_workflows_from_yaml.py:WorkflowsFromYamlApiTestCase.test_outputs
nosetests test/unit/test_galaxy_mapping.py
nosetests test/unit/workflows/test_workflow_progress.py
```
2015-12-16 15:22:18 +00:00
Dannon Baker cf5d209e0f Manual merge of #1303 to resolve build artifact conflicts. 2015-12-16 06:51:12 -05:00
John Chilton 7f7010dbd9 Remove left over packed scripts.
The source files have been deleted.
2015-12-14 19:38:06 +00:00
carlfeberhard 2acdbe54f7 UI, Citations: fix citation-model's import of bibtex to use *either* commonjs or global 2015-12-14 17:22:58 -05:00
guerler 3108ba5c01 Ensure that text fields only display text 2015-12-14 13:29:01 -05:00
guerler 42edfca679 Repack, refix section validation 2015-12-14 11:24:25 -05:00
guerler c61a5529b4 Merge branch 'dev' of git://github.com/galaxyproject/galaxy into run_workflow_form_004 2015-12-14 10:37:45 -05:00
carlfeberhard c1ce8ef0ce UI, list of pairs collection creator: improve auto-pair error message to be more beginner friendly(?) 2015-12-14 09:20:10 -05:00
carlfeberhard f14b38124b UI, list of pairs collection creator: prevent vice-versa pair duplication by removing paired dataset from both temp lists during auto pairing 2015-12-14 08:59:24 -05:00
carlfeberhard 84f3b72e1a (merge dev); Testing, histories: update tests to reflect allowing anon to create/copy histories via the API 2015-12-11 13:44:48 -05:00
carlfeberhard 32be886f0f API, Histories: allow api/histories/create to be used as anon user; UI, Histories: minor fixes 2015-12-11 10:30:39 -05:00
carlfeberhard 9e512f5246 UI, History: use copy dialog in the embedded histories in Pages, add autoClose option to copy dialog 2015-12-11 08:44:45 -05:00
guerler 952f3f9b7a Open select2 dropdown on click 2015-12-11 03:10:17 -05:00
carlfeberhard d72b913c1d UI, History: hack multiple copy by API into the 'histories shared with me' mako grid 2015-12-10 16:25:52 -05:00
carlfeberhard 1ebc0ea9e7 UI, Quotameter: correctly update the quotameter for anon users 2015-12-10 14:15:33 -05:00
carlfeberhard cb23e010d7 UI, History: use copy dialog in history/view for import, minor fixes 2015-12-10 13:52:43 -05:00
guerler 9a4c834370 Use fa icons for drill down expansion 2015-12-10 13:01:35 -05:00
carlfeberhard 09cb673a9b UI, History: use copy dialog for shared history popupmenus, use custom templates for both saved and shared history lists/grids. refactor custom grid code for insertion of copy dialog 2015-12-10 12:59:19 -05:00
guerler 636e9900ba Improve handling of unspecified workflow editor values 2015-12-10 10:57:29 -05:00
carlfeberhard 253ca7ec49 UI, History: insert/use copy dialog in the 'Saved Histories' grid 2015-12-10 10:52:48 -05:00
carlfeberhard 941109dda8 UI, History: use copy dialog as import dialog in published history pages, refactor copy-dialog 2015-12-09 19:29:59 -05:00
carlfeberhard d72dd3735c Client, polyfills: check for sessionStorage using a more cross-browser (apparently) way 2015-12-09 14:10:36 -05:00
carlfeberhard e391fa4975 UI, History: allow copy dialog to have default of copy-all-datasets passed in as option; Replace import link with copy dialog in published histories 2015-12-09 11:44:51 -05:00
carlfeberhard 78427438ad UI, History: refactor the history copy dialog, use it from the options menu (instead of history/copy), pass ui-modal closing_callback a flag whether it was a cancellation or not 2015-12-09 11:07:07 -05:00
guerler 2b63427e96 Handle late validated dataset references 2015-12-08 16:39:21 -05:00
Martin Cech fe1c9dd293 Merge pull request #1251 from jmchilton/workflow_labels_2
Workflow Editor UI for Step Labels
2015-12-08 12:04:26 -05:00
carlfeberhard 6ba86d89bc UI, Citations: don't create new BibtexParser, remove debugging 2015-12-08 10:57:41 -05:00
carlfeberhard 5ff09896f7 UI, Citations: fix require of bibtex parser 2015-12-08 10:27:09 -05:00
John Chilton 3f8950628c Workflow label UI refinement.
- Escape workflow labels in mako.
 - Handle unlabelling steps properly (restore original node name to node and editor form titles).
2015-12-08 09:22:11 +00:00
guerler 485e8ef8f2 Add fallback for missing section and repeat title 2015-12-07 16:06:37 -05:00
Martin Cech ef0b6cc459 show notifications as Toasts and not like JS alerts (bleh) 2015-12-07 15:07:14 -05:00
guerler 8c6d530a66 Merge branch 'dev' of git://github.com/galaxyproject/galaxy into run_workflow_form_004 2015-12-07 00:50:30 -05:00
John Chilton 3a023f4cae Merge pull request #818 from mvdbeek/cross_toolshed_tool_fetching
Look up installed tools from different toolshed(s)
2015-12-06 15:56:31 -05:00
guerler a951d34c70 Merge branch 'dev' of git://github.com/galaxyproject/galaxy into run_workflow_form_004 2015-12-06 14:09:20 -05:00
carlfeberhard b55635f71b Client, upload: fix passing of nginx_upload_path and ftp_upload_site to upload-view, fix default nginx_upload_path in configuration serializer 2015-12-06 12:10:31 -05:00
guerler ab651fa89c Fix url, lint and packing
Catch missing history, fix failing api test
2015-12-06 10:48:40 -05:00
John Chilton e3161b4671 Add support for workflow step labels in editor.
- If a step has a label, display it in the step editor side panel title.
 - Allow clicking the title to change the label.
 - Display the label (if set) as the workflow node box title.
 - Add icon to workflow node since the title might not be related to type anymore.
 - Enforce unique labels accross the workflow in the editor.
 - Qunit test cases for some of this behavior and other recent changes.
2015-12-06 12:27:13 +00:00
guerler 6820b29d3b Merge branch 'dev' of git://github.com/galaxyproject/galaxy into run_workflow_form_004 2015-12-05 22:42:31 -05:00
guerler e29f7155c4 Remove files 2015-12-05 22:40:54 -05:00
guerler 7e5069baff Remove files 2015-12-05 18:34:13 -05:00
guerler 4dc134d43b Merge branch 'dev' of git://github.com/galaxyproject/galaxy into run_workflow_form_004 2015-12-05 18:29:18 -05:00
Björn Grüning 6126bd0e93 Merge pull request #1214 from jmchilton/format_2_1
Small enhancements in workflow inputs and outputs
2015-12-05 21:37:50 +01:00
John Chilton 1fdde2cb4d Refactor generic side workflow editor panel toward backbone. 2015-12-05 16:37:08 +00:00
Marius van den Beek 4f1359a0a6 Merge branch 'dev' of github.com:galaxyproject/galaxy into cross_toolshed_tool_fetching 2015-12-05 12:34:37 +01:00
Marius van den Beek 1be4f85404 Add messages inform users of changes in the tool_id. 2015-12-05 12:28:46 +01:00
John Chilton c91a2eb339 Multi data parameter improvements.
Allow multiple collections to be fed to a multi data parameter in one reduction step. Fixes #750 and will really simplify certain classes of tools.

Rebased original with fixes for rerun of such reductions.

Manually tested workflow execution and everything seems fine. The workflow editor already thought this was possible, so that is another bug corrected by this enhancement.

To run the associated API test, execute the following command:

./run_tests.sh -with_framework_test_tools -api test/api/test_tools.py:ToolsTestCase.test_reduce_multiple_lists_on_multi_data

Conflicts:
	static/maps/mvc/dataset/dataset-choice.js.map
	static/maps/mvc/form/form-select-content.js.map
	static/scripts/mvc/form/form-select-content.js
2015-12-04 20:41:21 +00:00