Skip to content

Commit

Permalink
remove workflows and inputs from editor config
Browse files Browse the repository at this point in the history
  • Loading branch information
ElectronicBlueberry committed Dec 4, 2024
1 parent f0c8376 commit cf9b302
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 75 deletions.
1 change: 0 additions & 1 deletion client/src/components/Panels/ToolBox.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ const props = defineProps({
panelView: { type: String, required: true },
showAdvanced: { type: Boolean, default: false, required: true },
panelQuery: { type: String, required: true },
editorWorkflows: { type: Array, default: null },
dataManagers: { type: Array, default: null },
moduleSections: { type: Array as PropType<Record<string, any>>, default: null },
});
Expand Down
2 changes: 0 additions & 2 deletions client/src/components/Panels/ToolPanel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import Heading from "@/components/Common/Heading.vue";
const props = defineProps({
workflow: { type: Boolean, default: false },
editorWorkflows: { type: Array, default: null },
dataManagers: { type: Array, default: null },
moduleSections: { type: Array, default: null },
});
Expand Down Expand Up @@ -198,7 +197,6 @@ watch(
:panel-query.sync="query"
:panel-view="currentPanelView"
:show-advanced.sync="showAdvanced"
:editor-workflows="editorWorkflows"
:data-managers="dataManagers"
:module-sections="moduleSections"
@updatePanelView="updatePanelView"
Expand Down
5 changes: 0 additions & 5 deletions client/src/components/Workflow/Editor/Index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
workflow
:module-sections="moduleSections"
:data-managers="dataManagers"
:editor-workflows="workflows"
@onInsertTool="onInsertTool"
@onInsertModule="onInsertModule"
@onInsertWorkflow="onInsertWorkflow"
Expand Down Expand Up @@ -265,10 +264,6 @@ export default {
type: Array,
required: true,
},
workflows: {
type: Array,
required: true,
},
},
setup(props, { emit }) {
const { datatypes, datatypesMapper, datatypesMapperLoading } = useDatatypesMapper();
Expand Down
1 change: 0 additions & 1 deletion client/src/entry/analysis/modules/WorkflowEditor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
:initial-version="editorConfig.initialVersion"
:module-sections="editorConfig.moduleSections"
:workflow-tags="editorConfig.tags"
:workflows="editorConfig.workflows"
@update:confirmation="$emit('update:confirmation', $event)" />
</template>
<script>
Expand Down
49 changes: 0 additions & 49 deletions lib/galaxy/webapps/galaxy/controllers/workflow.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
import logging

from markupsafe import escape
from sqlalchemy import (
and_,
desc,
false,
func,
select,
)

from galaxy import (
model,
Expand Down Expand Up @@ -168,35 +161,6 @@ def editor(self, trans, id=None, workflow_id=None, version=None, **kwargs):
else:
new_workflow = True

# The following query loads all user-owned workflows,
# So that they can be copied or inserted in the workflow editor.
assert trans.user # help out type checker, require_login means we will have a user
workflow_stmnt = (
select(
model.StoredWorkflow.id,
model.StoredWorkflow.latest_workflow_id,
model.StoredWorkflow.name,
func.coalesce(func.count(model.WorkflowStep.id), 0).label("step_count"),
)
.join(
model.WorkflowStep,
model.StoredWorkflow.latest_workflow_id == model.WorkflowStep.workflow_id,
isouter=True,
)
.where(
and_(
model.StoredWorkflow.user_id == trans.user.id,
model.StoredWorkflow.deleted == false(),
model.StoredWorkflow.hidden == false(),
)
)
.group_by(
model.StoredWorkflow.id,
)
.order_by(desc(model.StoredWorkflow.update_time))
)
workflow_results = trans.sa_session.execute(workflow_stmnt).all()

# create workflow module models
module_sections = []
for module_section in load_module_sections(trans).values():
Expand Down Expand Up @@ -239,23 +203,10 @@ def editor(self, trans, id=None, workflow_id=None, version=None, **kwargs):
# identify item tags
item_tags = stored.make_tag_string_list()

# create workflow models
workflows = [
{
"id": trans.security.encode_id(stored_workflow_id),
"latest_id": trans.security.encode_id(latest_workflow_id),
"step_count": step_count,
"name": workflow_name,
}
for stored_workflow_id, latest_workflow_id, workflow_name, step_count in workflow_results
if not stored or stored_workflow_id != stored.id
]

# build workflow editor model
editor_config = {
"moduleSections": module_sections,
"dataManagers": data_managers,
"workflows": workflows,
}

# for existing workflow add its data to the model
Expand Down
17 changes: 0 additions & 17 deletions lib/galaxy/workflow/modules.py
Original file line number Diff line number Diff line change
Expand Up @@ -2567,23 +2567,6 @@ def load_module_sections(trans):
is configured with.
"""
module_sections = {}
module_sections["inputs"] = {
"name": "inputs",
"title": "Inputs",
"modules": [
{"name": "data_input", "title": "Input Dataset", "description": "Input dataset"},
{
"name": "data_collection_input",
"title": "Input Dataset Collection",
"description": "Input dataset collection",
},
{
"name": "parameter_input",
"title": "Parameter Input",
"description": "Simple inputs used for workflow logic",
},
],
}

if trans.app.config.enable_beta_workflow_modules:
module_sections["experimental"] = {
Expand Down

0 comments on commit cf9b302

Please sign in to comment.