Rename CollapsibleShipmentCardViewModel to CollapsibleShipmentItemCardViewModel

itsmeichigo · itsmeichigo · commit f01cbdb9a0ce · 2025-03-26T12:17:54.000+07:00
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/WooShipping Split Shipments/CollapsibleShipmentItemCard.swift b/WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/WooShipping Split Shipments/CollapsibleShipmentItemCard.swift
@@ -5,9 +5,9 @@ import SwiftUI
 struct CollapsibleShipmentItemCard: View {
     @State private var isCollapsed: Bool = true
 
-    private let viewModel: CollapsibleShipmentCardViewModel
+    private let viewModel: CollapsibleShipmentItemCardViewModel
 
-    init(viewModel: CollapsibleShipmentCardViewModel) {
+    init(viewModel: CollapsibleShipmentItemCardViewModel) {
         self.viewModel = viewModel
     }
 
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/WooShipping Split Shipments/CollapsibleShipmentItemCardViewModel.swift b/WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/WooShipping Split Shipments/CollapsibleShipmentItemCardViewModel.swift
@@ -3,7 +3,7 @@ import WooFoundation
 import Yosemite
 
 /// View model for `CollapsibleShipmentItemCard`.
-final class CollapsibleShipmentCardViewModel: ObservableObject, Identifiable {
+final class CollapsibleShipmentItemCardViewModel: ObservableObject, Identifiable {
     let id = UUID()
 
     /// The main item row.
@@ -58,7 +58,7 @@ final class CollapsibleShipmentCardViewModel: ObservableObject, Identifiable {
     }
 }
 
-private extension CollapsibleShipmentCardViewModel {
+private extension CollapsibleShipmentItemCardViewModel {
     func observeSelection() {
         mainItemRow.onSelectedChange = { [weak self] row in
             guard let self else { return }
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/WooShipping Split Shipments/WooShippingSplitShipmentsViewModel.swift b/WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/WooShipping Split Shipments/WooShippingSplitShipmentsViewModel.swift
@@ -26,7 +26,7 @@ final class WooShippingSplitShipmentsViewModel: ObservableObject {
         "\(itemsWeightLabel) • \(itemsPriceLabel)"
     }
 
-    let shipmentCardViewModels: [CollapsibleShipmentCardViewModel]
+    let shipmentCardViewModels: [CollapsibleShipmentItemCardViewModel]
 
     @Published private(set) var moveToNoticeViewModel: MoveToShipmentNoticeViewModel?
 
@@ -48,7 +48,7 @@ final class WooShippingSplitShipmentsViewModel: ObservableObject {
         self.shippingSettingsService = shippingSettingsService
 
         self.shipmentCardViewModels = {
-            var viewModels = [CollapsibleShipmentCardViewModel]()
+            var viewModels = [CollapsibleShipmentItemCardViewModel]()
             for item in items {
                 // TODO: #15303 Set IDs based on web logic
                 let childShipmentIds: [String] = {
@@ -64,7 +64,7 @@ final class WooShippingSplitShipmentsViewModel: ObservableObject {
                     return children
                 }()
 
-                let viewModel = CollapsibleShipmentCardViewModel(parentShipmentId: "\(item.productOrVariationID)",
+                let viewModel = CollapsibleShipmentItemCardViewModel(parentShipmentId: "\(item.productOrVariationID)",
                                                                  childShipmentIds: childShipmentIds,
                                                                  item: item,
                                                                  currency: order.currency)
diff --git a/WooCommerce/WooCommerce.xcodeproj/project.pbxproj b/WooCommerce/WooCommerce.xcodeproj/project.pbxproj
@@ -3035,7 +3035,7 @@
 		EEB4E2DE29B61AAD00371C3C /* CouponInputTransformer.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEB4E2DD29B61AAD00371C3C /* CouponInputTransformer.swift */; };
 		EEBA02A32ADD6005001FE8E4 /* BlazeCampaignDashboardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEBA02A22ADD6005001FE8E4 /* BlazeCampaignDashboardView.swift */; };
 		EEBA02A52ADD606D001FE8E4 /* BlazeCampaignDashboardViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEBA02A42ADD606D001FE8E4 /* BlazeCampaignDashboardViewModel.swift */; };
-		EEBB816F2D8C082B008D6CE5 /* CollapsibleShipmentCardViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEBB816E2D8C0821008D6CE5 /* CollapsibleShipmentCardViewModel.swift */; };
+		EEBB816F2D8C082B008D6CE5 /* CollapsibleShipmentItemCardViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEBB816E2D8C0821008D6CE5 /* CollapsibleShipmentItemCardViewModel.swift */; };
 		EEBB81712D8C0839008D6CE5 /* CollapsibleShipmentItemCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEBB81702D8C0834008D6CE5 /* CollapsibleShipmentItemCard.swift */; };
 		EEBB9B3B2D8E5071008D6CE5 /* SelectableShipmentItemRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEBB9B3A2D8E5058008D6CE5 /* SelectableShipmentItemRow.swift */; };
 		EEBB9B3D2D8E5099008D6CE5 /* SelectableShipmentItemRowViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEBB9B3C2D8E508E008D6CE5 /* SelectableShipmentItemRowViewModel.swift */; };
@@ -6253,7 +6253,7 @@
 		EEB4E2DD29B61AAD00371C3C /* CouponInputTransformer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CouponInputTransformer.swift; sourceTree = "<group>"; };
 		EEBA02A22ADD6005001FE8E4 /* BlazeCampaignDashboardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlazeCampaignDashboardView.swift; sourceTree = "<group>"; };
 		EEBA02A42ADD606D001FE8E4 /* BlazeCampaignDashboardViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlazeCampaignDashboardViewModel.swift; sourceTree = "<group>"; };
-		EEBB816E2D8C0821008D6CE5 /* CollapsibleShipmentCardViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CollapsibleShipmentCardViewModel.swift; sourceTree = "<group>"; };
+		EEBB816E2D8C0821008D6CE5 /* CollapsibleShipmentItemCardViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CollapsibleShipmentItemCardViewModel.swift; sourceTree = "<group>"; };
 		EEBB81702D8C0834008D6CE5 /* CollapsibleShipmentItemCard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CollapsibleShipmentItemCard.swift; sourceTree = "<group>"; };
 		EEBB9B3A2D8E5058008D6CE5 /* SelectableShipmentItemRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectableShipmentItemRow.swift; sourceTree = "<group>"; };
 		EEBB9B3C2D8E508E008D6CE5 /* SelectableShipmentItemRowViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectableShipmentItemRowViewModel.swift; sourceTree = "<group>"; };
@@ -14030,7 +14030,7 @@
 				EEBB9B3C2D8E508E008D6CE5 /* SelectableShipmentItemRowViewModel.swift */,
 				EEBB9B3A2D8E5058008D6CE5 /* SelectableShipmentItemRow.swift */,
 				EEBB81702D8C0834008D6CE5 /* CollapsibleShipmentItemCard.swift */,
-				EEBB816E2D8C0821008D6CE5 /* CollapsibleShipmentCardViewModel.swift */,
+				EEBB816E2D8C0821008D6CE5 /* CollapsibleShipmentItemCardViewModel.swift */,
 				EE7E75AB2D84080A00E6FF5B /* WooShippingSplitShipmentsViewModel.swift */,
 				EE7E75A92D84066800E6FF5B /* WooShippingSplitShipmentsDetailView.swift */,
 				EE7E75A72D83EB0700E6FF5B /* WooShippingSplitShipmentsRow.swift */,
@@ -15905,7 +15905,7 @@
 				0211259F2578DE310075AD2A /* ShippingLabelPrintingStepView.swift in Sources */,
 				B58B4AB22108F01700076FDD /* NoticeView.swift in Sources */,
 				20D2CCA52C7E328300051705 /* POSModalCloseButton.swift in Sources */,
-				EEBB816F2D8C082B008D6CE5 /* CollapsibleShipmentCardViewModel.swift in Sources */,
+				EEBB816F2D8C082B008D6CE5 /* CollapsibleShipmentItemCardViewModel.swift in Sources */,
 				DA25ADDD2C86145E00AE81FE /* MarkOrderAsReadUseCase.swift in Sources */,
 				01BB6C072D09DC560094D55B /* CardPresentModalLocationPreAlert.swift in Sources */,
 				74B5713621CD7604008F9B8E /* SharingHelper.swift in Sources */,

Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@ import SwiftUI`
`5`	`5`	`struct CollapsibleShipmentItemCard: View {`
`6`	`6`	`@State private var isCollapsed: Bool = true`
`7`	`7`
`8`		`- private let viewModel: CollapsibleShipmentCardViewModel`
	`8`	`+ private let viewModel: CollapsibleShipmentItemCardViewModel`
`9`	`9`
`10`		`- init(viewModel: CollapsibleShipmentCardViewModel) {`
	`10`	`+ init(viewModel: CollapsibleShipmentItemCardViewModel) {`
`11`	`11`	`self.viewModel = viewModel`
`12`	`12`	`}`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import WooFoundation`
`3`	`3`	`import Yosemite`
`4`	`4`
`5`	`5`	/// View model for `CollapsibleShipmentItemCard`.
`6`		`-final class CollapsibleShipmentCardViewModel: ObservableObject, Identifiable {`
	`6`	`+final class CollapsibleShipmentItemCardViewModel: ObservableObject, Identifiable {`
`7`	`7`	`let id = UUID()`
`8`	`8`
`9`	`9`	`/// The main item row.`
`@@ -58,7 +58,7 @@ final class CollapsibleShipmentCardViewModel: ObservableObject, Identifiable {`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`
`61`		`-private extension CollapsibleShipmentCardViewModel {`
	`61`	`+private extension CollapsibleShipmentItemCardViewModel {`
`62`	`62`	`func observeSelection() {`
`63`	`63`	`mainItemRow.onSelectedChange = { [weak self] row in`
`64`	`64`	`guard let self else { return }`