Remove unused code and show notice for unsupported customer

Author: itsmeichigo

WooCommerce/Classes/Bookings/BookingFilters/BookableProductListSyncable.swift

@@ -16,6 +16,8 @@ struct BookableProductListSyncable: ListSyncable {
 
     let searchConfiguration: ListSearchConfiguration? = nil
 
+    let selectionDisabledMessage: String? = nil
+
     // MARK: - ResultsController Configuration
 
     func createPredicate() -> NSPredicate {
@@ -63,6 +65,8 @@ struct BookableProductListSyncable: ListSyncable {
     /// Returns the description for an item
     func description(for item: Product) -> String? { nil }
 
+    func selectionEnabled(for item: Product) -> Bool { true }
+
     func filterItem(for item: Product) -> BookingProductFilter {
         BookingProductFilter(productID: item.productID, name: item.name)
     }

WooCommerce/Classes/Bookings/BookingFilters/CustomerListSyncable.swift

@@ -20,6 +20,8 @@ struct CustomerListSyncable: ListSyncable {
         emptySearchDescription: Localization.emptySearchDescription
     )
 
+    let selectionDisabledMessage: String? = Localization.selectionDisabledMessage
+
     // MARK: - ResultsController Configuration
 
     func createPredicate() -> NSPredicate {
@@ -79,6 +81,10 @@ struct CustomerListSyncable: ListSyncable {
         item.email
     }
 
+    func selectionEnabled(for item: Customer) -> Bool {
+        item.customerID > 0
+    }
+    
     func filterItem(for item: Customer) -> BookingCustomerFilter {
         let name: String = {
             if let firstName = item.firstName, let lastName = item.lastName {
@@ -122,5 +128,10 @@ private extension CustomerListSyncable {
             value: "Try adjusting your search term to see more results",
             comment: "Message on the empty search result view of the booking customer selector view"
         )
+        static let selectionDisabledMessage = NSLocalizedString(
+            "bookingCustomerSelectorView.selectionDisabledMessage",
+            value: "This user is a guest, and guests can’t be used for filtering bookings.",
+            comment: "Error message when selecting guest customer in booking filtering"
+        )
     }
 }

WooCommerce/Classes/Bookings/BookingFilters/CustomerSelector+BookingFilter.swift

@@ -12,6 +12,7 @@ protocol ListSyncable {
     var emptyStateMessage: String { get }
     var emptyItemTitlePlaceholder: String? { get }
     var searchConfiguration: ListSearchConfiguration? { get }
+    var selectionDisabledMessage: String? { get }
 
     // MARK: - ResultsController Configuration
 
@@ -37,6 +38,9 @@ protocol ListSyncable {
     /// Returns the description for an item
     func description(for item: ModelType) -> String?
 
+    /// Checks whether the specified item can be selected
+    func selectionEnabled(for item: ModelType) -> Bool
+
     /// Returns the filter type for an item
     func filterItem(for item: ModelType) -> ListFilterType
 }

WooCommerce/Classes/Bookings/BookingFilters/ListSyncable.swift

@@ -3,6 +3,7 @@ import SwiftUI
 struct SyncableListSelectorView<Syncable: ListSyncable>: View {
     @ObservedObject private var viewModel: SyncableListSelectorViewModel<Syncable>
     @State private var selectedItems: [Syncable.ListFilterType]
+    @State private var notice: Notice?
 
     @ScaledMetric private var scale: CGFloat = 1.0
 
@@ -39,6 +40,7 @@ struct SyncableListSelectorView<Syncable: ListSyncable>: View {
         }
         .navigationTitle(syncable.title)
         .navigationBarTitleDisplayMode(.inline)
+        .notice($notice)
         .if(syncable.searchConfiguration != nil) { view in
             view.searchable(text: $viewModel.searchQuery,
                             placement: .navigationBarDrawer(displayMode: .always),
@@ -79,7 +81,7 @@ private extension SyncableListSelectorView {
                 optionRow(text: syncable.displayName(for: item),
                           description: syncable.description(for: item),
                           isSelected: selectedItems.contains(where: { $0 == syncable.filterItem(for: item) }),
-                          onSelection: { toggleSelection(for: item) })
+                          onSelection: { toggleSelectionIfPossible(for: item) })
             }
 
             InfiniteScrollIndicator(showContent: viewModel.shouldShowBottomActivityIndicator)
@@ -92,7 +94,13 @@ private extension SyncableListSelectorView {
         .background(Color(.listBackground))
     }
 
-    func toggleSelection(for item: Syncable.ModelType) {
+    func toggleSelectionIfPossible(for item: Syncable.ModelType) {
+        guard syncable.selectionEnabled(for: item) else {
+            if let message = syncable.selectionDisabledMessage {
+                notice = Notice(message: message, feedbackType: .error)
+            }
+            return
+        }
         let filterItem = syncable.filterItem(for: item)
         if let index = selectedItems.firstIndex(of: filterItem) {
             selectedItems.remove(at: index)

WooCommerce/Classes/Bookings/BookingFilters/SyncableListSelectorView.swift

@@ -16,6 +16,8 @@ struct TeamMemberListSyncable: ListSyncable {
 
     let searchConfiguration: ListSearchConfiguration? = nil
 
+    let selectionDisabledMessage: String? = nil
+
     // MARK: - ResultsController Configuration
 
     func createPredicate() -> NSPredicate {
@@ -55,6 +57,8 @@ struct TeamMemberListSyncable: ListSyncable {
     /// Returns the description for an item
     func description(for item: BookingResource) -> String? { nil }
 
+    func selectionEnabled(for item: BookingResource) -> Bool { true }
+
     func filterItem(for item: BookingResource) -> BookingResource {
         item
     }

WooCommerce/Classes/Bookings/BookingFilters/TeamMemberListSyncable.swift

@@ -95,7 +95,7 @@ enum FilterListValueSelectorConfig {
     // Filter list selector for products
     case products(siteID: Int64)
     // Filter list selector for customer
-    case customer(siteID: Int64, source: FilterSource)
+    case customer(siteID: Int64)
     // Filter list selector for booking team member
     case bookingResource(siteID: Int64)
     // Filter list selector for bookable product
@@ -364,19 +364,12 @@ private extension FilterListViewController {
                 }()
                 self.listSelector.present(controller, animated: true)
 
-            case .customer(let siteID, let source):
-                let configuration: CustomerSelectorViewController.Configuration = {
-                    switch source {
-                    case .booking: .configurationForBookingFilter
-                    case .orders: .configurationForOrderFilter
-                    case .products: fatalError("Customer filter not supported!")
-                    }
-                }()
+            case .customer(let siteID):
                 let selectedCustomerID = (selected.selectedValue as? CustomerFilter)?.id
                 let controller: CustomerSelectorViewController = {
                     return CustomerSelectorViewController(
                         siteID: siteID,
-                        configuration: configuration,
+                        configuration: .configurationForOrderFilter,
                         addressFormViewModel: nil,
                         selectedCustomerID: selectedCustomerID,
                         onCustomerSelected: { customer in

WooCommerce/Classes/ViewRelated/Filters/FilterListViewController.swift

@@ -265,7 +265,7 @@ extension FilterOrderListViewModel.OrderListFilter {
                                        selectedValue: filters.product)
         case .customer(let siteID):
             return FilterTypeViewModel(title: title,
-                                       listSelectorConfig: .customer(siteID: siteID, source: .orders),
+                                       listSelectorConfig: .customer(siteID: siteID),
                                        selectedValue: filters.customer)
         case .salesChannel:
             let salesChannelOptions: [SalesChannelFilter] = [.any, .pointOfSale, .webCheckout, .wpAdmin]