Stats revamp: Use new Totals cell for Followers

Author: frosty

WordPress/Classes/Stores/StatsInsightsStore.swift

@@ -938,6 +938,19 @@ extension StatsInsightsStore {
         return state.emailFollowers
     }
 
+    func getTotalFollowerCount() -> Int {
+        let totalDotComFollowers = getDotComFollowers()?.dotComFollowersCount ?? 0
+        let totalEmailFollowers = getEmailFollowers()?.emailFollowersCount ?? 0
+
+        var totalPublicize = 0
+        if let publicize = getPublicize(),
+           !publicize.publicizeServices.isEmpty {
+            totalPublicize = publicize.publicizeServices.compactMap({$0.followers}).reduce(0, +)
+        }
+
+        return totalDotComFollowers + totalEmailFollowers + totalPublicize
+    }
+
     func getPublicize() -> StatsPublicizeInsight? {
         return state.publicizeFollowers
     }

WordPress/Classes/ViewRelated/Stats/Insights/SiteStatsInsightsTableViewController.swift

@@ -177,6 +177,7 @@ private extension SiteStatsInsightsTableViewController {
                 TabbedTotalsStatsRow.self,
                 TopTotalsInsightStatsRow.self,
                 MostPopularTimeInsightStatsRow.self,
+                TotalInsightStatsRow.self,
                 TableFooterRow.self,
                 StatsErrorRow.self,
                 StatsGhostGrowAudienceImmutableRow.self,

WordPress/Classes/ViewRelated/Stats/Insights/SiteStatsInsightsViewModel.swift

@@ -126,9 +126,13 @@ class SiteStatsInsightsViewModel: Observable {
                                         type: .insights,
                                         status: insightsStore.followersTotalsStatus,
                                         block: {
+                    if FeatureFlag.statsNewInsights.enabled {
+                        return TotalInsightStatsRow(dataRow: createFollowerTotalInsightsRow(), statSection: .insightsFollowerTotals, siteStatsInsightsDelegate: siteStatsInsightsDelegate)
+                    } else {
                                             return TwoColumnStatsRow(dataRows: createTotalFollowersRows(),
                                                                      statSection: .insightsFollowerTotals,
                                                                      siteStatsInsightsDelegate: nil)
+                    }
                 }, loading: {
                     return StatsGhostTwoColumnImmutableRow()
                 }, error: errorBlock))
@@ -413,12 +417,12 @@ private extension SiteStatsInsightsViewModel {
         let totalEmailFollowers = insightsStore.getEmailFollowers()?.emailFollowersCount ?? 0
 
         var totalPublicize = 0
-        if let publicize = insightsStore.getPublicize(), !publicize.publicizeServices.isEmpty {
+        if let publicize = insightsStore.getPublicize(),
+           !publicize.publicizeServices.isEmpty {
             totalPublicize = publicize.publicizeServices.compactMap({$0.followers}).reduce(0, +)
         }
 
-        let totalFollowers = totalDotComFollowers + totalEmailFollowers + totalPublicize
-
+        let totalFollowers = insightsStore.getTotalFollowerCount()
         guard totalFollowers > 0 else {
             return []
         }
@@ -438,6 +442,10 @@ private extension SiteStatsInsightsViewModel {
         return dataRows
     }
 
+    func createFollowerTotalInsightsRow() -> StatsTotalInsightsData {
+        return StatsTotalInsightsData(count: insightsStore.getTotalFollowerCount().abbreviatedString())
+    }
+
     func createPublicizeRows() -> [StatsTotalRowData] {
         guard let services = insightsStore.getPublicize()?.publicizeServices else {
             return []

WordPress/Classes/ViewRelated/Stats/SiteStatsTableViewCells.swift

@@ -287,6 +287,27 @@ struct MostPopularTimeInsightStatsRow: ImmuTableRow {
     }
 }
 
+struct TotalInsightStatsRow: ImmuTableRow {
+
+    typealias CellType = StatsTotalInsightsCell
+
+    static let cell: ImmuTableCell = {
+        return ImmuTableCell.class(CellType.self)
+    }()
+
+    let dataRow: StatsTotalInsightsData
+    let statSection: StatSection
+    weak var siteStatsInsightsDelegate: SiteStatsInsightsDelegate?
+    let action: ImmuTableAction? = nil
+
+    func configureCell(_ cell: UITableViewCell) {
+        guard let cell = cell as? CellType else {
+            return
+        }
+
+        cell.configure(count: dataRow.count, statSection: statSection, siteStatsInsightsDelegate: siteStatsInsightsDelegate)
+    }
+}
 
 // MARK: - Insights Management