Skip to content

Commit

Permalink
Fixes for job metrics Galaxy markdown component.
Browse files Browse the repository at this point in the history
So #10121 added back in the title header to the component which is only designed for the dataset details page for an individual dataset - the original implementation striped out the title for that reason.

The target might an interesting step of a workflow, a problematic tool, a complex resulting dataset - so trying to come up with a title automically is a little challenging. My thought was therefore to keep the component rendered as simply as possible - since the page or report writer will be the one that has the context for how the component should be titled. It needs a prefix and so the big h2 "Job Metrics" is not useful or wanted I think.

#10121 did correctly preserve the removal of the title for the job parameters component - so I think this getting added back in was just an oversight.
  • Loading branch information
jmchilton committed Nov 8, 2023
1 parent 3ccccc8 commit 200d03a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion client/src/components/JobMetrics/JobMetrics.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
7 changes: 6 additions & 1 deletion client/src/components/Markdown/Elements/JobMetrics.vue
Original file line number Diff line number Diff line change
@@ -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>

Expand Down

0 comments on commit 200d03a

Please sign in to comment.