Fixed #4847-text change on creating variation

Author: anas-p

WooCommerce.xcworkspace/contents.xcworkspacedata

@@ -64,7 +64,15 @@ extension ProductsTabProductTableViewCell: SearchResultCell {
 
 extension ProductsTabProductTableViewCell {
     func update(viewModel: ProductsTabProductViewModel, imageService: ImageService) {
-        nameLabel.text = viewModel.name
+
+        // TODO: #update Documentation here...
+        // TODO: Add Localization
+        if let variationID = viewModel.productVariation?.productVariationID {
+            nameLabel.text = "#\(variationID)\n\(viewModel.name)"
+        }
+        else {
+            nameLabel.text = viewModel.name
+        }
 
         detailsLabel.attributedText = viewModel.detailsAttributedString
 

WooCommerce/Classes/ViewRelated/Products/Cells/ProductsTabProductTableViewCell.swift

@@ -90,6 +90,8 @@ extension ProductFormViewController {
             displayInProgressView(title: Localization.ProgressView.productPublishingTitle, message: Localization.ProgressView.productPublishingMessage)
         case .save:
             displayInProgressView(title: Localization.ProgressView.productSavingTitle, message: Localization.ProgressView.productSavingMessage)
+        case .saveVariation:
+            displayInProgressView(title: Localization.ProgressView.productVariationTitle, message: Localization.ProgressView.productVariationMessage)
         }
     }
 
@@ -176,5 +178,9 @@ private enum Localization {
                                                               comment: "Title of the in-progress UI while deleting the Variation remotely")
         static let variationDeletionMessage = NSLocalizedString("Please wait while we update your store details",
                                                                 comment: "Message of the in-progress UI while deleting the Variation remotely")
+        static let productVariationTitle = NSLocalizedString("Saving your variation...",
+                                                          comment: "Title of the in-progress UI while saving a Variation remotely")
+        static let productVariationMessage = NSLocalizedString("Please wait while we save your latest changes",
+                                                            comment: "Message of the in-progress UI while saving a Variation remotely")
     }
 }

WooCommerce/Classes/ViewRelated/Products/Edit Product/ProductFormViewController+Helpers.swift

@@ -60,6 +60,7 @@ final class ProductFormViewController<ViewModel: ProductFormViewModelProtocol>:
          currency: String = ServiceLocator.currencySettings.symbol(from: ServiceLocator.currencySettings.currencyCode),
          presentationStyle: ProductFormPresentationStyle) {
         self.viewModel = viewModel
+
         self.eventLogger = eventLogger
         self.currency = currency
         self.presentationStyle = presentationStyle
@@ -96,9 +97,15 @@ final class ProductFormViewController<ViewModel: ProductFormViewModelProtocol>:
 
     override func viewDidLoad() {
         super.viewDidLoad()
-
         configurePresentationStyle()
-        configureNavigationBar()
+        // TODO: #update
+        if let variationID = self.viewModel.getProductVariationID() {
+            configureNavigationBar(title: "Variation #\(variationID)")
+        }
+        else {
+            configureNavigationBar()
+        }
+
         configureMainView()
         configureTableView()
         configureMoreDetailsContainerView()
@@ -165,7 +172,7 @@ final class ProductFormViewController<ViewModel: ProductFormViewModelProtocol>:
 
     @objc func saveProductAndLogEvent() {
         eventLogger.logUpdateButtonTapped()
-        saveProduct()
+        saveProduct(status: self.viewModel.getProductVariationID() != nil ? .custom("variation") : nil)
     }
 
     @objc func publishProduct() {
@@ -407,9 +414,12 @@ final class ProductFormViewController<ViewModel: ProductFormViewModelProtocol>:
 //
 private extension ProductFormViewController {
 
-    func configureNavigationBar() {
+    /// Configure navigation bar with the title
+    ///
+    func configureNavigationBar(title: String = String()) {
         updateNavigationBar()
         updateBackButtonTitle()
+        updateNavigationBarTitle(title: title)
     }
 
     func configureMainView() {
@@ -801,7 +811,15 @@ private extension ProductFormViewController {
         navigationItem.backButtonTitle = viewModel.productModel.name.isNotEmpty ? viewModel.productModel.name : Localization.unnamedProduct
     }
 
+    func updateNavigationBarTitle(title: String) {
+        // Update navigation bar title with variation ID
+        self.title = title
+    }
+
     func updateNavigationBar() {
+
+
+
         // Create action buttons based on view model
         let rightBarButtonItems: [UIBarButtonItem] = viewModel.actionButtons.reversed().map { buttonType in
             switch buttonType {

WooCommerce/Classes/ViewRelated/Products/Edit Product/ProductFormViewController.swift

@@ -5,8 +5,14 @@ import protocol Storage.StorageManagerType
 
 /// Provides data for product form UI, and handles product editing actions.
 final class ProductFormViewModel: ProductFormViewModelProtocol {
+
     typealias ProductModel = EditableProductModel
 
+    // TODO: #update
+    func getProductVariationID() -> Int64? {
+        return nil
+    }
+
     /// Emits product on change, except when the product name is the only change (`productName` is emitted for this case).
     var observableProduct: Observable<EditableProductModel> {
         productSubject
@@ -37,6 +43,8 @@ final class ProductFormViewModel: ProductFormViewModelProtocol {
         originalProduct
     }
 
+    var isVariation: Bool = false
+
     /// The form type could change from .add to .edit after creation.
     private(set) var formType: ProductFormType
 

WooCommerce/Classes/ViewRelated/Products/Edit Product/ProductFormViewModel.swift

@@ -19,8 +19,10 @@ enum ActionButtonType {
 enum SaveMessageType {
     case publish
     case save
+    case saveVariation
 }
 
+
 /// A view model for `ProductFormViewController` to add/edit a generic product model (e.g. `Product` or `ProductVariation`).
 ///
 protocol ProductFormViewModelProtocol {
@@ -56,6 +58,11 @@ protocol ProductFormViewModelProtocol {
     /// The action buttons that should be rendered in the navigation bar.
     var actionButtons: [ActionButtonType] { get }
 
+//    //TODO: #update
+//    var isVariation: Bool { get }
+
+    func getProductVariationID() -> Int64?
+
     // Unsaved changes
 
     func hasUnsavedChanges() -> Bool
@@ -154,6 +161,8 @@ extension ProductFormViewModelProtocol {
         switch productStatus {
         case .publish where !productModel.existsRemotely || originalProductModel.status != .publish:
             return .publish
+        case .custom("variation"):
+            return .saveVariation
         default:
             return .save
         }

WooCommerce/Classes/ViewRelated/Products/Edit Product/ProductFormViewModelProtocol.swift

@@ -6,6 +6,11 @@ final class ProductVariationFormViewModel: ProductFormViewModelProtocol {
 
     typealias ProductModel = EditableProductVariationModel
 
+    //TODO: #update
+    func getProductVariationID() -> Int64? {
+        return productVariation.productVariation.productVariationID
+    }
+
     /// Emits product variation on change.
     var observableProduct: Observable<EditableProductVariationModel> {
         productVariationSubject
@@ -94,6 +99,7 @@ final class ProductVariationFormViewModel: ProductFormViewModelProtocol {
     private let storesManager: StoresManager
     private var cancellable: ObservationToken?
 
+
     init(productVariation: EditableProductVariationModel,
          allAttributes: [ProductAttribute],
          parentProductSKU: String?,

WooCommerce/Classes/ViewRelated/Products/Edit Product/ProductVariationFormViewModel.swift

@@ -373,7 +373,6 @@ extension ProductVariationsViewController: UITableViewDataSource {
         let model = EditableProductVariationModel(productVariation: productVariation,
                                                   allAttributes: allAttributes,
                                                   parentProductSKU: parentProductSKU)
-
         let viewModel = ProductsTabProductViewModel(productVariationModel: model)
         cell.update(viewModel: viewModel, imageService: imageService)
         cell.selectionStyle = .none
@@ -410,6 +409,7 @@ extension ProductVariationsViewController: UITableViewDelegate {
         let currency = ServiceLocator.currencySettings.symbol(from: currencyCode)
         let productImageActionHandler = ProductImageActionHandler(siteID: productVariation.siteID,
                                                                   product: model)
+
         let viewModel = ProductVariationFormViewModel(productVariation: model,
                                                       allAttributes: allAttributes,
                                                       parentProductSKU: parentProductSKU,

WooCommerce/Classes/ViewRelated/Products/Variations/ProductVariationsViewController.swift

@@ -7,7 +7,7 @@ extension ProductsTabProductViewModel {
         imageUrl = productVariationModel.productVariation.image?.src
         name = productVariationModel.name
         detailsAttributedString = productVariationModel.createDetailsAttributedString(currencySettings: currencySettings)
-
+        productVariation = productVariationModel.productVariation
         imageService = ServiceLocator.imageService
         isSelected = false
         isDraggable = false

WooCommerce/Classes/ViewRelated/Products/Variations/ProductsTabProductViewModel+ProductVariation.swift

@@ -19,16 +19,23 @@ private extension ProductStatus {
 struct ProductsTabProductViewModel {
     let imageUrl: String?
     let name: String
+    let productVariation: ProductVariation?
     let detailsAttributedString: NSAttributedString
     let isSelected: Bool
     let isDraggable: Bool
 
     // Dependency for configuring the view.
     let imageService: ImageService
 
-    init(product: Product, isSelected: Bool = false, isDraggable: Bool = false, imageService: ImageService = ServiceLocator.imageService) {
+    init(product: Product,
+         productVariation: ProductVariation? = nil,
+         isSelected: Bool = false,
+         isDraggable: Bool = false,
+         imageService: ImageService = ServiceLocator.imageService) {
+
         imageUrl = product.images.first?.src
         name = product.name.isEmpty ? Localization.noTitle : product.name
+        self.productVariation = productVariation
         self.isSelected = isSelected
         self.isDraggable = isDraggable
         detailsAttributedString = EditableProductModel(product: product).createDetailsAttributedString()