Update initial selection logic and remove full product model from BookingProductFilter

Author: itsmeichigo

Modules/Sources/Yosemite/Model/Bookings/BookingProductFilter.swift

@@ -3,21 +3,17 @@ import Foundation
 /// Used to filter bookings by product
 ///
 public struct BookingProductFilter: Codable, Hashable {
-    /// The underlying product
-    public let product: Product
-
     /// ID of the product
     /// periphery:ignore - to be used later when applying filter
     ///
-    public let id: Int64
+    public let productID: Int64
 
     /// Name of the product
     ///
     public let name: String
 
-    public init(product: Product) {
-        self.id = product.productID
-        self.name = product.name
-        self.product = product
+    public init(productID: Int64, name: String) {
+        self.productID = productID
+        self.name = name
     }
 }

WooCommerce/Classes/Bookings/BookingFilters/SyncableListSelectorView.swift

@@ -5,17 +5,18 @@ struct SyncableListSelectorView<Syncable: ListSyncable>: View {
     @State var selectedItem: Syncable.ModelType?
 
     private let syncable: Syncable
+    private let initialSelection: (Syncable.ModelType?) -> Bool
     private let onSelection: (Syncable.ModelType?) -> Void
 
     private let viewPadding: CGFloat = 16
 
     init(viewModel: SyncableListSelectorViewModel<Syncable>,
          syncable: Syncable,
-         selectedItem: Syncable.ModelType?,
+         initialSelection: @escaping (Syncable.ModelType?) -> Bool,
          onSelection: @escaping (Syncable.ModelType?) -> Void) {
         self.viewModel = viewModel
         self.syncable = syncable
-        self.selectedItem = selectedItem
+        self.initialSelection = initialSelection
         self.onSelection = onSelection
     }
 
@@ -68,7 +69,7 @@ private extension SyncableListSelectorView {
 
             ForEach(items, id: \.self) { item in
                 optionRow(text: syncable.displayName(for: item),
-                          isSelected: item == selectedItem,
+                          isSelected: isItemSelected(item),
                           onSelection: { selectedItem = item })
             }
 
@@ -82,6 +83,13 @@ private extension SyncableListSelectorView {
         .background(Color(.listBackground))
     }
 
+    func isItemSelected(_ item: Syncable.ModelType?) -> Bool {
+        if let selectedItem {
+            return item == selectedItem
+        }
+        return initialSelection(item)
+    }
+
     func optionRow(text: String, isSelected: Bool, onSelection: @escaping () -> Void) -> some View {
         HStack {
             Text(text)

WooCommerce/Classes/ViewRelated/Filters/FilterListViewController.swift

@@ -375,7 +375,7 @@ private extension FilterListViewController {
                 let memberListSelectorView = SyncableListSelectorView(
                     viewModel: viewModel,
                     syncable: syncable,
-                    selectedItem: selectedMember,
+                    initialSelection: { $0 == selectedMember },
                     onSelection: { [weak self] resource in
                         selected.selectedValue = resource
                         self?.updateUI(numberOfActiveFilters: self?.viewModel.filterTypeViewModels.numberOfActiveFilters ?? 0)
@@ -392,11 +392,11 @@ private extension FilterListViewController {
                 let memberListSelectorView = SyncableListSelectorView(
                     viewModel: viewModel,
                     syncable: syncable,
-                    selectedItem: selectedProduct?.product,
+                    initialSelection: { $0?.productID == selectedProduct?.productID },
                     onSelection: { [weak self] product in
                         selected.selectedValue = {
                             guard let product else { return BookingProductFilter?.none }
-                            return BookingProductFilter(product: product)
+                            return BookingProductFilter(productID: product.productID, name: product.name)
                         }()
                         self?.updateUI(numberOfActiveFilters: self?.viewModel.filterTypeViewModels.numberOfActiveFilters ?? 0)
                         self?.listSelector.reloadData()