Remove sync code from country view model

Author: Ecarrion

WooCommerce/Classes/ViewRelated/Orders/Order Details/Address Edit/CountrySelectorCommand.swift

@@ -9,7 +9,7 @@ final class CountrySelectorCommand: ObservableListSelectorCommand {
 
     /// Original array of countries.
     ///
-    private var countries: [Country]
+    private let countries: [Country]
 
     /// Data to display
     ///
@@ -41,13 +41,6 @@ final class CountrySelectorCommand: ObservableListSelectorCommand {
         cell.textLabel?.text = model.name
     }
 
-    /// Resets countries data.
-    ///
-    func resetCountries(_ countries: [Country]) {
-        self.countries = countries
-        self.data = countries
-    }
-
     /// Filter available countries that contains a given search term.
     ///
     func filterCountries(term: String) {

WooCommerce/Classes/ViewRelated/Orders/Order Details/Address Edit/CountrySelectorViewModel.swift

@@ -15,10 +15,6 @@ final class CountrySelectorViewModel: FilterListSelectorViewModelable, Observabl
         }
     }
 
-    /// Define if the view should show placeholders instead of the real elements.
-    ///
-    @Published private(set) var showPlaceholders: Bool = false
-
     /// Command that powers the `ListSelector` view.
     ///
     let command = CountrySelectorCommand(countries: [])
@@ -31,93 +27,12 @@ final class CountrySelectorViewModel: FilterListSelectorViewModelable, Observabl
     ///
     let filterPlaceholder = Localization.placeholder
 
-    /// ResultsController for stored countries.
-    ///
-    private lazy var countriesResultsController: ResultsController<StorageCountry> = {
-        let countriesDescriptor = NSSortDescriptor(key: "name", ascending: true)
-        return ResultsController<StorageCountry>(storageManager: storageManager, sortedBy: [countriesDescriptor])
-    }()
-
-    /// Trigger to sync countries.
-    ///
-    private let syncCountriesTrigger = PassthroughSubject<Void, Never>()
-
-    /// Storage to fetch countries
-    ///
-    private let storageManager: StorageManagerType
-
-    /// Stores to sync countries
-    ///
-    private let stores: StoresManager
-
     /// Current `SiteID`, needed to sync countries from a remote source.
     ///
     private let siteID: Int64
 
-    init(siteID: Int64, storageManager: StorageManagerType = ServiceLocator.storageManager, stores: StoresManager = ServiceLocator.stores) {
+    init(siteID: Int64) {
         self.siteID = siteID
-        self.storageManager = storageManager
-        self.stores = stores
-        bindSyncTrigger()
-        bindStoredCountries()
-    }
-}
-
-// MARK: Helpers
-private extension CountrySelectorViewModel {
-    /// Fetches & Binds countries from storage, If there are no stored countries, trigger a sync request.
-    ///
-    func bindStoredCountries() {
-
-        // Bind stored countries & command
-        countriesResultsController.onDidChangeContent = { [weak self] in
-            guard let self = self else { return }
-            self.command.resetCountries(self.countriesResultsController.fetchedObjects)
-        }
-
-        // Initial fetch
-        try? countriesResultsController.performFetch()
-
-        // Trigger a sync request if there are no countries.
-        guard !countriesResultsController.isEmpty else {
-            return syncCountriesTrigger.send()
-        }
-
-        // Reset countries with fetched
-        command.resetCountries(countriesResultsController.fetchedObjects)
-    }
-
-    /// Sync countries when requested. Defines the `showPlaceholderState` value depending if countries are being synced or not.
-    ///
-    func bindSyncTrigger() {
-        syncCountriesTrigger
-            .handleEvents(receiveOutput: { // Set `showPlaceholders` to `true` before initiating sync.
-                self.showPlaceholders = true // I could not find a way to assign this using combine operators. :-(
-            })
-            .map { // Sync countries
-                self.makeSyncCountriesFuture()
-                    .replaceError(with: ()) // TODO: Handle errors
-            }
-            .switchToLatest()
-            .map { _ in // Set `showPlaceholders` to `false` after sync is done.
-                false
-            }
-            .assign(to: &$showPlaceholders)
-    }
-
-    /// Creates a publisher that syncs countries into our storage layer.
-    ///
-    func makeSyncCountriesFuture() -> AnyPublisher<Void, Error> {
-        Future<Void, Error> { [weak self] promise in
-            guard let self = self else { return }
-
-            let action = DataAction.synchronizeCountries(siteID: self.siteID) { result in
-                let newResult = result.map { _ in } // Hides the result success type because we don't need it.
-                promise(newResult)
-            }
-            self.stores.dispatch(action)
-        }
-        .eraseToAnyPublisher()
     }
 }
 

WooCommerce/Classes/ViewRelated/Orders/Order Details/Address Edit/FilterListSelector.swift

@@ -20,10 +20,6 @@ protocol FilterListSelectorViewModelable: ObservableObject {
     /// Placeholder for the filter text field
     ///
     var filterPlaceholder: String { get }
-
-    /// Value to indicate if the views should be redacted
-    ///
-    var showPlaceholders: Bool { get }
 }
 
 /// Filterable List Selector View
@@ -42,8 +38,6 @@ struct FilterListSelector<ViewModel: FilterListSelectorViewModelable>: View {
             ListSelector(command: viewModel.command, tableStyle: .plain)
         }
         .navigationTitle(viewModel.navigationTitle)
-        .redacted(reason: viewModel.showPlaceholders ? .placeholder : [])
-        .shimmering(active: viewModel.showPlaceholders)
     }
 }
 

WooCommerce/Classes/ViewRelated/Orders/Order Details/Address Edit/StateSelectorViewModel.swift

@@ -25,10 +25,6 @@ final class StateSelectorViewModel: FilterListSelectorViewModelable, ObservableO
     /// Filter text field placeholder
     ///
     let filterPlaceholder = Localization.placeholder
-
-    /// States do not require data loading
-    ///
-    let showPlaceholders = false
 }
 
 // MARK: Constants