Merge branch 'develop' into issue/1988-image-uplad-product-id

# Conflicts:
#	WooCommerce/Classes/ViewRelated/Products/Media/ProductImageActionHandler.swift

Author: jaclync

Gemfile.lock

@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/wordpress-mobile/release-toolkit
-  revision: d00351ee4e04d8a5f3305116dab017b2c389b1cf
-  tag: 0.9.1
+  revision: e426345db3afc839ee463ec1ce8432f584880957
+  tag: 0.9.2
   specs:
-    fastlane-plugin-wpmreleasetoolkit (0.9.1)
+    fastlane-plugin-wpmreleasetoolkit (0.9.2)
       activesupport (~> 4)
       chroma (= 0.2.0)
       diffy (~> 3.3)
@@ -198,7 +198,7 @@ GEM
     octokit (4.18.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    oj (3.10.5)
+    oj (3.10.6)
     optimist (3.0.0)
     options (2.3.2)
     os (1.0.1)

Networking/Networking/Model/Product/Product.swift

@@ -460,6 +460,7 @@ public struct Product: Codable {
         try container.encode(featured, forKey: .featured)
         try container.encode(catalogVisibilityKey, forKey: .catalogVisibilityKey)
         try container.encode(slug, forKey: .slug)
+        try container.encode(purchaseNote, forKey: .purchaseNote)
     }
 }
 

Podfile

@@ -31,10 +31,10 @@ target 'WooCommerce' do
 
   pod 'Gridicons', '~> 1.0'
 
-  pod 'WordPressAuthenticator', '~> 1.12.0'
+  pod 'WordPressAuthenticator', '~> 1.13.0-beta.4'
   # To allow pod to pick up beta versions use -beta. E.g., 1.1.7-beta.1
-  #pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => ''
-  #pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => ''
+  # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => ''
+  # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => ''
 
   # pod 'WordPressShared', :git => 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', :branch => ''
   pod 'WordPressShared', '~> 1.8.16'

Podfile.lock

@@ -49,7 +49,7 @@ PODS:
   - WordPress-Aztec-iOS (1.11.0)
   - WordPress-Editor-iOS (1.11.0):
     - WordPress-Aztec-iOS (= 1.11.0)
-  - WordPressAuthenticator (1.12.0):
+  - WordPressAuthenticator (1.13.0-beta.4):
     - 1PasswordExtension (= 1.8.6)
     - Alamofire (= 4.8)
     - CocoaLumberjack (~> 3.5)
@@ -101,7 +101,7 @@ DEPENDENCIES:
   - KeychainAccess (~> 3.2)
   - Kingfisher (~> 5.11.0)
   - WordPress-Editor-iOS (~> 1.11.0)
-  - WordPressAuthenticator (~> 1.12.0)
+  - WordPressAuthenticator (~> 1.13.0-beta.4)
   - WordPressShared (~> 1.8.16)
   - WordPressUI (~> 1.5.2)
   - Wormholy (~> 1.5.2)
@@ -172,7 +172,7 @@ SPEC CHECKSUMS:
   UIDeviceIdentifier: 44f805037d21b94394821828f4fcaba34b38c2d0
   WordPress-Aztec-iOS: 050b34d4c3adfb7c60363849049b13d60683b348
   WordPress-Editor-iOS: 304098424f1051cb271546c99f906aac296b1b81
-  WordPressAuthenticator: 593bbdad097e4752cc464ac1c6ef460e1a9801a8
+  WordPressAuthenticator: d55a86bb181478bb536b3fc8a9dd4eaa7f6bc3e0
   WordPressKit: 0602e8188245b3267269570d3d78c138e64a4eba
   WordPressShared: 1bc316ed162f42af4e0fa2869437e9e28b532b01
   WordPressUI: 70cc58a253c352330b23cd8fa6dd6a2021570e18
@@ -188,6 +188,6 @@ SPEC CHECKSUMS:
   ZendeskSupportProvidersSDK: e183d32abac888c448469e2005c4a5a8c3ed73f0
   ZendeskSupportSDK: e52f37fa8bcba91f024b81025869fe5a2860f741
 
-PODFILE CHECKSUM: ea2d66e1c363926ebf17e44164fd4f687a973e0c
+PODFILE CHECKSUM: 1fdc82d9f06d4aef1372b814f6a800315cf8d526
 
 COCOAPODS: 1.9.1

WooCommerce/Classes/ViewRelated/Orders/Order Details/Order Notes Section/Add Order Note/NewNoteViewController.swift

@@ -140,7 +140,7 @@ private extension NewNoteViewController {
             NSLocalizedString("Private note",
                               comment: "Spoken accessibility label for an icon image that indicates it's a private note and is not seen by the customer.")
 
-        cell.onTextChange = { [weak self] (text) in
+        cell.noteTextView.onTextChange = { [weak self] (text) in
             self?.navigationItem.rightBarButtonItem?.isEnabled = !text.isEmpty
             self?.noteText = text
         }

WooCommerce/Classes/ViewRelated/Orders/OrdersViewController.swift

@@ -22,7 +22,7 @@ class OrdersViewController: UIViewController {
 
     weak var delegate: OrdersViewControllerDelegate?
 
-    private lazy var viewModel = OrdersViewModel()
+    private let viewModel: OrdersViewModel
 
     /// Main TableView.
     ///
@@ -46,15 +46,6 @@ class OrdersViewController: UIViewController {
         return FooterSpinnerView(tableViewStyle: tableView.style)
     }()
 
-    /// ResultsController: Surrounds us. Binds the galaxy together. And also, keeps the UITableView <> (Stored) Orders in sync.
-    ///
-    private lazy var resultsController: ResultsController<StorageOrder> = {
-        let storageManager = ServiceLocator.storageManager
-        let descriptor = NSSortDescriptor(keyPath: \StorageOrder.dateCreated, ascending: false)
-
-        return ResultsController<StorageOrder>(storageManager: storageManager, sectionNameKeyPath: "normalizedAgeAsString", sortedBy: [descriptor])
-    }()
-
     /// Used for looking up the `OrderStatus` to show in the `OrderTableViewCell`.
     ///
     /// The `OrderStatus` data is fetched from the API by `OrdersMasterViewModel`.
@@ -70,28 +61,12 @@ class OrdersViewController: UIViewController {
     ///
     private let syncingCoordinator = SyncingCoordinator()
 
-    /// OrderStatus that must be matched by retrieved orders.
-    ///
-    private let statusFilter: OrderStatus?
-
     /// The current list of order statuses for the default site
     ///
     private var currentSiteStatuses: [OrderStatus] {
         return statusResultsController.fetchedObjects
     }
 
-    /// Indicates if there are no results onscreen.
-    ///
-    private var isEmpty: Bool {
-        return resultsController.isEmpty
-    }
-
-    /// Indicates if there's a filter being applied.
-    ///
-    private var isFiltered: Bool {
-        return statusFilter != nil
-    }
-
     /// UI Active State
     ///
     private var state: State = .results {
@@ -112,7 +87,7 @@ class OrdersViewController: UIViewController {
     /// - Parameter statusFilter The filter to use.
     ///
     init(title: String, statusFilter: OrderStatus? = nil) {
-        self.statusFilter = statusFilter
+        viewModel = OrdersViewModel(statusFilter: statusFilter)
 
         super.init(nibName: Self.nibName, bundle: nil)
 
@@ -126,7 +101,6 @@ class OrdersViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        refreshResultsPredicate()
         refreshStatusPredicate()
         registerTableViewHeadersAndCells()
 
@@ -135,6 +109,8 @@ class OrdersViewController: UIViewController {
         configureGhostableTableView()
         configureResultsControllers()
 
+        configureViewModel()
+
         startListeningToNotifications()
     }
 
@@ -153,24 +129,10 @@ class OrdersViewController: UIViewController {
 // MARK: - User Interface Initialization
 //
 private extension OrdersViewController {
-    /// Setup: Order filtering
+    /// Initialize ViewModel operations
     ///
-    func refreshResultsPredicate() {
-        resultsController.predicate = {
-            let excludeSearchCache = NSPredicate(format: "exclusiveForSearch = false")
-            let excludeNonMatchingStatus = statusFilter.map { NSPredicate(format: "statusKey = %@", $0.slug) }
-
-            var predicates = [ excludeSearchCache, excludeNonMatchingStatus ].compactMap { $0 }
-            if let tomorrow = Date.tomorrow() {
-                let dateSubPredicate = NSPredicate(format: "dateCreated < %@", tomorrow as NSDate)
-                predicates.append(dateSubPredicate)
-            }
-
-            return NSCompoundPredicate(andPredicateWithSubpredicates: predicates)
-        }()
-
-        tableView.setContentOffset(.zero, animated: false)
-        tableView.reloadData()
+    func configureViewModel() {
+        viewModel.activateAndForwardUpdates(to: tableView)
     }
 
     /// Setup: Order status predicate
@@ -192,10 +154,6 @@ private extension OrdersViewController {
     /// Setup: Results Controller
     ///
     func configureResultsControllers() {
-        // Orders FRC
-        resultsController.startForwardingEvents(to: tableView)
-        try? resultsController.performFetch()
-
         // Order status FRC
         try? statusResultsController.performFetch()
     }
@@ -302,7 +260,6 @@ extension OrdersViewController: SyncingCoordinatorDelegate {
 
         let action = viewModel.synchronizationAction(
             siteID: siteID,
-            statusKey: statusFilter?.slug,
             pageNumber: pageNumber,
             pageSize: pageSize,
             reason: SyncReason(rawValue: reason ?? "")) { [weak self] error in
@@ -314,7 +271,8 @@ extension OrdersViewController: SyncingCoordinatorDelegate {
                     DDLogError("⛔️ Error synchronizing orders: \(error)")
                     self.displaySyncingErrorNotice(pageNumber: pageNumber, pageSize: pageSize, reason: reason)
                 } else {
-                    ServiceLocator.analytics.track(.ordersListLoaded, withProperties: ["status": self.statusFilter?.slug ?? String()])
+                    let status = self.viewModel.statusFilter?.slug ?? String()
+                    ServiceLocator.analytics.track(.ordersListLoaded, withProperties: ["status": status])
                 }
 
                 self.transitionToResultsUpdatedState()
@@ -347,7 +305,7 @@ extension OrdersViewController {
             return false
         }
 
-        return highestPageBeingSynced * SyncingCoordinator.Defaults.pageSize > resultsController.numberOfObjects
+        return highestPageBeingSynced * SyncingCoordinator.Defaults.pageSize > viewModel.numberOfObjects
     }
 
     /// Stops animating the Footer Spinner.
@@ -452,12 +410,6 @@ private extension OrdersViewController {
 //
 private extension OrdersViewController {
 
-    func detailsViewModel(at indexPath: IndexPath) -> OrderDetailsViewModel {
-        let order = resultsController.object(at: indexPath)
-
-        return OrderDetailsViewModel(order: order)
-    }
-
     func lookUpOrderStatus(for order: Order) -> OrderStatus? {
         for orderStatus in currentSiteStatuses where orderStatus.slug == order.statusKey {
             return orderStatus
@@ -473,21 +425,21 @@ private extension OrdersViewController {
 extension OrdersViewController: UITableViewDataSource {
 
     func numberOfSections(in tableView: UITableView) -> Int {
-        return resultsController.sections.count
+        viewModel.numberOfSections
     }
 
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return resultsController.sections[section].numberOfObjects
+        viewModel.numberOfRows(in: section)
     }
 
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         guard let cell = tableView.dequeueReusableCell(withIdentifier: OrderTableViewCell.reuseIdentifier, for: indexPath) as? OrderTableViewCell else {
             fatalError()
         }
 
-        let viewModel = detailsViewModel(at: indexPath)
-        let orderStatus = lookUpOrderStatus(for: viewModel.order)
-        cell.configureCell(viewModel: viewModel, orderStatus: orderStatus)
+        let detailsViewModel = viewModel.detailsViewModel(at: indexPath)
+        let orderStatus = lookUpOrderStatus(for: detailsViewModel.order)
+        cell.configureCell(viewModel: detailsViewModel, orderStatus: orderStatus)
         cell.layoutIfNeeded()
         return cell
     }
@@ -499,7 +451,7 @@ extension OrdersViewController: UITableViewDataSource {
         }
 
         header.leftText = {
-            let rawAge = resultsController.sections[section].name
+            let rawAge = viewModel.sectionInfo(at: section).name
             return Age(rawValue: rawAge)?.description
         }()
         header.rightText = nil
@@ -524,13 +476,13 @@ extension OrdersViewController: UITableViewDelegate {
             assertionFailure("Expected OrderDetailsViewController to be instantiated")
             return
         }
-        orderDetailsVC.viewModel = detailsViewModel(at: indexPath)
+        orderDetailsVC.viewModel = viewModel.detailsViewModel(at: indexPath)
 
         navigationController?.pushViewController(orderDetailsVC, animated: true)
     }
 
     func tableView(_ tableView: UITableView, willDisplay cell: UITableViewCell, forRowAt indexPath: IndexPath) {
-        let orderIndex = resultsController.objectIndex(from: indexPath)
+        let orderIndex = viewModel.objectIndex(from: indexPath)
         syncingCoordinator.ensureNextPageIsSynchronized(lastVisibleIndex: orderIndex)
     }
 }
@@ -590,19 +542,19 @@ private extension OrdersViewController {
     /// we've got cached results, or not.
     ///
     func transitionToSyncingState() {
-        state = isEmpty ? .placeholder : .syncing
+        state = viewModel.isEmpty ? .placeholder : .syncing
     }
 
     /// Should be called whenever the results are updated: after Sync'ing (or after applying a filter).
     /// Transitions to `.results` / `.emptyFiltered` / `.emptyUnfiltered` accordingly.
     ///
     func transitionToResultsUpdatedState() {
-        if isEmpty == false {
+        if viewModel.isEmpty == false {
             state = .results
             return
         }
 
-        if isFiltered {
+        if viewModel.isFiltered {
             state = .emptyFiltered
             return
         }