From 803523c31ded26ef6913c3b9fd6bb4747965b384 Mon Sep 17 00:00:00 2001 From: Rish Date: Wed, 24 Mar 2021 21:41:35 +0530 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fixed=20incorrect=20member=20cou?= =?UTF-8?q?nt=20on=20dashboard?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit closes https://github.com/TryGhost/Team/issues/561 In case the last event for a new member on site was before 30 day period, the count for members was showing 0 instead of the actual value. The change fixes the count to show the correct value even if there is no new recent member activity. --- ghost/admin/app/services/members-stats.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghost/admin/app/services/members-stats.js b/ghost/admin/app/services/members-stats.js index 31a66bd86e..80d1f8c343 100644 --- a/ghost/admin/app/services/members-stats.js +++ b/ghost/admin/app/services/members-stats.js @@ -112,7 +112,10 @@ export default class MembersStatsService extends Service { const firstDateInRangeIndex = data.findIndex((val) => { return moment(val.date).isAfter(currentRangeDate); }); - const initialDateInRangeVal = firstDateInRangeIndex > 0 ? data[firstDateInRangeIndex - 1] : null; + let initialDateInRangeVal = firstDateInRangeIndex > 0 ? data[firstDateInRangeIndex - 1] : null; + if (data.length > 0 && !initialDateInRangeVal && firstDateInRangeIndex !== 0) { + initialDateInRangeVal = data[data.length - 1]; + } let lastVal = { paid: initialDateInRangeVal ? initialDateInRangeVal.paid : 0, free: initialDateInRangeVal ? initialDateInRangeVal.free : 0,