Merge branch 'develop' into issue/121-manual-status-change

Author: ctarda

Networking/NetworkingTests/Remote/ReportRemoteTests.swift

@@ -21,6 +21,8 @@ class ReportRemoteTests: XCTestCase {
         network.removeAllSimulatedResponses()
     }
 
+    // MARK: - loadOrderTotals
+
     /// Verifies that 'loadOrderTotals' properly parses the successful response
     ///
     func testOrderTotalsReturnsSuccess() {
@@ -65,4 +67,43 @@ class ReportRemoteTests: XCTestCase {
         }
         wait(for: [expectation], timeout: Constants.expectationTimeout)
     }
+
+    // MARK: - loadOrderStatuses
+
+    /// Verifies that 'loadOrderStatuses' properly parses the successful response
+    ///
+    func testLoadOrderStatusesReturnsSuccess() {
+        let expectation = self.expectation(description: "Load order statuses")
+        let remote = ReportRemote(network: network)
+
+        network.simulateResponse(requestUrlSuffix: "reports/orders/totals", filename: "report-orders")
+        remote.loadOrderStatuses(for: sampleSiteID) { (orderStatuses, error) in
+            XCTAssertNil(error)
+            XCTAssertNotNil(orderStatuses)
+            XCTAssertEqual(orderStatuses?.count, 9)
+            expectation.fulfill()
+        }
+        wait(for: [expectation], timeout: Constants.expectationTimeout)
+    }
+
+    /// Verifies that `loadOrderStatuses` correctly returns a Dotcom Error, whenever the request failed.
+    ///
+    func testLoadOrderStatusesProperlyParsesErrorResponses() {
+        let expectation = self.expectation(description: "Error Handling")
+        let remote = ReportRemote(network: network)
+
+        network.simulateResponse(requestUrlSuffix: "reports/orders/totals", filename: "generic_error")
+        remote.loadOrderTotals(for: sampleSiteID) { (reportTotals, error) in
+            guard let error = error as? DotcomError else {
+                XCTFail()
+                return
+            }
+
+            XCTAssert(error == .unauthorized)
+            XCTAssertEqual(reportTotals?.isEmpty, true)
+
+            expectation.fulfill()
+        }
+        wait(for: [expectation], timeout: Constants.expectationTimeout)
+    }
 }

WooCommerce/Classes/ViewRelated/Dashboard/DashboardViewController.swift

@@ -220,12 +220,6 @@ private extension DashboardViewController {
             group.leave()
         }
 
-        group.enter()
-        newOrdersViewController.syncOrderStatus() { _ in
-            // don't bubble up error to user
-            group.leave()
-        }
-
         group.enter()
         topPerformersViewController.syncTopPerformers() { error in
             if let error = error {

WooCommerce/Classes/ViewRelated/Dashboard/MyStore/NewOrdersViewController.swift

@@ -18,7 +18,17 @@ class NewOrdersViewController: UIViewController {
     @IBOutlet private weak var actionButton: UIButton!
     @IBOutlet private weak var bottomSpacerView: UIView!
 
-    private var orderStatuses: [OrderStatus]?
+    private var orderStatuses: [OrderStatus]? {
+        didSet {
+            updateNewOrdersIfNeeded(orderCount: totalPendingOrders)
+        }
+    }
+
+    /// Total number of pending server-side orders
+    ///
+    private var totalPendingOrders: Int {
+        return orderStatuses?.filter({ $0.slug == OrderStatusEnum.processing.rawValue }).map({ $0.total }).reduce(0, +) ?? 0
+    }
 
     // MARK: - Public Properties
 
@@ -47,35 +57,12 @@ extension NewOrdersViewController {
             return
         }
 
-        let action = StatsAction.retrieveOrderTotals(siteID: siteID, status: .processing) { [weak self] (processingOrderCount, error) in
-            guard let `self` = self, let processingOrderCount = processingOrderCount else {
-                if let error = error {
-                    DDLogError("⛔️ Dashboard (New Orders) — Error synchronizing pending orders: \(error)")
-                }
-                onCompletion?(error)
-                return
-            }
-
-            self.updateNewOrdersIfNeeded(orderCount: processingOrderCount)
-            onCompletion?(nil)
-        }
-
-        StoresManager.shared.dispatch(action)
-    }
-
-    func syncOrderStatus(onCompletion: ((Error?) -> Void)? = nil) {
-        guard let siteID = StoresManager.shared.sessionManager.defaultStoreID else {
-            onCompletion?(nil)
-            return
-        }
-
         let action = OrderStatusAction.retrieveOrderStatuses(siteID: siteID) { [weak self] (orderStatuses, error) in
             if let error = error {
                 DDLogError("⛔️ Dashboard (New Orders) — Error synchronizing order statuses: \(error)")
             }
 
             self?.orderStatuses = orderStatuses
-
             onCompletion?(error)
         }
 
@@ -110,18 +97,14 @@ private extension NewOrdersViewController {
 private extension NewOrdersViewController {
 
     @IBAction func buttonTouchUpInside(_ sender: UIButton) {
-        sender.fadeOutSelectedBackground {
-            WooAnalytics.shared.track(.dashboardNewOrdersButtonTapped)
-
-            guard let statuses = self.orderStatuses else {
-                DDLogError("Error: missing list of order statuses. Cannot present new orders list.")
-                return
-            }
-
-            for filterStatus in statuses where filterStatus.slug == OrderStatusEnum.processing.rawValue {
-                MainTabBarController.presentOrders(statusFilter: filterStatus)
-            }
+        sender.fadeOutSelectedBackground()
+        guard let pendingStatus = orderStatuses?.first(where: { $0.slug == OrderStatusEnum.processing.rawValue }) else {
+            DDLogError("⛔️ Unable to display pending orders list — unable to locate pending status for current site.")
+            return
         }
+
+       WooAnalytics.shared.track(.dashboardNewOrdersButtonTapped)
+       MainTabBarController.presentOrders(statusFilter: pendingStatus)
     }
 
     @IBAction func buttonTouchUpOutside(_ sender: UIButton) {

WooCommerce/Classes/ViewRelated/Dashboard/Settings/Help/ApplicationLogViewController.swift

@@ -216,7 +216,7 @@ private extension ApplicationLogViewController {
         cell.selectionStyle = .default
         cell.textLabel?.textAlignment = .center
         cell.textLabel?.textColor = StyleManager.destructiveActionColor
-        cell.textLabel?.text = NSLocalizedString("Clear old activity logs", comment: "Deletes all activity logs except for the marked 'Current'.")
+        cell.textLabel?.text = NSLocalizedString("Reset Activity Log", comment: "Deletes all activity logs except for the marked 'Current'.")
     }
 }
 

WooCommerce/Classes/ViewRelated/Orders/OrdersViewController.swift

@@ -36,14 +36,13 @@ class OrdersViewController: UIViewController {
         return ResultsController<StorageOrder>(storageManager: storageManager, sectionNameKeyPath: "normalizedAgeAsString", sortedBy: [descriptor])
     }()
 
-    /// ResultsController: Surrounds us. Binds the galaxy together. And also, keeps the UITableView <> (Stored) OrderStatuses in sync.
+    /// ResultsController: Handles all things order status
     ///
     private lazy var statusResultsController: ResultsController<StorageOrderStatus> = {
         let storageManager = AppDelegate.shared.storageManager
-        let predicate = NSPredicate(format: "siteID == %lld", StoresManager.shared.sessionManager.defaultStoreID ?? Int.min)
         let descriptor = NSSortDescriptor(key: "slug", ascending: true)
 
-        return ResultsController<StorageOrderStatus>(storageManager: storageManager, matching: predicate, sortedBy: [descriptor])
+        return ResultsController<StorageOrderStatus>(storageManager: storageManager, sortedBy: [descriptor])
     }()
 
     /// SyncCoordinator: Keeps tracks of which pages have been refreshed, and encapsulates the "What should we sync now" logic.
@@ -66,6 +65,12 @@ class OrdersViewController: UIViewController {
         }
     }
 
+    /// The current list of order statuses for the default site
+    ///
+    private var currentSiteStatuses: [OrderStatus] {
+        return statusResultsController.fetchedObjects
+    }
+
     /// Keep track of the (Autosizing Cell's) Height. This helps us prevent UI flickers, due to sizing recalculations.
     ///
     private var estimatedRowHeights = [IndexPath: CGFloat]()
@@ -118,19 +123,22 @@ class OrdersViewController: UIViewController {
 
         refreshTitle()
         refreshResultsPredicate()
+        refreshStatusPredicate()
         registerTableViewCells()
 
         configureSyncingCoordinator()
         configureNavigation()
         configureTableView()
-        configureResultsController()
+        configureResultsControllers()
 
         startListeningToNotifications()
     }
 
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
 
+        syncOrderStatus()
+        resetStatusFilterIfNeeded()
         syncingCoordinator.synchronizeFirstPage()
         if AppRatingManager.shared.shouldPromptForAppReview() {
             displayRatingPrompt()
@@ -164,7 +172,7 @@ private extension OrdersViewController {
         navigationItem.title = title
     }
 
-    /// Setup: Filtering
+    /// Setup: Order filtering
     ///
     func refreshResultsPredicate() {
         resultsController.predicate = {
@@ -184,6 +192,12 @@ private extension OrdersViewController {
         tableView.reloadData()
     }
 
+    /// Setup: Order status predicate
+    ///
+    func refreshStatusPredicate() {
+        statusResultsController.predicate = NSPredicate(format: "siteID == %lld", StoresManager.shared.sessionManager.defaultStoreID ?? Int.min)
+    }
+
     /// Setup: Navigation Item
     ///
     func configureNavigation() {
@@ -225,9 +239,12 @@ private extension OrdersViewController {
 
     /// Setup: Results Controller
     ///
-    func configureResultsController() {
+    func configureResultsControllers() {
+        // Orders FRC
         resultsController.startForwardingEvents(to: tableView)
         try? resultsController.performFetch()
+
+        // Order status FRC
         try? statusResultsController.performFetch()
     }
 
@@ -285,6 +302,8 @@ extension OrdersViewController {
     /// Runs whenever the default Account is updated.
     ///
     @objc func defaultAccountWasUpdated() {
+        statusFilter = nil
+        refreshStatusPredicate()
         syncingCoordinator.resetInternalState()
     }
 }
@@ -316,7 +335,7 @@ extension OrdersViewController {
             self?.statusFilter = nil
         }
 
-        for orderStatus in statusResultsController.fetchedObjects {
+        for orderStatus in currentSiteStatuses {
             actionSheet.addDefaultActionWithTitle(orderStatus.name) { [weak self] _ in
                 self?.statusFilter = orderStatus
             }
@@ -331,6 +350,7 @@ extension OrdersViewController {
 
     @IBAction func pullToRefresh(sender: UIRefreshControl) {
         WooAnalytics.shared.track(.ordersListPulledToRefresh)
+        syncOrderStatus()
         syncingCoordinator.synchronizeFirstPage {
             sender.endRefreshing()
         }
@@ -373,6 +393,24 @@ private extension OrdersViewController {
         let action = OrderAction.resetStoredOrders(onCompletion: onCompletion)
         StoresManager.shared.dispatch(action)
     }
+
+    /// Reset the current status filter if needed (e.g. when changing stores and the currently
+    /// selected filter does not exist in the new store)
+    ///
+    func resetStatusFilterIfNeeded() {
+        guard let statusFilter = statusFilter else {
+            // "All" is the current filter so bail
+            return
+        }
+        guard currentSiteStatuses.isEmpty == false else {
+            self.statusFilter = nil
+            return
+        }
+
+        if currentSiteStatuses.contains(statusFilter) == false {
+            self.statusFilter = nil
+        }
+    }
 }
 
 
@@ -411,6 +449,26 @@ extension OrdersViewController: SyncingCoordinatorDelegate {
 
         StoresManager.shared.dispatch(action)
     }
+
+    func syncOrderStatus(onCompletion: ((Error?) -> Void)? = nil) {
+        guard let siteID = StoresManager.shared.sessionManager.defaultStoreID else {
+            onCompletion?(nil)
+            return
+        }
+
+        // First, let's verify our FRC predicate is up to date
+        refreshStatusPredicate()
+
+        let action = OrderStatusAction.retrieveOrderStatuses(siteID: siteID) { [weak self] (_, error) in
+            if let error = error {
+                DDLogError("⛔️ Order List — Error synchronizing order statuses: \(error)")
+            }
+            self?.resetStatusFilterIfNeeded()
+            onCompletion?(error)
+        }
+
+        StoresManager.shared.dispatch(action)
+    }
 }
 
 
@@ -472,6 +530,7 @@ private extension OrdersViewController {
         let message = NSLocalizedString("Unable to refresh list", comment: "Refresh Action Failed")
         let actionTitle = NSLocalizedString("Retry", comment: "Retry Action")
         let notice = Notice(title: message, feedbackType: .error, actionTitle: actionTitle) { [weak self] in
+            self?.syncOrderStatus()
             self?.sync(pageNumber: pageNumber, pageSize: pageSize)
         }
 
@@ -557,8 +616,7 @@ private extension OrdersViewController {
     }
 
     func lookUpOrderStatus(for order: Order) -> OrderStatus? {
-        let listAll = statusResultsController.fetchedObjects
-        for orderStatus in listAll where orderStatus.slug == order.statusKey {
+        for orderStatus in currentSiteStatuses where orderStatus.slug == order.statusKey {
             return orderStatus
         }
 

WooCommerce/Resources/ar.lproj/Localizable.strings

@@ -135,7 +135,7 @@
 "Certificate error" = "خطأ في الشهادة";
 
 /* Deletes all activity logs except for the marked 'Current'. */
-"Clear old activity logs" = "مسح سجلات النشاط القديمة";
+"Reset Activity Log" = "مسح سجلات النشاط القديمة";
 
 /* Settings > Privacy Settings > collect info section. Label for the `Collect Information` toggle. */
 "Collect Information" = "جمع المعلومات";

WooCommerce/Resources/de.lproj/Localizable.strings

@@ -135,7 +135,7 @@
 "Certificate error" = "Zertifikatsfehler";
 
 /* Deletes all activity logs except for the marked 'Current'. */
-"Clear old activity logs" = "Alte Aktivitätsprotokolle löschen";
+"Reset Activity Log" = "Alte Aktivitätsprotokolle löschen";
 
 /* Settings > Privacy Settings > collect info section. Label for the `Collect Information` toggle. */
 "Collect Information" = "Informationen erfassen";

WooCommerce/Resources/en.lproj/Localizable.strings

@@ -133,7 +133,7 @@
 "Certificate error" = "Certificate error";
 
 /* Deletes all activity logs except for the marked 'Current'. */
-"Clear old activity logs" = "Clear old activity logs";
+"Reset Activity Log" = "Reset Activity Log";
 
 /* Settings > Privacy Settings > collect info section. Label for the `Collect Information` toggle. */
 "Collect Information" = "Collect Information";

WooCommerce/Resources/es.lproj/Localizable.strings

@@ -135,7 +135,7 @@
 "Certificate error" = "Error del certificado";
 
 /* Deletes all activity logs except for the marked 'Current'. */
-"Clear old activity logs" = "Borrar registros de actividad antiguos";
+"Reset Activity Log" = "Borrar registros de actividad antiguos";
 
 /* Settings > Privacy Settings > collect info section. Label for the `Collect Information` toggle. */
 "Collect Information" = "Recopilar información";

WooCommerce/Resources/fr.lproj/Localizable.strings

@@ -135,7 +135,7 @@
 "Certificate error" = "Erreur de certificat";
 
 /* Deletes all activity logs except for the marked 'Current'. */
-"Clear old activity logs" = "Effacer vos anciens journaux d'activités";
+"Reset Activity Log" = "Effacer vos anciens journaux d'activités";
 
 /* Settings > Privacy Settings > collect info section. Label for the `Collect Information` toggle. */
 "Collect Information" = "Recueil d’information";