Merge branch 'trunk' into issue/17845-move-add-new-insight-card

Author: sla8c

.buildkite/commands/release-build-jetpack.sh

@@ -0,0 +1,22 @@
+#!/bin/bash -eu
+
+# FIXIT-13.1: Temporary fix until we're on the Xcode 13.1 VM
+echo "--- :rubygems: Fixing Ruby Setup"
+gem install bundler
+
+echo "--- :arrow_down: Installing Release Dependencies"
+brew update # Update homebrew to temporarily fix a bintray issue
+brew install imagemagick
+brew install ghostscript
+
+echo "--- :rubygems: Setting up Gems"
+install_gems
+
+echo "--- :cocoapods: Setting up Pods"
+install_cocoapods
+
+echo "--- :closed_lock_with_key: Installing Secrets"
+bundle exec fastlane run configure_apply
+
+echo "--- :hammer_and_wrench: Building"
+bundle exec fastlane build_and_upload_jetpack_for_app_store

.buildkite/commands/release-build-wordpress-internal.sh

@@ -0,0 +1,22 @@
+#!/bin/bash -eu
+
+# FIXIT-13.1: Temporary fix until we're on the Xcode 13.1 VM
+echo "--- :rubygems: Fixing Ruby Setup"
+gem install bundler
+
+echo "--- :arrow_down: Installing Release Dependencies"
+brew update # Update homebrew to temporarily fix a bintray issue
+brew install imagemagick
+brew install ghostscript
+
+echo "--- :rubygems: Setting up Gems"
+install_gems
+
+echo "--- :cocoapods: Setting up Pods"
+install_cocoapods
+
+echo "--- :closed_lock_with_key: Installing Secrets"
+bundle exec fastlane run configure_apply
+
+echo "--- :hammer_and_wrench: Building"
+bundle exec fastlane build_and_upload_app_center skip_confirm:true

.buildkite/commands/release-build-wordpress.sh

@@ -0,0 +1,22 @@
+#!/bin/bash -eu
+
+# FIXIT-13.1: Temporary fix until we're on the Xcode 13.1 VM
+echo "--- :rubygems: Fixing Ruby Setup"
+gem install bundler
+
+echo "--- :arrow_down: Installing Release Dependencies"
+brew update # Update homebrew to temporarily fix a bintray issue
+brew install imagemagick
+brew install ghostscript
+
+echo "--- :rubygems: Setting up Gems"
+install_gems
+
+echo "--- :cocoapods: Setting up Pods"
+install_cocoapods
+
+echo "--- :closed_lock_with_key: Installing Secrets"
+bundle exec fastlane run configure_apply
+
+echo "--- :hammer_and_wrench: Building"
+bundle exec fastlane build_and_upload_app_store_connect skip_confirm:true create_gh_release:true

.buildkite/release-builds.yml

@@ -0,0 +1,36 @@
+# This pipeline is meant to be run via the Buildkite API, and is only used for release builds
+
+# Nodes with values to reuse in the pipeline.
+common_params:
+  # Common plugin settings to use with the `plugins` key.
+  - &common_plugins
+    - automattic/bash-cache#v1.5.0
+    - automattic/git-s3-cache#v1.1.0:
+        bucket: "a8c-repo-mirrors"
+        repo: "wordpress-mobile/wordpress-ios/"
+  # Common environment values to use with the `env` key.
+  - &common_env
+    IMAGE_ID: xcode-13
+
+steps:
+
+  - label: "🛠 WordPress Release Build (App Store Connect)"
+    command: ".buildkite/commands/release-build-wordpress.sh"
+    env: *common_env
+    plugins: *common_plugins
+    notify:
+    - slack: "#build-and-ship"
+
+  - label: "🛠 WordPress Release Build (App Center)"
+    command: ".buildkite/commands/release-build-wordpress-internal.sh"
+    env: *common_env
+    plugins: *common_plugins
+    notify:
+    - slack: "#build-and-ship"
+
+  - label: "🛠 Jetpack Release Build (App Store Connect)"
+    command: ".buildkite/commands/release-build-jetpack.sh"
+    env: *common_env
+    plugins: *common_plugins
+    notify:
+    - slack: "#build-and-ship"

Podfile

@@ -169,7 +169,7 @@ abstract_target 'Apps' do
     ## Gutenberg (React Native)
     ## =====================
     ##
-    gutenberg :tag => 'v1.71.0-alpha2'
+    gutenberg :tag => 'v1.71.0'
 
     ## Third party libraries
     ## =====================

Podfile.lock

@@ -2,6 +2,7 @@
 -----
 * [*] Site creation: Fixed bug where sites created within the app were not given the correct time zone, leading to post scheduling issues. [#17821]
 * [*] Block editor: Replacing the media for an image set as featured prompts to update the featured image [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3930]
+* [***] Block editor: Font size and line-height support for text-based blocks used in block-based themes [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4519]
 * [**] 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]

RELEASE-NOTES.txt

@@ -31,4 +31,9 @@ typedef NS_ENUM(NSUInteger, ReaderCommentsSource) {
 /// Navigates to the specified comment when the view appears
 @property (nonatomic, strong) NSNumber *navigateToCommentID;
 
+
+// Comment moderation support.
+@property (nonatomic, assign, readwrite) BOOL commentModified;
+- (void)refreshAfterCommentModeration;
+
 @end

WordPress/Classes/ViewRelated/Reader/Comments/ReaderCommentsViewController.h

@@ -144,6 +144,7 @@ - (void)viewDidLoad
 {
     [super viewDidLoad];
     self.view.backgroundColor = [UIColor murielBasicBackground];
+    self.commentModified = NO;
 
     [self checkIfLoggedIn];
 
@@ -195,6 +196,11 @@ - (void)viewWillDisappear:(BOOL)animated
 {
     [super viewWillDisappear:animated];
     [self dismissNotice];
+    
+    if (self.commentModified) {
+        // Don't post the notification until the view is being dismissed to avoid purging cached comments prematurely.
+        [self postCommentModifiedNotification];
+    }
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-result"
@@ -933,6 +939,12 @@ - (void)refreshNoResultsView
     [self.noResultsViewController didMoveToParentViewController:self];
 }
 
+- (void)refreshAfterCommentModeration
+{
+    [self.tableViewHandler refreshTableView];
+    [self refreshNoResultsView];
+}
+
 - (void)updateTableViewForAttachments
 {
     [self.tableView performBatchUpdates:nil completion:nil];
@@ -1199,9 +1211,11 @@ - (NSFetchRequest *)fetchRequest
         return nil;
     }
 
-    NSFetchRequest *fetchRequest = [[NSFetchRequest alloc] initWithEntityName:NSStringFromClass([Comment class])];
-    fetchRequest.predicate = [NSPredicate predicateWithFormat:@"post = %@", self.post];
+    // Moderated comments could still be cached, so filter out non-approved comments.
+    NSString *approvedStatus = [Comment descriptionFor:CommentStatusTypeApproved];
 
+    NSFetchRequest *fetchRequest = [[NSFetchRequest alloc] initWithEntityName:NSStringFromClass([Comment class])];
+    fetchRequest.predicate = [NSPredicate predicateWithFormat:@"post = %@ AND status = %@", self.post, approvedStatus];
     NSSortDescriptor *sortDescriptor = [[NSSortDescriptor alloc] initWithKey:@"hierarchy" ascending:YES];
     [fetchRequest setSortDescriptors:@[sortDescriptor]];
 
@@ -1225,12 +1239,6 @@ - (void)configureCell:(UITableViewCell *)aCell atIndexPath:(NSIndexPath *)indexP
     }
 
     Comment *comment = [self.tableViewHandler.resultsController objectAtIndexPath:indexPath];
-    // The user may have moderated a comment, but it is not removed from the post yet.
-    // So check the status to be sure only Approved comments are displayed.
-    if (![comment.status isEqualToString:[Comment descriptionFor:CommentStatusTypeApproved]]) {
-        return;
-    }
-    
     if ([self newCommentThreadEnabled]) {
         CommentContentTableViewCell *cell = (CommentContentTableViewCell *)aCell;
         [self configureContentCell:cell comment:comment indexPath:indexPath handler:self.tableViewHandler];
@@ -1290,8 +1298,6 @@ - (void)configureCell:(UITableViewCell *)aCell atIndexPath:(NSIndexPath *)indexP
         };
     }
 
-
-
     NSAttributedString *attrStr = [self cacheContentForComment:comment];
     [cell configureCellWithComment:comment attributedString:attrStr];
 }

WordPress/Classes/ViewRelated/Reader/Comments/ReaderCommentsViewController.m

@@ -142,6 +142,12 @@ extension NSNotification.Name {
         WPAnalytics.trackReader(.readerArticleCommentsOpened, properties: properties)
     }
 
+    // MARK: - Notification
+
+    @objc func postCommentModifiedNotification() {
+        NotificationCenter.default.post(name: .ReaderCommentModifiedNotification, object: nil)
+    }
+
 }
 
 // MARK: - Popover Presentation Delegate
@@ -190,13 +196,13 @@ private extension ReaderCommentsViewController {
         return [
             [
                 .unapprove { [weak self] in
-                    self?.moderateComment(comment, status: .pending, handler: handler)
+                    self?.moderateComment(comment, status: .pending)
                 },
                 .spam { [weak self] in
-                    self?.moderateComment(comment, status: .spam, handler: handler)
+                    self?.moderateComment(comment, status: .spam)
                 },
                 .trash { [weak self] in
-                    self?.moderateComment(comment, status: .unapproved, handler: handler)
+                    self?.moderateComment(comment, status: .unapproved)
                 }
             ],
             [
@@ -223,7 +229,7 @@ private extension ReaderCommentsViewController {
             CommentAnalytics.trackCommentEdited(comment: comment)
 
             self?.commentService.uploadComment(comment, success: {
-                NotificationCenter.default.post(name: .ReaderCommentModifiedNotification, object: nil)
+                self?.commentModified = true
 
                 // update the thread again in case the approval status changed.
                 tableView.reloadRows(at: [indexPath], with: .automatic)
@@ -237,23 +243,18 @@ private extension ReaderCommentsViewController {
         present(navigationControllerToPresent, animated: true)
     }
 
-    func moderateComment(_ comment: Comment, status: CommentStatusType, handler: WPTableViewHandler) {
+    func moderateComment(_ comment: Comment, status: CommentStatusType) {
         let successBlock: (String) -> Void = { [weak self] noticeText in
-            NotificationCenter.default.post(name: .ReaderCommentModifiedNotification, object: nil)
-
-            // Adjust the ReaderPost's comment count.
-            if let post = self?.post, let commentCount = post.commentCount?.intValue {
-                let adjustment = (status == .approved) ? 1 : -1
-                post.commentCount = NSNumber(value: commentCount + adjustment)
-            }
+            self?.commentModified = true
+            self?.refreshAfterCommentModeration()
 
-            // Refresh the UI. The table view handler is needed because the fetched results delegate is set to nil.
-            handler.refreshTableViewPreservingOffset()
+            // Dismiss any old notices to avoid stacked Undo notices.
+            self?.dismissNotice()
 
             // If the status is Approved, the user has undone a comment moderation.
             // So don't show the Undo option in this case.
             (status == .approved) ? self?.displayNotice(title: noticeText) :
-                                    self?.showActionableNotice(title: noticeText, comment: comment, handler: handler)
+                                    self?.showActionableNotice(title: noticeText, comment: comment)
         }
 
         switch status {
@@ -288,12 +289,12 @@ private extension ReaderCommentsViewController {
         }
     }
 
-    func showActionableNotice(title: String, comment: Comment, handler: WPTableViewHandler) {
+    func showActionableNotice(title: String, comment: Comment) {
         displayActionableNotice(title: title,
                                 actionTitle: .undoActionTitle,
                                 actionHandler: { [weak self] _ in
             // Set the Comment's status back to Approved when the user selects Undo on the notice.
-            self?.moderateComment(comment, status: .approved, handler: handler)
+            self?.moderateComment(comment, status: .approved)
         })
     }