Merge branch 'woomob-1240-ui-booking-filters' into woomob-1240-filter-team-member

Author: itsmeichigo

…l/Bookings/FilterBookingsByProduct.swift …odel/Bookings/BookingProductFilter.swiftModules/Sources/Yosemite/Model/Bookings/FilterBookingsByProduct.swift renamed to Modules/Sources/Yosemite/Model/Bookings/BookingProductFilter.swift Modules/Sources/Yosemite/Model/Bookings/FilterBookingsByProduct.swift renamed to Modules/Sources/Yosemite/Model/Bookings/BookingProductFilter.swift

@@ -3,7 +3,7 @@ import Foundation
 
 /// Used to filter bookings by product
 ///
-public struct FilterBookingsByProduct: Codable, Hashable {
+public struct BookingProductFilter: Codable, Hashable {
     /// ID of the product
     ///
     public let id: Int64

WooCommerce/Classes/Bookings/BookingFilters/BookingFiltersViewModel.swift

@@ -35,12 +35,12 @@ final class BookingFiltersViewModel: FilterListViewModel {
     }
 
     var criteria: Filters {
-        let teamMember = teamMemberFilterViewModel.selectedValue as? BookingResource ?? nil
-        let product = productFilterViewModel.selectedValue as? FilterBookingsByProduct ?? nil
-        let customer = customerFilterViewModel.selectedValue as? CustomerFilter ?? nil
-        let attendanceStatus = attendanceStatusFilterViewModel.selectedValue as? BookingAttendanceStatus ?? nil
-        let paymentStatus = paymentStatusFilterViewModel.selectedValue as? BookingStatus ?? nil
-        let dateRange = dateTimeFilterViewModel.selectedValue as? BookingDateRangeFilter ?? nil
+        let teamMember = teamMemberFilterViewModel.selectedValue as? BookingResource
+        let product = productFilterViewModel.selectedValue as? BookingProductFilter
+        let customer = customerFilterViewModel.selectedValue as? CustomerFilter
+        let attendanceStatus = attendanceStatusFilterViewModel.selectedValue as? BookingAttendanceStatus
+        let paymentStatus = paymentStatusFilterViewModel.selectedValue as? BookingStatus
+        let dateRange = dateTimeFilterViewModel.selectedValue as? BookingDateRangeFilter
         let numberOfActiveFilters = filterTypeViewModels.numberOfActiveFilters
 
         return Filters(teamMember: teamMember,
@@ -74,31 +74,20 @@ final class BookingFiltersViewModel: FilterListViewModel {
     }
 
     func clearAll() {
-        let clearedTeamMember: BookingResource? = nil
-        teamMemberFilterViewModel.selectedValue = clearedTeamMember
-
-        let clearedProduct: FilterBookingsByProduct? = nil
-        productFilterViewModel.selectedValue = clearedProduct
-
-        let clearedCustomer: CustomerFilter? = nil
-        customerFilterViewModel.selectedValue = clearedCustomer
-
-        let clearedAttendanceStatus: BookingAttendanceStatus? = nil
-        attendanceStatusFilterViewModel.selectedValue = clearedAttendanceStatus
-
-        let clearedPaymentStatus: BookingStatus? = nil
-        paymentStatusFilterViewModel.selectedValue = clearedPaymentStatus
-
-        let clearedDateRange: BookingDateRangeFilter? = nil
-        dateTimeFilterViewModel.selectedValue = clearedDateRange
+        teamMemberFilterViewModel.selectedValue = BookingResource?.none
+        productFilterViewModel.selectedValue = BookingProductFilter?.none
+        customerFilterViewModel.selectedValue = CustomerFilter?.none
+        attendanceStatusFilterViewModel.selectedValue = BookingAttendanceStatus?.none
+        paymentStatusFilterViewModel.selectedValue = BookingStatus?.none
+        dateTimeFilterViewModel.selectedValue = BookingDateRangeFilter?.none
     }
 
     typealias Criteria = Filters
 
     struct Filters: Equatable, HumanReadable {
 
         let teamMember: BookingResource?
-        let product: FilterBookingsByProduct?
+        let product: BookingProductFilter?
         let attendanceStatus: BookingAttendanceStatus?
         let paymentStatus: BookingStatus?
         let customer: CustomerFilter?
@@ -117,7 +106,7 @@ final class BookingFiltersViewModel: FilterListViewModel {
         }
 
         init(teamMember: BookingResource?,
-             product: FilterBookingsByProduct?,
+             product: BookingProductFilter?,
              attendanceStatus: BookingAttendanceStatus?,
              paymentStatus: BookingStatus?,
              customer: CustomerFilter?,
@@ -260,7 +249,7 @@ extension BookingStatus: FilterType {
     }
 }
 
-extension FilterBookingsByProduct: FilterType {
+extension BookingProductFilter: FilterType {
     /// The user-facing description of the filter value.
     var description: String { name }