Skip to content

Remove favoriteProducts feature flag #15786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 23, 2025
Merged

Remove favoriteProducts feature flag #15786

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14c3f27
Remove favoriteProducts feature flag
joshheald Jun 19, 2025
7c56b3b
Merge branch 'trunk' into task/remove-favourite-products-flag
joshheald Jun 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Modules/Sources/Experiments/DefaultFeatureFlagService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
return true
case .blazeCampaignObjective:
return true
case .favoriteProducts:
return true
case .hideSitesInStorePicker:
return true
case .filterHistoryOnOrderAndProductLists:
Expand Down
4 changes: 0 additions & 4 deletions Modules/Sources/Experiments/FeatureFlag.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,6 @@ public enum FeatureFlag: Int {
///
case blazeCampaignObjective

/// Allows marking product as favorite
///
case favoriteProducts

/// Supports hiding sites from the store picker
///
case hideSitesInStorePicker
Expand Down
3 changes: 0 additions & 3 deletions .../Classes/ViewRelated/Products/Edit Product/FavoriteProducts/FavoriteProductsUseCase.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,6 @@ struct DefaultFavoriteProductsUseCase: FavoriteProductsUseCase {

@MainActor
func favoriteProductIDs() async -> [Int64] {
guard featureFlagService.isFeatureFlagEnabled(.favoriteProducts) else {
return []
}
return await withCheckedContinuation { continuation in
stores.dispatch(AppSettingsAction.loadFavoriteProductIDs(siteID: siteID, onCompletion: { savedFavProductIDs in
continuation.resume(returning: savedFavProductIDs)
Expand Down
9 changes: 1 addition & 8 deletions WooCommerce/Classes/ViewRelated/Products/Edit Product/ProductFormViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,6 @@ final class ProductFormViewModel: ProductFormViewModelProtocol {
///
private lazy var remoteActionUseCase = ProductFormRemoteActionUseCase(stores: stores)

private let featureFlagService: FeatureFlagService

init(product: EditableProductModel,
formType: ProductFormType,
productImageActionHandler: ProductImageActionHandler,
Expand All @@ -240,8 +238,7 @@ final class ProductFormViewModel: ProductFormViewModelProtocol {
productImagesUploader: ProductImageUploaderProtocol = ServiceLocator.productImageUploader,
analytics: Analytics = ServiceLocator.analytics,
blazeEligibilityChecker: BlazeEligibilityCheckerProtocol = BlazeEligibilityChecker(),
favoriteProductsUseCase: FavoriteProductsUseCase? = nil,
featureFlagService: FeatureFlagService = ServiceLocator.featureFlagService) {
favoriteProductsUseCase: FavoriteProductsUseCase? = nil) {
self.formType = formType
self.productImageActionHandler = productImageActionHandler
self.originalProduct = product
Expand All @@ -253,7 +250,6 @@ final class ProductFormViewModel: ProductFormViewModelProtocol {
self.analytics = analytics
self.blazeEligibilityChecker = blazeEligibilityChecker
self.favoriteProductsUseCase = favoriteProductsUseCase ?? DefaultFavoriteProductsUseCase(siteID: product.siteID)
self.featureFlagService = featureFlagService

self.cancellable = productImageActionHandler.addUpdateObserver(self) { [weak self] allStatuses in
guard let self = self else { return }
Expand Down Expand Up @@ -316,9 +312,6 @@ extension ProductFormViewModel {
}

func canFavoriteProduct() -> Bool {
guard featureFlagService.isFeatureFlagEnabled(.favoriteProducts) else {
return false
}
return formType != .add
}

Expand Down
23 changes: 7 additions & 16 deletions WooCommerce/Classes/ViewRelated/Products/Filters/FilterProductListViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,22 +101,13 @@ final class FilterProductListViewModel: FilterListViewModel {
self.siteID = siteID
self.analytics = analytics

if featureFlagService.isFeatureFlagEnabled(.favoriteProducts) {
self.filterTypeViewModels = [
stockStatusFilterViewModel,
productStatusFilterViewModel,
productTypeFilterViewModel,
productCategoryFilterViewModel,
productFavoriteFilterViewModel
]
} else {
self.filterTypeViewModels = [
stockStatusFilterViewModel,
productStatusFilterViewModel,
productTypeFilterViewModel,
productCategoryFilterViewModel,
]
}
self.filterTypeViewModels = [
stockStatusFilterViewModel,
productStatusFilterViewModel,
productTypeFilterViewModel,
productCategoryFilterViewModel,
productFavoriteFilterViewModel
]
}

var criteria: Filters {
Expand Down
5 changes: 0 additions & 5 deletions WooCommerce/WooCommerceTests/Mocks/MockFeatureFlagService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ final class MockFeatureFlagService: FeatureFlagService {
var blazeCampaignObjective: Bool
var revampedShippingLabelCreation: Bool
var viewEditCustomFieldsInProductsAndOrders: Bool
var favoriteProducts: Bool
var hideSitesInStorePicker: Bool
var backgroundProductImageUpload: Bool
var notificationSettings: Bool
Expand All @@ -44,7 +43,6 @@ final class MockFeatureFlagService: FeatureFlagService {
blazeCampaignObjective: Bool = false,
revampedShippingLabelCreation: Bool = false,
viewEditCustomFieldsInProductsAndOrders: Bool = false,
favoriteProducts: Bool = false,
hideSitesInStorePicker: Bool = false,
backgroundProductImageUpload: Bool = false,
notificationSettings: Bool = false,
Expand All @@ -67,7 +65,6 @@ final class MockFeatureFlagService: FeatureFlagService {
self.blazeCampaignObjective = blazeCampaignObjective
self.revampedShippingLabelCreation = revampedShippingLabelCreation
self.viewEditCustomFieldsInProductsAndOrders = viewEditCustomFieldsInProductsAndOrders
self.favoriteProducts = favoriteProducts
self.hideSitesInStorePicker = hideSitesInStorePicker
self.backgroundProductImageUpload = backgroundProductImageUpload
self.notificationSettings = notificationSettings
Expand Down Expand Up @@ -117,8 +114,6 @@ final class MockFeatureFlagService: FeatureFlagService {
return revampedShippingLabelCreation
case .viewEditCustomFieldsInProductsAndOrders:
return viewEditCustomFieldsInProductsAndOrders
case .favoriteProducts:
return favoriteProducts
case .hideSitesInStorePicker:
return hideSitesInStorePicker
case .backgroundProductImageUpload:
Expand Down
21 changes: 7 additions & 14 deletions ...mmerce/WooCommerceTests/ViewRelated/Products/Edit Product/ProductFormViewModelTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,7 @@ final class ProductFormViewModelTests: XCTestCase {
// Given
let product = Product.fake()
let viewModel = createViewModel(product: product,
formType: .edit,
featureFlagService: MockFeatureFlagService(favoriteProducts: true))
formType: .edit)

// When
XCTAssertTrue(viewModel.canFavoriteProduct())
Expand All @@ -243,8 +242,7 @@ final class ProductFormViewModelTests: XCTestCase {
// Given
let product = Product.fake()
let viewModel = createViewModel(product: product,
formType: .add,
featureFlagService: MockFeatureFlagService(favoriteProducts: true))
formType: .add)

// When
XCTAssertFalse(viewModel.canFavoriteProduct())
Expand All @@ -254,8 +252,7 @@ final class ProductFormViewModelTests: XCTestCase {
// Given
let product = Product.fake()
let viewModel = createViewModel(product: product,
formType: .add,
featureFlagService: MockFeatureFlagService(favoriteProducts: false))
formType: .add)

// When
XCTAssertFalse(viewModel.canFavoriteProduct())
Expand All @@ -268,8 +265,7 @@ final class ProductFormViewModelTests: XCTestCase {
let viewModel = createViewModel(product: product,
formType: .edit,
stores: stores,
favoriteProductsUseCase: mockUseCase,
featureFlagService: MockFeatureFlagService(favoriteProducts: true))
favoriteProductsUseCase: mockUseCase)

// When
viewModel.markAsFavorite()
Expand All @@ -285,8 +281,7 @@ final class ProductFormViewModelTests: XCTestCase {
let viewModel = createViewModel(product: product,
formType: .edit,
stores: stores,
favoriteProductsUseCase: mockUseCase,
featureFlagService: MockFeatureFlagService(favoriteProducts: true))
favoriteProductsUseCase: mockUseCase)

// When
viewModel.removeFromFavorite()
Expand Down Expand Up @@ -850,8 +845,7 @@ private extension ProductFormViewModelTests {
stores: StoresManager = ServiceLocator.stores,
analytics: Analytics = ServiceLocator.analytics,
blazeEligibilityChecker: BlazeEligibilityCheckerProtocol = BlazeEligibilityChecker(),
favoriteProductsUseCase: FavoriteProductsUseCase? = nil,
featureFlagService: FeatureFlagService = ServiceLocator.featureFlagService) -> ProductFormViewModel {
favoriteProductsUseCase: FavoriteProductsUseCase? = nil) -> ProductFormViewModel {
let model = EditableProductModel(product: product)
let siteID: Int64 = 123
let productImageActionHandler = ProductImageActionHandler(siteID: siteID, product: model)
Expand All @@ -861,7 +855,6 @@ private extension ProductFormViewModelTests {
stores: stores,
analytics: analytics,
blazeEligibilityChecker: blazeEligibilityChecker,
favoriteProductsUseCase: favoriteProductsUseCase,
featureFlagService: featureFlagService)
favoriteProductsUseCase: favoriteProductsUseCase)
}
}
27 changes: 1 addition & 26 deletions ...merce/WooCommerceTests/ViewRelated/Products/Filters/FilterProductListViewModelTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ final class FilterProductListViewModelTests: XCTestCase {

func test_criteria_with_non_nil_filters_then_it_returns_all_active_filters() {
// Given
let featureFlagService = MockFeatureFlagService(favoriteProducts: true)
let filters = FilterProductListViewModel.Filters(stockStatus: .inStock,
productStatus: .draft,
promotableProductType: PromotableProductType(productType: .grouped,
Expand All @@ -36,8 +35,7 @@ final class FilterProductListViewModelTests: XCTestCase {

// When
let viewModel = FilterProductListViewModel(filters: filters,
siteID: 0,
featureFlagService: featureFlagService)
siteID: 0)

// Then
let expectedCriteria = filters
Expand Down Expand Up @@ -84,29 +82,6 @@ final class FilterProductListViewModelTests: XCTestCase {
XCTAssertEqual(filters.analyticsDescription, "instock,draft,grouped,category,favorite_products")
}

// MARK: Favorite product feature flag

func test_filterTypeViewModels_does_not_contain_favorite_filter_view_model_when_feature_flag_off() {
// Given
let featureFlagService = MockFeatureFlagService(favoriteProducts: false)
let filters = FilterProductListViewModel.Filters(stockStatus: .inStock,
productStatus: .draft,
promotableProductType: PromotableProductType(productType: .grouped,
isAvailable: true,
promoteUrl: nil),
productCategory: filterProductCategory,
favoriteProduct: FavoriteProductsFilter(),
numberOfActiveFilters: 5)

// When
let viewModel = FilterProductListViewModel(filters: filters,
siteID: 0,
featureFlagService: featureFlagService)

// Then
XCTAssertFalse(viewModel.filterTypeViewModels.contains(where: { $0.title == FilterProductListViewModel.ProductListFilter.Localization.favoriteProduct } ))
}

func test_applyPastFilter_updates_the_filters_correctly() {
// Given
let filters = createMockFilters(stockStatus: .inStock)
Expand Down
Loading