Update package confirm for both package item and package details

Author: itsmeichigo

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

@@ -99,7 +99,7 @@ struct ShippingLabelPackageItem_Previews: PreviewProvider {
                                                           selectedPackageID: "Box 1",
                                                           totalWeight: "",
                                                           products: [],
-                                                          productVariations: [])
+                                                          productVariations: []) { _ 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

@@ -5,6 +5,8 @@ import Yosemite
 
 final class ShippingLabelPackageItemViewModel: ObservableObject {
 
+    typealias PackageSwitchHandler = (_ newPackage: ShippingLabelPackageAttributes) -> Void
+
     /// The id of the selected package. Defaults to last selected package, if any.
     ///
     let selectedPackageID: String
@@ -35,6 +37,7 @@ final class ShippingLabelPackageItemViewModel: ObservableObject {
     private let orderItems: [OrderItem]
     private let currency: String
     private let currencyFormatter: CurrencyFormatter
+    private let onPackageSwitch: PackageSwitchHandler
 
     /// The weight unit used in the Store
     ///
@@ -47,15 +50,18 @@ final class ShippingLabelPackageItemViewModel: ObservableObject {
          totalWeight: String,
          products: [Product],
          productVariations: [ProductVariation],
+         onPackageSwitch: @escaping PackageSwitchHandler,
          formatter: CurrencyFormatter = CurrencyFormatter(currencySettings: ServiceLocator.currencySettings),
          weightUnit: String? = ServiceLocator.shippingSettingsService.weightUnit) {
         self.order = order
         self.orderItems = orderItems
         self.currency = order.currency
         self.currencyFormatter = formatter
         self.weightUnit = weightUnit
-        self.packageListViewModel = ShippingLabelPackageListViewModel(packagesResponse: packagesResponse)
         self.selectedPackageID = selectedPackageID
+        self.onPackageSwitch = onPackageSwitch
+        self.packageListViewModel = ShippingLabelPackageListViewModel(packagesResponse: packagesResponse)
+        self.packageListViewModel.delegate = self
 
         packageListViewModel.didSelectPackage(selectedPackageID)
         configureItemRows(products: products, productVariations: productVariations)
@@ -66,6 +72,19 @@ final class ShippingLabelPackageItemViewModel: ObservableObject {
     }
 }
 
+// MARK: ShippingLabelPackageSelectionDelegate conformance
+extension ShippingLabelPackageItemViewModel: ShippingLabelPackageSelectionDelegate {
+    func didSelectPackage(id: String) {
+        // TODO-4599: set to current total weight if manually edited
+        let newTotalWeight = ""
+        let newPackage = ShippingLabelPackageAttributes(packageID: id,
+                                                        totalWeight: newTotalWeight,
+                                                        productIDs: orderItems.map { $0.productOrVariationID })
+
+        onPackageSwitch(newPackage)
+    }
+}
+
 // MARK: - Helper methods
 private extension ShippingLabelPackageItemViewModel {
     /// Generate the items rows, creating an element in the array for every item (eg. if there is an item with quantity 3,

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

@@ -80,7 +80,9 @@ final class ShippingLabelPackagesFormViewModel: ObservableObject {
                                                              selectedPackageID: details.packageID,
                                                              totalWeight: details.totalWeight,
                                                              products: products,
-                                                             productVariations: variations)
+                                                             productVariations: variations) { [weak self] newPackage in
+                        self?.switchPackage(currentID: details.packageID, newPackage: newPackage)
+                    }
                 }
             }
             .sink { [weak self] viewModels in
@@ -89,6 +91,18 @@ final class ShippingLabelPackagesFormViewModel: ObservableObject {
             .store(in: &cancellables)
     }
 
+    /// Update selected packages when user switch any package.
+    ///
+    private func switchPackage(currentID: String, newPackage: ShippingLabelPackageAttributes) {
+        selectedPackages = selectedPackages.map { package in
+            if package.packageID == currentID {
+                return newPackage
+            } else {
+                return package
+            }
+        }
+    }
+
     private func configureResultsControllers() {
         resultsControllers = ShippingLabelPackageDetailsResultsControllers(siteID: order.siteID,
                                                                            orderItems: order.items,

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

@@ -1,6 +1,10 @@
 import Foundation
 import Yosemite
 
+protocol ShippingLabelPackageSelectionDelegate: AnyObject {
+    func didSelectPackage(id: String)
+}
+
 /// View model for `ShippingLabelPackageList` and `ShippingLabelPackageSelection`.
 ///
 final class ShippingLabelPackageListViewModel: ObservableObject {
@@ -31,6 +35,8 @@ final class ShippingLabelPackageListViewModel: ObservableObject {
 
     lazy var addNewPackageViewModel: ShippingLabelAddNewPackageViewModel = ShippingLabelAddNewPackageViewModel(packagesResponse: packagesResponse)
 
+    weak var delegate: ShippingLabelPackageSelectionDelegate?
+
     /// The packages  response fetched from API
     ///
     private let packagesResponse: ShippingLabelPackagesResponse?
@@ -47,8 +53,20 @@ extension ShippingLabelPackageListViewModel {
         selectPredefinedPackage(id)
     }
 
-    // TODO-4599 - Update selection
-    func confirmPackageSelection() {}
+    func confirmPackageSelection() {
+        let newPackageID: String? = {
+            if let selectedCustomPackage = selectedCustomPackage {
+                return selectedCustomPackage.title
+            } else if let selectedPredefinedPackage = selectedPredefinedPackage {
+                return selectedPredefinedPackage.id
+            }
+            return nil
+        }()
+        guard let newPackageID = newPackageID else {
+            return
+        }
+        delegate?.didSelectPackage(id: newPackageID)
+    }
 
     private func selectCustomPackage(_ id: String) {
         guard let packagesResponse = packagesResponse else {

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

@@ -86,6 +86,7 @@ final class ShippingLabelPackageDetailsViewModel: ObservableObject {
         self.weightUnit = weightUnit
         self.packageListViewModel = ShippingLabelPackageListViewModel(packagesResponse: packagesResponse)
         self.selectedPackageID = selectedPackages.first?.packageID // TODO-4599: fix this
+        self.packageListViewModel.delegate = self
 
         configureResultsControllers()
         setDefaultPackage()
@@ -111,7 +112,9 @@ final class ShippingLabelPackageDetailsViewModel: ObservableObject {
     ///
     private func configureTotalWeights(initialTotalWeight: String?) {
         if let initialTotalWeight = initialTotalWeight {
-            let calculatedWeight = calculateTotalWeight(products: products, productVariations: productVariations, customPackage: packageListViewModel.selectedCustomPackage)
+            let calculatedWeight = calculateTotalWeight(products: products,
+                                                        productVariations: productVariations,
+                                                        customPackage: packageListViewModel.selectedCustomPackage)
             // Return early if manual input is detected
             if initialTotalWeight != String(calculatedWeight) {
                 isPackageWeightEdited = true
@@ -251,7 +254,11 @@ extension ShippingLabelPackageDetailsViewModel {
 }
 
 // MARK: - Package Selection
-extension ShippingLabelPackageDetailsViewModel {
+extension ShippingLabelPackageDetailsViewModel: ShippingLabelPackageSelectionDelegate {
+    func didSelectPackage(id: String) {
+        selectedPackageID = id
+    }
+
     /// Sets the package passed through the init method, or set the last selected package, if any, as the default selected package
     ///
     func setDefaultPackage() {
@@ -260,12 +267,6 @@ extension ShippingLabelPackageDetailsViewModel {
         }
         packageListViewModel.didSelectPackage(selectedPackageID)
         packageListViewModel.confirmPackageSelection()
-//        if let selectedCustomPackage = selectedCustomPackage {
-//            selectedPackageID = selectedCustomPackage.title
-//        }
-//        else if let selectedPredefinedPackage = selectedPredefinedPackage {
-//            selectedPackageID = selectedPredefinedPackage.id
-//        }
     }
 }