diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-01-23 16:01:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-23 16:01:25 +0100 |
| commit | a63495230a3a28e022504f36356cd75b17b635ba (patch) | |
| tree | 02ee97effb903d57cc8f310b334153749c276795 | |
| parent | bddd9ba36d9f4e86e2a4bbea77f967c143afa2cc (diff) | |
Change `percent` to `rate` in retention metrics API (#16910)
| -rw-r--r-- | app/javascript/mastodon/components/admin/Retention.js | 6 | ||||
| -rw-r--r-- | app/lib/admin/metrics/retention.rb | 4 | ||||
| -rw-r--r-- | app/serializers/rest/admin/cohort_serializer.rb | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/app/javascript/mastodon/components/admin/Retention.js b/app/javascript/mastodon/components/admin/Retention.js index 3a7aaed9d..47c9e7151 100644 --- a/app/javascript/mastodon/components/admin/Retention.js +++ b/app/javascript/mastodon/components/admin/Retention.js @@ -88,7 +88,7 @@ export default class Retention extends React.PureComponent { </td> {data[0].data.slice(1).map((retention, i) => { - const average = data.reduce((sum, cohort, k) => cohort.data[i + 1] ? sum + (cohort.data[i + 1].percent - sum)/(k + 1) : sum, 0); + const average = data.reduce((sum, cohort, k) => cohort.data[i + 1] ? sum + (cohort.data[i + 1].rate - sum)/(k + 1) : sum, 0); return ( <td key={retention.date}> @@ -118,8 +118,8 @@ export default class Retention extends React.PureComponent { {cohort.data.slice(1).map(retention => ( <td key={retention.date}> - <div className={classNames('retention__table__box', `retention__table__box--${roundTo10(retention.percent * 100)}`)}> - <FormattedNumber value={retention.percent} style='percent' /> + <div className={classNames('retention__table__box', `retention__table__box--${roundTo10(retention.rate * 100)}`)}> + <FormattedNumber value={retention.rate} style='percent' /> </div> </td> ))} diff --git a/app/lib/admin/metrics/retention.rb b/app/lib/admin/metrics/retention.rb index 6b9dfde49..0179a6e28 100644 --- a/app/lib/admin/metrics/retention.rb +++ b/app/lib/admin/metrics/retention.rb @@ -6,7 +6,7 @@ class Admin::Metrics::Retention end class CohortData < ActiveModelSerializers::Model - attributes :date, :percent, :value + attributes :date, :rate, :value end def initialize(start_at, end_at, frequency) @@ -59,7 +59,7 @@ class Admin::Metrics::Retention current_cohort.data << CohortData.new( date: row['retention_period'], - percent: rate.to_f, + rate: rate.to_f, value: value.to_s ) end diff --git a/app/serializers/rest/admin/cohort_serializer.rb b/app/serializers/rest/admin/cohort_serializer.rb index 56b35c699..f68173616 100644 --- a/app/serializers/rest/admin/cohort_serializer.rb +++ b/app/serializers/rest/admin/cohort_serializer.rb @@ -4,7 +4,7 @@ class REST::Admin::CohortSerializer < ActiveModel::Serializer attributes :period, :frequency class CohortDataSerializer < ActiveModel::Serializer - attributes :date, :percent, :value + attributes :date, :rate, :value def date object.date.iso8601 |