Fix: Users Unable to Upload Product Images if the store is private

Networking/Networking/Model/Site.swift

@@ -284,6 +284,11 @@ public extension Site {
         return TimeZone(secondsFromGMT: secondsFromGMT) ?? .current
     }
 
+    /// Returns true only if the site is hosted on WP.com and is private.
+    ///
+    var isPrivateWPCOMSite: Bool {
+        return isWordPressComStore && !isPublic
+    }
 }
 
 private extension Site {

RELEASE-NOTES.txt

@@ -1,5 +1,9 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 
+18.9
+-----
+- [internal] Resolved an issue where users were unable to upload product images when the store is set to private on WP.com. [https://github.com/woocommerce/woocommerce-ios/issues/12646]
+
 18.8
 -----
 - [internal] Optimize API calls sent for Dashboard screen. [https://github.com/woocommerce/woocommerce-ios/pull/12775]

WooCommerce/Classes/ViewRelated/Products/Edit Product/Cells/ImageAndTitleAndTextTableViewCell.swift

@@ -25,6 +25,7 @@ final class ImageAndTitleAndTextTableViewCell: UITableViewCell {
     struct DataConfiguration {
         let title: String?
         let titleFontStyle: FontStyle
+        let titleTintColor: UIColor?
         let text: String?
         let textTintColor: UIColor?
         let image: UIImage?
@@ -36,6 +37,7 @@ final class ImageAndTitleAndTextTableViewCell: UITableViewCell {
 
         init(title: String?,
              titleFontStyle: FontStyle = .body,
+             titleTintColor: UIColor? = nil,
              text: String? = nil,
              textTintColor: UIColor? = nil,
              image: UIImage? = nil,
@@ -46,6 +48,7 @@ final class ImageAndTitleAndTextTableViewCell: UITableViewCell {
              showsSeparator: Bool = true) {
             self.title = title
             self.titleFontStyle = titleFontStyle
+            self.titleTintColor = titleTintColor
             self.text = text
             self.textTintColor = textTintColor
             self.image = image
@@ -60,6 +63,7 @@ final class ImageAndTitleAndTextTableViewCell: UITableViewCell {
     struct ViewModel: Equatable {
         let title: String?
         let titleFontStyle: FontStyle
+        let titleTintColor: UIColor?
         let text: String?
         let textTintColor: UIColor?
         let image: UIImage?
@@ -73,6 +77,7 @@ final class ImageAndTitleAndTextTableViewCell: UITableViewCell {
 
         init(title: String?,
              titleFontStyle: FontStyle = .body,
+             titleTintColor: UIColor? = nil,
              text: String?,
              textTintColor: UIColor? = nil,
              image: UIImage? = nil,
@@ -85,6 +90,7 @@ final class ImageAndTitleAndTextTableViewCell: UITableViewCell {
              showsSeparator: Bool = true) {
             self.title = title
             self.titleFontStyle = titleFontStyle
+            self.titleTintColor = titleTintColor
             self.text = text
             self.textTintColor = textTintColor
             self.image = image
@@ -183,8 +189,11 @@ extension ImageAndTitleAndTextTableViewCell {
         selectionStyle = viewModel.isActionable ? .default: .none
         accessoryView = nil
 
+        if let titleTintColor = viewModel.titleTintColor {
+            titleLabel.textColor = titleTintColor
+        }
+
         if let textTintColor = viewModel.textTintColor {
-            titleLabel.textColor = textTintColor
             descriptionLabel.textColor = textTintColor
         }
 

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

@@ -24,6 +24,8 @@ struct DefaultProductFormTableViewModel: ProductFormTableViewModel {
 
     private let isDescriptionAIEnabled: Bool
     private let featureFlagService: FeatureFlagService
+    private let stores: StoresManager
+
 
     init(product: ProductFormDataModel,
          actionsFactory: ProductFormActionsFactoryProtocol,
@@ -33,14 +35,16 @@ struct DefaultProductFormTableViewModel: ProductFormTableViewModel {
          weightUnit: String? = ServiceLocator.shippingSettingsService.weightUnit,
          dimensionUnit: String? = ServiceLocator.shippingSettingsService.dimensionUnit,
          isDescriptionAIEnabled: Bool,
-         featureFlagService: FeatureFlagService = ServiceLocator.featureFlagService) {
+         featureFlagService: FeatureFlagService = ServiceLocator.featureFlagService,
+         stores: StoresManager = ServiceLocator.stores) {
         self.currency = currency
         self.currencyFormatter = currencyFormatter
         self.shippingValueLocalizer = shippingValueLocalizer
         self.weightUnit = weightUnit
         self.dimensionUnit = dimensionUnit
         self.isDescriptionAIEnabled = isDescriptionAIEnabled
         self.featureFlagService = featureFlagService
+        self.stores = stores
         configureSections(product: product, actionsFactory: actionsFactory)
     }
 }
@@ -55,8 +59,11 @@ private extension DefaultProductFormTableViewModel {
     func primaryFieldRows(product: ProductFormDataModel, actions: [ProductFormEditAction]) -> [ProductFormSection.PrimaryFieldRow] {
         actions.map { action -> [ProductFormSection.PrimaryFieldRow] in
             switch action {
-            case .images(let editable):
-                return [.images(isEditable: editable, allowsMultiple: product.allowsMultipleImages(), isVariation: product is EditableProductVariationModel)]
+            case .images(let editable, let isStorePublic):
+                return [.images(isEditable: editable,
+                                isStorePublic: isStorePublic,
+                                allowsMultiple: product.allowsMultipleImages(),
+                                isVariation: product is EditableProductVariationModel)]
             case .linkedProductsPromo(let viewModel):
                 return [.linkedProductsPromo(viewModel: viewModel)]
             case .name(let editable):

WooCommerce/Classes/ViewRelated/Products/Edit Product/Downloadable Files/File List/BottomSheetListSelector/DownloadableFileBottomSheetListSelectorCommand.swift

@@ -22,6 +22,7 @@ final class DownloadableFileBottomSheetListSelectorCommand: BottomSheetListSelec
         cell.selectionStyle = .none
         cell.accessoryType = .disclosureIndicator
         let viewModel = ImageAndTitleAndTextTableViewCell.ViewModel(title: model.title,
+                                                                    titleTintColor: .text,
                                                                     text: nil,
                                                                     textTintColor: .text,
                                                                     image: model.image,

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

@@ -3,7 +3,7 @@ import protocol Experiments.FeatureFlagService
 
 /// Edit actions in the product form. Each action allows the user to edit a subset of product properties.
 enum ProductFormEditAction: Equatable {
-    case images(editable: Bool)
+    case images(editable: Bool, isStorePublic: Bool)
     case linkedProductsPromo(viewModel: FeatureAnnouncementCardViewModel)
     case name(editable: Bool)
     case description(editable: Bool)
@@ -62,6 +62,8 @@ struct ProductFormActionsFactory: ProductFormActionsFactoryProtocol {
     private let addOnsFeatureEnabled: Bool
     private let variationsPrice: VariationsPrice
 
+    private let stores: StoresManager
+
     private let isLinkedProductsPromoEnabled: Bool
     private let linkedProductsPromoCampaign = LinkedProductsPromoCampaign()
     private var linkedProductsPromoViewModel: FeatureAnnouncementCardViewModel {
@@ -81,7 +83,8 @@ struct ProductFormActionsFactory: ProductFormActionsFactoryProtocol {
          isBundledProductsEnabled: Bool = ServiceLocator.featureFlagService.isFeatureFlagEnabled(.productBundles),
          isCompositeProductsEnabled: Bool = ServiceLocator.featureFlagService.isFeatureFlagEnabled(.compositeProducts),
          isMinMaxQuantitiesEnabled: Bool = ServiceLocator.featureFlagService.isFeatureFlagEnabled(.readOnlyMinMaxQuantities),
-         variationsPrice: VariationsPrice = .unknown) {
+         variationsPrice: VariationsPrice = .unknown,
+         stores: StoresManager = ServiceLocator.stores) {
         self.product = product
         self.formType = formType
         self.canPromoteWithBlaze = canPromoteWithBlaze
@@ -92,6 +95,7 @@ struct ProductFormActionsFactory: ProductFormActionsFactoryProtocol {
         self.isBundledProductsEnabled = isBundledProductsEnabled
         self.isCompositeProductsEnabled = isCompositeProductsEnabled
         self.isMinMaxQuantitiesEnabled = isMinMaxQuantitiesEnabled
+        self.stores = stores
     }
 
     /// Returns an array of actions that are visible in the product form primary section.
@@ -107,8 +111,14 @@ struct ProductFormActionsFactory: ProductFormActionsFactoryProtocol {
 
         let shouldShowPromoteWithBlaze = canPromoteWithBlaze
 
+        var isStorePublic = true
+
+        if let site = stores.sessionManager.defaultSite {
+            isStorePublic = !site.isPrivateWPCOMSite
+        }
+
         let actions: [ProductFormEditAction?] = [
-            shouldShowImagesRow ? .images(editable: editable): nil,
+            shouldShowImagesRow ? .images(editable: editable, isStorePublic: isStorePublic): nil,
             shouldShowLinkedProductsPromo ? .linkedProductsPromo(viewModel: newLinkedProductsPromoViewModel) : nil,
             .name(editable: editable),
             shouldShowDescriptionRow ? .description(editable: editable): nil,

WooCommerce/Classes/ViewRelated/Products/Edit Product/ProductFormSection+ReusableTableRow.swift

@@ -25,7 +25,7 @@ extension ProductFormSection.PrimaryFieldRow: ReusableTableRow {
     var cellTypes: [UITableViewCell.Type] {
         switch self {
         case .images:
-            return [ProductImagesHeaderTableViewCell.self]
+            return [ProductImagesHeaderTableViewCell.self, ImageAndTitleAndTextTableViewCell.self]
         case .linkedProductsPromo:
             return [cellType]
         case .name:
@@ -51,8 +51,8 @@ extension ProductFormSection.PrimaryFieldRow: ReusableTableRow {
 
     private var cellType: UITableViewCell.Type {
         switch self {
-        case .images:
-            return ProductImagesHeaderTableViewCell.self
+        case .images(_, let isStorePublic, _, _):
+            return isStorePublic ? ProductImagesHeaderTableViewCell.self : ImageAndTitleAndTextTableViewCell.self
         case .linkedProductsPromo:
             return FeatureAnnouncementCardCell.self
         case .name(_, let editable, _):

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

@@ -4,6 +4,7 @@ import Yosemite
 private extension ProductFormSection.SettingsRow.ViewModel {
     func toCellViewModel() -> ImageAndTitleAndTextTableViewCell.ViewModel {
         return ImageAndTitleAndTextTableViewCell.ViewModel(title: title,
+                                                           titleTintColor: tintColor,
                                                            text: details,
                                                            textTintColor: tintColor,
                                                            image: icon,
@@ -87,8 +88,12 @@ private extension ProductFormTableViewDataSource {
 private extension ProductFormTableViewDataSource {
     func configureCellInPrimaryFieldsSection(_ cell: UITableViewCell, row: ProductFormSection.PrimaryFieldRow) {
         switch row {
-        case .images(let editable, let allowsMultipleImages, let isVariation):
-            configureImages(cell: cell, isEditable: editable, allowsMultipleImages: allowsMultipleImages, isVariation: isVariation)
+        case .images(let editable, let isStorePublic, let allowsMultipleImages, let isVariation):
+            configureImages(cell: cell,
+                            isEditable: editable,
+                            isStorePublic: isStorePublic,
+                            allowsMultipleImages: allowsMultipleImages,
+                            isVariation: isVariation)
         case .linkedProductsPromo(let viewModel):
             configureLinkedProductsPromo(cell: cell, viewModel: viewModel)
         case .name(let name, let editable, let productStatus):
@@ -107,9 +112,36 @@ private extension ProductFormTableViewDataSource {
             configurePromoteWithBlaze(cell: cell)
         }
     }
-    func configureImages(cell: UITableViewCell, isEditable: Bool, allowsMultipleImages: Bool, isVariation: Bool) {
+
+    func configureImages(cell: UITableViewCell, isEditable: Bool, isStorePublic: Bool, allowsMultipleImages: Bool, isVariation: Bool) {
+        // only show images row if it's a .org site or a public .com site. Private .com site will see a banner.
+        guard isStorePublic else {
+            guard let cell = cell as? ImageAndTitleAndTextTableViewCell else {
+                fatalError("Expected cell to be of type ImageAndTitleAndTextTableViewCell for the product images cell when store is private on WP.com")
+            }
+            let viewModel = ImageAndTitleAndTextTableViewCell.ViewModel(
+                title: Localization.wpComStoreNotPublicTitle,
+                    titleFontStyle: .body,
+                    titleTintColor: .text,
+                text: Localization.wpComStoreNotPublicText,
+                    textTintColor: .textLink,
+                    image: .infoOutlineImage,
+                    imageTintColor: .text,
+                    numberOfLinesForTitle: 0,
+                    numberOfLinesForText: 0,
+                    isActionable: true,
+                    showsDisclosureIndicator: false,
+                    showsSeparator: true
+                )
+
+                cell.updateUI(viewModel: viewModel)
+                cell.contentView.backgroundColor = .warningBackground
+            return
+        }
+
+        // display product images
         guard let cell = cell as? ProductImagesHeaderTableViewCell else {
-            fatalError()
+            fatalError("Expected cell to be of type ProductImagesHeaderTableViewCell for displaying product images")
         }
 
         defer {
@@ -144,6 +176,7 @@ private extension ProductFormTableViewDataSource {
             self?.onAddImage?()
         }
     }
+
     func configureName(cell: UITableViewCell, name: String?, isEditable: Bool, productStatus: ProductStatus) {
         if isEditable {
             configureEditableName(cell: cell, name: name, productStatus: productStatus)
@@ -430,5 +463,15 @@ private extension ProductFormTableViewDataSource {
             "Learn more",
             comment: "Title for the link to open the legal URL for AI-generated content in the product detail screen"
         )
+        static let wpComStoreNotPublicTitle = NSLocalizedString(
+            "productFormTableViewDataSource.wpComStoreNotPublicTitle",
+            value: "The images are unavailable because your site is marked Private. You can change this by switching to Coming Soon mode.",
+            comment: "Title message indicating that images are unavailable because the site is private."
+        )
+        static let wpComStoreNotPublicText = NSLocalizedString(
+            "productFormTableViewDataSource.wpComStoreNotPublicText",
+            value: "Tap to learn more.",
+            comment: "Text message prompting the user to tap to learn more about changing the privacy setting."
+        )
     }
 }

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

@@ -15,7 +15,7 @@ enum ProductFormSection: Equatable {
     }
 
     enum PrimaryFieldRow: Equatable {
-        case images(isEditable: Bool, allowsMultiple: Bool, isVariation: Bool)
+        case images(isEditable: Bool, isStorePublic: Bool, allowsMultiple: Bool, isVariation: Bool)
         case linkedProductsPromo(viewModel: FeatureAnnouncementCardViewModel)
         case name(name: String?, isEditable: Bool, productStatus: ProductStatus)
         case variationName(name: String)

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

@@ -1,4 +1,5 @@
 import Combine
+import SafariServices
 import Photos
 import UIKit
 import WordPressUI
@@ -400,6 +401,11 @@ final class ProductFormViewController<ViewModel: ProductFormViewModelProtocol>:
         case .primaryFields(let rows):
             let row = rows[indexPath.row]
             switch row {
+            case .images(_, let isStorePublic, _, _):
+                guard isStorePublic else {
+                    presentURL(URLs.wpComPrivacySettings)
+                    return
+                }
             case .description(_, let isEditable, _):
                 guard isEditable else {
                     return
@@ -1284,6 +1290,18 @@ extension ProductFormViewController: KeyboardScrollable {
     }
 }
 
+// MARK: - Helper Methods
+
+private extension ProductFormViewController {
+
+    /// Presents a URL modally.
+    ///
+    func presentURL(_ url: URL) {
+        let safariViewController = SFSafariViewController(url: url)
+        present(safariViewController, animated: true)
+    }
+}
+
 // MARK: - Navigation actions handling
 //
 private extension ProductFormViewController {
@@ -2039,6 +2057,10 @@ private enum Localization {
     }
 }
 
+private enum URLs {
+    static let wpComPrivacySettings = URL(string: "https://wordpress.com/support/privacy-settings/")!
+}
+
 private enum ActionSheetStrings {
     static let saveProductAsDraft = NSLocalizedString("Save as draft",
                                                       comment: "Button title to save a product as draft in Product More Options Action Sheet")

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

@@ -7,20 +7,31 @@ struct ProductVariationFormActionsFactory: ProductFormActionsFactoryProtocol {
 
     private let isMinMaxQuantitiesEnabled: Bool
 
+    private let stores: StoresManager
+
     init(productVariation: EditableProductVariationModel,
          editable: Bool,
-         isMinMaxQuantitiesEnabled: Bool = ServiceLocator.featureFlagService.isFeatureFlagEnabled(.readOnlyMinMaxQuantities)) {
+         isMinMaxQuantitiesEnabled: Bool = ServiceLocator.featureFlagService.isFeatureFlagEnabled(.readOnlyMinMaxQuantities),
+         stores: StoresManager = ServiceLocator.stores) {
         self.productVariation = productVariation
         self.editable = editable
         self.isMinMaxQuantitiesEnabled = isMinMaxQuantitiesEnabled
+        self.stores = stores
     }
 
     /// Returns an array of actions that are visible in the product form primary section.
     func primarySectionActions() -> [ProductFormEditAction] {
+
+        var isStorePublic = true
+
+        if let site = stores.sessionManager.defaultSite {
+            isStorePublic = !site.isPrivateWPCOMSite
+        }
+
         let shouldShowImagesRow = editable || productVariation.images.isNotEmpty
         let shouldShowDescriptionRow = editable || productVariation.description?.isNotEmpty == true
         let actions: [ProductFormEditAction?] = [
-            shouldShowImagesRow ? .images(editable: editable): nil,
+            shouldShowImagesRow ? .images(editable: editable, isStorePublic: isStorePublic): nil,
             .variationName,
             shouldShowDescriptionRow ? .description(editable: editable): nil
         ]