From e2d444de74e71b0abe01753fa33aced0d1eeabad Mon Sep 17 00:00:00 2001
From: Ahmed Awan <qe66653@umbc.edu>
Date: Thu, 22 Aug 2024 15:42:55 -0500
Subject: [PATCH] prioritize link to subworkflow in invocation view

... and disable Report tab in subworkflow step
---
 .../WorkflowInvocationOverview.vue            | 32 +++++++++----------
 .../WorkflowInvocationState.vue               |  1 +
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/client/src/components/WorkflowInvocationState/WorkflowInvocationOverview.vue b/client/src/components/WorkflowInvocationState/WorkflowInvocationOverview.vue
index 9e8fb40cce09..8964c378d440 100644
--- a/client/src/components/WorkflowInvocationState/WorkflowInvocationOverview.vue
+++ b/client/src/components/WorkflowInvocationState/WorkflowInvocationOverview.vue
@@ -154,6 +154,12 @@ function onCancel() {
 
 <template>
     <div class="mb-3 workflow-invocation-state-component">
+        <BAlert v-if="invocation && isSubworkflow" variant="secondary" show>
+            This subworkflow is
+            <HelpText :uri="`galaxy.invocations.states.${invocation.state}`" :text="invocation.state" />.
+            <ExternalLink :href="withPrefix(`/workflows/invocations/${invocation.id}`)"> Click here </ExternalLink>
+            to view this subworkflow in graph view.
+        </BAlert>
         <div v-if="!invocationAndJobTerminal">
             <BAlert variant="info" show>
                 <LoadingSpan :message="`Waiting to complete invocation ${indexStr}`" />
@@ -225,23 +231,15 @@ function onCancel() {
             </div>
         </div>
         <!-- An invocation has been loaded, display the graph -->
-        <div v-if="invocation">
-            <div v-if="workflow && !isSubworkflow">
-                <InvocationGraph
-                    class="mt-1"
-                    :invocation="invocation"
-                    :workflow="workflow"
-                    :is-terminal="invocationAndJobTerminal"
-                    :is-scheduled="invocationSchedulingTerminal"
-                    :is-full-page="isFullPage"
-                    :show-minimap="isFullPage" />
-            </div>
-            <BAlert v-else-if="isSubworkflow" variant="secondary" show>
-                This subworkflow is
-                <HelpText :uri="`galaxy.invocations.states.${invocation.state}`" :text="invocation.state" />.
-                <ExternalLink :href="withPrefix(`/workflows/invocations/${invocation.id}`)"> Click here </ExternalLink>
-                to view this subworkflow in graph view.
-            </BAlert>
+        <div v-if="invocation && workflow && !isSubworkflow">
+            <InvocationGraph
+                class="mt-1"
+                :invocation="invocation"
+                :workflow="workflow"
+                :is-terminal="invocationAndJobTerminal"
+                :is-scheduled="invocationSchedulingTerminal"
+                :is-full-page="isFullPage"
+                :show-minimap="isFullPage" />
         </div>
     </div>
 </template>
diff --git a/client/src/components/WorkflowInvocationState/WorkflowInvocationState.vue b/client/src/components/WorkflowInvocationState/WorkflowInvocationState.vue
index 85968bb08c85..920b1a659d4b 100644
--- a/client/src/components/WorkflowInvocationState/WorkflowInvocationState.vue
+++ b/client/src/components/WorkflowInvocationState/WorkflowInvocationState.vue
@@ -252,6 +252,7 @@ function getWorkflowName() {
                 <p>TODO: Insert readonly version of workflow editor here</p>
             </BTab> -->
             <BTab
+                v-if="!props.isSubworkflow"
                 title="Report"
                 title-item-class="invocation-report-tab"
                 :disabled="!invocationStateSuccess || !workflow"