Show new Comment detail view when a cached comment notification is selected.

Author: ScoutHarris

WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift

@@ -23,6 +23,7 @@ enum FeatureFlag: Int, CaseIterable, OverrideableFlag {
     case followConversationPostDetails
     case markAllNotificationsAsRead
     case mediaPickerPermissionsNotice
+    case notificationCommentDetails
 
     /// Returns a boolean indicating if the feature is enabled
     var enabled: Bool {
@@ -74,6 +75,8 @@ enum FeatureFlag: Int, CaseIterable, OverrideableFlag {
             return true
         case .mediaPickerPermissionsNotice:
             return true
+        case .notificationCommentDetails:
+            return false
         }
     }
 
@@ -142,6 +145,8 @@ extension FeatureFlag {
             return "Mark Notifications As Read"
         case .mediaPickerPermissionsNotice:
             return "Media Picker Permissions Notice"
+        case .notificationCommentDetails:
+            return "Notification Comment Details"
         }
     }
 

WordPress/Classes/ViewRelated/Comments/CommentDetailViewController.swift

@@ -20,10 +20,19 @@ class CommentDetailViewController: UIViewController {
 
     @objc weak var delegate: CommentDetailsDelegate?
     private var comment: Comment
-    private var isLastInList: Bool
+    private var isLastInList = true
     private var managedObjectContext: NSManagedObjectContext
     private var rows = [RowType]()
     private var moderationBar: CommentModerationBar?
+    private var notification: Notification?
+
+    private var isNotificationComment: Bool {
+        notification != nil
+    }
+
+    private var viewTitle: String? {
+        isNotificationComment ? notification?.title : nil
+    }
 
     private var viewIsVisible: Bool {
         return navigationController?.visibleViewController == self
@@ -163,16 +172,26 @@ class CommentDetailViewController: UIViewController {
 
     // MARK: Initialization
 
-    @objc required init(comment: Comment,
-                        isLastInList: Bool,
-                        managedObjectContext: NSManagedObjectContext = ContextManager.sharedInstance().mainContext) {
+    @objc init(comment: Comment,
+               isLastInList: Bool,
+               managedObjectContext: NSManagedObjectContext = ContextManager.sharedInstance().mainContext) {
         self.comment = comment
         self.isLastInList = isLastInList
         self.managedObjectContext = managedObjectContext
         self.replyID = comment.replyID
         super.init(nibName: nil, bundle: nil)
     }
 
+    init(comment: Comment,
+         notification: Notification,
+         managedObjectContext: NSManagedObjectContext = ContextManager.sharedInstance().mainContext) {
+        self.comment = comment
+        self.notification = notification
+        self.managedObjectContext = managedObjectContext
+        self.replyID = comment.replyID
+        super.init(nibName: nil, bundle: nil)
+    }
+
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
@@ -280,6 +299,7 @@ private extension CommentDetailViewController {
         }
 
         navigationController?.navigationBar.isTranslucent = true
+        title = viewTitle
 
         configureEditButtonItem()
     }

WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationsViewController.swift

@@ -312,6 +312,7 @@ class NotificationsViewController: UITableViewController, UIViewControllerRestor
             return
         }
 
+        // TODO: add check for CommentDetailViewController
         for case let detailVC as NotificationDetailsViewController in navigationControllers {
             if detailVC.onDeletionRequestCallback == nil, let note = detailVC.note {
                 configureDetailsViewController(detailVC, withNote: note)
@@ -723,7 +724,24 @@ extension NotificationsViewController {
         view.isUserInteractionEnabled = false
 
         DispatchQueue.main.async {
-            self.performSegue(withIdentifier: NotificationDetailsViewController.classNameWithoutNamespaces(), sender: note)
+            if FeatureFlag.notificationCommentDetails.enabled,
+               note.kind == .comment {
+                let notificationCommentDetailCoordinator = NotificationCommentDetailCoordinator(notification: note)
+
+                // For now, NotificationCommentDetailCoordinator only loads the Comment if it is cached.
+                // If the comment is not cached, fall back to showing the old comment view.
+                // This is temporary until NotificationCommentDetailCoordinator can fetch the comment from the endpoint.
+
+                if let commentDetailViewController = notificationCommentDetailCoordinator.viewController {
+                    commentDetailViewController.navigationItem.largeTitleDisplayMode = .never
+                    self.showDetailViewController(commentDetailViewController, sender: nil)
+                } else {
+                    // TODO: remove when NotificationCommentDetailCoordinator updated to fetch comment.
+                    self.performSegue(withIdentifier: NotificationDetailsViewController.classNameWithoutNamespaces(), sender: note)
+                }
+            } else {
+                self.performSegue(withIdentifier: NotificationDetailsViewController.classNameWithoutNamespaces(), sender: note)
+            }
             self.view.isUserInteractionEnabled = true
         }
     }