mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-10-31 02:28:09 +08:00
Merge pull request #19781 from ahmedhamidawan/fix_workflow_run_graph_non_input_steps_bug
Fix workflow run graph non input steps not appearing bug
This commit is contained in:
@@ -50,6 +50,7 @@ const hasUpgradeMessages = ref(false);
|
||||
const hasStepVersionChanges = ref(false);
|
||||
const invocations = ref([]);
|
||||
const simpleForm = ref(false);
|
||||
const disableSimpleForm = ref(false);
|
||||
const submissionError = ref("");
|
||||
const workflowError = ref("");
|
||||
const workflowName = ref("");
|
||||
@@ -109,6 +110,7 @@ async function loadRun() {
|
||||
if (incomingModel.hasReplacementParametersInToolForm) {
|
||||
console.log("cannot render simple workflow form - has ${} values in tool steps");
|
||||
simpleForm.value = false;
|
||||
disableSimpleForm.value = true;
|
||||
}
|
||||
// If there are required parameters in a tool form (a disconnected runtime
|
||||
// input), we have to render the tool form steps and cannot use the
|
||||
@@ -116,12 +118,14 @@ async function loadRun() {
|
||||
if (incomingModel.hasOpenToolSteps) {
|
||||
console.log("cannot render simple workflow form - one or more tools have disconnected runtime inputs");
|
||||
simpleForm.value = false;
|
||||
disableSimpleForm.value = true;
|
||||
}
|
||||
// Just render the whole form for resource request parameters (kind of
|
||||
// niche - I'm not sure anyone is using these currently anyway).
|
||||
if (incomingModel.hasWorkflowResourceParameters) {
|
||||
console.log(`Cannot render simple workflow form - workflow resource parameters are configured`);
|
||||
simpleForm.value = false;
|
||||
disableSimpleForm.value = true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -247,6 +251,7 @@ defineExpose({
|
||||
v-else
|
||||
:model="workflowModel"
|
||||
:can-mutate-current-history="canRunOnHistory"
|
||||
:disable-simple-form="disableSimpleForm"
|
||||
@submissionSuccess="handleInvocations"
|
||||
@submissionError="handleSubmissionError"
|
||||
@showSimple="advancedForm = false" />
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
<b>Workflow: {{ model.name }}</b> <i>(version: {{ model.runData.version + 1 }})</i>
|
||||
<div class="float-right d-flex flex-gapx-1">
|
||||
<b-button
|
||||
v-if="!disableSimpleForm"
|
||||
v-b-tooltip.hover.noninteractive
|
||||
variant="link"
|
||||
class="text-decoration-none"
|
||||
@@ -104,6 +105,10 @@ export default {
|
||||
type: Boolean,
|
||||
required: true,
|
||||
},
|
||||
disableSimpleForm: {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
||||
@@ -86,7 +86,7 @@ export function useWorkflowRunGraph(
|
||||
/** The steps of the original workflow */
|
||||
const workflowSteps = computed<Record<string, Readonly<Step>>>(() => loadedWorkflow.value?.steps);
|
||||
|
||||
const steps = computed<Record<string, WorkflowRunStep>>(() => {
|
||||
const steps = computed<Record<string, WorkflowRunStep | Readonly<Step>>>(() => {
|
||||
if (!workflowSteps.value || !formInputs.value || !inputs.value) {
|
||||
return {};
|
||||
}
|
||||
@@ -103,6 +103,9 @@ export function useWorkflowRunGraph(
|
||||
const dataInput = inputs.value[step.id.toString()];
|
||||
const formInput = formInputs.value.find((input) => parseInt(input.name) === step.id);
|
||||
stepInfo = getWorkflowRunStepInfo(formInput, dataInput);
|
||||
} else {
|
||||
// not an input, so just the original step
|
||||
result[stepId] = step;
|
||||
}
|
||||
if (stepInfo) {
|
||||
result[stepId] = { ...step, ...stepInfo };
|
||||
|
||||
Reference in New Issue
Block a user