crate.version: Move downloadData() property to DownloadGraph component

Author: Turbo87

app/components/download-graph.js

@@ -3,6 +3,7 @@ import { inject as service } from '@ember/service';
 import { waitForPromise } from '@ember/test-waiters';
 import Component from '@glimmer/component';
 
+import subDays from 'date-fns/subDays';
 import window from 'ember-window-mock';
 
 // Colors by http://colorbrewer2.org/#type=diverging&scheme=RdBu&n=10
@@ -65,7 +66,7 @@ export default class DownloadGraph extends Component {
   }
 
   get data() {
-    let [labels, ...rows] = this.args.data;
+    let [labels, ...rows] = this.downloadData;
 
     let datasets = labels
       .slice(1)
@@ -89,4 +90,60 @@ export default class DownloadGraph extends Component {
 
     return { datasets };
   }
+
+  get downloadData() {
+    let downloads = this.args.data;
+    if (!downloads) {
+      return;
+    }
+
+    let extra = downloads.content?.meta?.extra_downloads ?? [];
+
+    let dates = {};
+    let versions = new Set([]);
+
+    let now = new Date();
+    for (let i = 0; i < 90; i++) {
+      let date = subDays(now, i);
+      dates[date.toISOString().slice(0, 10)] = { date, cnt: {} };
+    }
+
+    downloads.forEach(d => {
+      let version_num = d.version.num;
+
+      versions.add(version_num);
+
+      let key = d.date;
+      if (dates[key]) {
+        let prev = dates[key].cnt[version_num] || 0;
+        dates[key].cnt[version_num] = prev + d.downloads;
+      }
+    });
+
+    extra.forEach(d => {
+      let key = d.date;
+      if (dates[key]) {
+        let prev = dates[key].cnt['Other'] || 0;
+        dates[key].cnt['Other'] = prev + d.downloads;
+      }
+    });
+
+    let versionsList = [...versions].sort();
+    if (extra.length !== 0) {
+      versionsList.unshift('Other');
+    }
+
+    let headers = ['Date', ...versionsList];
+
+    let data = [headers];
+    for (let date in dates) {
+      let row = [dates[date].date];
+      for (let version of versionsList) {
+        row.push(dates[date].cnt[version] || 0);
+      }
+      data.push(row);
+    }
+
+    return data;
+  }
 }

app/controllers/crate/version.js

@@ -3,7 +3,6 @@ import { computed } from '@ember/object';
 import { alias } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
 
-import subDays from 'date-fns/subDays';
 import { task } from 'ember-concurrency';
 
 export default class CrateVersionController extends Controller {
@@ -24,63 +23,6 @@ export default class CrateVersionController extends Controller {
     return this.crate.owner_user.findBy('id', this.session.currentUser?.id);
   }
 
-  @computed('downloads')
-  get downloadData() {
-    let downloads = this.downloads;
-    if (!downloads) {
-      return;
-    }
-
-    let extra = downloads.content?.meta?.extra_downloads ?? [];
-
-    let dates = {};
-    let versions = new Set([]);
-
-    let now = new Date();
-    for (let i = 0; i < 90; i++) {
-      let date = subDays(now, i);
-      dates[date.toISOString().slice(0, 10)] = { date, cnt: {} };
-    }
-
-    downloads.forEach(d => {
-      let version_num = d.version.num;
-
-      versions.add(version_num);
-
-      let key = d.date;
-      if (dates[key]) {
-        let prev = dates[key].cnt[version_num] || 0;
-        dates[key].cnt[version_num] = prev + d.downloads;
-      }
-    });
-
-    extra.forEach(d => {
-      let key = d.date;
-      if (dates[key]) {
-        let prev = dates[key].cnt['Other'] || 0;
-        dates[key].cnt['Other'] = prev + d.downloads;
-      }
-    });
-
-    let versionsList = [...versions].sort();
-    if (extra.length !== 0) {
-      versionsList.unshift('Other');
-    }
-
-    let headers = ['Date', ...versionsList];
-
-    let data = [headers];
-    for (let date in dates) {
-      let row = [dates[date].date];
-      for (let version of versionsList) {
-        row.push(dates[date].cnt[version] || 0);
-      }
-      data.push(row);
-    }
-
-    return data;
-  }
-
   @alias('loadReadmeTask.last.value') readme;
 
   @task(function* () {

app/templates/crate/version.hbs

@@ -100,7 +100,7 @@
     </div>
     <div local-class='graph'>
       <h4>Downloads over the last 90 days</h4>
-      <DownloadGraph @data={{this.downloadData}} local-class="graph-data" />
+      <DownloadGraph @data={{this.downloads}} local-class="graph-data" />
     </div>
   </div>
 {{/unless}}

tests/components/download-graph-test.js

@@ -78,11 +78,39 @@ module('Component | DownloadGraph', function (hooks) {
 });
 
 function exampleData() {
-  return [
-    ['Date', 'Other', '1.0.52', '1.0.53', '1.0.54', '1.0.55', '1.0.56'],
-    [new Date('2020-12-30'), 36745, 201, 2228, 4298, 3702, 30520],
-    [new Date('2020-12-29'), 33242, 261, 1650, 4277, 4157, 31631],
-    [new Date('2020-12-28'), 19981, 181, 968, 2786, 2414, 23616],
-    [new Date('2020-12-27'), 19064, 186, 873, 2477, 15713, 3815],
+  let downloads = [
+    { version: { num: '1.0.52' }, date: '2020-12-30', downloads: 201 },
+    { version: { num: '1.0.53' }, date: '2020-12-30', downloads: 2228 },
+    { version: { num: '1.0.54' }, date: '2020-12-30', downloads: 4298 },
+    { version: { num: '1.0.55' }, date: '2020-12-30', downloads: 3702 },
+    { version: { num: '1.0.56' }, date: '2020-12-30', downloads: 30520 },
+    { version: { num: '1.0.52' }, date: '2020-12-29', downloads: 261 },
+    { version: { num: '1.0.53' }, date: '2020-12-29', downloads: 1650 },
+    { version: { num: '1.0.54' }, date: '2020-12-29', downloads: 4277 },
+    { version: { num: '1.0.55' }, date: '2020-12-29', downloads: 4157 },
+    { version: { num: '1.0.56' }, date: '2020-12-29', downloads: 31631 },
+    { version: { num: '1.0.52' }, date: '2020-12-28', downloads: 181 },
+    { version: { num: '1.0.53' }, date: '2020-12-28', downloads: 968 },
+    { version: { num: '1.0.54' }, date: '2020-12-28', downloads: 2786 },
+    { version: { num: '1.0.55' }, date: '2020-12-28', downloads: 2414 },
+    { version: { num: '1.0.56' }, date: '2020-12-28', downloads: 23616 },
+    { version: { num: '1.0.52' }, date: '2020-12-27', downloads: 186 },
+    { version: { num: '1.0.53' }, date: '2020-12-27', downloads: 873 },
+    { version: { num: '1.0.54' }, date: '2020-12-27', downloads: 2477 },
+    { version: { num: '1.0.55' }, date: '2020-12-27', downloads: 15713 },
+    { version: { num: '1.0.56' }, date: '2020-12-27', downloads: 3815 },
   ];
+
+  downloads.content = {
+    meta: {
+      extra_downloads: [
+        { date: '2020-12-30', downloads: 36745 },
+        { date: '2020-12-29', downloads: 33242 },
+        { date: '2020-12-28', downloads: 19981 },
+        { date: '2020-12-27', downloads: 19064 },
+      ],
+    },
+  };
+
+  return downloads;
 }