Clear products onboarding banner and resync announcements when a product is added

Author: rachelmcr

WooCommerce/Classes/ViewRelated/Dashboard/DashboardViewController.swift

@@ -318,6 +318,11 @@ private extension DashboardViewController {
     private func startAddProductFlow() {
         guard let announcementView, let navigationController else { return }
         let coordinator = AddProductCoordinator(siteID: siteID, sourceView: announcementView, sourceNavigationController: navigationController)
+        coordinator.onProductCreated = { [weak self] in
+            guard let self else { return }
+            self.viewModel.announcementViewModel = nil // Remove the products onboarding banner
+            self.viewModel.syncAnnouncements(for: self.siteID)
+        }
         coordinator.start()
     }
 

WooCommerce/Classes/ViewRelated/Products/Add Product/AddProductCoordinator.swift

@@ -30,6 +30,10 @@ final class AddProductCoordinator: Coordinator {
         return controller
     }()
 
+    /// Assign this closure to be notified when a new product is saved remotely
+    ///
+    var onProductCreated: () -> Void = {}
+
     init(siteID: Int64,
          sourceBarButtonItem: UIBarButtonItem,
          sourceNavigationController: UINavigationController,
@@ -211,6 +215,7 @@ private extension AddProductCoordinator {
         let viewModel = ProductFormViewModel(product: model,
                                              formType: .add,
                                              productImageActionHandler: productImageActionHandler)
+        viewModel.onProductCreated = onProductCreated
         let viewController = ProductFormViewController(viewModel: viewModel,
                                                        eventLogger: ProductFormEventLogger(),
                                                        productImageActionHandler: productImageActionHandler,

WooCommerce/Classes/ViewRelated/Products/Edit Product/ProductFormViewModel.swift

@@ -181,6 +181,10 @@ final class ProductFormViewModel: ProductFormViewModelProtocol {
 
     private let featureFlagService: FeatureFlagService
 
+    /// Assign this closure to be notified when a new product is saved remotely
+    ///
+    var onProductCreated: () -> Void = {}
+
     init(product: EditableProductModel,
          formType: ProductFormType,
          productImageActionHandler: ProductImageActionHandler,
@@ -432,7 +436,7 @@ extension ProductFormViewModel {
             let productWithStatusUpdated = product.product.copy(statusKey: status.rawValue)
             return EditableProductModel(product: productWithStatusUpdated)
         }()
-        let remoteActionUseCase = ProductFormRemoteActionUseCase()
+        let remoteActionUseCase = ProductFormRemoteActionUseCase(stores: stores)
         switch formType {
         case .add:
             let productIDBeforeSave = productModel.productID
@@ -449,6 +453,7 @@ extension ProductFormViewModel {
                     onCompletion(.success(data.product))
                     self.replaceProductID(productIDBeforeSave: productIDBeforeSave)
                     self.saveProductImagesWhenNoneIsPendingUploadAnymore()
+                    self.onProductCreated()
                 }
             }
         case .edit:

WooCommerce/WooCommerceTests/ViewRelated/Products/Edit Product/ProductFormViewModelTests.swift

@@ -579,6 +579,30 @@ final class ProductFormViewModelTests: XCTestCase {
         let hasLinkedProducts = try XCTUnwrap(analyticsProvider.receivedProperties.first?["has_linked_products"] as? Bool)
         XCTAssertTrue(hasLinkedProducts)
     }
+
+    func test_onProductCreated_called_when_new_product_saved_remotely() {
+        // Given
+        var isCallbackCalled = false
+        let stores = MockStoresManager(sessionManager: .testingInstance)
+        let viewModel = createViewModel(product: Product.fake(), formType: .add, stores: stores)
+        viewModel.onProductCreated = {
+            isCallbackCalled = true
+        }
+
+        // When
+        stores.whenReceivingAction(ofType: ProductAction.self) { action in
+            switch action {
+            case let .addProduct(product, onCompletion):
+                onCompletion(.success(product))
+            default:
+                XCTFail("Received unsupported action: \(action)")
+            }
+        }
+        viewModel.saveProductRemotely(status: .draft) { _ in }
+
+        // Then
+        XCTAssertTrue(isCallbackCalled)
+    }
 }
 
 private extension ProductFormViewModelTests {