add/adjust view simplified vs advanced workflow run form

galaxyproject · Jan 21, 2025 · 4e81cb8 · 4e81cb8
1 parent 0957fe2
commit 4e81cb8
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 12 deletions.
diff --git a/client/src/components/Workflow/Run/WorkflowRun.vue b/client/src/components/Workflow/Run/WorkflowRun.vue
@@ -218,7 +218,8 @@ defineExpose({
                         :model="workflowModel"
                         :can-mutate-current-history="canRunOnHistory"
                         @submissionSuccess="handleInvocations"
-                        @submissionError="handleSubmissionError" />
+                        @submissionError="handleSubmissionError"
+                        @showSimple="advancedForm = false" />
                 </div>
             </div>
         </span>

diff --git a/client/src/components/Workflow/Run/WorkflowRunForm.vue b/client/src/components/Workflow/Run/WorkflowRunForm.vue
@@ -8,13 +8,22 @@
         </BAlert>
         <div class="h4 clearfix mb-3">
             <b>Workflow: {{ model.name }}</b> <i>(version: {{ model.runData.version + 1 }})</i>
-            <ButtonSpinner
-                id="run-workflow"
-                class="float-right"
-                title="Run Workflow"
-                :disabled="!canRunOnHistory"
-                :wait="showExecuting"
-                @onClick="onExecute" />
+            <div class="float-right d-flex flex-gapx-1">
+                <b-button
+                    v-b-tooltip.hover.noninteractive
+                    variant="link"
+                    class="text-decoration-none"
+                    title="Use simplified run form instead"
+                    @click="$emit('showSimple')">
+                    <span class="fas fa-arrow-left" /> Simple Form
+                </b-button>
+                <ButtonSpinner
+                    id="run-workflow"
+                    title="Run Workflow"
+                    :disabled="!canRunOnHistory"
+                    :wait="showExecuting"
+                    @onClick="onExecute" />
+            </div>
         </div>
         <FormCard v-if="wpInputsAvailable" title="Workflow Parameters">
             <template v-slot:body>

diff --git a/client/src/components/Workflow/Run/WorkflowRunFormSimple.vue b/client/src/components/Workflow/Run/WorkflowRunFormSimple.vue
@@ -248,6 +248,10 @@ async function onExecute() {
                                 v-model="splitObjectStore">
                                 Send outputs and intermediate to different storage locations?
                             </BFormCheckbox>
+                            <!-- Options to default one way or the other, disable if admins want, etc.. -->
+                            <BFormCheckbox class="workflow-expand-form-link" @change="emit('showAdvanced')">
+                                Expand to full workflow form.
+                            </BFormCheckbox>
                             <WorkflowStorageConfiguration
                                 v-if="isConfigLoaded && config.object_store_allows_id_selection"
                                 :split-object-store="splitObjectStore"
@@ -275,10 +279,6 @@ async function onExecute() {
                     @onChange="onChange"
                     @onValidation="onValidation"
                     @update:active-node-id="($event) => (activeNodeId = $event)" />
-                <!-- Options to default one way or the other, disable if admins want, etc.. -->
-                <a href="#" class="workflow-expand-form-link" @click="emit('showAdvanced')">
-                    Expand to full workflow form.
-                </a>
             </div>
             <div v-show="showGraph" class="w-50">
                 <WorkflowRunGraph