mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-09-24 16:30:27 +08:00
John Chilton
4626f714bb
Builds on refactoring the workflow run form landing and orchestration into Vue (#9147). Implements #9111 - part of https://github.com/galaxyproject/galaxy/projects/15 and outlined in http://bit.ly/simplified-workflow-ui. What is in the PR: - Add new Galaxy configuration option - ``simplified_workflow_run_ui`` set to ``off`` by default. - If instead the admin has set this parameter to ``prefer``, on the workflow run page scan the workflow run request and if three conditions are met show a simplfied tool form. These conditions are: - No workflow "resource parameters" - pretty niche, not documented, I don't think anyone outside of Canada is using them and even them I'm not sure if they ever got to production. - No "open" tools (i.e. tools with disconnected runtime inputs). - No "replacement parameters" defined outside PJAs. I'm calling #{} inside PJA and ${} inside tool steps both "replacement parameters" because the user populates them the same way in the GUI. The API only handles them inside the context of the PJA - it seems the GUI is responsible for replacing them at runtime in the traditional form. - The simplified workflow form: - Drops tool and subworkflow steps from rendering all together and instead just renders the inputs. These are not rendered as separate "steps" or forms - but as just different inputs the same clean, simple form (more the like tool GUI). Labels (or step indexes as a fallback) are used at the input name, step annotations are used as the input help text. - Simplify the workflow request made by the client - send only replacement parameters and inputs - do not serialize tool state for each module. I think this makes what we are tracking more structured and should be more performant as well. Prevents storing HDA IDs in unstructured JSON blobs in the database as well. - Drops history target option to simplify the UI - simplified_workflow_run_ui_target_history can be set to either 'current' or 'new' to adjust this parameter Galaxy-wide for the simplified form. - Drops job caching option to simplify the UI - simplified_workflow_run_ui_cache can be set to 'off' or 'on' to change this parameter Galaxy-wide for the simplified form. - Drops resource parameters - we've already verified there are none for simplified workflows.
145 lines
5.0 KiB
Plaintext
145 lines
5.0 KiB
Plaintext
{
|
|
"a_galaxy_workflow": "true",
|
|
"annotation": "",
|
|
"format-version": "0.1",
|
|
"name": "test",
|
|
"steps": {
|
|
"0": {
|
|
"annotation": "",
|
|
"content_id": null,
|
|
"id": 0,
|
|
"input_connections": {},
|
|
"inputs": [
|
|
{
|
|
"description": "",
|
|
"name": "Input Dataset"
|
|
}
|
|
],
|
|
"label": "coolinput",
|
|
"name": "Input dataset",
|
|
"outputs": [],
|
|
"position": {
|
|
"left": 200,
|
|
"top": 200
|
|
},
|
|
"tool_errors": null,
|
|
"tool_id": null,
|
|
"tool_state": "{\"name\": \"Input Dataset\"}",
|
|
"tool_version": null,
|
|
"type": "data_input",
|
|
"uuid": "ef60789e-60fd-4c5a-baa5-598aeac0b5dc",
|
|
"workflow_outputs": []
|
|
},
|
|
"1": {
|
|
"annotation": "",
|
|
"content_id": "addValue",
|
|
"id": 1,
|
|
"input_connections": {},
|
|
"inputs": [
|
|
{
|
|
"description": "runtime parameter for tool Add column",
|
|
"name": "input"
|
|
}
|
|
],
|
|
"label": null,
|
|
"name": "Add column",
|
|
"outputs": [
|
|
{
|
|
"name": "out_file1",
|
|
"type": "input"
|
|
}
|
|
],
|
|
"position": {
|
|
"left": 204,
|
|
"top": 319
|
|
},
|
|
"post_job_actions": {},
|
|
"tool_errors": null,
|
|
"tool_id": "addValue",
|
|
"tool_state": "{\"__page__\": 0, \"__rerun_remap_job_id__\": null, \"__job_resource\": \"{\\\"__current_case__\\\": 0, \\\"__job_resource__select\\\": \\\"no\\\"}\", \"exp\": \"\\\"1\\\"\", \"iterate\": \"\\\"no\\\"\", \"input\": \"{\\\"__class__\\\": \\\"RuntimeValue\\\"}\"}",
|
|
"tool_version": "1.0.0",
|
|
"type": "tool",
|
|
"uuid": "1daceb2a-719c-49a6-881c-5301076de918",
|
|
"workflow_outputs": []
|
|
},
|
|
"2": {
|
|
"annotation": "",
|
|
"content_id": "addValue",
|
|
"id": 2,
|
|
"input_connections": {
|
|
"input": {
|
|
"id": 0,
|
|
"output_name": "output"
|
|
}
|
|
},
|
|
"inputs": [
|
|
{
|
|
"description": "runtime parameter for tool Add column",
|
|
"name": "input"
|
|
}
|
|
],
|
|
"label": null,
|
|
"name": "Add column",
|
|
"outputs": [
|
|
{
|
|
"name": "out_file1",
|
|
"type": "input"
|
|
}
|
|
],
|
|
"position": {
|
|
"left": 418,
|
|
"top": 234
|
|
},
|
|
"post_job_actions": {},
|
|
"tool_errors": null,
|
|
"tool_id": "addValue",
|
|
"tool_state": "{\"__page__\": 0, \"__rerun_remap_job_id__\": null, \"__job_resource\": \"{\\\"__current_case__\\\": 0, \\\"__job_resource__select\\\": \\\"no\\\"}\", \"exp\": \"\\\"1\\\"\", \"iterate\": \"\\\"no\\\"\", \"input\": \"{\\\"__class__\\\": \\\"RuntimeValue\\\"}\"}",
|
|
"tool_version": "1.0.0",
|
|
"type": "tool",
|
|
"uuid": "f5349127-d008-44b2-a41e-af024de92d2e",
|
|
"workflow_outputs": []
|
|
},
|
|
"3": {
|
|
"annotation": "",
|
|
"content_id": "cat1",
|
|
"id": 3,
|
|
"input_connections": {
|
|
"input1": {
|
|
"id": 2,
|
|
"output_name": "out_file1"
|
|
},
|
|
"queries_0|input2": {
|
|
"id": 1,
|
|
"output_name": "out_file1"
|
|
}
|
|
},
|
|
"inputs": [
|
|
{
|
|
"description": "runtime parameter for tool Concatenate datasets",
|
|
"name": "input1"
|
|
}
|
|
],
|
|
"label": null,
|
|
"name": "Concatenate datasets",
|
|
"outputs": [
|
|
{
|
|
"name": "out_file1",
|
|
"type": "input"
|
|
}
|
|
],
|
|
"position": {
|
|
"left": 389.5,
|
|
"top": 396
|
|
},
|
|
"post_job_actions": {},
|
|
"tool_errors": null,
|
|
"tool_id": "cat1",
|
|
"tool_state": "{\"__job_resource\": \"{\\\"__current_case__\\\": 0, \\\"__job_resource__select\\\": \\\"no\\\"}\", \"__page__\": 0, \"__rerun_remap_job_id__\": null, \"input1\": \"{\\\"__class__\\\": \\\"RuntimeValue\\\"}\", \"queries\": \"[{\\\"input2\\\": {\\\"__class__\\\": \\\"RuntimeValue\\\"}, \\\"__index__\\\": 0}]\"}",
|
|
"tool_version": "1.0.0",
|
|
"type": "tool",
|
|
"uuid": "32205465-a47e-4d8a-aa45-2560b1a38f54",
|
|
"workflow_outputs": []
|
|
}
|
|
},
|
|
"uuid": "9f791470-2fca-4f63-aa18-72ae0211b077"
|
|
} |