From 2e3c72891e4e20fde88d8eda2d38b010b209b26b Mon Sep 17 00:00:00 2001 From: Kevin Ansfield Date: Tue, 26 May 2020 11:36:53 +0100 Subject: [PATCH] Updated members screen to work with final stats API naming refs https://github.com/TryGhost/Ghost/commit/071ab9774b31e4bc60918c2f4ed6a03803378bc2 - stats API uses snake_case rather than camelCase to be consistent with the rest of Ghost's APIs --- app/components/gh-members-chart.hbs | 4 ++-- app/components/gh-members-chart.js | 6 +++--- mirage/config/members.js | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/components/gh-members-chart.hbs b/app/components/gh-members-chart.hbs index 6d199f51b..a0fe7fcbe 100644 --- a/app/components/gh-members-chart.hbs +++ b/app/components/gh-members-chart.hbs @@ -54,11 +54,11 @@ {{else}}

Signed up in the last {{this.range}} days

{{/if}} -
{{if this.fetchStatsTask.isRunning "-" this.stats.totalInRange}}
+
{{if this.fetchStatsTask.isRunning "-" this.stats.total_in_range}}

Signed up today

-
{{if this.fetchStatsTask.isRunning "-" this.stats.newToday}}
+
{{if this.fetchStatsTask.isRunning "-" this.stats.new_today}}
\ No newline at end of file diff --git a/app/components/gh-members-chart.js b/app/components/gh-members-chart.js index bbabef266..be662c082 100644 --- a/app/components/gh-members-chart.js +++ b/app/components/gh-members-chart.js @@ -69,12 +69,12 @@ export default Component.extend({ this.set('stats', stats); this.setChartOptions({ - rangeInDays: Object.keys(stats.totalOnDate).length + rangeInDays: Object.keys(stats.total_on_date).length }); this.setChartData({ - dateLabels: Object.keys(stats.totalOnDate), - dateValues: Object.values(stats.totalOnDate) + dateLabels: Object.keys(stats.total_on_date), + dateValues: Object.values(stats.total_on_date) }); }), diff --git a/mirage/config/members.js b/mirage/config/members.js index 924307a79..a6d7f3f29 100644 --- a/mirage/config/members.js +++ b/mirage/config/members.js @@ -47,9 +47,9 @@ export function mockMembersStats(server) { return { total, - totalInRange: rangeTotal, - totalOnDate, - newToday: dateCounts[moment().format('YYYY-MM-DD')] + total_in_range: rangeTotal, + total_on_date: totalOnDate, + new_today: dateCounts[moment().format('YYYY-MM-DD')] }; }); }