Fix build failure after merging develop

Author: itsmeichigo

WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/Package Details/Multi-package/ShippingLabelPackageItem.swift

@@ -99,7 +99,9 @@ struct ShippingLabelPackageItem_Previews: PreviewProvider {
                                                           selectedPackageID: "Box 1",
                                                           totalWeight: "",
                                                           products: [],
-                                                          productVariations: []) { _ in }
+                                                          productVariations: [],
+                                                          onPackageSwitch: { _ in },
+                                                          onPackagesSync: { _ in })
         ShippingLabelPackageItem(packageNumber: 1, isCollapsible: true, safeAreaInsets: .zero, viewModel: viewModel)
     }
 }

WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/Package Details/Multi-package/ShippingLabelPackageItemViewModel.swift

@@ -6,14 +6,17 @@ import Yosemite
 final class ShippingLabelPackageItemViewModel: ObservableObject {
 
     typealias PackageSwitchHandler = (_ newPackage: ShippingLabelPackageAttributes) -> Void
+    typealias PackagesSyncHandler = (_ packagesResponse: ShippingLabelPackagesResponse?) -> Void
 
     /// The id of the selected package. Defaults to last selected package, if any.
     ///
     let selectedPackageID: String
 
     /// View model for the package list
     ///
-    let packageListViewModel: ShippingLabelPackageListViewModel
+    lazy var packageListViewModel: ShippingLabelPackageListViewModel = {
+        .init(siteID: order.siteID, packagesResponse: packagesResponse)
+    }()
 
     @Published var totalWeight: String = ""
 
@@ -38,6 +41,11 @@ final class ShippingLabelPackageItemViewModel: ObservableObject {
     private let currency: String
     private let currencyFormatter: CurrencyFormatter
     private let onPackageSwitch: PackageSwitchHandler
+    private let onPackagesSync: PackagesSyncHandler
+
+    /// The packages  response fetched from API
+    ///
+    private var packagesResponse: ShippingLabelPackagesResponse?
 
     /// The weight unit used in the Store
     ///
@@ -55,6 +63,7 @@ final class ShippingLabelPackageItemViewModel: ObservableObject {
          products: [Product],
          productVariations: [ProductVariation],
          onPackageSwitch: @escaping PackageSwitchHandler,
+         onPackagesSync: @escaping PackagesSyncHandler,
          formatter: CurrencyFormatter = CurrencyFormatter(currencySettings: ServiceLocator.currencySettings),
          weightUnit: String? = ServiceLocator.shippingSettingsService.weightUnit) {
         self.order = order
@@ -64,7 +73,8 @@ final class ShippingLabelPackageItemViewModel: ObservableObject {
         self.weightUnit = weightUnit
         self.selectedPackageID = selectedPackageID
         self.onPackageSwitch = onPackageSwitch
-        self.packageListViewModel = ShippingLabelPackageListViewModel(packagesResponse: packagesResponse)
+        self.onPackagesSync = onPackagesSync
+        self.packagesResponse = packagesResponse
         self.packageListViewModel.delegate = self
 
         packageListViewModel.didSelectPackage(selectedPackageID)
@@ -108,6 +118,12 @@ extension ShippingLabelPackageItemViewModel: ShippingLabelPackageSelectionDelega
 
         onPackageSwitch(newPackage)
     }
+
+    func didSyncPackages(packagesResponse: ShippingLabelPackagesResponse?) {
+        self.packagesResponse = packagesResponse
+        packageListViewModel = .init(siteID: order.siteID, packagesResponse: packagesResponse)
+        onPackagesSync(packagesResponse)
+    }
 }
 
 // MARK: - Helper methods

WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/Package Details/Multi-package/ShippingLabelPackagesForm.swift

@@ -51,7 +51,7 @@ struct ShippingLabelPackagesForm_Previews: PreviewProvider {
     static var previews: some View {
         let viewModel = ShippingLabelPackagesFormViewModel(order: ShippingLabelPackagesFormViewModel.sampleOrder(),
                                                            packagesResponse: ShippingLabelPackagesFormViewModel.samplePackageDetails(),
-                                                           selectedPackages: [])
+                                                           selectedPackages: []) { _ in }
 
         ShippingLabelPackagesForm(viewModel: viewModel)
         .environment(\.colorScheme, .light)

WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/Package Details/Multi-package/ShippingLabelPackagesFormViewModel.swift

@@ -21,6 +21,7 @@ final class ShippingLabelPackagesFormViewModel: ObservableObject {
     private let stores: StoresManager
     private let storageManager: StorageManagerType
     private var resultsControllers: ShippingLabelPackageDetailsResultsControllers?
+    private let onPackageSyncCompletion: (_ packagesResponse: ShippingLabelPackagesResponse?) -> Void
 
     private var cancellables: Set<AnyCancellable> = []
 
@@ -39,6 +40,7 @@ final class ShippingLabelPackagesFormViewModel: ObservableObject {
     init(order: Order,
          packagesResponse: ShippingLabelPackagesResponse?,
          selectedPackages: [ShippingLabelPackageAttributes],
+         onPackageSyncCompletion: @escaping (_ packagesResponse: ShippingLabelPackagesResponse?) -> Void,
          formatter: CurrencyFormatter = CurrencyFormatter(currencySettings: ServiceLocator.currencySettings),
          stores: StoresManager = ServiceLocator.stores,
          storageManager: StorageManagerType = ServiceLocator.storageManager,
@@ -47,6 +49,7 @@ final class ShippingLabelPackagesFormViewModel: ObservableObject {
         self.stores = stores
         self.storageManager = storageManager
         self.selectedPackages = selectedPackages
+        self.onPackageSyncCompletion = onPackageSyncCompletion
 
         configureResultsControllers()
         syncProducts()
@@ -80,9 +83,13 @@ final class ShippingLabelPackagesFormViewModel: ObservableObject {
                                                              selectedPackageID: details.packageID,
                                                              totalWeight: details.totalWeight,
                                                              products: products,
-                                                             productVariations: variations) { [weak self] newPackage in
-                        self?.switchPackage(currentID: details.packageID, newPackage: newPackage)
-                    }
+                                                             productVariations: variations,
+                                                             onPackageSwitch: { [weak self] newPackage in
+                                                                self?.switchPackage(currentID: details.packageID, newPackage: newPackage)
+                                                             },
+                                                             onPackagesSync: { [weak self] packagesResponse in
+                                                                self?.onPackageSyncCompletion(packagesResponse)
+                                                             })
                 }
             }
             .sink { [weak self] viewModels in

WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/Package Details/Package Selection/ShippingLabelPackageList.swift

@@ -95,7 +95,8 @@ private extension ShippingLabelPackageList {
 
 struct ShippingLabelPackageList_Previews: PreviewProvider {
     static var previews: some View {
-        let viewModel = ShippingLabelPackageListViewModel(packagesResponse: ShippingLabelPackageDetailsViewModel.samplePackageDetails())
+        let viewModel = ShippingLabelPackageListViewModel(siteID: 123,
+                                                          packagesResponse: ShippingLabelPackageDetailsViewModel.samplePackageDetails())
         ShippingLabelPackageList(viewModel: viewModel)
     }
 }

WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/Package Details/Package Selection/ShippingLabelPackageListViewModel.swift

@@ -3,6 +3,7 @@ import Yosemite
 
 protocol ShippingLabelPackageSelectionDelegate: AnyObject {
     func didSelectPackage(id: String)
+    func didSyncPackages(packagesResponse: ShippingLabelPackagesResponse?)
 }
 
 /// View model for `ShippingLabelPackageList` and `ShippingLabelPackageSelection`.
@@ -33,15 +34,23 @@ final class ShippingLabelPackageListViewModel: ObservableObject {
         return customPackages.isNotEmpty || predefinedOptions.isNotEmpty
     }
 
-    lazy var addNewPackageViewModel: ShippingLabelAddNewPackageViewModel = ShippingLabelAddNewPackageViewModel(packagesResponse: packagesResponse)
+    lazy var addNewPackageViewModel = ShippingLabelAddNewPackageViewModel(siteID: siteID,
+                                                                          packagesResponse: packagesResponse,
+                                                                          onCompletion: { [weak self] (customPackage, predefinedOption, packagesResponse) in
+                                                                            guard let self = self else { return }
+                                                                            self.handleNewPackage(customPackage, predefinedOption, packagesResponse)
+                                                                          })
 
     weak var delegate: ShippingLabelPackageSelectionDelegate?
 
     /// The packages  response fetched from API
     ///
-    private let packagesResponse: ShippingLabelPackagesResponse?
+    private var packagesResponse: ShippingLabelPackagesResponse?
 
-    init(packagesResponse: ShippingLabelPackagesResponse?) {
+    private let siteID: Int64
+
+    init(siteID: Int64, packagesResponse: ShippingLabelPackagesResponse?) {
+        self.siteID = siteID
         self.packagesResponse = packagesResponse
     }
 }
@@ -97,4 +106,30 @@ extension ShippingLabelPackageListViewModel {
             }
         }
     }
+
+    /// Selects a newly created custom package or newly activated service package and adds it to the package list
+    ///
+    private func handleNewPackage(_ customPackage: ShippingLabelCustomPackage?,
+                          _ servicePackage: ShippingLabelPredefinedPackage?,
+                          _ packagesResponse: ShippingLabelPackagesResponse?) {
+        guard let packagesResponse = packagesResponse else {
+            return
+        }
+
+        self.packagesResponse = packagesResponse
+        addNewPackageViewModel = .init(siteID: siteID,
+                                       packagesResponse: packagesResponse,
+                                       onCompletion: { [weak self] (customPackage, predefinedOption, packagesResponse) in
+                                         guard let self = self else { return }
+                                         self.handleNewPackage(customPackage, predefinedOption, packagesResponse)
+                                       })
+        if let customPackage = customPackage {
+            selectCustomPackage(customPackage.title)
+        }
+        else if let servicePackage = servicePackage {
+            selectPredefinedPackage(servicePackage.id)
+        }
+
+        delegate?.didSyncPackages(packagesResponse: packagesResponse)
+    }
 }

WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/Package Details/Package Selection/ShippingLabelPackageSelection.swift

@@ -16,8 +16,9 @@ struct ShippingLabelPackageSelection: View {
 
 struct ShippingLabelPackageSelection_Previews: PreviewProvider {
     static var previews: some View {
-        let viewModelWithPackages = ShippingLabelPackageListViewModel(packagesResponse: ShippingLabelPackageDetailsViewModel.samplePackageDetails())
-        let viewModelWithoutPackages = ShippingLabelPackageListViewModel(packagesResponse: nil)
+        let viewModelWithPackages = ShippingLabelPackageListViewModel(siteID: 123,
+                                                                      packagesResponse: ShippingLabelPackageDetailsViewModel.samplePackageDetails())
+        let viewModelWithoutPackages = ShippingLabelPackageListViewModel(siteID: 123, packagesResponse: nil)
 
         ShippingLabelPackageSelection(viewModel: viewModelWithPackages)
         ShippingLabelPackageSelection(viewModel: viewModelWithoutPackages)

WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/Package Details/ShippingLabelPackageDetailsViewModel.swift

@@ -70,14 +70,6 @@ final class ShippingLabelPackageDetailsViewModel: ObservableObject {
     ///
     @Published private var isPackageWeightEdited: Bool = false
 
-    // TODO-4599: check this
-    lazy var addNewPackageViewModel = ShippingLabelAddNewPackageViewModel(siteID: order.siteID,
-                                                                          packagesResponse: packagesResponse,
-                                                                          onCompletion: { [weak self] (customPackage, predefinedOption, packagesResponse) in
-                                                                            guard let self = self else { return }
-                                                                            self.handleNewPackage(customPackage, predefinedOption, packagesResponse)
-                                                                          })
-
     /// Completion callback after package details are synced from remote
     ///
     private let onPackageSyncCompletion: (_ packagesResponse: ShippingLabelPackagesResponse?) -> Void
@@ -102,8 +94,9 @@ final class ShippingLabelPackageDetailsViewModel: ObservableObject {
         self.stores = stores
         self.storageManager = storageManager
         self.weightUnit = weightUnit
-        self.packageListViewModel = ShippingLabelPackageListViewModel(packagesResponse: packagesResponse)
-        self.selectedPackageID = selectedPackages.first?.packageID // TODO-4599: fix this
+        self.packageListViewModel = ShippingLabelPackageListViewModel(siteID: order.siteID, packagesResponse: packagesResponse)
+        // This is temporary solution while supporting both single and multiple packages solution.
+        self.selectedPackageID = selectedPackages.first?.packageID
         self.onPackageSyncCompletion = onPackageSyncCompletion
         self.onPackageSaveCompletion = onPackageSaveCompletion
         self.packageListViewModel.delegate = self
@@ -113,7 +106,9 @@ final class ShippingLabelPackageDetailsViewModel: ObservableObject {
         syncProducts()
         syncProductVariations()
         configureItemRows()
-        configureTotalWeights(initialTotalWeight: selectedPackages.first?.totalWeight) // TODO-4599: fix this
+
+        // This is temporary solution while supporting both single and multiple packages solution.
+        configureTotalWeights(initialTotalWeight: selectedPackages.first?.totalWeight)
     }
 
     /// Observe changes in products and variations to update item rows.
@@ -283,6 +278,10 @@ extension ShippingLabelPackageDetailsViewModel: ShippingLabelPackageSelectionDel
         selectedPackageID = id
     }
 
+    func didSyncPackages(packagesResponse: ShippingLabelPackagesResponse?) {
+        onPackageSyncCompletion(packagesResponse)
+    }
+
     /// Sets the package passed through the init method, or set the last selected package, if any, as the default selected package
     ///
     func setDefaultPackage() {
@@ -292,27 +291,6 @@ extension ShippingLabelPackageDetailsViewModel: ShippingLabelPackageSelectionDel
         packageListViewModel.didSelectPackage(selectedPackageID)
         packageListViewModel.confirmPackageSelection()
     }
-
-    /// Selects a newly created custom package or newly activated service package and adds it to the package list
-    ///
-    func handleNewPackage(_ customPackage: ShippingLabelCustomPackage?,
-                          _ servicePackage: ShippingLabelPredefinedPackage?,
-                          _ packagesResponse: ShippingLabelPackagesResponse?) {
-        guard let packagesResponse = packagesResponse else {
-            return
-        }
-
-        self.packagesResponse = packagesResponse
-
-        if let customPackage = customPackage {
-            selectCustomPackage(customPackage.title)
-        }
-        else if let servicePackage = servicePackage {
-            selectPredefinedPackage(servicePackage.id)
-        }
-
-        onPackageSyncCompletion(packagesResponse)
-    }
 }
 
 /// API Requests

WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/ShippingLabelFormViewController.swift

@@ -420,7 +420,10 @@ private extension ShippingLabelFormViewController {
         if ServiceLocator.featureFlagService.isFeatureFlagEnabled(.shippingLabelsMultiPackage) {
             let vm = ShippingLabelPackagesFormViewModel(order: viewModel.order,
                                                         packagesResponse: viewModel.packagesResponse,
-                                                        selectedPackages: inputPackages)
+                                                        selectedPackages: inputPackages,
+                                                        onPackageSyncCompletion: { [weak self] (packagesResponse) in
+                                                          self?.viewModel.handleNewPackagesResponse(packagesResponse: packagesResponse)
+                                                        })
             let packagesForm = ShippingLabelPackagesForm(viewModel: vm)
             let hostingVC = UIHostingController(rootView: packagesForm)
             navigationController?.show(hostingVC, sender: nil)