Merge pull request #17267 from wordpress-mobile/feature/17200-approve…

…_action Comment Moderation Bar: update comment when Approved button tapped.
wordpress-mobile · Oct 6, 2021 · db6a2ae · db6a2ae
2 parents 6bbedf9 + 0e4ef85
commit db6a2ae
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 16 deletions.
diff --git a/WordPress/Classes/Services/CommentService.m b/WordPress/Classes/Services/CommentService.m
@@ -859,7 +859,8 @@ - (void)moderateComment:(Comment *)comment
                         if (success) {
                             success();
                         }
-                    } failure:^(NSError *error) {                        
+                    } failure:^(NSError *error) {
+                        DDLogError(@"Error moderating comment: %@", error);
                         [self.managedObjectContext performBlock:^{
                             // Note: The comment might have been deleted at this point
                             Comment *commentInContext = (Comment *)[self.managedObjectContext existingObjectWithID:commentID error:nil];

diff --git a/WordPress/Classes/ViewRelated/Comments/CommentContentTableViewCell.swift b/WordPress/Classes/ViewRelated/Comments/CommentContentTableViewCell.swift
@@ -135,7 +135,7 @@ class CommentContentTableViewCell: UITableViewCell, NibReusable {
         isModerationEnabled = comment.canModerate
 
         if isModerationEnabled {
-            moderationBar.comment = comment
+            moderationBar.commentStatus = CommentStatusType.typeForStatus(comment.status)
         }
 
         // Configure comment content.

diff --git a/WordPress/Classes/ViewRelated/Comments/CommentDetailViewController.swift b/WordPress/Classes/ViewRelated/Comments/CommentDetailViewController.swift
@@ -11,6 +11,8 @@ class CommentDetailViewController: UITableViewController {
 
     private var rows = [RowType]()
 
+    private var moderationBar: CommentModerationBar?
+
     // MARK: Views
 
     private var headerCell = CommentHeaderTableViewCell()
@@ -131,6 +133,7 @@ class CommentDetailViewController: UITableViewController {
 
             configureContentCell(cell, comment: comment)
             cell.moderationBar.delegate = self
+            moderationBar = cell.moderationBar
             return cell
 
         case .replyIndicator:
@@ -394,11 +397,33 @@ private extension String {
 extension CommentDetailViewController: CommentModerationBarDelegate {
     func statusChangedTo(_ commentStatus: CommentStatusType) {
 
-        // TODO: update Comment
-
         switch commentStatus {
+        case .approved:
+            approveComment()
         default:
             break
         }
     }
 }
+
+// MARK: - Comment Moderation Actions
+
+private extension CommentDetailViewController {
+
+    func approveComment() {
+        CommentAnalytics.trackCommentApproved(comment: comment)
+
+        commentService.approve(comment, success: { [weak self] in
+            self?.displayNotice(title: ModerationMessages.approveSuccess)
+        }, failure: { [weak self] error in
+            self?.displayNotice(title: ModerationMessages.approveFail)
+            self?.moderationBar?.commentStatus = CommentStatusType.typeForStatus(self?.comment.status)
+        })
+    }
+
+    struct ModerationMessages {
+        static let approveSuccess = NSLocalizedString("Comment approved.", comment: "Message displayed when approving a comment succeeds.")
+        static let approveFail = NSLocalizedString("Error approving comment.", comment: "Message displayed when approving a comment fails.")
+    }
+
+}
diff --git a/WordPress/Classes/ViewRelated/Comments/CommentModerationBar.swift b/WordPress/Classes/ViewRelated/Comments/CommentModerationBar.swift
@@ -30,18 +30,12 @@ class CommentModerationBar: UIView {
 
     weak var delegate: CommentModerationBarDelegate?
 
-    var comment: Comment? {
+    var commentStatus: CommentStatusType? {
         didSet {
-            currentStatus = CommentStatusType.typeForStatus(comment?.status)
-        }
-    }
-
-    private var currentStatus: CommentStatusType? {
-        didSet {
-            if oldValue != currentStatus {
+            if oldValue != commentStatus {
                 toggleButtonForStatus(oldValue)
             }
-            toggleButtonForStatus(currentStatus)
+            toggleButtonForStatus(commentStatus)
         }
     }
 
@@ -209,9 +203,10 @@ private extension CommentModerationBar {
     }
 
     func updateStatusTo(_ status: CommentStatusType) {
-        // Don't change the comment.status. It is needed to fallback to if the update fails.
-        currentStatus = status
-        delegate?.statusChangedTo(status)
+        ReachabilityUtils.onAvailableInternetConnectionDo {
+            commentStatus = status
+            delegate?.statusChangedTo(status)
+        }
     }
 
 }