Merge pull request #2260 from woocommerce/issue/2120-product-setting-visibility-UI

Product Settings: show, edit and update Product Visibility

Author: pmusolino

Networking/Networking/Model/Product/ProductStatus.swift

@@ -56,7 +56,7 @@ extension ProductStatus: RawRepresentable {
         case .pending:
             return NSLocalizedString("Pending review", comment: "Display label for the product's pending status")
         case .privateStatus:
-            return NSLocalizedString("Private", comment: "Display label for the product's private status")
+            return NSLocalizedString("Privately published", comment: "Display label for the product's private status")
         case .custom(let payload):
             return payload // unable to localize at runtime.
         }

Networking/Networking/Remote/SitePostsRemote.swift

@@ -16,7 +16,7 @@ public class SitePostsRemote: Remote {
     ///   - completion: Closure to be executed upon completion.
     ///
     public func loadSitePost(for siteID: Int64, postID: Int64, completion: @escaping (Post?, Error?) -> Void) {
-        let path = String(format: "/sites/%d/posts/%d", siteID, postID)
+        let path = String(format: "sites/%d/posts/%d", siteID, postID)
         let parameters = ["fields": "site_ID,password"]
         let request = DotcomRequest(wordpressApiVersion: .mark1_1, method: .get, path: path, parameters: parameters)
         let mapper = PostMapper()
@@ -38,7 +38,7 @@ public class SitePostsRemote: Remote {
             var parameters = try post.toDictionary()
             let parametersFields = ["fields": "site_ID,password"]
             parameters.merge(parametersFields) { (current, _) in current }
-            let path = String(format: "/sites/%d/posts/%d", siteID, postID)
+            let path = String(format: "sites/%d/posts/%d", siteID, postID)
             let request = DotcomRequest(wordpressApiVersion: .mark1_2, method: .post, path: path, parameters: parameters)
             let mapper = PostMapper()
 

Networking/NetworkingTests/Remote/SitePostsRemoteTests.swift

@@ -35,7 +35,7 @@ class SitePostsRemoteTests: XCTestCase {
 
         let postID: Int64 = 7
 
-        network.simulateResponse(requestUrlSuffix: "/sites/\(sampleSiteID)/posts/\(postID)", filename: "site-post")
+        network.simulateResponse(requestUrlSuffix: "sites/\(sampleSiteID)/posts/\(postID)", filename: "site-post")
         remote.loadSitePost(for: sampleSiteID, postID: postID) {[weak self] (sitePost, error) in
             XCTAssertNil(error)
             XCTAssertNotNil(sitePost)
@@ -70,7 +70,7 @@ class SitePostsRemoteTests: XCTestCase {
         let remote = SitePostsRemote(network: network)
         let expectation = self.expectation(description: "Wait for site post update")
 
-        network.simulateResponse(requestUrlSuffix: "/sites/\(sampleSiteID)/posts/\(postID)", filename: "site-post-update")
+        network.simulateResponse(requestUrlSuffix: "sites/\(sampleSiteID)/posts/\(postID)", filename: "site-post-update")
 
         let newPassword = "new-password"
         let post = Post(siteID: sampleSiteID, password: newPassword)

WooCommerce/Classes/Extensions/UIImage+Woo.swift

@@ -397,6 +397,12 @@ extension UIImage {
         return im2.imageWithTintColor(tintColor)
     }
 
+    /// Password Field Image
+    ///
+    static var passwordFieldImage: UIImage {
+        return UIImage.gridicon(.visible)
+    }
+
     /// Waiting for Customers Image
     ///
     static var waitingForCustomersImage: UIImage {

WooCommerce/Classes/Styles/UIColor+SemanticColors.swift

@@ -149,6 +149,13 @@ extension UIColor {
         return UIColor(light: .accent,
                        dark: .systemColor(.label))
     }
+
+    /// Text. WooCommercePurple-60 (< iOS 13 and Light Mode) and WooCommercePurple-30 (Dark Mode)
+    ///
+    static var textBrand: UIColor {
+        return UIColor(light: .withColorStudio(.wooCommercePurple, shade: .shade60),
+        dark: .withColorStudio(.wooCommercePurple, shade: .shade30))
+    }
 }
 
 

WooCommerce/Classes/ViewRelated/Products/Edit Product/Product Settings/List Selector Data Source/ProductStatusSettingListSelectorCommand.swift

@@ -12,8 +12,7 @@ final class ProductStatusSettingListSelectorCommand: ListSelectorCommand {
     let data: [ProductStatus] = [
         .publish,
         .draft,
-        .pending,
-        .privateStatus
+        .pending
     ]
 
     private(set) var selected: ProductStatus?

WooCommerce/Classes/ViewRelated/Products/Edit Product/Product Settings/ProductSettingsRows.swift

@@ -39,11 +39,28 @@ enum ProductSettingsRows {
                 return
             }
 
+            /// If the status is private, the status cell becomes not editable.
+            if isStatusPrivate() {
+                cell.accessoryType = .none
+                cell.selectionStyle = .none
+                cell.applyNonSelectableLabelsStyle()
+            }
+            else {
+                cell.accessoryType = .disclosureIndicator
+                cell.selectionStyle = .default
+                cell.applyDefaultLabelsStyle()
+            }
+
             cell.updateUI(title: NSLocalizedString("Status", comment: "Status label in Product Settings"), value: settings.status.description)
-            cell.accessoryType = .disclosureIndicator
         }
 
         func handleTap(sourceViewController: UIViewController, onCompletion: @escaping (ProductSettings) -> Void) {
+
+            /// If the status is private, the cell doesn't trigger any action
+            guard !isStatusPrivate() else {
+                return
+            }
+
             let command = ProductStatusSettingListSelectorCommand(selected: settings.status)
 
             let listSelectorViewController = ListSelectorViewController(command: command) { selected in
@@ -58,6 +75,48 @@ enum ProductSettingsRows {
         let reuseIdentifier: String = SettingTitleAndValueTableViewCell.reuseIdentifier
 
         let cellTypes: [UITableViewCell.Type] = [SettingTitleAndValueTableViewCell.self]
+
+        /// Utils
+        func isStatusPrivate() -> Bool {
+            return settings.status == .privateStatus
+        }
+    }
+
+    struct Visibility: ProductSettingsRowMediator {
+
+        private let settings: ProductSettings
+
+        init(_ settings: ProductSettings) {
+            self.settings = settings
+        }
+
+        func configure(cell: UITableViewCell) {
+            guard let cell = cell as? SettingTitleAndValueTableViewCell else {
+                return
+            }
+
+            let title = NSLocalizedString("Visibility", comment: "Visibility label in Product Settings")
+            cell.updateUI(title: title, value: ProductVisibility(status: settings.status, password: settings.password).description)
+            cell.accessoryType = .disclosureIndicator
+        }
+
+        func handleTap(sourceViewController: UIViewController, onCompletion: @escaping (ProductSettings) -> Void) {
+            // If the password was not fetched, the cell is not selectable
+            guard settings.password != nil else {
+                return
+            }
+
+            let viewController = ProductVisibilityViewController(settings: settings) { (productSettings) in
+                self.settings.password = productSettings.password
+                self.settings.status = productSettings.status
+                onCompletion(self.settings)
+            }
+            sourceViewController.navigationController?.pushViewController(viewController, animated: true)
+        }
+
+        let reuseIdentifier: String = SettingTitleAndValueTableViewCell.reuseIdentifier
+
+        let cellTypes: [UITableViewCell.Type] = [SettingTitleAndValueTableViewCell.self]
     }
 
     struct CatalogVisibility: ProductSettingsRowMediator {

WooCommerce/Classes/ViewRelated/Products/Edit Product/Product Settings/ProductSettingsSections.swift

@@ -21,7 +21,7 @@ enum ProductSettingsSections {
         let rows: [ProductSettingsRowMediator]
 
         init(_ settings: ProductSettings) {
-            rows = [ProductSettingsRows.Status(settings), ProductSettingsRows.CatalogVisibility(settings)]
+            rows = [ProductSettingsRows.Status(settings), ProductSettingsRows.Visibility(settings), ProductSettingsRows.CatalogVisibility(settings)]
         }
     }
 

WooCommerce/Classes/ViewRelated/Products/Edit Product/Product Settings/ProductSettingsViewController.swift

@@ -14,11 +14,17 @@ final class ProductSettingsViewController: UIViewController {
     typealias Completion = (_ productSettings: ProductSettings) -> Void
     private let onCompletion: Completion
 
+    // Password Completion callback called when the password is fetched
+    //
+    typealias PasswordRetrievedCompletion = (_ password: String) -> Void
+    private let onPasswordCompletion: PasswordRetrievedCompletion
+
     /// Init
     ///
-    init(product: Product, completion: @escaping Completion) {
-        viewModel = ProductSettingsViewModel(product: product)
+    init(product: Product, password: String?, completion: @escaping Completion, onPasswordRetrieved: @escaping PasswordRetrievedCompletion) {
+        viewModel = ProductSettingsViewModel(product: product, password: password)
         onCompletion = completion
+        onPasswordCompletion = onPasswordRetrieved
         super.init(nibName: nil, bundle: nil)
     }
 
@@ -35,6 +41,9 @@ final class ProductSettingsViewController: UIViewController {
         viewModel.onReload = {  [weak self] in
             self?.tableView.reloadData()
         }
+        viewModel.onPasswordRetrieved = { [weak self] (passwordRetrieved) in
+            self?.onPasswordCompletion(passwordRetrieved)
+        }
     }
 
 }
@@ -127,7 +136,6 @@ extension ProductSettingsViewController: UITableViewDelegate {
         viewModel.handleCellTap(at: indexPath, sourceViewController: self)
     }
 
-
     func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
         return UITableView.automaticDimension
     }

WooCommerce/Classes/ViewRelated/Products/Edit Product/Product Settings/ProductSettingsViewModel.swift

@@ -4,28 +4,50 @@ import Yosemite
 /// The Product Settings contains 2 sections: Publish Settings and More Options
 final class ProductSettingsViewModel {
 
-    private(set) var sections: [ProductSettingsSectionMediator] {
-        didSet {
-            self.onReload?()
-        }
-    }
+    private let product: Product
+
+    /// The original password, the one fetched from site post API
+    private var password: String?
 
     var productSettings: ProductSettings {
         didSet {
             sections = Self.configureSections(productSettings)
         }
     }
 
-    private let product: Product
+    private(set) var sections: [ProductSettingsSectionMediator] {
+        didSet {
+            self.onReload?()
+        }
+    }
 
     /// Closures
     /// - `onReload` called when sections data are reloaded/refreshed
+    /// - `onPasswordRetrieved` called when the password is fetched
     var onReload: (() -> Void)?
+    var onPasswordRetrieved: ((_ password: String) -> Void)?
 
-    init(product: Product) {
+    init(product: Product, password: String?) {
         self.product = product
-        productSettings = ProductSettings(from: product)
+        self.password = password
+        productSettings = ProductSettings(from: product, password: password)
         sections = Self.configureSections(productSettings)
+
+        /// If nil, we fetch the password from site post API because it was never fetched
+        if password == nil {
+            retrieveProductPassword(siteID: product.siteID, productID: product.productID) { [weak self] (password, error) in
+                guard let self = self else {
+                    return
+                }
+                guard error == nil, let password = password else {
+                    return
+                }
+                self.onPasswordRetrieved?(password)
+                self.password = password
+                self.productSettings.password = password
+                self.sections = Self.configureSections(self.productSettings)
+            }
+        }
     }
 
     func handleCellTap(at indexPath: IndexPath, sourceViewController: UIViewController) {
@@ -40,13 +62,30 @@ final class ProductSettingsViewModel {
     }
 
     func hasUnsavedChanges() -> Bool {
-        guard ProductSettings(from: product) != productSettings else {
+        guard ProductSettings(from: product, password: password) != productSettings else {
             return false
         }
         return true
     }
 }
 
+// MARK: Syncing data. Yosemite related stuff
+private extension ProductSettingsViewModel {
+    func retrieveProductPassword(siteID: Int64, productID: Int64, onCompletion: ((String?, Error?) -> ())? = nil) {
+        let action = SitePostAction.retrieveSitePostPassword(siteID: siteID, postID: productID) { (password, error) in
+            guard let _ = password else {
+                DDLogError("⛔️ Error fetching product password: \(error.debugDescription)")
+                onCompletion?(nil, error)
+                return
+            }
+
+            onCompletion?(password, nil)
+        }
+
+        ServiceLocator.stores.dispatch(action)
+    }
+}
+
 // MARK: Configure sections and rows in Product Settings
 //
 private extension ProductSettingsViewModel {