Add label support, add labels to usage manifest

mozilla · Feb 24, 2018 · dc89e66 · dc89e66
1 parent d589fed
commit dc89e66
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/manifests/firefox-usage-report.json b/manifests/firefox-usage-report.json
@@ -8,10 +8,13 @@
                 "units": {
                     "y": "hours"
                 },
+                "labels": {
+                    "y": "hours"
+                },
                 "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse vel odio eu odio malesuada tristique. Aliquam semper, dolor ultricies suscipit semper, nisi elit accumsan ante, quis cursus lacus massa id metus. Nullam et malesuada sem. Sed maximus viverra cursus. Proin nisl ex, sollicitudin pulvinar tristique et, finibus et massa."
             },
             "Average Intensity": {
-                "units": {
+                "labels": {
                     "y": "intensity"
                 },
                 "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse vel odio eu odio malesuada tristique. Aliquam semper, dolor ultricies suscipit semper, nisi elit accumsan ante, quis cursus lacus massa id metus. Nullam et malesuada sem. Sed maximus viverra cursus. Proin nisl ex, sollicitudin pulvinar tristique et, finibus et massa."
@@ -20,15 +23,24 @@
                 "units": {
                     "y": "clients"
                 },
+                "labels": {
+                    "y": "clients"
+                },
                 "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse vel odio eu odio malesuada tristique. Aliquam semper, dolor ultricies suscipit semper, nisi elit accumsan ante, quis cursus lacus massa id metus. Nullam et malesuada sem. Sed maximus viverra cursus. Proin nisl ex, sollicitudin pulvinar tristique et, finibus et massa."
             },
             "Operating System": {
+                "units": {
+                    "y": "%"
+                },
                 "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse vel odio eu odio malesuada tristique. Aliquam semper, dolor ultricies suscipit semper, nisi elit accumsan ante, quis cursus lacus massa id metus. Nullam et malesuada sem. Sed maximus viverra cursus. Proin nisl ex, sollicitudin pulvinar tristique et, finibus et massa."
             },
             "YAU": {
                 "units": {
                     "y": "clients"
                 },
+                "labels": {
+                    "y": "clients"
+                },
                 "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse vel odio eu odio malesuada tristique. Aliquam semper, dolor ultricies suscipit semper, nisi elit accumsan ante, quis cursus lacus massa id metus. Nullam et malesuada sem. Sed maximus viverra cursus. Proin nisl ex, sollicitudin pulvinar tristique et, finibus et massa."
             }
         }

diff --git a/src/transpose.js b/src/transpose.js
@@ -84,8 +84,9 @@ function processSource(error, body, manifest, callback) {
                 const chartDescription = chartMeta.description;
                 const chartSection = getSectionTitle(metricName);
                 const chartUnits = chartMeta.units;
+                const chartLabels = chartMeta.labels;
 
-                const chart = dataset.getChart(chartTitle, chartDescription, chartSection, chartUnits);
+                const chart = dataset.getChart(chartTitle, chartDescription, chartSection, chartUnits, chartLabels);
                 const category = chart.getCategory(categoryName);
 
                 // If the source dataset doesn't specify any populations, create
@@ -126,9 +127,9 @@ class Dataset {
         this.categoryNames = [];
     }
 
-    getChart(title, description, section, units) {
+    getChart(title, description, section, units, labels) {
         if (!propertyExists(this.charts, title)) {
-            this.charts[title] = new Chart(title, description, section, units);
+            this.charts[title] = new Chart(title, description, section, units, labels);
         }
         return this.charts[title];
     }
@@ -165,11 +166,12 @@ class Dataset {
 }
 
 class Chart {
-    constructor(title, description, section, units) {
+    constructor(title, description, section, units, labels) {
         this.title = title;
         this.description = description;
         this.section = section;
         this.units = units;
+        this.labels = labels;
 
         this.categories = {};
     }
@@ -193,6 +195,7 @@ class Chart {
             description: this.description,
             section: this.section,
             units: this.units,
+            labels: this.labels,
             categories: renderedCategories,
         };
     }