Merge pull request #7626 from woocommerce/issue/7605-remove-hubmenu-feature-flag

Remove `.hubMenu` feature flag references

Author: iamgabrielma

Experiments/Experiments/DefaultFeatureFlagService.swift

@@ -9,8 +9,6 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .jetpackConnectionPackageSupport:
             return true
-        case .hubMenu:
-            return true
         case .couponView:
             return true
         case .productSKUInputScanner:

Experiments/Experiments/FeatureFlag.swift

@@ -18,10 +18,6 @@ public enum FeatureFlag: Int {
     ///
     case jetpackConnectionPackageSupport
 
-    /// Display the new tab "Menu" in the tab bar.
-    ///
-    case hubMenu
-
     /// Displays the option to view coupons
     ///
     case couponView

WooCommerce/Classes/ViewRelated/Dashboard/DashboardViewController.swift

@@ -148,7 +148,6 @@ private extension DashboardViewController {
     func configureNavigation() {
         configureTitle()
         configureHeaderStackView()
-        configureNavigationItem()
     }
 
     func configureTabBarItem() {
@@ -196,23 +195,6 @@ private extension DashboardViewController {
         contentBottomToContainerConstraint = contentView.bottomAnchor.constraint(equalTo: containerView.bottomAnchor)
     }
 
-    private func configureNavigationItem() {
-        if !ServiceLocator.featureFlagService.isFeatureFlagEnabled(.hubMenu) {
-            let rightBarButton = UIBarButtonItem(image: .gearBarButtonItemImage,
-                                                 style: .plain,
-                                                 target: self,
-                                                 action: #selector(settingsTapped))
-            rightBarButton.accessibilityLabel = NSLocalizedString("Settings", comment: "Accessibility label for the Settings button.")
-            rightBarButton.accessibilityTraits = .button
-            rightBarButton.accessibilityHint = NSLocalizedString(
-                "Navigates to Settings.",
-                comment: "VoiceOver accessibility hint, informing the user the button can be used to navigate to the Settings screen."
-            )
-            rightBarButton.accessibilityIdentifier = "dashboard-settings-button"
-            navigationItem.setRightBarButton(rightBarButton, animated: false)
-        }
-    }
-
     func configureDashboardUIContainer() {
         hiddenScrollView.configureForLargeTitleWorkaround()
         // Adds the "hidden" scroll view to the root of the UIViewController for large titles.

WooCommerce/Classes/ViewRelated/Dashboard/Settings/Settings/SettingsViewModel.swift

@@ -195,20 +195,6 @@ private extension SettingsViewModel {
     }
 
     func configureSections() {
-        // Selected Store
-        let selectedStoreSection: Section? = {
-            if featureFlagService.isFeatureFlagEnabled(.hubMenu) {
-                return nil
-            }
-            else {
-                let storeRows: [Row] = sites.count > 1 ?
-                [.selectedStore, .switchStore] : [.selectedStore]
-                return Section(title: Localization.selectedStoreTitle,
-                               rows: storeRows,
-                               footerHeight: UITableView.automaticDimension)
-            }
-        }()
-
         // Plugins
         let pluginsSection: Section? = {
             // Show the plugins section only if the user has an `admin` role for the default store site.
@@ -301,7 +287,6 @@ private extension SettingsViewModel {
                                     footerHeight: CGFloat.leastNonzeroMagnitude)
 
         sections = [
-            selectedStoreSection,
             pluginsSection,
             storeSettingsSection,
             helpAndFeedbackSection,
@@ -371,12 +356,6 @@ private extension SettingsViewModel {
 //
 private extension SettingsViewModel {
     enum Localization {
-        static let selectedStoreTitle = NSLocalizedString(
-            "Selected Store",
-            comment: "My Store > Settings > Selected Store information section. " +
-                "This is the heading listed above the information row that displays the store website and their username."
-        ).uppercased()
-
         static let pluginsTitle = NSLocalizedString(
             "Plugins",
             comment: "My Store > Settings > Plugins section title"

WooCommerce/Classes/ViewRelated/MainTabBarController.swift

@@ -35,14 +35,14 @@ extension WooTab {
     ///
     /// - Parameters:
     ///   - visibleIndex: the index of visible tabs on the tab bar
-    init(visibleIndex: Int, isHubMenuFeatureFlagOn: Bool) {
-        let tabs = WooTab.visibleTabs(isHubMenuFeatureFlagOn)
+    init(visibleIndex: Int) {
+        let tabs = WooTab.visibleTabs()
         self = tabs[visibleIndex]
     }
 
     /// Returns the visible tab index.
-    func visibleIndex(_ isHubMenuFeatureFlagOn: Bool) -> Int {
-        let tabs = WooTab.visibleTabs(isHubMenuFeatureFlagOn)
+    func visibleIndex() -> Int {
+        let tabs = WooTab.visibleTabs()
         guard let tabIndex = tabs.firstIndex(where: { $0 == self }) else {
             assertionFailure("Trying to get the visible tab index for tab \(self) while the visible tabs are: \(tabs)")
             return 0
@@ -51,17 +51,8 @@ extension WooTab {
     }
 
     // Note: currently only the Dashboard tab (My Store) view controller is set up in Main.storyboard.
-    private static func visibleTabs(_ isHubMenuFeatureFlagOn: Bool) -> [WooTab] {
-        var tabs: [WooTab] = [.myStore, .orders, .products]
-
-        if isHubMenuFeatureFlagOn {
-            tabs.append(.hubMenu)
-        }
-        else {
-            tabs.append(.reviews)
-        }
-
-        return tabs
+    private static func visibleTabs() -> [WooTab] {
+        [.myStore, .orders, .products, .hubMenu]
     }
 }
 
@@ -114,8 +105,6 @@ final class MainTabBarController: UITabBarController {
 
     private var productImageUploadErrorsSubscription: AnyCancellable?
 
-    private lazy var isHubMenuFeatureFlagOn = featureFlagService.isFeatureFlagEnabled(.hubMenu)
-
     private lazy var isOrdersSplitViewFeatureFlagOn = featureFlagService.isFeatureFlagEnabled(.splitViewInOrdersTab)
 
     init?(coder: NSCoder,
@@ -174,11 +163,11 @@ final class MainTabBarController: UITabBarController {
     }
 
     override func tabBar(_ tabBar: UITabBar, didSelect item: UITabBarItem) {
-        let currentlySelectedTab = WooTab(visibleIndex: selectedIndex, isHubMenuFeatureFlagOn: isHubMenuFeatureFlagOn)
+        let currentlySelectedTab = WooTab(visibleIndex: selectedIndex)
         guard let userSelectedIndex = tabBar.items?.firstIndex(of: item) else {
                 return
         }
-        let userSelectedTab = WooTab(visibleIndex: userSelectedIndex, isHubMenuFeatureFlagOn: isHubMenuFeatureFlagOn)
+        let userSelectedTab = WooTab(visibleIndex: userSelectedIndex)
 
         // Did we reselect the already-selected tab?
         if currentlySelectedTab == userSelectedTab {
@@ -197,7 +186,7 @@ final class MainTabBarController: UITabBarController {
         if let presentedController = Self.childViewController()?.presentedViewController {
             presentedController.dismiss(animated: true)
         }
-        selectedIndex = tab.visibleIndex(isHubMenuFeatureFlagOn)
+        selectedIndex = tab.visibleIndex()
         if let navController = selectedViewController as? UINavigationController {
             navController.popToRootViewController(animated: animated) {
                 completion?()
@@ -439,22 +428,17 @@ private extension MainTabBarController {
         viewControllers = {
             var controllers = [UIViewController]()
 
-            let dashboardTabIndex = WooTab.myStore.visibleIndex(isHubMenuFeatureFlagOn)
+            let dashboardTabIndex = WooTab.myStore.visibleIndex()
             controllers.insert(dashboardNavigationController, at: dashboardTabIndex)
 
-            let ordersTabIndex = WooTab.orders.visibleIndex(isHubMenuFeatureFlagOn)
+            let ordersTabIndex = WooTab.orders.visibleIndex()
             controllers.insert(ordersNavigationController, at: ordersTabIndex)
 
-            let productsTabIndex = WooTab.products.visibleIndex(isHubMenuFeatureFlagOn)
+            let productsTabIndex = WooTab.products.visibleIndex()
             controllers.insert(productsNavigationController, at: productsTabIndex)
 
-            if isHubMenuFeatureFlagOn {
-                let hubMenuTabIndex = WooTab.hubMenu.visibleIndex(isHubMenuFeatureFlagOn)
-                controllers.insert(hubMenuNavigationController, at: hubMenuTabIndex)
-            } else {
-                let reviewsTabIndex = WooTab.reviews.visibleIndex(isHubMenuFeatureFlagOn)
-                controllers.insert(reviewsNavigationController, at: reviewsTabIndex)
-            }
+            let hubMenuTabIndex = WooTab.hubMenu.visibleIndex()
+            controllers.insert(hubMenuNavigationController, at: hubMenuTabIndex)
 
             return controllers
         }()
@@ -487,26 +471,16 @@ private extension MainTabBarController {
         let productsViewController = createProductsViewController(siteID: siteID)
         productsNavigationController.viewControllers = [productsViewController]
 
-        // Configure hub menu tab coordinator or reviews tab coordinator once per logged in session potentially with multiple sites.
-        if isHubMenuFeatureFlagOn {
-            if hubMenuTabCoordinator == nil {
-                let hubTabCoordinator = createHubMenuTabCoordinator()
-                self.hubMenuTabCoordinator = hubTabCoordinator
-                hubTabCoordinator.start()
-            }
-            hubMenuTabCoordinator?.activate(siteID: siteID)
-        }
-        else {
-            if reviewsTabCoordinator == nil {
-                let reviewsTabCoordinator = createReviewsTabCoordinator()
-                self.reviewsTabCoordinator = reviewsTabCoordinator
-                reviewsTabCoordinator.start()
-            }
-            reviewsTabCoordinator?.activate(siteID: siteID)
+        // Configure hub menu tab coordinator once per logged in session potentially with multiple sites.
+        if hubMenuTabCoordinator == nil {
+            let hubTabCoordinator = createHubMenuTabCoordinator()
+            self.hubMenuTabCoordinator = hubTabCoordinator
+            hubTabCoordinator.start()
         }
+        hubMenuTabCoordinator?.activate(siteID: siteID)
 
         // Set dashboard to be the default tab.
-        selectedIndex = WooTab.myStore.visibleIndex(isHubMenuFeatureFlagOn)
+        selectedIndex = WooTab.myStore.visibleIndex()
     }
 
     func createDashboardViewController(siteID: Int64) -> UIViewController {
@@ -561,8 +535,8 @@ private extension MainTabBarController {
     }
 
     func updateMenuTabBadge(with action: NotificationBadgeActionType) {
-        let tab = self.isHubMenuFeatureFlagOn ? WooTab.hubMenu : WooTab.reviews
-        let tabIndex = tab.visibleIndex(self.isHubMenuFeatureFlagOn)
+        let tab = WooTab.hubMenu
+        let tabIndex = tab.visibleIndex()
         let input = NotificationsBadgeInput(action: action, tab: tab, tabBar: self.tabBar, tabIndex: tabIndex)
 
         self.notificationsBadge.updateBadge(with: input)
@@ -579,7 +553,7 @@ private extension MainTabBarController {
             }
 
             let tab = WooTab.orders
-            let tabIndex = tab.visibleIndex(self.isHubMenuFeatureFlagOn)
+            let tabIndex = tab.visibleIndex()
 
             guard let orderTab: UITabBarItem = self.tabBar.items?[tabIndex] else {
                 return

WooCommerce/Classes/ViewRelated/Reviews/ReviewsViewController.swift

@@ -235,11 +235,7 @@ private extension ReviewsViewController {
     }
 
     func refreshTitle() {
-        if ServiceLocator.featureFlagService.isFeatureFlagEnabled(.hubMenu) {
-            title = Localization.title
-        } else {
-            navigationItem.title = Localization.title
-        }
+        title = Localization.title
     }
 }
 

WooCommerce/WooCommerceTests/Mocks/MockFeatureFlagService.swift

@@ -3,7 +3,6 @@ import Experiments
 
 struct MockFeatureFlagService: FeatureFlagService {
     private let isJetpackConnectionPackageSupportOn: Bool
-    private let isHubMenuOn: Bool
     private let isInboxOn: Bool
     private let isSplitViewInOrdersTabOn: Bool
     private let isUpdateOrderOptimisticallyOn: Bool
@@ -13,7 +12,6 @@ struct MockFeatureFlagService: FeatureFlagService {
     private let isLoginPrologueOnboardingEnabled: Bool
 
     init(isJetpackConnectionPackageSupportOn: Bool = false,
-         isHubMenuOn: Bool = false,
          isInboxOn: Bool = false,
          isSplitViewInOrdersTabOn: Bool = false,
          isUpdateOrderOptimisticallyOn: Bool = false,
@@ -22,7 +20,6 @@ struct MockFeatureFlagService: FeatureFlagService {
          isBackgroundImageUploadEnabled: Bool = false,
          isLoginPrologueOnboardingEnabled: Bool = false) {
         self.isJetpackConnectionPackageSupportOn = isJetpackConnectionPackageSupportOn
-        self.isHubMenuOn = isHubMenuOn
         self.isInboxOn = isInboxOn
         self.isSplitViewInOrdersTabOn = isSplitViewInOrdersTabOn
         self.isUpdateOrderOptimisticallyOn = isUpdateOrderOptimisticallyOn
@@ -36,8 +33,6 @@ struct MockFeatureFlagService: FeatureFlagService {
         switch featureFlag {
         case .jetpackConnectionPackageSupport:
             return isJetpackConnectionPackageSupportOn
-        case .hubMenu:
-            return isHubMenuOn
         case .inbox:
             return isInboxOn
         case .splitViewInOrdersTab: