Merge pull request #7680 from woocommerce/issue/7605-remove-bgProductImageUpload-feature-flag

Remove `backgroundProductImageUpload` feature flag

Author: iamgabrielma

Experiments/Experiments/DefaultFeatureFlagService.swift

@@ -7,8 +7,6 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
         switch featureFlag {
         case .barcodeScanner:
             return buildConfig == .localDeveloper || buildConfig == .alpha
-        case .couponView:
-            return true
         case .productSKUInputScanner:
             return true
         case .inbox:
@@ -17,18 +15,10 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .splitViewInOrdersTab:
             return buildConfig == .localDeveloper || buildConfig == .alpha
-        case .couponDeletion:
-            return true
-        case .couponEditing:
-            return true
-        case .couponCreation:
-            return true
         case .updateOrderOptimistically:
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .shippingLabelsOnboardingM1:
             return buildConfig == .localDeveloper || buildConfig == .alpha
-        case .backgroundProductImageUpload:
-            return true
         case .appleIDAccountDeletion:
             return true
         case .newToWooCommerceLinkInLoginPrologue:

Experiments/Experiments/FeatureFlag.swift

@@ -14,10 +14,6 @@ public enum FeatureFlag: Int {
     ///
     case reviews
 
-    /// Displays the option to view coupons
-    ///
-    case couponView
-
     /// Barcode scanner for product SKU input
     ///
     case productSKUInputScanner
@@ -34,18 +30,6 @@ public enum FeatureFlag: Int {
     ///
     case splitViewInOrdersTab
 
-    /// Displays the option to delete coupons
-    ///
-    case couponDeletion
-
-    /// Displays the option to edit a coupon
-    ///
-    case couponEditing
-
-    /// Displays the option to create a coupon
-    ///
-    case couponCreation
-
     /// Enable optimistic updates for orders
     ///
     case updateOrderOptimistically
@@ -54,10 +38,6 @@ public enum FeatureFlag: Int {
     ///
     case shippingLabelsOnboardingM1
 
-    /// Enable image upload after leaving the product form
-    ///
-    case backgroundProductImageUpload
-
     /// Enable IPP reader manuals consolidation screen
     ///
     case consolidatedCardReaderManuals

WooCommerce/Classes/ServiceLocator/LegacyProductImageUploader.swift

@@ -38,8 +38,7 @@ final class ServiceLocator {
 
     /// Product image uploader
     ///
-    private static var _productImageUploader: ProductImageUploaderProtocol =
-    featureFlagService.isFeatureFlagEnabled(.backgroundProductImageUpload) ? ProductImageUploader(): LegacyProductImageUploader()
+    private static var _productImageUploader: ProductImageUploaderProtocol = ProductImageUploader()
 
     /// Push Notifications Manager
     ///

WooCommerce/Classes/ServiceLocator/ServiceLocator.swift

@@ -86,12 +86,11 @@ struct CouponDetails: View {
             ])
         }
 
-        if viewModel.isDeletingEnabled {
-            buttons.append(.destructive(Text(Localization.deleteCoupon), action: {
-                ServiceLocator.analytics.track(.couponDetails, withProperties: ["action": "tapped_delete"])
-                showingDeletionConfirmAlert = true
-            }))
-        }
+        buttons.append(.destructive(Text(Localization.deleteCoupon), action: {
+            ServiceLocator.analytics.track(.couponDetails, withProperties: ["action": "tapped_delete"])
+            showingDeletionConfirmAlert = true
+        }))
+
 
         buttons.append(.cancel())
 

WooCommerce/Classes/ViewRelated/Coupons/CouponDetails/CouponDetails.swift

@@ -128,7 +128,6 @@ final class CouponDetailsViewModel: ObservableObject {
     private let currencySettings: CurrencySettings
 
     let isEditingEnabled: Bool
-    let isDeletingEnabled: Bool
 
     // Closure to be triggered when the coupon is updated successfully
     let onUpdate: () -> Void
@@ -149,8 +148,7 @@ final class CouponDetailsViewModel: ObservableObject {
         self.onDeletion = onDeletion
         self.onUpdate = onUpdate
 
-        isEditingEnabled = featureFlags.isFeatureFlagEnabled(.couponEditing) && coupon.discountType != .other
-        isDeletingEnabled = featureFlags.isFeatureFlagEnabled(.couponDeletion)
+        isEditingEnabled = coupon.discountType != .other
         populateDetails()
     }
 

WooCommerce/Classes/ViewRelated/Coupons/CouponDetails/CouponDetailsViewModel.swift

@@ -253,13 +253,9 @@ private extension CouponListViewController {
 
     func configureNavigationBarItems(hasCoupons: Bool) {
         if hasCoupons {
-            navigationItem.rightBarButtonItems = viewModel.isCreationEnabled
-            ? [createCouponButtonItem, searchBarButtonItem]
-            : [searchBarButtonItem]
+            navigationItem.rightBarButtonItems = [createCouponButtonItem, searchBarButtonItem]
         } else {
-            navigationItem.rightBarButtonItems = viewModel.isCreationEnabled
-            ? [createCouponButtonItem]
-            : []
+            navigationItem.rightBarButtonItems = [createCouponButtonItem]
         }
     }
 
@@ -382,21 +378,14 @@ private extension CouponListViewController {
     }
 
     func buildNoResultConfig() -> EmptyStateViewController.Config {
-        if viewModel.isCreationEnabled {
-            return .withButton(
-                    message: .init(string: Localization.couponCreationSuggestionMessage),
-                    image: .emptyCouponsImage,
-                    details: Localization.emptyStateDetails,
-                    buttonTitle: Localization.createCouponAction
-            ) { [weak self] button in
-                guard let self = self else { return }
-                self.displayCouponTypeBottomSheet()
-            }
-        } else {
-            return .simple(
-                    message: .init(string: Localization.emptyStateMessage),
-                    image: .emptyCouponsImage
-            )
+        return .withButton(
+            message: .init(string: Localization.couponCreationSuggestionMessage),
+            image: .emptyCouponsImage,
+            details: Localization.emptyStateDetails,
+            buttonTitle: Localization.createCouponAction
+        ) { [weak self] button in
+            guard let self = self else { return }
+            self.displayCouponTypeBottomSheet()
         }
     }
 

WooCommerce/Classes/ViewRelated/Coupons/CouponListViewController.swift

@@ -61,9 +61,6 @@ final class CouponListViewModel {
     ///
     private let storageManager: StorageManagerType
 
-    /// Marks if the Coupon Creation feature is enabled or not
-    let isCreationEnabled: Bool
-
     // MARK: - Initialization and setup
     //
     init(siteID: Int64,
@@ -78,7 +75,6 @@ final class CouponListViewModel {
         self.resultsController = Self.createResultsController(siteID: siteID,
                                                               storageManager: storageManager)
 
-        isCreationEnabled = featureFlags.isFeatureFlagEnabled(.couponCreation)
         configureSyncingCoordinator()
         configureResultsController()
         configureFeedbackBannerVisibility()

WooCommerce/Classes/ViewRelated/Coupons/CouponListViewModel.swift

@@ -94,11 +94,7 @@ private extension BetaFeaturesViewController {
     }
 
     func couponManagementSection() -> Section? {
-        guard ServiceLocator.featureFlagService.isFeatureFlagEnabled(.couponView) else {
-            return nil
-        }
-        return Section(rows: [.couponManagement,
-                              .couponManagementDescription])
+        Section(rows: [.couponManagement, .couponManagementDescription])
     }
 
     /// Register table cells.

WooCommerce/Classes/ViewRelated/Dashboard/Settings/Beta features/BetaFeaturesViewController.swift

@@ -571,9 +571,6 @@ private extension MainTabBarController {
 
 private extension MainTabBarController {
     func observeProductImageUploadStatusUpdates() {
-        guard featureFlagService.isFeatureFlagEnabled(.backgroundProductImageUpload) else {
-            return
-        }
         productImageUploadErrorsSubscription = productImageUploader.errors.sink { [weak self] error in
             guard let self = self else { return }
             switch error.error {