Revert changes made to SearchUICommand and related files

itsmeichigo · itsmeichigo · commit 13856451ae27 · 2025-08-01T15:15:59.000+07:00
diff --git a/Modules/Sources/Yosemite/Model/Storage/Coupon+ReadOnlyConvertible.swift b/Modules/Sources/Yosemite/Model/Storage/Coupon+ReadOnlyConvertible.swift
@@ -64,9 +64,3 @@ extension Storage.Coupon: ReadOnlyConvertible {
                       usedBy: usedBy ?? [])
     }
 }
-
-extension Storage.Coupon: ListItemConvertible {
-    public func toListItem() -> Yosemite.Coupon {
-        toReadOnly()
-    }
-}
diff --git a/Modules/Sources/Yosemite/Model/Storage/Customer+ReadOnlyConvertible.swift b/Modules/Sources/Yosemite/Model/Storage/Customer+ReadOnlyConvertible.swift
@@ -132,9 +132,3 @@ extension Storage.Customer: ReadOnlyConvertible {
         )
     }
 }
-
-extension Storage.Customer: ListItemConvertible {
-    public func toListItem() -> Yosemite.Customer {
-        toReadOnly()
-    }
-}
diff --git a/Modules/Sources/Yosemite/Model/Storage/Order+ReadOnlyConvertible.swift b/Modules/Sources/Yosemite/Model/Storage/Order+ReadOnlyConvertible.swift
@@ -82,6 +82,7 @@ extension Storage.Order: ReadOnlyConvertible {
         let orderCustomFields = customFields?.map { $0.toReadOnly() } ?? [Yosemite.MetaData]()
         let orderGiftCards = appliedGiftCards?.map { $0.toReadOnly() } ?? [Yosemite.OrderGiftCard]()
         let orderShippingLabels = shippingLabels?.map { $0.toReadOnly() } ?? [Yosemite.ShippingLabel]()
+        let orderShipments = shipments?.map { $0.toReadOnly() } ?? [Yosemite.WooShippingShipment]()
 
         return Order(siteID: siteID,
                      orderID: orderID,
@@ -171,10 +172,3 @@ extension Storage.Order {
         return items?.toTypeCheckedArray() ?? [Storage.OrderItem]()
     }
  }
-
-extension StorageOrder: ListItemConvertible {
-    public func toListItem() -> Yosemite.Order {
-        // TODO: return simplified object to improve performance
-        toReadOnly()
-    }
-}
diff --git a/Modules/Sources/Yosemite/Model/Storage/ProductShippingClass+ReadOnlyConvertible.swift b/Modules/Sources/Yosemite/Model/Storage/ProductShippingClass+ReadOnlyConvertible.swift
@@ -29,9 +29,3 @@ extension Storage.ProductShippingClass: ReadOnlyConvertible {
                                     slug: slug)
     }
 }
-
-extension Storage.ProductShippingClass: ListItemConvertible {
-    public func toListItem() -> Yosemite.ProductShippingClass {
-        toReadOnly()
-    }
-}
diff --git a/Modules/Sources/Yosemite/Model/Storage/TaxClass+ReadOnlyConvertible.swift b/Modules/Sources/Yosemite/Model/Storage/TaxClass+ReadOnlyConvertible.swift
@@ -20,9 +20,3 @@ extension Storage.TaxClass: ReadOnlyConvertible {
         return TaxClass(siteID: siteID, name: name, slug: slug)
     }
 }
-
-extension StorageTaxClass: ListItemConvertible {
-    public func toListItem() -> Yosemite.TaxClass {
-        toReadOnly()
-    }
-}
diff --git a/Modules/Sources/Yosemite/Tools/ResultsController.swift b/Modules/Sources/Yosemite/Tools/ResultsController.swift
@@ -361,17 +361,4 @@ public extension ResultsController where T: ListItemConvertible {
     func listItem(at indexPath: IndexPath) -> T.ListItemType {
         return controller.object(at: indexPath).toListItem()
     }
-
-    func listItemObjects(in section: Int) -> [T.ListItemType] {
-        let objects = controller.sections?[safe: section].map { $0.objects }
-        guard let objects else {
-            return []
-        }
-        guard let castedObjects = objects as? [T] else {
-            assertionFailure("Failed to cast objects into an array of \(T.self)")
-            return []
-        }
-
-        return castedObjects.map { $0.toListItem() }
-    }
 }
diff --git a/Modules/Tests/YosemiteTests/Tools/ResultsControllerTests.swift b/Modules/Tests/YosemiteTests/Tools/ResultsControllerTests.swift
@@ -516,58 +516,6 @@ final class ResultsControllerTests: XCTestCase {
         XCTAssertEqual(listItem.name, "Product 2")
         XCTAssertEqual(listItem.price, "20.00")
     }
-
-    func test_listItemObjects_in_section_returns_list_items_for_specified_section() throws {
-        // Given
-        let categoryA = createSampleProductListItem(productID: 1, name: "Product A1", price: "10.00")
-        let categoryA2 = createSampleProductListItem(productID: 2, name: "Product A2", price: "15.00")
-        let categoryB = createSampleProductListItem(productID: 3, name: "Product B1", price: "20.00")
-
-        // Insert products and manually set product type for section grouping
-        let storageProductA = storageManager.insertSampleProductListItem(item: categoryA)
-        storageProductA.productTypeKey = "simple"
-        let storageProductA2 = storageManager.insertSampleProductListItem(item: categoryA2)
-        storageProductA2.productTypeKey = "simple"
-        let storageProductB = storageManager.insertSampleProductListItem(item: categoryB)
-        storageProductB.productTypeKey = "variable"
-
-        let sortDescriptor = NSSortDescriptor(key: #keyPath(StorageProduct.productID), ascending: true)
-        let resultsController = ResultsController<StorageProduct>(viewStorage: viewStorage,
-                                                                 sectionNameKeyPath: #keyPath(StorageProduct.productTypeKey),
-                                                                 sortedBy: [sortDescriptor])
-        try resultsController.performFetch()
-
-        // When
-        let section0Items = resultsController.listItemObjects(in: 0)
-        let section1Items = resultsController.listItemObjects(in: 1)
-
-        // Then
-        XCTAssertEqual(section0Items.count, 2)
-        XCTAssertEqual(section0Items[0].productID, 1)
-        XCTAssertEqual(section0Items[0].name, "Product A1")
-        XCTAssertEqual(section0Items[1].productID, 2)
-        XCTAssertEqual(section0Items[1].name, "Product A2")
-
-        XCTAssertEqual(section1Items.count, 1)
-        XCTAssertEqual(section1Items[0].productID, 3)
-        XCTAssertEqual(section1Items[0].name, "Product B1")
-    }
-
-    func test_listItemObjects_in_section_returns_empty_array_for_nonexistent_section() throws {
-        // Given
-        let product = createSampleProductListItem(productID: 1, name: "Product 1", price: "10.00")
-        storageManager.insertSampleProductListItem(item: product)
-
-        let sortDescriptor = NSSortDescriptor(key: #keyPath(StorageProduct.productID), ascending: true)
-        let resultsController = ResultsController<StorageProduct>(viewStorage: viewStorage, sortedBy: [sortDescriptor])
-        try resultsController.performFetch()
-
-        // When
-        let items = resultsController.listItemObjects(in: 5)
-
-        // Then
-        XCTAssertTrue(items.isEmpty)
-    }
 }
 
 // MARK: - Utils
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
@@ -4,7 +4,6 @@ import Yosemite
 
 /// Implementation of `SearchUICommand` for selecting linked products to a grouped product from search UI.
 final class ProductListMultiSelectorSearchUICommand: NSObject, SearchUICommand {
-    typealias ListItemModel = ProductListItem
     typealias Model = Product
     typealias CellViewModel = ProductsTabProductViewModel
     typealias ResultsControllerModel = StorageProduct
@@ -71,8 +70,8 @@ final class ProductListMultiSelectorSearchUICommand: NSObject, SearchUICommand {
         }
     }
 
-    func createCellViewModel(model: ProductListItem) -> ProductsTabProductViewModel {
-        return ProductsTabProductViewModel(product: model, isSelected: isProductSelected(model))
+    func createCellViewModel(model: Product) -> ProductsTabProductViewModel {
+        return ProductsTabProductViewModel(product: model.toListItem(), isSelected: isProductSelected(model))
     }
 
     /// Synchronizes the Products matching a given Keyword
@@ -136,12 +135,12 @@ private extension ProductListMultiSelectorSearchUICommand {
         selectedProductIDs.isNotEmpty
     }
 
-    func isProductSelected(_ product: ProductListItem) -> Bool {
+    func isProductSelected(_ product: Product) -> Bool {
         return selectedProductIDs.contains(product.productID)
     }
 
     func onProductSelected(_ product: Product) {
-        if isProductSelected(product.toListItem()) {
+        if isProductSelected(product) {
             // Unselects the product if it is currently selected.
             selectedProductIDs.removeAll { $0 == product.productID }
         } else {
diff --git a/WooCommerce/Classes/ViewRelated/Search/Product/ProductSearchUICommand.swift b/WooCommerce/Classes/ViewRelated/Search/Product/ProductSearchUICommand.swift
@@ -6,7 +6,6 @@ import protocol WooFoundation.Analytics
 
 /// Implementation of `SearchUICommand` for Product search.
 final class ProductSearchUICommand: SearchUICommand {
-    typealias ListItemModel = ProductListItem
     typealias Model = Product
     typealias CellViewModel = ProductsTabProductViewModel
     typealias ResultsControllerModel = StorageProduct
@@ -113,9 +112,9 @@ final class ProductSearchUICommand: SearchUICommand {
         viewController.configure(.simple(message: message, image: .magnifyingGlassNotFound))
     }
 
-    func createCellViewModel(model: ProductListItem) -> ProductsTabProductViewModel {
+    func createCellViewModel(model: Product) -> ProductsTabProductViewModel {
         let hasPendingUploads = activeUploadIds.contains(where: { $0 ==  model.productID })
-        return ProductsTabProductViewModel(product: model, hasPendingUploads: hasPendingUploads, isSKUShown: true)
+        return ProductsTabProductViewModel(product: model.toListItem(), hasPendingUploads: hasPendingUploads, isSKUShown: true)
     }
 
     /// Synchronizes the Products matching a given Keyword
diff --git a/WooCommerce/Classes/ViewRelated/Search/SearchUICommand.swift b/WooCommerce/Classes/ViewRelated/Search/SearchUICommand.swift
@@ -2,9 +2,8 @@ import Combine
 import UIKit
 import Yosemite
 
-/// An interface for search UI associated with a generic list item model, full model, and cell view model.
+/// An interface for search UI associated with a generic model and cell view model.
 protocol SearchUICommand {
-    associatedtype ListItemModel // model to display on list items
     associatedtype Model // model to send to selection closure
     associatedtype CellViewModel
     associatedtype EmptyStateViewControllerType: UIViewController = EmptyStateViewController
@@ -44,10 +43,8 @@ protocol SearchUICommand {
     /// Set externally to enable resyncing the models when needed. Otherwise, an empty closure can be set by default.
     var resynchronizeModels: (() -> Void) { get set }
 
-    associatedtype ResultsControllerModel: ResultsControllerMutableType & ListItemConvertible where
-    ResultsControllerModel.ReadOnlyType == Model,
-    ResultsControllerModel.ListItemType == ListItemModel
-
+    associatedtype ResultsControllerModel: ResultsControllerMutableType & ReadOnlyConvertible 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>
 
@@ -102,7 +99,7 @@ protocol SearchUICommand {
     ///
     /// - Parameter model: search result model used to display on list items.
     /// - Returns: a view model based on the search result model.
-    func createCellViewModel(model: ListItemModel) -> CellViewModel
+    func createCellViewModel(model: Model) -> CellViewModel
 
     /// Synchronizes the models matching a given keyword.
     func synchronizeModels(siteID: Int64,
diff --git a/WooCommerce/Classes/ViewRelated/Search/SearchViewController.swift b/WooCommerce/Classes/ViewRelated/Search/SearchViewController.swift
@@ -208,7 +208,7 @@ where Cell.SearchModel == Command.CellViewModel {
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(Cell.self, for: indexPath)
 
-        let model = resultsController.listItem(at: indexPath)
+        let model = resultsController.object(at: indexPath)
         let cellModel = searchUICommand.createCellViewModel(model: model)
         cell.configureCell(searchModel: cellModel)
         return cell

Original file line number	Diff line number	Diff line change
`@@ -64,9 +64,3 @@ extension Storage.Coupon: ReadOnlyConvertible {`
`64`	`64`	`usedBy: usedBy ?? [])`
`65`	`65`	`}`
`66`	`66`	`}`
`67`		`-`
`68`		`-extension Storage.Coupon: ListItemConvertible {`
`69`		`- public func toListItem() -> Yosemite.Coupon {`
`70`		`- toReadOnly()`
`71`		`- }`
`72`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -132,9 +132,3 @@ extension Storage.Customer: ReadOnlyConvertible {`
`132`	`132`	`)`
`133`	`133`	`}`
`134`	`134`	`}`
`135`		`-`
`136`		`-extension Storage.Customer: ListItemConvertible {`
`137`		`- public func toListItem() -> Yosemite.Customer {`
`138`		`- toReadOnly()`
`139`		`- }`
`140`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,3 @@ extension Storage.ProductShippingClass: ReadOnlyConvertible {`
`29`	`29`	`slug: slug)`
`30`	`30`	`}`
`31`	`31`	`}`
`32`		`-`
`33`		`-extension Storage.ProductShippingClass: ListItemConvertible {`
`34`		`- public func toListItem() -> Yosemite.ProductShippingClass {`
`35`		`- toReadOnly()`
`36`		`- }`
`37`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,3 @@ extension Storage.TaxClass: ReadOnlyConvertible {`
`20`	`20`	`return TaxClass(siteID: siteID, name: name, slug: slug)`
`21`	`21`	`}`
`22`	`22`	`}`
`23`		`-`
`24`		`-extension StorageTaxClass: ListItemConvertible {`
`25`		`- public func toListItem() -> Yosemite.TaxClass {`
`26`		`- toReadOnly()`
`27`		`- }`
`28`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ import Yosemite`
`4`	`4`
`5`	`5`	/// Implementation of `SearchUICommand` for selecting linked products to a grouped product from search UI.
`6`	`6`	`final class ProductListMultiSelectorSearchUICommand: NSObject, SearchUICommand {`
`7`		`- typealias ListItemModel = ProductListItem`
`8`	`7`	`typealias Model = Product`
`9`	`8`	`typealias CellViewModel = ProductsTabProductViewModel`
`10`	`9`	`typealias ResultsControllerModel = StorageProduct`
`@@ -71,8 +70,8 @@ final class ProductListMultiSelectorSearchUICommand: NSObject, SearchUICommand {`
`71`	`70`	`}`
`72`	`71`	`}`
`73`	`72`
`74`		`- func createCellViewModel(model: ProductListItem) -> ProductsTabProductViewModel {`
`75`		`- return ProductsTabProductViewModel(product: model, isSelected: isProductSelected(model))`
	`73`	`+ func createCellViewModel(model: Product) -> ProductsTabProductViewModel {`
	`74`	`+ return ProductsTabProductViewModel(product: model.toListItem(), isSelected: isProductSelected(model))`
`76`	`75`	`}`
`77`	`76`
`78`	`77`	`/// Synchronizes the Products matching a given Keyword`
`@@ -136,12 +135,12 @@ private extension ProductListMultiSelectorSearchUICommand {`
`136`	`135`	`selectedProductIDs.isNotEmpty`
`137`	`136`	`}`
`138`	`137`
`139`		`- func isProductSelected(_ product: ProductListItem) -> Bool {`
	`138`	`+ func isProductSelected(_ product: Product) -> Bool {`
`140`	`139`	`return selectedProductIDs.contains(product.productID)`
`141`	`140`	`}`
`142`	`141`
`143`	`142`	`func onProductSelected(_ product: Product) {`
`144`		`- if isProductSelected(product.toListItem()) {`
	`143`	`+ if isProductSelected(product) {`
`145`	`144`	`// Unselects the product if it is currently selected.`
`146`	`145`	`selectedProductIDs.removeAll { $0 == product.productID }`
`147`	`146`	`} else {`