Skip to content

Commit bcab23f

Browse files
ealeksandrovealeksandrov
committed
Rename NewOrderViewModel -> EditableOrderViewModel
1 parent 3a67956 commit bcab23f

File tree

10 files changed

+92
-92
lines changed

10 files changed

+92
-92
lines changed

‎WooCommerce/Classes/ViewRelated/Orders/Order Creation/CustomerNoteSection/CustomerNoteSection.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import SwiftUI
33
struct CustomerNoteSection: View {
44

55
/// Parent view model to access all data
6-
@ObservedObject var viewModel: NewOrderViewModel
6+
@ObservedObject var viewModel: EditableOrderViewModel
77

88
/// View model to drive the view content
9-
private var notesDataViewModel: NewOrderViewModel.CustomerNoteDataViewModel {
9+
private var notesDataViewModel: EditableOrderViewModel.CustomerNoteDataViewModel {
1010
viewModel.customerNoteDataViewModel
1111
}
1212

@@ -35,7 +35,7 @@ struct CustomerNoteSection: View {
3535

3636
private struct CustomerNoteSectionContent: View {
3737
/// View model to drive the view content
38-
var viewModel: NewOrderViewModel.CustomerNoteDataViewModel
38+
var viewModel: EditableOrderViewModel.CustomerNoteDataViewModel
3939

4040
@Binding var showEditNotesView: Bool
4141

@@ -116,8 +116,8 @@ private extension CustomerNoteSectionContent {
116116

117117
struct CustomerNoteSection_Previews: PreviewProvider {
118118
static var previews: some View {
119-
let emptyViewModel = NewOrderViewModel.CustomerNoteDataViewModel(customerNote: "")
120-
let notesViewModel = NewOrderViewModel.CustomerNoteDataViewModel(customerNote: "some notes")
119+
let emptyViewModel = EditableOrderViewModel.CustomerNoteDataViewModel(customerNote: "")
120+
let notesViewModel = EditableOrderViewModel.CustomerNoteDataViewModel(customerNote: "some notes")
121121

122122
ScrollView {
123123
CustomerNoteSectionContent(viewModel: emptyViewModel, showEditNotesView: .constant(false))

‎WooCommerce/Classes/ViewRelated/Orders/Order Creation/CustomerSection/OrderCustomerSection.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import SwiftUI
55
struct OrderCustomerSection: View {
66

77
/// Parent view model to access all data
8-
@ObservedObject var viewModel: NewOrderViewModel
8+
@ObservedObject var viewModel: EditableOrderViewModel
99

1010
/// View model for the address form.
1111
///
@@ -33,7 +33,7 @@ struct OrderCustomerSection: View {
3333
private struct OrderCustomerSectionContent: View {
3434

3535
/// View model to drive the view content
36-
var viewModel: NewOrderViewModel.CustomerDataViewModel
36+
var viewModel: EditableOrderViewModel.CustomerDataViewModel
3737

3838
@Binding var showAddressForm: Bool
3939

@@ -138,8 +138,8 @@ private extension OrderCustomerSectionContent {
138138
@available(iOS 15.0, *)
139139
struct OrderCustomerSection_Previews: PreviewProvider {
140140
static var previews: some View {
141-
let emptyViewModel = NewOrderViewModel.CustomerDataViewModel(billingAddress: nil, shippingAddress: nil)
142-
let addressViewModel = NewOrderViewModel.CustomerDataViewModel(fullName: "Johnny Appleseed",
141+
let emptyViewModel = EditableOrderViewModel.CustomerDataViewModel(billingAddress: nil, shippingAddress: nil)
142+
let addressViewModel = EditableOrderViewModel.CustomerDataViewModel(fullName: "Johnny Appleseed",
143143
billingAddressFormatted: nil,
144144
shippingAddressFormatted: """
145145
Johnny Appleseed

WooCommerce/Classes/ViewRelated/Orders/Order Creation/NewOrderViewModel.swift renamed to WooCommerce/Classes/ViewRelated/Orders/Order Creation/EditableOrderViewModel.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import Experiments
55
import WooFoundation
66
import enum Networking.DotcomError
77

8-
/// View model for `NewOrder`.
8+
/// View model used in Order Creation and Editing flows.
99
///
10-
final class NewOrderViewModel: ObservableObject {
10+
final class EditableOrderViewModel: ObservableObject {
1111
let siteID: Int64
1212
private let stores: StoresManager
1313
private let storageManager: StorageManagerType
@@ -392,7 +392,7 @@ final class NewOrderViewModel: ObservableObject {
392392
}
393393

394394
// MARK: - Types
395-
extension NewOrderViewModel {
395+
extension EditableOrderViewModel {
396396
/// Representation of possible navigation bar trailing buttons
397397
///
398398
enum NavigationItem: Equatable {
@@ -528,7 +528,7 @@ extension NewOrderViewModel {
528528
}
529529

530530
// MARK: - Helpers
531-
private extension NewOrderViewModel {
531+
private extension EditableOrderViewModel {
532532

533533
/// Sets the view to be `disabled` when `performingNetworkRequest` or when `statePublisher` is `.syncing(blocking: true)`
534534
///
@@ -829,7 +829,7 @@ private extension NewOrderViewModel {
829829
}
830830
}
831831

832-
private extension NewOrderViewModel {
832+
private extension EditableOrderViewModel {
833833
/// Fetches products from storage.
834834
///
835835
func updateProductsResultsController() {
@@ -855,7 +855,7 @@ private extension NewOrderViewModel {
855855

856856
// MARK: Constants
857857

858-
extension NewOrderViewModel {
858+
extension EditableOrderViewModel {
859859
/// New Order notices
860860
///
861861
enum NoticeFactory {
@@ -893,7 +893,7 @@ extension NewOrderViewModel {
893893
}
894894
}
895895

896-
private extension NewOrderViewModel {
896+
private extension EditableOrderViewModel {
897897
enum Localization {
898898
static let titleForNewOrder = NSLocalizedString("New Order", comment: "Title for the order creation screen")
899899
static let titleWithOrderNumber = NSLocalizedString("Order #%1$@", comment: "Order number title. Parameters: %1$@ - order number")

‎WooCommerce/Classes/ViewRelated/Orders/Order Creation/FlowCoordinator/AddOrderCoordinator.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ private extension AddOrderCoordinator {
7878
/// Presents `NewOrderHostingController`.
7979
///
8080
func presentNewOrderController() {
81-
let viewModel = NewOrderViewModel(siteID: siteID)
81+
let viewModel = EditableOrderViewModel(siteID: siteID)
8282
viewModel.onFinished = onOrderCreated
8383

8484
let viewController = NewOrderHostingController(viewModel: viewModel)

‎WooCommerce/Classes/ViewRelated/Orders/Order Creation/NewOrder.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ final class NewOrderHostingController: UIHostingController<NewOrder> {
88
/// References to keep the Combine subscriptions alive within the lifecycle of the object.
99
///
1010
private var subscriptions: Set<AnyCancellable> = []
11-
private let viewModel: NewOrderViewModel
11+
private let viewModel: EditableOrderViewModel
1212

13-
init(viewModel: NewOrderViewModel) {
13+
init(viewModel: EditableOrderViewModel) {
1414
self.viewModel = viewModel
1515
super.init(rootView: NewOrder(viewModel: viewModel))
1616

@@ -97,7 +97,7 @@ struct NewOrder: View {
9797
///
9898
var dismissHandler: (() -> Void) = {}
9999

100-
@ObservedObject var viewModel: NewOrderViewModel
100+
@ObservedObject var viewModel: EditableOrderViewModel
101101

102102
/// Fix for breaking navbar button
103103
@State private var navigationButtonID = UUID()
@@ -171,7 +171,7 @@ private struct ProductsSection: View {
171171
let scroll: ScrollViewProxy
172172

173173
/// View model to drive the view content
174-
@ObservedObject var viewModel: NewOrderViewModel
174+
@ObservedObject var viewModel: EditableOrderViewModel
175175

176176
/// Fix for breaking navbar button
177177
@Binding var navigationButtonID: UUID
@@ -263,7 +263,7 @@ private extension NewOrder {
263263

264264
struct NewOrder_Previews: PreviewProvider {
265265
static var previews: some View {
266-
let viewModel = NewOrderViewModel(siteID: 123)
266+
let viewModel = EditableOrderViewModel(siteID: 123)
267267

268268
NavigationView {
269269
NewOrder(viewModel: viewModel)

‎WooCommerce/Classes/ViewRelated/Orders/Order Creation/PaymentSection/OrderPaymentSection.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import Yosemite
55
///
66
struct OrderPaymentSection: View {
77
/// View model to drive the view content
8-
let viewModel: NewOrderViewModel.PaymentDataViewModel
8+
let viewModel: EditableOrderViewModel.PaymentDataViewModel
99

1010
/// Indicates if the shipping line details screen should be shown or not.
1111
///
@@ -101,7 +101,7 @@ private extension OrderPaymentSection {
101101

102102
struct OrderPaymentSection_Previews: PreviewProvider {
103103
static var previews: some View {
104-
let viewModel = NewOrderViewModel.PaymentDataViewModel(itemsTotal: "20.00", orderTotal: "20.00")
104+
let viewModel = EditableOrderViewModel.PaymentDataViewModel(itemsTotal: "20.00", orderTotal: "20.00")
105105

106106
OrderPaymentSection(viewModel: viewModel)
107107
.previewLayout(.sizeThatFits)

‎WooCommerce/Classes/ViewRelated/Orders/Order Creation/StatusSection/OrderStatusSection.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import Yosemite
44
/// Represents the Status section with date label, status badge and edit button.
55
///
66
struct OrderStatusSection: View {
7-
@ObservedObject var viewModel: NewOrderViewModel
7+
@ObservedObject var viewModel: EditableOrderViewModel
88

99
@Environment(\.safeAreaInsets) var safeAreaInsets: EdgeInsets
1010

@@ -73,7 +73,7 @@ private extension OrderStatusSection {
7373

7474
struct OrderStatusSection_Previews: PreviewProvider {
7575
static var previews: some View {
76-
let viewModel = NewOrderViewModel(siteID: 123)
76+
let viewModel = EditableOrderViewModel(siteID: 123)
7777

7878
ScrollView {
7979
OrderStatusSection(viewModel: viewModel)

‎WooCommerce/Classes/ViewRelated/Orders/Order Details/OrderDetailsViewController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ private extension OrderDetailsViewController {
353353
/// Presents the order edit form
354354
///
355355
private func editOrder() {
356-
let viewModel = NewOrderViewModel(siteID: viewModel.order.siteID, flow: .editing(initialOrder: viewModel.order))
356+
let viewModel = EditableOrderViewModel(siteID: viewModel.order.siteID, flow: .editing(initialOrder: viewModel.order))
357357
viewModel.onFinished = { [weak self] order in
358358
guard let self = self else { return }
359359
self.dismiss(animated: true)

‎WooCommerce/WooCommerce.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1334,7 +1334,7 @@
13341334
CCFC010D23E9BD5500157A78 /* stats_top_earners_month.json in Resources */ = {isa = PBXBuildFile; fileRef = CCFC00E723E9BD5500157A78 /* stats_top_earners_month.json */; };
13351335
CCFC010E23E9BD5500157A78 /* stats_visits_day.json in Resources */ = {isa = PBXBuildFile; fileRef = CCFC00E823E9BD5500157A78 /* stats_visits_day.json */; };
13361336
CCFC50552743BC0D001E505F /* NewOrder.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCFC50542743BC0D001E505F /* NewOrder.swift */; };
1337-
CCFC50592743E021001E505F /* NewOrderViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCFC50582743E021001E505F /* NewOrderViewModel.swift */; };
1337+
CCFC50592743E021001E505F /* EditableOrderViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCFC50582743E021001E505F /* EditableOrderViewModel.swift */; };
13381338
CE0F17CF22A8105800964A63 /* ReadMoreTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE0F17CD22A8105800964A63 /* ReadMoreTableViewCell.swift */; };
13391339
CE0F17D022A8105800964A63 /* ReadMoreTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE0F17CE22A8105800964A63 /* ReadMoreTableViewCell.xib */; };
13401340
CE0F17D222A8308900964A63 /* FancyAlertController+PurchaseNote.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE0F17D122A8308900964A63 /* FancyAlertController+PurchaseNote.swift */; };
@@ -3109,7 +3109,7 @@
31093109
CCFC011023E9E3F400157A78 /* start.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = start.sh; sourceTree = "<group>"; };
31103110
CCFC011123E9E40B00157A78 /* stop.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = stop.sh; sourceTree = "<group>"; };
31113111
CCFC50542743BC0D001E505F /* NewOrder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewOrder.swift; sourceTree = "<group>"; };
3112-
CCFC50582743E021001E505F /* NewOrderViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewOrderViewModel.swift; sourceTree = "<group>"; };
3112+
CCFC50582743E021001E505F /* EditableOrderViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditableOrderViewModel.swift; sourceTree = "<group>"; };
31133113
CE0F17CD22A8105800964A63 /* ReadMoreTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReadMoreTableViewCell.swift; sourceTree = "<group>"; };
31143114
CE0F17CE22A8105800964A63 /* ReadMoreTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReadMoreTableViewCell.xib; sourceTree = "<group>"; };
31153115
CE0F17D122A8308900964A63 /* FancyAlertController+PurchaseNote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "FancyAlertController+PurchaseNote.swift"; sourceTree = "<group>"; };
@@ -6976,7 +6976,7 @@
69766976
children = (
69776977
B651474327D644DE00C9C4E6 /* CustomerNoteSection */,
69786978
CCFC50542743BC0D001E505F /* NewOrder.swift */,
6979-
CCFC50582743E021001E505F /* NewOrderViewModel.swift */,
6979+
CCFC50582743E021001E505F /* EditableOrderViewModel.swift */,
69806980
26C6439127B5DBE900DD00D1 /* Synchronizer */,
69816981
AE264C05275A495E00B52996 /* FlowCoordinator */,
69826982
CC200BAF27847D9300EC5884 /* PaymentSection */,
@@ -9731,7 +9731,7 @@
97319731
B979A9BA282D62A500EBB383 /* InPersonPaymentsDeactivateStripeView.swift in Sources */,
97329732
319A626127ACAE3400BC96C3 /* InPersonPaymentsPluginChoicesView.swift in Sources */,
97339733
6856D31F941A33BAE66F394D /* KeyboardFrameAdjustmentProvider.swift in Sources */,
9734-
CCFC50592743E021001E505F /* NewOrderViewModel.swift in Sources */,
9734+
CCFC50592743E021001E505F /* EditableOrderViewModel.swift in Sources */,
97359735
6856DB2E741639716E149967 /* KeyboardStateProvider.swift in Sources */,
97369736
ABC35F18E744C5576B986CB3 /* InPersonPaymentsUnavailableView.swift in Sources */,
97379737
ABC35528D2D6BE6F516E5CEF /* InPersonPaymentsOnboardingError.swift in Sources */,

0 commit comments

Comments
 (0)