Fix: #4846 - Products: add the variation number to the variations list and details

Author: anas-p

WooCommerce.xcworkspace/contents.xcworkspacedata

@@ -65,10 +65,10 @@ extension ProductsTabProductTableViewCell: SearchResultCell {
 extension ProductsTabProductTableViewCell {
     func update(viewModel: ProductsTabProductViewModel, imageService: ImageService) {
 
-        // TODO: #update Documentation here...
-        // TODO: Add Localization
         if let variationID = viewModel.productVariation?.productVariationID {
-            nameLabel.text = "#\(variationID)\n\(viewModel.name)"
+            // Add product variation ID with name
+            // See more: https://github.com/woocommerce/woocommerce-ios/issues/4846
+            nameLabel.text = "\(Localization.variationID(variationID: "\(variationID)"))\n\(viewModel.name)"
         }
         else {
             nameLabel.text = viewModel.name
@@ -163,7 +163,7 @@ private extension ProductsTabProductTableViewCell {
 
     func configureNameLabel() {
         nameLabel.applyBodyStyle()
-        nameLabel.numberOfLines = 2
+        nameLabel.numberOfLines = 3
     }
 
     func configureDetailsLabel() {
@@ -238,6 +238,13 @@ private extension ProductsTabProductTableViewCell {
     }
 }
 
+private enum Localization {
+    static func variationID(variationID: String) -> String {
+        let titleFormat = NSLocalizedString("#%1$@", comment: "Variation ID. Parameters: %1$@ - Product variation ID")
+        return String.localizedStringWithFormat(titleFormat, variationID)
+    }
+}
+
 #if canImport(SwiftUI) && DEBUG
 
 import SwiftUI

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

@@ -60,7 +60,6 @@ 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
@@ -98,9 +97,12 @@ final class ProductFormViewController<ViewModel: ProductFormViewModelProtocol>:
     override func viewDidLoad() {
         super.viewDidLoad()
         configurePresentationStyle()
-        // TODO: #update
-        if let variationID = self.viewModel.getProductVariationID() {
-            configureNavigationBar(title: "Variation #\(variationID)")
+
+        // If the page opens from product variation,
+        // product variation ID will show on navigation bar title along with text `Variation`
+        // See more: https://github.com/woocommerce/woocommerce-ios/issues/4846
+        if let variationID = self.viewModel.productionVariationID {
+            configureNavigationBar(title: Localization.variationViewTitle(variationID: "\(variationID)"))
         }
         else {
             configureNavigationBar()
@@ -172,7 +174,7 @@ final class ProductFormViewController<ViewModel: ProductFormViewModelProtocol>:
 
     @objc func saveProductAndLogEvent() {
         eventLogger.logUpdateButtonTapped()
-        saveProduct(status: self.viewModel.getProductVariationID() != nil ? .custom("variation") : nil)
+        saveProduct()
     }
 
     @objc func publishProduct() {
@@ -1453,6 +1455,11 @@ private enum Localization {
                                                             comment: "Navigation bar title for editing linked products for a grouped product")
     static let unnamedProduct = NSLocalizedString("Unnamed product",
                                                   comment: "Back button title when the product doesn't have a name")
+
+    static func variationViewTitle(variationID: String) -> String {
+        let titleFormat = NSLocalizedString("Variation #%1$@", comment: "Navigation bar title for variation. Parameters: %1$@ - Product variation ID")
+        return String.localizedStringWithFormat(titleFormat, variationID)
+    }
 }
 
 private enum ActionSheetStrings {

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

@@ -5,13 +5,10 @@ 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
-    }
+    /// Production variation ID only for Product Variation not for product
+    var productionVariationID: Int64? = nil
 
     /// Emits product on change, except when the product name is the only change (`productName` is emitted for this case).
     var observableProduct: Observable<EditableProductModel> {
@@ -43,8 +40,6 @@ 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

@@ -58,10 +58,8 @@ 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?
+    /// The product variation ID
+    var productionVariationID: Int64? { get }
 
     // Unsaved changes
 

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

@@ -6,11 +6,6 @@ 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
@@ -31,6 +26,11 @@ final class ProductVariationFormViewModel: ProductFormViewModelProtocol {
         isUpdateEnabledSubject
     }
 
+    /// The product variation ID
+    var productionVariationID: Int64? {
+        productVariation.productVariation.productVariationID
+    }
+
     /// Emits a void value informing when there is a new variation price state available
     var newVariationsPrice: Observable<Void> = PublishSubject<Void>()
 
@@ -99,7 +99,6 @@ final class ProductVariationFormViewModel: ProductFormViewModelProtocol {
     private let storesManager: StoresManager
     private var cancellable: ObservationToken?
 
-
     init(productVariation: EditableProductVariationModel,
          allAttributes: [ProductAttribute],
          parentProductSKU: String?,
@@ -282,6 +281,10 @@ extension ProductVariationFormViewModel {
     func updateProductVariations(from product: Product) {
         //no-op
     }
+
+//    func getProductVariationID() -> Int64? {
+//        return productVariation.productVariation.productVariationID
+//    }
 }
 
 // MARK: Remote actions

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

@@ -368,7 +368,6 @@ extension ProductVariationsViewController: UITableViewDataSource {
 
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(ProductsTabProductTableViewCell.self, for: indexPath)
-
         let productVariation = resultsController.object(at: indexPath)
         let model = EditableProductVariationModel(productVariation: productVariation,
                                                   allAttributes: allAttributes,
@@ -377,7 +376,6 @@ extension ProductVariationsViewController: UITableViewDataSource {
         cell.update(viewModel: viewModel, imageService: imageService)
         cell.selectionStyle = .none
         cell.accessoryType = .disclosureIndicator
-
         return cell
     }
 }