Merge pull request #60 from atlarge-research/feat/metric-styling

Show full metric names during portfolio creation

5 files changed, 24 insertions, 7 deletions

diff --git a/api/opendc/api/v2/schedulers/endpoint.py b/api/opendc/api/v2/schedulers/endpoint.py
index 9c19f631..f33159bf 100644
--- a/api/opendc/api/v2/schedulers/endpoint.py
+++ b/api/opendc/api/v2/schedulers/endpoint.py
@@ -6,7 +6,7 @@ SCHEDULERS = [
     'core-mem',
     'core-mem-inv',
     'active-servers',
-    'active-server-inv',
+    'active-servers-inv',
     'provisioned-cores',
     'provisioned-cores-inv',
     'random'
diff --git a/frontend/src/components/app/results/PortfolioResultsComponent.js b/frontend/src/components/app/results/PortfolioResultsComponent.js
index 10b189a6..759acd57 100644
--- a/frontend/src/components/app/results/PortfolioResultsComponent.js
+++ b/frontend/src/components/app/results/PortfolioResultsComponent.js
@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import { Bar, CartesianGrid, ComposedChart, ErrorBar, ResponsiveContainer, Scatter, XAxis, YAxis } from 'recharts'
-import { AVAILABLE_METRICS, METRIC_NAMES, METRIC_UNITS } from '../../../util/available-metrics'
+import { AVAILABLE_METRICS, METRIC_NAMES_SHORT, METRIC_UNITS } from '../../../util/available-metrics'
 import { mean, std } from 'mathjs'
 import Shapes from '../../../shapes/index'
 import approx from 'approximate-number'
@@ -52,7 +52,7 @@ const PortfolioResultsComponent = ({ portfolio, scenarios }) => {
             <div className="row">
                 {AVAILABLE_METRICS.map((metric) => (
                     <div className="col-6 mb-2" key={metric}>
-                        <h4>{METRIC_NAMES[metric]}</h4>
+                        <h4>{METRIC_NAMES_SHORT[metric]}</h4>
                         <ResponsiveContainer aspect={16 / 9} width="100%">
                             <ComposedChart
                                 data={dataPerMetric[metric]}
diff --git a/frontend/src/components/modals/custom-components/NewPortfolioModalComponent.js b/frontend/src/components/modals/custom-components/NewPortfolioModalComponent.js
index 978ca11d..67646e2c 100644
--- a/frontend/src/components/modals/custom-components/NewPortfolioModalComponent.js
+++ b/frontend/src/components/modals/custom-components/NewPortfolioModalComponent.js
@@ -2,7 +2,7 @@ import PropTypes from 'prop-types'
 import React, { useRef } from 'react'
 import { Form, FormGroup, Input, Label } from 'reactstrap'
 import Modal from '../Modal'
-import { AVAILABLE_METRICS } from '../../../util/available-metrics'
+import { AVAILABLE_METRICS, METRIC_NAMES } from '../../../util/available-metrics'
 
 const NewPortfolioModalComponent = ({ show, callback }) => {
     const textInput = useRef(null)
@@ -39,7 +39,7 @@ const NewPortfolioModalComponent = ({ show, callback }) => {
                                     type="checkbox"
                                     innerRef={(ref) => (metricCheckboxes.current[metric] = ref)}
                                 />
-                                <code>{metric}</code>
+                                {METRIC_NAMES[metric]}
                             </Label>
                         </FormGroup>
                     ))}
diff --git a/frontend/src/sagas/scenarios.js b/frontend/src/sagas/scenarios.js
index 720c0c97..59223610 100644
--- a/frontend/src/sagas/scenarios.js
+++ b/frontend/src/sagas/scenarios.js
@@ -52,7 +52,7 @@ export function* onDeleteScenario(action) {
         yield call(deleteScenario, action.id)
 
         const currentPortfolioId = yield select((state) => state.currentPortfolioId)
-        const scenarioIds = yield select((state) => state.objects.project[currentPortfolioId].scenarioIds)
+        const scenarioIds = yield select((state) => state.objects.portfolio[currentPortfolioId].scenarioIds)
 
         yield put(
             addPropToStoreObject('scenario', currentPortfolioId, {
diff --git a/frontend/src/util/available-metrics.js b/frontend/src/util/available-metrics.js
index ed11f5f7..807bc0c1 100644
--- a/frontend/src/util/available-metrics.js
+++ b/frontend/src/util/available-metrics.js
@@ -15,7 +15,7 @@ export const AVAILABLE_METRICS = [
     'total_vms_failed',
 ]
 
-export const METRIC_NAMES = {
+export const METRIC_NAMES_SHORT = {
     total_overcommitted_burst: 'Overcomm. CPU Cycles',
     total_granted_burst: 'Granted CPU Cycles',
     total_requested_burst: 'Requested CPU Cycles',
@@ -32,6 +32,23 @@ export const METRIC_NAMES = {
     total_vms_failed: 'Max. Num. VMs Failed',
 }
 
+export const METRIC_NAMES = {
+    total_overcommitted_burst: 'Overcommitted CPU Cycles',
+    total_granted_burst: 'Granted CPU Cycles',
+    total_requested_burst: 'Requested CPU Cycles',
+    total_interfered_burst: 'Interfered CPU Cycles',
+    total_power_draw: 'Total Power Consumption',
+    mean_cpu_usage: 'Mean Host CPU Usage',
+    mean_cpu_demand: 'Mean Host CPU Demand',
+    mean_num_deployed_images: 'Mean Number of Deployed Images Per Host',
+    max_num_deployed_images: 'Maximum Number Deployed Images Per Host',
+    total_failure_vm_slices: 'Total Number Failed VM Slices',
+    total_vms_submitted: 'Total Number VMs Submitted',
+    total_vms_queued: 'Maximum Number VMs Queued',
+    total_vms_finished: 'Maximum Number VMs Finished',
+    total_vms_failed: 'Maximum Number VMs Failed',
+}
+
 export const METRIC_UNITS = {
     total_overcommitted_burst: 'MFLOP',
     total_granted_burst: 'MFLOP',