Merge pull request #16994 from jmchilton/job_metrics_fix

Fixes for job metrics Galaxy markdown component.
galaxyproject · Nov 9, 2023 · ff45b63 · ff45b63
2 parents f91693d + 200d03a
commit ff45b63
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/client/src/components/JobMetrics/JobMetrics.vue b/client/src/components/JobMetrics/JobMetrics.vue
@@ -194,7 +194,7 @@ const estimatedServerInstance = computed(() => {
         </div>
 
         <AwsEstimate
-            v-if="jobRuntimeInSeconds && coresAllocated && ec2Instances"
+            v-if="jobRuntimeInSeconds && coresAllocated && ec2Instances && shouldShowAwsEstimate"
             :ec2-instances="ec2Instances"
             :should-show-aws-estimate="shouldShowAwsEstimate"
             :job-runtime-in-seconds="jobRuntimeInSeconds"

diff --git a/client/src/components/Markdown/Elements/JobMetrics.vue b/client/src/components/Markdown/Elements/JobMetrics.vue
@@ -1,6 +1,11 @@
 <template>
     <b-card nobody>
-        <JobMetrics class="job-metrics" :job-id="args.job_id" />
+        <JobMetrics
+            class="job-metrics"
+            :job-id="args.job_id"
+            :should-show-aws-estimate="false"
+            :should-show-carbon-emissions-estimates="false"
+            :include-title="false" />
     </b-card>
 </template>