fix: remove search feature flag (#474)

Co-authored-by: Brandon Rodriguez <[email protected]>
mbta · Oct 18, 2024 · 2dde237 · 2dde237
1 parent 77960f4
commit 2dde237
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 35 deletions.
diff --git a/iosApp/iosApp/ContentView.swift b/iosApp/iosApp/ContentView.swift
@@ -105,7 +105,7 @@ struct ContentView: View {
             ZStack(alignment: .top) {
                 mapWithSheets
                 VStack(alignment: .trailing, spacing: 0) {
-                    if contentVM.searchEnabled, nearbyVM.navigationStack.lastSafe() == .nearby {
+                    if nearbyVM.navigationStack.lastSafe() == .nearby {
                         SearchOverlay(searchObserver: searchObserver, nearbyVM: nearbyVM, searchVM: searchVM)
                     }
                     if !searchObserver.isSearching, !viewportProvider.viewport.isFollowing,
@@ -117,7 +117,6 @@ struct ContentView: View {
         }
         .onAppear {
             Task { await errorBannerVM.activate() }
-            Task { await contentVM.loadSettings() }
             Task { await contentVM.loadConfig() }
         }
         .onChange(of: scenePhase) { newPhase in

diff --git a/iosApp/iosApp/Pages/Settings/Setting+Convenience.swift b/iosApp/iosApp/Pages/Settings/Setting+Convenience.swift
@@ -16,8 +16,6 @@ extension Setting: Identifiable {
 
     var name: String {
         switch key {
-        case .search:
-            "Search"
         case .searchRouteResults:
             "Search - Route Results"
         case .map:
@@ -27,8 +25,6 @@ extension Setting: Identifiable {
 
     var icon: String {
         switch key {
-        case .search:
-            "magnifyingglass"
         case .searchRouteResults:
             "point.topleft.down.to.point.bottomright.curvepath.fill"
         case .map:
@@ -38,8 +34,6 @@ extension Setting: Identifiable {
 
     var category: SettingsSection.Category {
         switch key {
-        case .search:
-            .featureFlags
         case .searchRouteResults:
             .featureFlags
         case .map:

diff --git a/iosApp/iosApp/ViewModels/ContentViewModel.swift b/iosApp/iosApp/ViewModels/ContentViewModel.swift
@@ -12,33 +12,19 @@ import shared
 
 class ContentViewModel: ObservableObject {
     @Published var configResponse: ApiResult<ConfigResponse>?
-    @Published var searchEnabled: Bool
-    private var settings: Set<Setting> = []
 
     var configUseCase: ConfigUseCase
-    var settingsRepo: ISettingsRepository
 
     init(configUseCase: ConfigUseCase = UsecaseDI().configUsecase,
-         configResponse: ApiResult<ConfigResponse>? = nil,
-         searchEnabled: Bool = false,
-         settingsRepo: ISettingsRepository = RepositoryDI().settings) {
+         configResponse: ApiResult<ConfigResponse>? = nil) {
         self.configUseCase = configUseCase
         self.configResponse = configResponse
-        self.searchEnabled = searchEnabled
-        self.settingsRepo = settingsRepo
     }
 
     func configureMapboxToken(token: String) {
         MapboxOptions.accessToken = token
     }
 
-    @MainActor func loadSettings() async {
-        do {
-            let settings = try await settingsRepo.getSettings()
-            searchEnabled = settings.first(where: { $0.key == .search })?.isOn ?? false
-        } catch {}
-    }
-
     @MainActor func loadConfig() async {
         do {
             configResponse = try await configUseCase.getConfig()

diff --git a/iosApp/iosAppTests/Pages/Settings/SettingsPageTests.swift b/iosApp/iosAppTests/Pages/Settings/SettingsPageTests.swift
@@ -20,13 +20,13 @@ final class SettingsPageTests: XCTestCase {
 
         init(
             mapDebug: Bool,
-            searchFeatureFlag: Bool,
+            searchRouteResults: Bool,
             onGet: (() -> Void)? = nil,
             onSet: ((Set<Setting>) -> Void)? = nil
         ) {
             settings = [
                 Setting(key: .map, isOn: mapDebug),
-                Setting(key: .search, isOn: searchFeatureFlag),
+                Setting(key: .searchRouteResults, isOn: searchRouteResults),
             ]
             self.onGet = onGet
             self.onSet = onSet
@@ -48,7 +48,7 @@ final class SettingsPageTests: XCTestCase {
 
         let settingsRepository = FakeSettingsRepository(
             mapDebug: true,
-            searchFeatureFlag: false,
+            searchRouteResults: false,
             onGet: {
                 loadedPublisher.send(())
             }
@@ -71,7 +71,7 @@ final class SettingsPageTests: XCTestCase {
 
         let settingsRepository = FakeSettingsRepository(
             mapDebug: false,
-            searchFeatureFlag: false,
+            searchRouteResults: false,
             onGet: {
                 loadedPublisher.send(())
             },

diff --git a/iosApp/iosAppTests/Views/ContentViewModelTests.swift b/iosApp/iosAppTests/Views/ContentViewModelTests.swift
@@ -24,11 +24,4 @@ final class ContentViewModelTests: XCTestCase {
         await contentVM.loadConfig()
         XCTAssertEqual(contentVM.configResponse, expectedResult)
     }
-
-    func testLoadSettingsSetsSettings() async {
-        let expectedResult: Set<Setting> = [.init(key: .search, isOn: true)]
-        let contentVM = ContentViewModel(settingsRepo: MockSettingsRepository(settings: expectedResult))
-        await contentVM.loadSettings()
-        XCTAssertTrue(contentVM.searchEnabled)
-    }
 }
diff --git a/shared/src/commonMain/kotlin/com/mbta/tid/mbta_app/repositories/SettingsRepository.kt b/shared/src/commonMain/kotlin/com/mbta/tid/mbta_app/repositories/SettingsRepository.kt
@@ -36,7 +36,6 @@ class SettingsRepository : ISettingsRepository, KoinComponent {
 
 enum class Settings(val dataStoreKey: Preferences.Key<Boolean>) {
     Map(booleanPreferencesKey("map_debug")),
-    Search(booleanPreferencesKey("search_featureFlag")),
     SearchRouteResults(booleanPreferencesKey("searchRouteResults_featureFlag")),
 }