Merge pull request #17854 from wordpress-mobile/issue/6969_filter_for_email_followers

People: Add email followers filter to people page

Author: leandroalonso

RELEASE-NOTES.txt

@@ -2,6 +2,7 @@
 -----
 * [**] Some of the screens of the app has a new, fresh and more modern visual, including the initial one: My Site. [#17812]
 * [**] Notifications: added a button to mark all notifications in the selected filter as read. [#17840]
+* [**] People: you can now manage Email Followers on the People section! [#17854]
 * [*] Stats: fix navigation between Stats tab. [#17856]
 * [*] Quick Start: Fixed a bug where a user logging in via a self-hosted site not connected to Jetpack would see Quick Start when selecting "No thanks" on the Quick Start prompt. [#17855] 
 

WordPress/Classes/Models/ManagedPerson.swift

@@ -30,6 +30,8 @@ class ManagedPerson: NSManagedObject {
             return User(managedPerson: self)
         case PersonKind.viewer.rawValue:
             return Viewer(managedPerson: self)
+        case PersonKind.emailFollower.rawValue:
+            return EmailFollower(managedPerson: self)
         default:
             return Follower(managedPerson: self)
         }
@@ -97,3 +99,18 @@ extension Viewer {
                   isSuperAdmin: managedPerson.isSuperAdmin)
     }
 }
+
+extension EmailFollower {
+    init(managedPerson: ManagedPerson) {
+        self.init(ID: Int(managedPerson.userID),
+                  username: managedPerson.username,
+                  firstName: managedPerson.firstName,
+                  lastName: managedPerson.lastName,
+                  displayName: managedPerson.displayName,
+                  role: RemoteRole.follower.slug,
+                  siteID: Int(managedPerson.siteID),
+                  linkedUserID: Int(managedPerson.linkedUserID),
+                  avatarURL: managedPerson.avatarURL.flatMap { URL(string: $0) },
+                  isSuperAdmin: managedPerson.isSuperAdmin)
+    }
+}

WordPress/Classes/Services/PeopleService.swift

@@ -68,6 +68,28 @@ struct PeopleService {
         })
     }
 
+    /// Loads a page of Email Followers associated to the current blog, starting at the specified offset.
+    ///
+    /// - Parameters:
+    ///     - offset: Number of records to skip.
+    ///     - count: Number of records to retrieve. By default set to 20.
+    ///     - success: Closure to be executed on success with the number of followers retrieved and a bool indicating if more are available.
+    ///     - failure: Closure to be executed on failure.
+    ///
+    func loadEmailFollowersPage(_ offset: Int = 0,
+                                count: Int = 20,
+                                success: @escaping ((_ retrieved: Int, _ shouldLoadMore: Bool) -> Void),
+                                failure: ((Error) -> Void)? = nil) {
+        let page = (offset / count) + 1
+        remote.getEmailFollowers(siteID, page: page, max: count, success: { followers, hasMore in
+            self.mergePeople(followers)
+            success(followers.count, hasMore)
+        }, failure: { error in
+            DDLogError(String(describing: error))
+            failure?(error)
+        })
+    }
+
     /// Loads a page of Viewers associated to the current blog, starting at the specified offset.
     ///
     /// - Parameters:
@@ -182,6 +204,30 @@ struct PeopleService {
         context.delete(managedPerson)
     }
 
+    /// Deletes a given EmailFollower.
+    ///
+    /// - Parameters:
+    ///     - person: The email follower that should be deleted
+    ///     - success: Closure to be executed in case of success.
+    ///     - failure: Closure to be executed on error
+    ///
+    func deleteEmailFollower(_ person: EmailFollower, success: (() -> Void)? = nil, failure: ((Error) -> Void)? = nil) {
+        guard let managedPerson = managedPersonFromPerson(person) else {
+            return
+        }
+
+        remote.deleteEmailFollower(siteID, userID: person.ID, success: {
+            success?()
+        }, failure: { error in
+            DDLogError("Error while deleting follower \(person.ID) from blog \(self.siteID): \(error)")
+
+            self.createManagedPerson(person)
+            failure?(error)
+        })
+
+        context.delete(managedPerson)
+    }
+
     /// Deletes a given Viewer.
     ///
     /// - Parameters:

WordPress/Classes/ViewRelated/People/People.storyboard

@@ -2,11 +2,12 @@ import UIKit
 import WordPressShared
 
 class PeopleCell: WPTableViewCell {
-    @IBOutlet var avatarImageView: CircularImageView!
-    @IBOutlet var displayNameLabel: UILabel!
-    @IBOutlet var usernameLabel: UILabel!
-    @IBOutlet var roleBadge: PeopleRoleBadgeLabel!
-    @IBOutlet var superAdminRoleBadge: PeopleRoleBadgeLabel!
+    @IBOutlet private weak var avatarImageView: CircularImageView!
+    @IBOutlet private weak var displayNameLabel: UILabel!
+    @IBOutlet private weak var usernameLabel: UILabel!
+    @IBOutlet private weak var roleBadge: PeopleRoleBadgeLabel!
+    @IBOutlet private weak var superAdminRoleBadge: PeopleRoleBadgeLabel!
+    @IBOutlet private weak var badgeStackView: UIStackView!
 
     override func awakeFromNib() {
         WPStyleGuide.configureLabel(displayNameLabel, textStyle: .callout)
@@ -18,6 +19,7 @@ class PeopleCell: WPTableViewCell {
         displayNameLabel.text = viewModel.displayName
         displayNameLabel.textColor = viewModel.usernameColor
         usernameLabel.text = viewModel.usernameText
+        usernameLabel.isHidden = viewModel.usernameHidden
         roleBadge.borderColor = viewModel.roleBorderColor
         roleBadge.backgroundColor = viewModel.roleBackgroundColor
         roleBadge.textColor = viewModel.roleTextColor
@@ -27,6 +29,7 @@ class PeopleCell: WPTableViewCell {
         superAdminRoleBadge.isHidden = viewModel.superAdminHidden
         superAdminRoleBadge.borderColor = viewModel.superAdminBorderColor
         superAdminRoleBadge.backgroundColor = viewModel.superAdminBackgroundColor
+        badgeStackView.isHidden = viewModel.roleHidden && viewModel.superAdminHidden
     }
 
     @objc func setAvatarURL(_ avatarURL: URL?) {

WordPress/Classes/ViewRelated/People/PeopleCell.swift

@@ -20,6 +20,10 @@ struct PeopleCellViewModel {
         return "@" + username
     }
 
+    var usernameHidden: Bool {
+        return username.isEmpty
+    }
+
     var usernameColor: UIColor {
         return .text
     }

WordPress/Classes/ViewRelated/People/PeopleCellViewModel.swift

@@ -69,7 +69,7 @@ class PeopleViewController: UITableViewController, UIViewControllerRestoration {
         // Followers must be sorted out by creationDate!
         //
         switch filter {
-        case .followers:
+        case .followers, .email:
             return [NSSortDescriptor(key: "creationDate", ascending: true, selector: #selector(NSDate.compare(_:)))]
         default:
             return [NSSortDescriptor(key: "displayName", ascending: true, selector: #selector(NSString.localizedCaseInsensitiveCompare(_:)))]
@@ -182,22 +182,18 @@ class PeopleViewController: UITableViewController, UIViewControllerRestoration {
         tableView.reloadData()
     }
 
-    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
-        if let personViewController = segue.destination as? PersonViewController,
-            let selectedIndexPath = tableView.indexPathForSelectedRow {
-            personViewController.context = viewContext
-            personViewController.blog = blog
-            personViewController.person = personAtIndexPath(selectedIndexPath)
-            switch filter {
-            case .followers:
-                personViewController.screenMode = .Follower
-            case .users:
-                personViewController.screenMode = .User
-            case .viewers:
-                personViewController.screenMode = .Viewer
-            }
+    @IBSegueAction func createPersonViewController(_ coder: NSCoder) -> PersonViewController? {
+        guard let selectedIndexPath = tableView.indexPathForSelectedRow, let blog = blog else { return nil }
+
+        return PersonViewController(coder: coder,
+                                    blog: blog,
+                                    context: viewContext,
+                                    person: personAtIndexPath(selectedIndexPath),
+                                    screenMode: filter.screenMode)
+    }
 
-        } else if let navController = segue.destination as? UINavigationController,
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
+        if let navController = segue.destination as? UINavigationController,
             let inviteViewController = navController.topViewController as? InvitePersonViewController {
             inviteViewController.blog = blog
         }
@@ -274,10 +270,11 @@ private extension PeopleViewController {
 
         case users      = "users"
         case followers  = "followers"
+        case email      = "email"
         case viewers    = "viewers"
 
         static var defaultFilters: [Filter] {
-            return [.users, .followers]
+            return [.users, .followers, .email]
         }
 
         var title: String {
@@ -288,6 +285,8 @@ private extension PeopleViewController {
                 return NSLocalizedString("Followers", comment: "Blog Followers")
             case .viewers:
                 return NSLocalizedString("Viewers", comment: "Blog Viewers")
+            case .email:
+                return NSLocalizedString("Email Followers", comment: "Blog Email Followers")
             }
         }
 
@@ -299,6 +298,21 @@ private extension PeopleViewController {
                 return .follower
             case .viewers:
                 return .viewer
+            case .email:
+                return .emailFollower
+            }
+        }
+
+        var screenMode: PersonViewController.ScreenMode {
+            switch self {
+            case .users:
+                return .User
+            case .followers:
+                return .Follower
+            case .viewers:
+                return .Viewer
+            case .email:
+                return .Email
             }
         }
     }
@@ -395,6 +409,8 @@ private extension PeopleViewController {
             loadUsersPage(offset, success: success)
         case .viewers:
             service.loadViewersPage(offset, success: success)
+        case .email:
+            service.loadEmailFollowersPage(offset, success: success)
         }
     }
 
@@ -449,32 +465,29 @@ private extension PeopleViewController {
     // MARK: No Results Helpers
 
     func refreshNoResultsView() {
-        noResultsViewController.removeFromView()
-
-        if isInitialLoad {
-            displayNoResultsView(forLoading: true)
-            return
-        }
-
         guard resultsController.fetchedObjects?.count == 0 else {
+            noResultsViewController.removeFromView()
             return
         }
 
-        displayNoResultsView()
+        displayNoResultsView(isLoading: isInitialLoad)
     }
 
-    func displayNoResultsView(forLoading: Bool = false) {
-        let accessoryView = forLoading ? NoResultsViewController.loadingAccessoryView() : nil
+    func displayNoResultsView(isLoading: Bool = false) {
+        let accessoryView = isLoading ? NoResultsViewController.loadingAccessoryView() : nil
         noResultsViewController.configure(title: noResultsTitle(), accessoryView: accessoryView)
 
-        addChild(noResultsViewController)
-        tableView.addSubview(withFadeAnimation: noResultsViewController.view)
-
         // Set the NRV top as the filterBar bottom so the NRV
         // adjusts correctly when refreshControl is active.
         let filterBarBottom = filterBar.frame.origin.y + filterBar.frame.size.height
         noResultsViewController.view.frame.origin.y = filterBarBottom
 
+        guard noResultsViewController.parent == nil else {
+            noResultsViewController.updateView()
+            return
+        }
+        addChild(noResultsViewController)
+        tableView.addSubview(withFadeAnimation: noResultsViewController.view)
         noResultsViewController.didMove(toParent: self)
     }