From e4ba07ac7eea4261ef7fd3bc71d1a2d64ebf474f Mon Sep 17 00:00:00 2001
From: Rendani Gangazhe <rendanig@gmail.com>
Date: Tue, 30 May 2023 16:59:39 +0200
Subject: [PATCH] Carbon emissions code clean up and minor bug fixes

---
 .../JobMetrics/CarbonEmissions/CarbonEmissions.vue          | 6 +++---
 .../CarbonEmissions/CarbonEmissionsCalculations.vue         | 6 ++----
 client/src/entry/analysis/router.js                         | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/client/src/components/JobMetrics/CarbonEmissions/CarbonEmissions.vue b/client/src/components/JobMetrics/CarbonEmissions/CarbonEmissions.vue
index 38b73e2b89c..ac7248a281f 100644
--- a/client/src/components/JobMetrics/CarbonEmissions/CarbonEmissions.vue
+++ b/client/src/components/JobMetrics/CarbonEmissions/CarbonEmissions.vue
@@ -178,7 +178,7 @@ const barChartData = computed(() => {
     if (canShowMemory) {
         data.push({
             name: "Memory",
-            value: 20,
+            value: getPercentage(values.memoryCarbonEmissions, values.totalCarbonEmissions),
         });
     }
 
@@ -196,10 +196,10 @@ function prettyPrintValue({
     convertValue?: (input: number) => number;
 }) {
     if (value < threshold) {
-        return `≤ ${threshold}` + `${unit ? ` ${unit}` : ""}`;
+        return `≤ ${threshold}  ${unit ?? ""}`;
     }
 
-    return `${value}` + `${unit ? ` ${unit}` : ""}`;
+    return `${value} ${unit ?? ""}`;
 }
 
 function getPercentage(value: number, total: number) {
diff --git a/client/src/components/JobMetrics/CarbonEmissions/CarbonEmissionsCalculations.vue b/client/src/components/JobMetrics/CarbonEmissions/CarbonEmissionsCalculations.vue
index 7071729ea57..cea83a67ad3 100644
--- a/client/src/components/JobMetrics/CarbonEmissions/CarbonEmissionsCalculations.vue
+++ b/client/src/components/JobMetrics/CarbonEmissions/CarbonEmissionsCalculations.vue
@@ -1,7 +1,7 @@
-<script setup>
+<script setup lang="ts">
 import ExternalLink from "@/components/ExternalLink.vue";
 import Heading from "@/components/Common/Heading.vue";
-import Abbreviation from "@/components/Abbreviation.vue";
+import Abbreviation from "@/components/Common/Abbreviation.vue";
 
 const dictionary = [
     {
@@ -38,8 +38,6 @@ const greenAlgorithmsUrl = "https://www.green-algorithms.org/";
         <header>
             <Heading h1 separator bold size="h-lg">Carbon Emissions Calculations</Heading>
 
-            <Citation class="formatted-reference" :citation="greenAlgorithmsCitation" prefix="-" />
-
             <p>
                 Our calculations are based off of the work of the
                 <ExternalLink :href="greenAlgorithmsUrl">Green Algorithms Project</ExternalLink>
diff --git a/client/src/entry/analysis/router.js b/client/src/entry/analysis/router.js
index 3ed273bd935..19dfdaff650 100644
--- a/client/src/entry/analysis/router.js
+++ b/client/src/entry/analysis/router.js
@@ -18,7 +18,7 @@ import StorageDashboardRoutes from "entry/analysis/routes/storageDashboardRoutes
 
 // child components
 import AboutGalaxy from "components/AboutGalaxy.vue";
-import CarbonEmissionsCalculations from "components/CarbonEmissions/CarbonEmissionsCalculations.vue";
+import CarbonEmissionsCalculations from "components/JobMetrics/CarbonEmissions/CarbonEmissionsCalculations";
 import Citations from "components/Citation/Citations";
 import ClientError from "components/ClientError";
 import CollectionEditView from "components/Collections/common/CollectionEditView";