Add a filter segmented control to product search.

jaclync · jaclync · commit 9f510308a892 · 2022-09-15T16:20:55.000+08:00
diff --git a/Storage/Storage/Tools/StorageType+Extensions.swift b/Storage/Storage/Tools/StorageType+Extensions.swift
@@ -345,8 +345,8 @@ public extension StorageType {
 
     /// Retrieves the Stored ProductSearchResults Lookup.
     ///
-    func loadProductSearchResults(keyword: String) -> ProductSearchResults? {
-        let predicate = \ProductSearchResults.keyword == keyword
+    func loadProductSearchResults(keyword: String, filterKey: String) -> ProductSearchResults? {
+        let predicate = \ProductSearchResults.keyword == keyword && \ProductSearchResults.filterKey == filterKey
         return firstObject(ofType: ProductSearchResults.self, matching: predicate)
     }
 
diff --git a/WooCommerce/Classes/ViewRelated/Coupons/CouponSearchUICommand.swift b/WooCommerce/Classes/ViewRelated/Coupons/CouponSearchUICommand.swift
@@ -15,6 +15,8 @@ final class CouponSearchUICommand: SearchUICommand {
 
     let cancelButtonAccessibilityIdentifier = "coupon-search-screen-cancel-button"
 
+    var resynchronizeModels: (() -> Void) = {}
+
     private let siteID: Int64
 
     init(siteID: Int64) {
@@ -80,6 +82,10 @@ final class CouponSearchUICommand: SearchUICommand {
 
         viewController.configure(.simple(message: message, image: .emptySearchResultsImage))
     }
+
+    func searchResultsPredicate(keyword: String) -> NSPredicate {
+        NSPredicate(format: "ANY searchResults.keyword = %@", keyword)
+    }
 }
 
 // MARK: - Subtypes
diff --git a/WooCommerce/Classes/ViewRelated/Products/Edit Product/Linked Products List Selector/ProductListSelector/ProductListMultiSelectorSearchUICommand.swift b/WooCommerce/Classes/ViewRelated/Products/Edit Product/Linked Products List Selector/ProductListSelector/ProductListMultiSelectorSearchUICommand.swift
@@ -12,6 +12,8 @@ final class ProductListMultiSelectorSearchUICommand: NSObject, SearchUICommand {
 
     let cancelButtonAccessibilityIdentifier = "product-search-screen-cancel-button"
 
+    var resynchronizeModels: (() -> Void) = {}
+
     private let siteID: Int64
 
     private let excludedProductIDs: [Int64]
@@ -90,6 +92,10 @@ final class ProductListMultiSelectorSearchUICommand: NSObject, SearchUICommand {
         reloadData()
         updateActionButton()
     }
+
+    func searchResultsPredicate(keyword: String) -> NSPredicate {
+        NSPredicate(format: "ANY searchResults.keyword = %@", keyword)
+    }
 }
 
 extension ProductListMultiSelectorSearchUICommand {
diff --git a/WooCommerce/Classes/ViewRelated/Search/Order/OrderSearchUICommand.swift b/WooCommerce/Classes/ViewRelated/Search/Order/OrderSearchUICommand.swift
@@ -14,6 +14,8 @@ final class OrderSearchUICommand: SearchUICommand {
 
     let cancelButtonAccessibilityIdentifier = "order-search-screen-cancel-button"
 
+    var resynchronizeModels: (() -> Void) = {}
+
     private lazy var statusResultsController: ResultsController<StorageOrderStatus> = {
         let storageManager = ServiceLocator.storageManager
         let predicate = NSPredicate(format: "siteID == %lld", siteID)
@@ -91,6 +93,10 @@ final class OrderSearchUICommand: SearchUICommand {
         }
         return keyword
     }
+
+    func searchResultsPredicate(keyword: String) -> NSPredicate {
+        NSPredicate(format: "ANY searchResults.keyword = %@", keyword)
+    }
 }
 
 private extension OrderSearchUICommand {
diff --git a/WooCommerce/Classes/ViewRelated/Search/Product/ProductSearchUICommand.swift b/WooCommerce/Classes/ViewRelated/Search/Product/ProductSearchUICommand.swift
@@ -12,10 +12,18 @@ final class ProductSearchUICommand: SearchUICommand {
 
     let cancelButtonAccessibilityIdentifier = "product-search-screen-cancel-button"
 
+    var resynchronizeModels: (() -> Void) = {}
+
+    private var lastSearchQueryByFilter: [ProductSearchFilter: String] = [:]
+    private var filter: ProductSearchFilter = .all
+
     private let siteID: Int64
+    private let isSearchProductsBySKUEnabled: Bool
 
-    init(siteID: Int64) {
+    init(siteID: Int64,
+         isSearchProductsBySKUEnabled: Bool = ServiceLocator.featureFlagService.isFeatureFlagEnabled(.searchProductsBySKU)) {
         self.siteID = siteID
+        self.isSearchProductsBySKUEnabled = isSearchProductsBySKUEnabled
     }
 
     func createResultsController() -> ResultsController<ResultsControllerModel> {
@@ -30,6 +38,37 @@ final class ProductSearchUICommand: SearchUICommand {
         nil
     }
 
+    func createHeaderView() -> UIView? {
+        guard isSearchProductsBySKUEnabled else {
+            return nil
+        }
+        let segmentedControl: UISegmentedControl = {
+            let segmentedControl = UISegmentedControl()
+
+            let filters: [ProductSearchFilter] = [.all, .sku]
+            for (index, filter) in filters.enumerated() {
+                segmentedControl.insertSegment(withTitle: filter.title, at: index, animated: false)
+                if filter == self.filter {
+                    segmentedControl.selectedSegmentIndex = index
+                }
+            }
+            segmentedControl.on(.valueChanged) { [weak self] sender in
+                let index = sender.selectedSegmentIndex
+                guard let filter = filters[safe: index] else {
+                    return
+                }
+                self?.showResults(filter: filter)
+            }
+            return segmentedControl
+        }()
+
+        let containerView = UIView(frame: .zero)
+        containerView.addSubview(segmentedControl)
+        segmentedControl.translatesAutoresizingMaskIntoConstraints = false
+        containerView.pinSubviewToAllEdges(segmentedControl, insets: .init(top: 8, left: 16, bottom: 16, right: 16))
+        return containerView
+    }
+
     func configureEmptyStateViewControllerBeforeDisplay(viewController: EmptyStateViewController,
                                                         searchKeyword: String) {
         let boldSearchKeyword = NSAttributedString(string: searchKeyword,
@@ -50,8 +89,18 @@ final class ProductSearchUICommand: SearchUICommand {
     /// Synchronizes the Products matching a given Keyword
     ///
     func synchronizeModels(siteID: Int64, keyword: String, pageNumber: Int, pageSize: Int, onCompletion: ((Bool) -> Void)?) {
+        if isSearchProductsBySKUEnabled {
+            // Returns early if the search query is the same for the given filter to avoid duplicate API requests when switching filter tabs.
+            if let lastFilterSearchQuery = lastSearchQueryByFilter[filter], lastFilterSearchQuery == keyword {
+                onCompletion?(true)
+                return
+            }
+            lastSearchQueryByFilter[filter] = keyword
+        }
+
         let action = ProductAction.searchProducts(siteID: siteID,
                                                   keyword: keyword,
+                                                  filter: filter,
                                                   pageNumber: pageNumber,
                                                   pageSize: pageSize) { result in
             if case let .failure(error) = result {
@@ -71,4 +120,33 @@ final class ProductSearchUICommand: SearchUICommand {
             viewController?.navigationController?.pushViewController(vc, animated: true)
         }
     }
+
+    func searchResultsPredicate(keyword: String) -> NSPredicate {
+        guard isSearchProductsBySKUEnabled else {
+            return NSPredicate(format: "ANY searchResults.keyword = %@", keyword)
+        }
+        return NSPredicate(format: "SUBQUERY(searchResults, $result, $result.keyword = %@ AND $result.filterKey = %@).@count > 0",
+                           keyword, filter.rawValue)
+    }
+}
+
+private extension ProductSearchUICommand {
+    func showResults(filter: ProductSearchFilter) {
+        guard filter != self.filter else {
+            return
+        }
+        self.filter = filter
+        resynchronizeModels()
+    }
+}
+
+private extension ProductSearchFilter {
+    var title: String {
+        switch self {
+        case .all:
+            return NSLocalizedString("All Products", comment: "Title of the product search filter to search for all products.")
+        case .sku:
+            return NSLocalizedString("SKU", comment: "Title of the product search filter to search for products that match the SKU.")
+        }
+    }
 }
diff --git a/WooCommerce/Classes/ViewRelated/Search/SearchUICommand.swift b/WooCommerce/Classes/ViewRelated/Search/SearchUICommand.swift
@@ -10,6 +10,9 @@ protocol SearchUICommand {
     /// The placeholder of the search bar.
     var searchBarPlaceholder: String { get }
 
+    /// A closure to resynchronize models if the data source might change (e.g. when the filter changes in products search).
+    var resynchronizeModels: (() -> Void) { get set }
+
     associatedtype ResultsControllerModel: ResultsControllerMutableType where ResultsControllerModel.ReadOnlyType == Model
     /// Creates a results controller for the search results. The result model's readonly type matches the search result model.
     func createResultsController() -> ResultsController<ResultsControllerModel>
@@ -51,6 +54,10 @@ protocol SearchUICommand {
     func configureEmptyStateViewControllerBeforeDisplay(viewController: EmptyStateViewControllerType,
                                                         searchKeyword: String)
 
+    /// The optional view to show between the search bar and search results table view.
+    /// If `nil`, the search bar is right above the search results.
+    func createHeaderView() -> UIView?
+
     /// Optionally configures the action button that dismisses the search UI.
     /// - Parameters:
     ///   - button: the button in the navigation bar that dismisses the search UI. Shows "Cancel" by default.
@@ -90,6 +97,12 @@ protocol SearchUICommand {
     /// - Parameter keyword: user-entered search keyword.
     /// - Returns: sanitized search keyword.
     func sanitizeKeyword(_ keyword: String) -> String
+
+    /// The predicate to fetch product search results based on the keyword.
+    /// Called when a search API request is made for the keyword.
+    /// - Parameter keyword: search query.
+    /// - Returns: predicate that is based on the search keyword.
+    func searchResultsPredicate(keyword: String) -> NSPredicate
 }
 
 // MARK: - Default implementation
@@ -102,6 +115,11 @@ extension SearchUICommand {
         // If not implemented, returns the keyword as entered
         return keyword
     }
+
+    func createHeaderView() -> UIView? {
+        // If not implemented, returns `nil` to not show the header.
+        nil
+    }
 }
 
 // MARK: - SearchUICommand using EmptySearchResultsViewController
diff --git a/WooCommerce/Classes/ViewRelated/Search/SearchViewController.swift b/WooCommerce/Classes/ViewRelated/Search/SearchViewController.swift
@@ -21,6 +21,9 @@ where Cell.SearchModel == Command.CellViewModel {
     ///
     @IBOutlet private var searchBar: UISearchBar!
 
+    /// Optional header view between the search bar and table view.
+    @IBOutlet private weak var headerView: UIView!
+
     /// TableView
     ///
     @IBOutlet private var tableView: UITableView!
@@ -92,7 +95,7 @@ where Cell.SearchModel == Command.CellViewModel {
         return keyboardFrameObserver
     }()
 
-    private let searchUICommand: Command
+    private var searchUICommand: Command
     private let tableViewSeparatorStyle: UITableViewCell.SeparatorStyle
 
 
@@ -131,9 +134,11 @@ where Cell.SearchModel == Command.CellViewModel {
         configureMainView()
         configureSearchBar()
         configureSearchBarBordersView()
+        configureHeaderView()
         configureTableView()
         configureResultsController()
         configureStarterViewController()
+        configureSearchResync()
 
         startListeningToNotifications()
 
@@ -290,6 +295,19 @@ private extension SearchViewController {
         cancelButton.accessibilityIdentifier = searchUICommand.cancelButtonAccessibilityIdentifier
     }
 
+    func configureHeaderView() {
+        if let searchHeaderView = searchUICommand.createHeaderView() {
+            headerView.addSubview(searchHeaderView)
+            searchHeaderView.translatesAutoresizingMaskIntoConstraints = false
+            headerView.pinSubviewToSafeArea(searchHeaderView)
+        } else {
+            headerView.isHidden = true
+            NSLayoutConstraint.activate([
+                headerView.heightAnchor.constraint(equalToConstant: 0)
+            ])
+        }
+    }
+
     /// Setup: Actions
     ///
     func configureActions() {
@@ -368,6 +386,13 @@ private extension SearchViewController {
                 self?.synchronizeSearchResults(with: query)
             }
     }
+
+    func configureSearchResync() {
+        searchUICommand.resynchronizeModels = { [weak self] in
+            guard let self = self else { return }
+            self.synchronizeSearchResults(with: self.searchQuery)
+        }
+    }
 }
 
 
@@ -378,6 +403,7 @@ extension SearchViewController: SyncingCoordinatorDelegate {
     /// Synchronizes the models for the Default Store (if any).
     ///
     func sync(pageNumber: Int, pageSize: Int, reason: String?, onCompletion: ((Bool) -> Void)? = nil) {
+        transitionToSyncingState()
         let keyword = searchUICommand.sanitizeKeyword(searchQuery)
         searchUICommand.synchronizeModels(siteID: storeID,
                                           keyword: keyword,
@@ -391,7 +417,6 @@ extension SearchViewController: SyncingCoordinatorDelegate {
             }
             onCompletion?(isCompleted)
         })
-        transitionToSyncingState()
     }
 }
 
@@ -405,7 +430,7 @@ private extension SearchViewController {
     func synchronizeSearchResults(with keyword: String) {
         // When the search query changes, also includes the original results predicate in addition to the search keyword.
         let keyword = searchUICommand.sanitizeKeyword(keyword)
-        let searchResultsPredicate = NSPredicate(format: "ANY searchResults.keyword = %@", keyword)
+        let searchResultsPredicate = searchUICommand.searchResultsPredicate(keyword: keyword)
         let subpredicates = [resultsPredicate].compactMap { $0 } + [searchResultsPredicate]
         resultsController.predicate = NSCompoundPredicate(andPredicateWithSubpredicates: subpredicates)
 
@@ -485,7 +510,7 @@ private extension SearchViewController {
         NSLayoutConstraint.activate([
             childView.leadingAnchor.constraint(equalTo: tableView.leadingAnchor),
             childView.trailingAnchor.constraint(equalTo: tableView.trailingAnchor),
-            childView.topAnchor.constraint(equalTo: searchBar.bottomAnchor),
+            childView.topAnchor.constraint(equalTo: headerView.bottomAnchor),
             childView.bottomAnchor.constraint(equalTo: view.bottomAnchor)
         ])
 
diff --git a/WooCommerce/Classes/ViewRelated/Search/SearchViewController.xib b/WooCommerce/Classes/ViewRelated/Search/SearchViewController.xib
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="SearchViewController" customModule="WooCommerce" customModuleProvider="target">
             <connections>
                 <outlet property="bordersView" destination="Ncr-u2-zVd" id="S5W-h1-qR2"/>
                 <outlet property="cancelButton" destination="YBC-g3-0LP" id="rmu-WT-3G1"/>
+                <outlet property="headerView" destination="3D3-Fa-C7n" id="WP4-6d-ICd"/>
                 <outlet property="searchBar" destination="cOC-iR-MJr" id="usQ-SP-NSs"/>
                 <outlet property="tableView" destination="y9n-QI-xEB" id="WSo-bN-Vnv"/>
                 <outlet property="view" destination="chb-2b-70h" id="wNB-f6-JWl"/>
@@ -43,7 +46,11 @@
                         <action selector="dismissWasPressed" destination="-1" eventType="touchUpInside" id="xwh-lf-NJz"/>
                     </connections>
                 </button>
-                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="y9n-QI-xEB">
+                <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3D3-Fa-C7n">
+                    <rect key="frame" x="0.0" y="10" width="375" height="41"/>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                </view>
+                <tableView clipsSubviews="YES" contentMode="scaleToFill" ambiguous="YES" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="y9n-QI-xEB">
                     <rect key="frame" x="0.0" y="51" width="375" height="616"/>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <connections>
@@ -55,13 +62,16 @@
             <viewLayoutGuide key="safeArea" id="l4O-t2-oPf"/>
             <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
+                <constraint firstItem="3D3-Fa-C7n" firstAttribute="top" secondItem="cOC-iR-MJr" secondAttribute="bottom" id="1cN-Hx-OP0"/>
                 <constraint firstItem="Ncr-u2-zVd" firstAttribute="leading" secondItem="chb-2b-70h" secondAttribute="leading" id="3GU-ol-Uc5"/>
+                <constraint firstItem="l4O-t2-oPf" firstAttribute="trailing" secondItem="3D3-Fa-C7n" secondAttribute="trailing" id="74H-a0-TJ8"/>
                 <constraint firstItem="cOC-iR-MJr" firstAttribute="bottom" secondItem="Ncr-u2-zVd" secondAttribute="bottom" id="A3E-fX-OKH"/>
                 <constraint firstItem="y9n-QI-xEB" firstAttribute="leading" secondItem="chb-2b-70h" secondAttribute="leading" id="B3k-rC-VuB"/>
                 <constraint firstItem="l4O-t2-oPf" firstAttribute="trailing" secondItem="YBC-g3-0LP" secondAttribute="trailing" constant="16" id="Dvf-RD-FUS"/>
                 <constraint firstItem="YBC-g3-0LP" firstAttribute="centerY" secondItem="cOC-iR-MJr" secondAttribute="centerY" constant="-1" id="JLs-22-kWd"/>
-                <constraint firstItem="y9n-QI-xEB" firstAttribute="top" secondItem="cOC-iR-MJr" secondAttribute="bottom" id="QMH-4a-wFC"/>
                 <constraint firstItem="cOC-iR-MJr" firstAttribute="top" secondItem="l4O-t2-oPf" secondAttribute="top" id="c7h-ay-W2D"/>
+                <constraint firstItem="3D3-Fa-C7n" firstAttribute="bottom" secondItem="y9n-QI-xEB" secondAttribute="top" id="eKa-Nm-JUM"/>
+                <constraint firstItem="3D3-Fa-C7n" firstAttribute="leading" secondItem="l4O-t2-oPf" secondAttribute="leading" id="elN-rT-CdI"/>
                 <constraint firstItem="YBC-g3-0LP" firstAttribute="leading" secondItem="cOC-iR-MJr" secondAttribute="trailing" constant="3" id="nSK-Od-9bp"/>
                 <constraint firstAttribute="trailing" secondItem="y9n-QI-xEB" secondAttribute="trailing" id="qbt-la-21b"/>
                 <constraint firstItem="l4O-t2-oPf" firstAttribute="bottom" secondItem="y9n-QI-xEB" secondAttribute="bottom" id="rig-yz-o3K"/>
@@ -73,4 +83,9 @@
             <point key="canvasLocation" x="108" y="139.880059970015"/>
         </view>
     </objects>
+    <resources>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
 </document>
diff --git a/Yosemite/Yosemite.xcodeproj/project.pbxproj b/Yosemite/Yosemite.xcodeproj/project.pbxproj
diff --git a/Yosemite/Yosemite/Actions/ProductAction.swift b/Yosemite/Yosemite/Actions/ProductAction.swift
diff --git a/Yosemite/Yosemite/Model/Products/ProductSearchFilter.swift b/Yosemite/Yosemite/Model/Products/ProductSearchFilter.swift
diff --git a/Yosemite/Yosemite/Stores/ProductStore.swift b/Yosemite/Yosemite/Stores/ProductStore.swift

Original file line number	Diff line number	Diff line change
`@@ -345,8 +345,8 @@ public extension StorageType {`
`345`	`345`
`346`	`346`	`/// Retrieves the Stored ProductSearchResults Lookup.`
`347`	`347`	`///`
`348`		`- func loadProductSearchResults(keyword: String) -> ProductSearchResults? {`
`349`		`- let predicate = \ProductSearchResults.keyword == keyword`
	`348`	`+ func loadProductSearchResults(keyword: String, filterKey: String) -> ProductSearchResults? {`
	`349`	`+ let predicate = \ProductSearchResults.keyword == keyword && \ProductSearchResults.filterKey == filterKey`
`350`	`350`	`return firstObject(ofType: ProductSearchResults.self, matching: predicate)`
`351`	`351`	`}`
`352`	`352`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@ final class CouponSearchUICommand: SearchUICommand {`
`15`	`15`
`16`	`16`	`let cancelButtonAccessibilityIdentifier = "coupon-search-screen-cancel-button"`
`17`	`17`
	`18`	`+ var resynchronizeModels: (() -> Void) = {}`
	`19`	`+`
`18`	`20`	`private let siteID: Int64`
`19`	`21`
`20`	`22`	`init(siteID: Int64) {`
`@@ -80,6 +82,10 @@ final class CouponSearchUICommand: SearchUICommand {`
`80`	`82`
`81`	`83`	`viewController.configure(.simple(message: message, image: .emptySearchResultsImage))`
`82`	`84`	`}`
	`85`	`+`
	`86`	`+ func searchResultsPredicate(keyword: String) -> NSPredicate {`
	`87`	`+ NSPredicate(format: "ANY searchResults.keyword = %@", keyword)`
	`88`	`+ }`
`83`	`89`	`}`
`84`	`90`
`85`	`91`	`// MARK: - Subtypes`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@ final class OrderSearchUICommand: SearchUICommand {`
`14`	`14`
`15`	`15`	`let cancelButtonAccessibilityIdentifier = "order-search-screen-cancel-button"`
`16`	`16`
	`17`	`+ var resynchronizeModels: (() -> Void) = {}`
	`18`	`+`
`17`	`19`	`private lazy var statusResultsController: ResultsController<StorageOrderStatus> = {`
`18`	`20`	`let storageManager = ServiceLocator.storageManager`
`19`	`21`	`let predicate = NSPredicate(format: "siteID == %lld", siteID)`
`@@ -91,6 +93,10 @@ final class OrderSearchUICommand: SearchUICommand {`
`91`	`93`	`}`
`92`	`94`	`return keyword`
`93`	`95`	`}`
	`96`	`+`
	`97`	`+ func searchResultsPredicate(keyword: String) -> NSPredicate {`
	`98`	`+ NSPredicate(format: "ANY searchResults.keyword = %@", keyword)`
	`99`	`+ }`
`94`	`100`	`}`
`95`	`101`
`96`	`102`	`private extension OrderSearchUICommand {`