[Shipping labels] Use backend data for saved packages

Networking/Networking/Model/Copiable/Models+Copiable.generated.swift

@@ -4122,7 +4122,7 @@ extension Networking.WooShippingPackagesResponse {
         storeOptions: CopiableProp<ShippingLabelStoreOptions> = .copy,
         customPackages: CopiableProp<[WooShippingCustomPackage]> = .copy,
         savedPredefinedPackages: CopiableProp<[WooShippingSavedPredefinedPackage]> = .copy,
-        allPredefinedOptions: CopiableProp<[WooShippingPredefinedOption]> = .copy
+        allPredefinedOptions: CopiableProp<[WooShippingCarrierPredefinedOptions]> = .copy
     ) -> Networking.WooShippingPackagesResponse {
         let storeOptions = storeOptions ?? self.storeOptions
         let customPackages = customPackages ?? self.customPackages

Networking/Networking/Model/ShippingLabel/Packages/Predefined package/WooShippingPredefinedOption.swift

@@ -21,6 +21,13 @@ public struct WooShippingPredefinedOption: Equatable, GeneratedFakeable {
     }
 }
 
+/// Represents a predefined carrier option in Shipping Labels for the WooCommerce Shipping extension.
+///
+public struct WooShippingCarrierPredefinedOptions: Equatable, GeneratedFakeable {
+    public let carrierID: String
+    public let predefinedOptions: [WooShippingPredefinedOption]
+}
+
 // MARK: Decodable
 extension WooShippingPredefinedOption: Decodable {
     public init(from decoder: Decoder) throws {

Networking/Networking/Model/ShippingLabel/Packages/Predefined package/WooShippingPredefinedPackage.swift

@@ -62,7 +62,21 @@ extension WooShippingPredefinedPackage: Decodable {
         let id = try container.decode(String.self, forKey: .id)
         let name = try container.decode(String.self, forKey: .name)
         let isLetter = try container.decodeIfPresent(Bool.self, forKey: .isLetter) ?? false
-        let dimensions = try container.decode(String.self, forKey: .dimensions)
+        var dimensions: String = ""
+        if let dimensionsString = try? container.decodeIfPresent(String.self, forKey: .dimensions) {
+            dimensions = dimensionsString
+        }
+        else if let dimensionsDict = try? container.decodeIfPresent([String: String].self, forKey: .dimensions) {
+            if let dimensionsOuter = dimensionsDict["outer"] {
+                dimensions = dimensionsOuter
+            }
+            else if let dimensionsInner = dimensionsDict["inner"] {
+                dimensions = dimensionsInner
+            }
+        }
+        else if let outerDimensionsString = try? container.decodeIfPresent(String.self, forKey: .outerDimensions) {
+            dimensions = outerDimensionsString
+        }
         let groupId = try container.decode(String.self, forKey: .groupId)
         var boxWeight: String = ""
         // Looks like some endpoints have boxWeight as String and some as Double
@@ -86,7 +100,10 @@ extension WooShippingPredefinedPackage: Decodable {
         case name
         case isLetter = "is_letter"
         case dimensions
+        case outer
+        case inner
         case groupId = "group_id"
         case boxWeight = "box_weight"
+        case outerDimensions = "outer_dimensions"
     }
 }

Networking/Networking/Model/ShippingLabel/Packages/Predefined package/WooShippingSavedPredefinedPackage.swift.swift

@@ -5,9 +5,9 @@ import WooFoundation
 /// Container struct for a predefined Shipping Label Packages for the WooCommerce Shipping extension with group title and provider identifier.
 ///
 public struct WooShippingSavedPredefinedPackage: Equatable, GeneratedFakeable, Identifiable {
-    let groupTitle: String
-    let providerID: String
-    let package: WooShippingPredefinedPackage
+    public let groupTitle: String
+    public let providerID: String
+    public let package: WooShippingPredefinedPackage
 
     public var id: String {
         return package.id

Networking/Networking/Model/ShippingLabel/Packages/WooShippingPackagesResponse.swift

@@ -15,12 +15,12 @@ public struct WooShippingPackagesResponse: Equatable, GeneratedFakeable, Generat
     public let savedPredefinedPackages: [WooShippingSavedPredefinedPackage]
 
     /// All predefined options
-    public let allPredefinedOptions: [WooShippingPredefinedOption]
+    public let allPredefinedOptions: [WooShippingCarrierPredefinedOptions]
 
     public init(storeOptions: ShippingLabelStoreOptions,
                 customPackages: [WooShippingCustomPackage],
                 savedPredefinedPackages: [WooShippingSavedPredefinedPackage],
-                allPredefinedOptions: [WooShippingPredefinedOption]) {
+                allPredefinedOptions: [WooShippingCarrierPredefinedOptions]) {
         self.storeOptions = storeOptions
         self.customPackages = customPackages
         self.savedPredefinedPackages = savedPredefinedPackages
@@ -44,21 +44,23 @@ extension WooShippingPackagesResponse: Decodable {
         }
 
         let allPredefinedPackagesData: [String: AnyCodable] = try packagesData.decode([String: AnyCodable].self, forKey: .predefined)
-        var allPredefinedOptions: [WooShippingPredefinedOption] = []
+        var allPredefinedOptions: [WooShippingCarrierPredefinedOptions] = []
         var allSavedPredefinedPackages: [WooShippingSavedPredefinedPackage] = []
 
         allPredefinedPackagesData.forEach { (key, value) in
             // key is a carrier id, for example "usps"
             if let provider: [String: Any]? = try? value.toDictionary() {
+                var providerOptions: [WooShippingPredefinedOption] = []
                 provider?.forEach({ (providerKey, providerValue) in
                     // providerKey is package group id, for example "pri_flat_boxes"
                     let providerValueDict = providerValue as? [String: Any]
                     let title: String = providerValueDict?["title"] as? String ?? ""
                     let packages = WooShippingPackagesResponse.getAllPredefinedPackages(packageDefinitions: providerValueDict)
                     let option = WooShippingPredefinedOption(title: title, providerID: key, predefinedPackages: packages)
-                    allPredefinedOptions.append(option)
+                    providerOptions.append(option)
                     allSavedPredefinedPackages.append(contentsOf: WooShippingPackagesResponse.savedPackages(savedOptions: savedPredefinedOptions, option: option))
                 })
+                allPredefinedOptions.append(WooShippingCarrierPredefinedOptions(carrierID: key, predefinedOptions: providerOptions))
             }
         }
 

WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/WooShipping Package and Rate Selection/WooCarrierPackagesSelectionView.swift

@@ -18,58 +18,47 @@ struct WooPackageGroup {
 }
 
 struct WooCarrierPackagesView: View {
-    @ObservedObject private var viewModel: WooCarrierPackagesSelectionViewModel
-
-    init(viewModel: WooCarrierPackagesSelectionViewModel) {
-        self.viewModel = viewModel
-    }
+    let carrierTab: WooShippingCarrierPackages
+    @Binding var selectedPackageId: String?  // Track the selected package index
+    @Binding var starredPackages: Set<String>
+    let tapAction: (String) -> Void
+    let starAction: (String) -> Void
 
     var body: some View {
         List {
-            if let packageGroups = viewModel.selectedCarrierTab?.packageGroups {
-                ForEach(packageGroups, id: \.id) { packageGroup in
-                    Section {
-                        ForEach(packageGroup.packages, id: \.id) { package in
-                            PackageOptionView(
-                                isSelected: viewModel.selectedPackageId == package.id,
-                                package: package,
-                                showTopDivider: false,
-                                showSource: false,
-                                tapAction: {
-                                    viewModel.selectedPackageId = viewModel.selectedPackageId == package.id ? nil : package.id
-                                },
-                                starAction: {
-                                    // Just temporary, will be replaced with proper logic
-                                    if viewModel.isPackageStarred(package) {
-                                        Task {
-                                            await viewModel.unstarPackage(package)
-                                        }
-                                    }
-                                    else {
-                                        Task {
-                                            await viewModel.starPackage(package)
-                                        }
-                                    }
-                                },
-                                starred: viewModel.isPackageStarred(package)
-                            )
-                            .alignmentGuide(.listRowSeparatorLeading) { _ in
-                                return 16
-                            }
-                        }
-                    } header: {
-                        HStack {
-                            Text(packageGroup.name.uppercased())
-                                .foregroundColor(.secondary)
-                                .fontWeight(.regular)
-                                .multilineTextAlignment(.leading)
-                            Spacer()
+            ForEach(carrierTab.packageGroups, id: \.id) { packageGroup in
+                Section {
+                    ForEach(packageGroup.packages, id: \.id) { package in
+                        PackageOptionView(
+                            isSelected: selectedPackageId == package.id,
+                            package: package,
+                            showTopDivider: false,
+                            showSource: false,
+                            tapAction: {
+                                tapAction(package.id)
+                            },
+                            starAction: {
+                                starAction(package.id)
+                                // Just temporary, will be replaced with proper logic
+                            },
+                            starred: starredPackages.contains(package.id)
+                        )
+                        .alignmentGuide(.listRowSeparatorLeading) { _ in
+                            return 16
                         }
-                        .padding(.horizontal)
-                        .background(Color.clear)
                     }
-                    .listRowInsets(.zero)
+                } header: {
+                    HStack {
+                        Text(packageGroup.name.uppercased())
+                            .foregroundColor(.secondary)
+                            .fontWeight(.regular)
+                            .multilineTextAlignment(.leading)
+                        Spacer()
+                    }
+                    .padding(.horizontal)
+                    .background(Color.clear)
                 }
+                .listRowInsets(.zero)
             }
         }
         .listStyle(.plain)
@@ -84,21 +73,27 @@ struct WooCarrierPackagesSelectionView: View {
         static let tabPadding: CGFloat = 9.0
     }
 
-    @ObservedObject private var viewModel: WooCarrierPackagesSelectionViewModel
+    @ObservedObject private var viewModel: WooShippingAddPackageViewModel
     let addPackageAction: (WooShippingPackageDataRepresentable) -> Void
 
-    init(viewModel: WooCarrierPackagesSelectionViewModel,
+    init(viewModel: WooShippingAddPackageViewModel,
          addPackageAction: @escaping (WooShippingPackageDataRepresentable) -> Void) {
         self.viewModel = viewModel
         self.addPackageAction = addPackageAction
     }
 
     var body: some View {
         VStack(spacing: 0) {
-            if viewModel.selectedTabIndex != nil, viewModel.tabs.isNotEmpty {
-                TopTabView(tabs: viewModel.tabs,
+            if viewModel.isLoadingPackages {
+                // TODO: think of a better progress/loading indicator
+                ProgressView()
+                    .progressViewStyle(.circular)
+                    .padding()
+            }
+            if viewModel.selectedCarriersTabIndex != nil, viewModel.carrierTabs.isNotEmpty {
+                TopTabView(tabs: viewModel.carrierTabs,
                            showContent: .constant(false),
-                           selectedTabIndex: $viewModel.selectedTabIndex,
+                           selectedTabIndex: $viewModel.selectedCarriersTabIndex,
                            tabsContainerHorizontalPadding: nil,
                            selectedStateColor: Color.accentColor,
                            unselectedStateColor: .secondary,
@@ -108,23 +103,32 @@ struct WooCarrierPackagesSelectionView: View {
                            tabItemContentHorizontalPadding: Constants.tabItemContentHorizontalPadding,
                            tabItemContentVerticalPadding: Constants.tabItemContentVerticalPadding)
             }
-            if viewModel.selectedCarrierTab != nil {
-                WooCarrierPackagesView(viewModel: viewModel)
+            if let selectedCarrierTab = viewModel.selectedCarrierTab {
+                WooCarrierPackagesView(carrierTab: selectedCarrierTab,
+                                       selectedPackageId: $viewModel.selectedCarriersPackageId,
+                                       starredPackages: $viewModel.starredCarriersPackages,
+                                       tapAction: { packageID in
+                    viewModel.selectedCarriersPackageId = viewModel.selectedCarriersPackageId == packageID ? nil : packageID
+                }, starAction: { packageID in
+                    Task {
+                        await viewModel.starUnstarPackage(packageID)
+                    }
+                })
             }
             Spacer()
             Divider()
             Button(WooShippingAddPackageView.Localization.addPackage) {
                 addPackageButtonTapped()
             }
-            .disabled(viewModel.selectedPackageId == nil)
+            .disabled(viewModel.selectedCarriersPackageId == nil)
             .buttonStyle(PrimaryButtonStyle())
             .padding()
         }
     }
 
     private func addPackageButtonTapped() {
         // call addPackageAction with data from selected package
-        guard let selectedPackage = viewModel.selectedPackage else { return }
+        guard let selectedPackage = viewModel.selectedCarriersPackage  else { return }
 
         addPackageAction(selectedPackage)
     }