Only show carbon emissions reports when enabled in config

galaxyproject · Mar 5, 2024 · 5a1a610 · 5a1a610
1 parent 3fd33f4
commit 5a1a610
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/client/src/components/History/Statistics/HistoryStatistics.vue b/client/src/components/History/Statistics/HistoryStatistics.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { useCarbonEmissions } from "@/composables/carbonEmissions";
 import { useHistoryStore } from "@/stores/historyStore";
 
 import HistoriesStorageOverview from "./HistoriesStorageOverview.vue";
@@ -8,6 +9,7 @@ import Heading from "@/components/Common/Heading.vue";
 const props = defineProps<{ historyId: string }>();
 
 const { getHistoryNameById } = useHistoryStore();
+const { shouldShowCarbonEmissionsReports } = useCarbonEmissions();
 </script>
 
 <template>
@@ -32,7 +34,7 @@ const { getHistoryNameById } = useHistoryStore();
             <HistoriesStorageOverview />
         </section>
 
-        <section class="mt-3">
+        <section v-if="shouldShowCarbonEmissionsReports" class="mt-3">
             <Heading h2 bold separator> Carbon Emissions </Heading>
             <HistoryCarbonEmissions :history-id="props.historyId" />
         </section>

diff --git a/client/src/components/WorkflowInvocationState/WorkflowInvocationSummary.vue b/client/src/components/WorkflowInvocationState/WorkflowInvocationSummary.vue
@@ -70,7 +70,7 @@
             :loading="!invocationAndJobTerminal"
             class="jobs-progress" />
 
-        <div>
+        <div v-if="shouldShowCarbonEmissionsReports">
             <strong>Carbon Emissions:</strong>
 
             <CarbonEmissions
@@ -178,7 +178,11 @@ export default {
         },
     },
     setup(props) {
-        const { carbonIntensity, geographicalServerLocationName } = useCarbonEmissions();
+        const { 
+            carbonIntensity,
+            geographicalServerLocationName,
+            shouldShowCarbonEmissionsReports
+        } = useCarbonEmissions();
 
         const invocationId = computed(() => props.invocation?.id);
 
@@ -208,7 +212,7 @@ export default {
         watch(
             () => invocationId.value,
             () => {
-                if (invocationId.value) {
+                if (shouldShowCarbonEmissionsReports && invocationId.value) {
                     fetchEnergyUsageData();
                 }
             },
@@ -219,6 +223,7 @@ export default {
             carbonIntensity,
             energyUsage,
             geographicalServerLocationName,
+            shouldShowCarbonEmissionsReports,
             invocationId,
             worldwideCarbonIntensity,
             worldwidePowerUsageEffectiveness,

diff --git a/client/src/composables/carbonEmissions.ts b/client/src/composables/carbonEmissions.ts
@@ -7,12 +7,14 @@ import { useConfig } from "./config";
 export function useCarbonEmissions() {
     const { config } = useConfig(true);
     const carbonIntensity = computed(() => (config.value?.carbon_intensity as number) ?? worldwideCarbonIntensity);
+    const shouldShowCarbonEmissionsReports = computed(() => (config.value?.carbon_emission_estimates as boolean) ?? true);
     const geographicalServerLocationName = computed(
         () => (config.value?.geographical_server_location_name as string) ?? "GLOBAL"
     );
 
     return {
         carbonIntensity,
         geographicalServerLocationName,
+        shouldShowCarbonEmissionsReports,
     };
 }