Merge branch 'release_23.2' into dev

galaxyproject · Feb 27, 2024 · ddd1803 · ddd1803
2 parents 745757e + 12a782b
commit ddd1803
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/client/src/components/DatasetInformation/DatasetDetails.vue b/client/src/components/DatasetInformation/DatasetDetails.vue
@@ -25,7 +25,7 @@
                             :geographical-server-location-name="config.geographical_server_location_name"
                             :power-usage-effectiveness="config.power_usage_effectiveness"
                             :should-show-aws-estimate="config.aws_estimate"
-                            :should-show-carbon-emissions-estimates="config.carbon_emissions_estimates" />
+                            :should-show-carbon-emission-estimates="config.carbon_emission_estimates" />
                         <JobDestinationParams v-if="currentUser.is_admin" :job-id="dataset.creating_job" />
                         <JobDependencies :dependencies="job.dependencies"></JobDependencies>
                         <div v-if="dataset.peek">

diff --git a/client/src/components/JobMetrics/JobMetrics.vue b/client/src/components/JobMetrics/JobMetrics.vue
@@ -45,7 +45,7 @@ const props = defineProps({
         type: Boolean,
         default: false,
     },
-    shouldShowCarbonEmissionsEstimates: {
+    shouldShowCarbonEmissionEstimates: {
         type: Boolean,
         default: true,
     },
@@ -209,9 +209,7 @@ const estimatedServerInstance = computed(() => {
             :memory-allocated-in-mebibyte="memoryAllocatedInMebibyte" />
 
         <CarbonEmissions
-            v-if="
-                shouldShowCarbonEmissionsEstimates && estimatedServerInstance && jobRuntimeInSeconds && coresAllocated
-            "
+            v-if="shouldShowCarbonEmissionEstimates && estimatedServerInstance && jobRuntimeInSeconds && coresAllocated"
             :carbon-intensity="carbonIntensity"
             :geographical-server-location-name="geographicalServerLocationName"
             :power-usage-effectiveness="powerUsageEffectiveness"

diff --git a/client/src/components/Markdown/Elements/JobMetrics.vue b/client/src/components/Markdown/Elements/JobMetrics.vue
@@ -74,7 +74,7 @@ watch(
                 class="job-metrics"
                 :job-id="targetJobId"
                 :should-show-aws-estimate="false"
-                :should-show-carbon-emissions-estimates="false"
+                :should-show-carbon-emission-estimates="false"
                 :include-title="false" />
         </JobSelection>
         <b-card-footer v-if="footer">