Merge branch 'trunk' into feature/17629-enable_moderation_menu

frosty · web-flow · commit 8cedc5038812 · 2022-02-04T14:46:02.000Z
diff --git a/.buildkite/commands/release-build-jetpack.sh b/.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
diff --git a/.buildkite/commands/release-build-wordpress-internal.sh b/.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
diff --git a/.buildkite/commands/release-build-wordpress.sh b/.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
diff --git a/.buildkite/release-builds.yml b/.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"
diff --git a/Podfile b/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
     ## =====================
diff --git a/Podfile.lock b/Podfile.lock
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -2,12 +2,14 @@
 -----
 * [*] 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]
 * [*] 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]
 * [**] Threaded comments: comments can now be moderated via a drop-down menu on each comment. [#17888]
+* [*] Stats: Users can now add a new Insights card from the navigation bar. [#17867]
 
 19.1
 -----
diff --git a/WordPress/Classes/ViewRelated/Stats/Insights/SiteStatsInsightsTableViewController.swift b/WordPress/Classes/ViewRelated/Stats/Insights/SiteStatsInsightsTableViewController.swift
@@ -83,6 +83,29 @@ class SiteStatsInsightsTableViewController: UITableViewController, StoryboardLoa
         viewModel?.refreshInsights()
     }
 
+    func showAddInsightView(source: String = "table_row") {
+        WPAnalytics.track(.statsItemTappedInsightsAddStat, withProperties: ["source": source])
+
+        if displayingEmptyView {
+            hideNoResults()
+            addViewModelListeners()
+            refreshInsights()
+        }
+
+        if insightsToShow.contains(.customize) {
+            // The view needs to be updated to remove the Customize card.
+            // However, if it's done here, there is a weird animation before AddInsight is presented.
+            // Instead, set 'viewNeedsUpdating' so the view is updated when 'addInsightDismissed' is called.
+            viewNeedsUpdating = true
+            dismissCustomizeCard()
+        }
+
+        let controller = AddInsightTableViewController(insightsDelegate: self,
+                insightsShown: insightsToShow.compactMap { $0.statSection })
+        let navigationController = UINavigationController(rootViewController: controller)
+        present(navigationController, animated: true, completion: nil)
+    }
+
 }
 
 // MARK: - Private Extension
@@ -281,22 +304,6 @@ private extension SiteStatsInsightsTableViewController {
 
     // MARK: - Insights Management
 
-    func showAddInsightView() {
-
-        if insightsToShow.contains(.customize) {
-            // The view needs to be updated to remove the Customize card.
-            // However, if it's done here, there is a weird animation before AddInsight is presented.
-            // Instead, set 'viewNeedsUpdating' so the view is updated when 'addInsightDismissed' is called.
-            viewNeedsUpdating = true
-            dismissCustomizeCard()
-        }
-
-        let controller = AddInsightTableViewController(insightsDelegate: self,
-                                                       insightsShown: insightsToShow.compactMap { $0.statSection })
-        let navigationController = UINavigationController(rootViewController: controller)
-        present(navigationController, animated: true, completion: nil)
-    }
-
     func moveInsightUp(_ insight: InsightType) {
         guard canMoveInsightUp(insight) else {
             return
@@ -633,15 +640,7 @@ extension SiteStatsInsightsTableViewController: ReaderDiscoverFlowDelegate {
 
 extension SiteStatsInsightsTableViewController: NoResultsViewControllerDelegate {
     func actionButtonPressed() {
-        guard !displayingEmptyView else {
-            WPAnalytics.track(.statsItemTappedInsightsAddStat)
-            showAddInsightView()
-            return
-        }
-
-        hideNoResults()
-        addViewModelListeners()
-        refreshInsights()
+        showAddInsightView()
     }
 }
 
diff --git a/WordPress/Classes/ViewRelated/Stats/Shared Views/StatsTotalRow.swift b/WordPress/Classes/ViewRelated/Stats/Shared Views/StatsTotalRow.swift
@@ -376,7 +376,8 @@ private extension StatsTotalRow {
     }
 
     @IBAction func didTapDisclosureButton(_ sender: UIButton) {
-        if let statSection = rowData?.statSection {
+        if let statSection = rowData?.statSection,
+               statSection != .insightsAddInsight {
             captureAnalyticsEventsFor(statSection)
         }
 
diff --git a/WordPress/Classes/ViewRelated/Stats/SiteStatsDashboardViewController.swift b/WordPress/Classes/ViewRelated/Stats/SiteStatsDashboardViewController.swift
@@ -69,17 +69,36 @@ class SiteStatsDashboardViewController: UIViewController {
     private var periodTableViewController = SiteStatsPeriodTableViewController.loadFromStoryboard()
     private var pageViewController: UIPageViewController?
 
+    @objc lazy var manageInsightsButton: UIBarButtonItem = {
+        let button = UIBarButtonItem(
+                image: .gridicon(.cog),
+                style: .plain,
+                target: self,
+                action: #selector(manageInsightsButtonTapped))
+        button.accessibilityHint = NSLocalizedString("Tap to customize insights", comment: "Accessibility hint to customize insights")
+        return button
+    }()
+
     // MARK: - View
 
     override func viewDidLoad() {
         super.viewDidLoad()
+        configureNavBar()
         setupFilterBar()
         restoreSelectedDateFromUserDefaults()
         restoreSelectedPeriodFromUserDefaults()
         addWillEnterForegroundObserver()
         view.accessibilityIdentifier = "stats-dashboard"
     }
 
+    func configureNavBar() {
+        parent?.navigationItem.rightBarButtonItem = currentSelectedPeriod == .insights ? manageInsightsButton : nil
+    }
+
+    @objc func manageInsightsButtonTapped() {
+        insightsTableViewController.showAddInsightView(source: "nav_bar")
+    }
+
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
         removeWillEnterForegroundObserver()
@@ -145,6 +164,8 @@ private extension SiteStatsDashboardViewController {
 
     @objc func selectedFilterDidChange(_ filterBar: FilterTabBar) {
         currentSelectedPeriod = StatsPeriodType(rawValue: filterBar.selectedIndex) ?? StatsPeriodType.insights
+
+        configureNavBar()
     }
 
 }
diff --git a/WordPress/Classes/ViewRelated/Stats/StatsViewController.m b/WordPress/Classes/ViewRelated/Stats/StatsViewController.m
@@ -59,7 +59,7 @@ - (void)viewDidLoad
     // Being shown in a modal window
     if (self.presentingViewController != nil) {
         UIBarButtonItem *doneButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(doneButtonTapped:)];
-        self.navigationItem.rightBarButtonItem = doneButton;
+        self.navigationItem.leftBarButtonItem = doneButton;
         self.title = self.blog.settings.name;
     }
 
diff --git a/WordPress/WordPressUITests/WordPressUITests.xctestplan b/WordPress/WordPressUITests/WordPressUITests.xctestplan
@@ -21,13 +21,19 @@
   "testTargets" : [
     {
       "skippedTests" : [
+        "EditorAztecTests",
+        "EditorGutenbergTests",
         "EditorTests\/testPlayground()",
         "LoginTests\/testEmailMagicLinkLogin()",
         "LoginTests\/testEmailPasswordLoginLogout()",
         "LoginTests\/testSelfHostedUsernamePasswordLoginLogout()",
         "LoginTests\/testUnsuccessfulLogin()",
         "LoginTests\/testWpcomUsernamePasswordLogin()",
+        "MainNavigationTests",
+        "ReaderTests",
         "SignupTests\/testEmailSignup()",
+        "StatsTests",
+        "SupportScreenTests",
         "SupportScreenTests\/testSupportScreenLoads()"
       ],
       "target" : {
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -518,7 +518,7 @@ platform :ios do
   end
 
   #####################################################################################
-  # build_and_upload_release
+  # build_and_upload_release [Deprecated - Can be removed once CircleCI is no longer in use]
   # -----------------------------------------------------------------------------------
   # This lane builds the app and uploads it for both internal and external distribution
   # -----------------------------------------------------------------------------------
@@ -534,14 +534,70 @@ platform :ios do
   #####################################################################################
   desc 'Builds and uploads for distribution'
   lane :build_and_upload_release do |options|
-    ios_build_prechecks(skip_confirm: options[:skip_confirm],
-                        internal: options[:beta_release],
-                        external: true)
+    build_and_upload_app_center(options) if options[:beta_release]
+    build_and_upload_app_store_connect(options)
+  end
+
+  #####################################################################################
+  # build_and_upload_app_store_connect
+  # -----------------------------------------------------------------------------------
+  # This lane builds the app and uploads it for App Store Connect
+  # -----------------------------------------------------------------------------------
+  # Usage:
+  # bundle exec fastlane build_and_upload_app_store_connect [skip_confirm:<skip confirm>]
+  #  [create_gh_release:<create release on GH>] [beta_release:<is a beta release>]
+  #
+  # Example:
+  # bundle exec fastlane build_and_upload_app_store_connect
+  # bundle exec fastlane build_and_upload_app_store_connect skip_confirm:true
+  # bundle exec fastlane build_and_upload_app_store_connect create_gh_release:true
+  # bundle exec fastlane build_and_upload_app_store_connect beta_release:true
+  #####################################################################################
+  desc 'Builds and uploads for distribution to App Store Connect'
+  lane :build_and_upload_app_store_connect do |options|
+    ios_build_prechecks(
+      skip_confirm: options[:skip_confirm],
+      internal: options[:beta_release],
+      external: true
+    )
+
     ios_build_preflight
 
-    build_and_upload_internal(skip_prechecks: true, skip_confirm: options[:skip_confirm]) if options[:beta_release]
-    build_and_upload_itc(skip_prechecks: true, skip_confirm: options[:skip_confirm],
-                         beta_release: options[:beta_release], create_release: options[:create_gh_release])
+    build_and_upload_itc(
+      skip_prechecks: true,
+      skip_confirm: options[:skip_confirm],
+      beta_release: options[:beta_release],
+      create_release: options[:create_gh_release]
+    )
+
+  end
+
+  #####################################################################################
+  # build_and_upload_app_center
+  # -----------------------------------------------------------------------------------
+  # This lane builds the app and uploads it for App Center
+  # -----------------------------------------------------------------------------------
+  # Usage:
+  # bundle exec fastlane build_and_upload_app_center [skip_confirm:<skip confirm>]
+  #
+  # Example:
+  # bundle exec fastlane build_and_upload_app_center
+  # bundle exec fastlane build_and_upload_app_center skip_confirm:true
+  #####################################################################################
+  desc 'Builds and uploads for distribution to App Center'
+  lane :build_and_upload_app_center do |options|
+    ios_build_prechecks(
+      skip_confirm: options[:skip_confirm],
+      internal: true,
+      external: true
+    )
+
+    ios_build_preflight
+
+    build_and_upload_internal(
+      skip_prechecks: true,
+      skip_confirm: options[:skip_confirm]
+    )
   end
 
   #####################################################################################

Original file line number	Diff line number	Diff line change
`@@ -376,7 +376,8 @@ private extension StatsTotalRow {`
`376`	`376`	`}`
`377`	`377`
`378`	`378`	`@IBAction func didTapDisclosureButton(_ sender: UIButton) {`
`379`		`- if let statSection = rowData?.statSection {`
	`379`	`+ if let statSection = rowData?.statSection,`
	`380`	`+ statSection != .insightsAddInsight {`
`380`	`381`	`captureAnalyticsEventsFor(statSection)`
`381`	`382`	`}`
`382`	`383`