Clean up unused profile page properties (#2801)

* Remove unused projects list from goToProject

* Delete unused sort

Author: ifosli

Kickstarter-Framework/Sources/Kickstarter-Framework-iOSTests/Kickstarter-iOS/Features/BackerDashboardProjects/Controller/BackerDashboardProjectsViewControllerTests.swift

@@ -69,7 +69,7 @@ internal final class BackerDashboardProjectsViewControllerTests: TestCase {
         language: language
       ) {
         let controller = BackerDashboardProjectsViewController
-          .configuredWith(projectsType: .backed, sort: .endingSoon)
+          .configuredWith(projectsType: .backed)
         controller.overrideUserInterfaceStyle = style
         let (parent, _) = traitControllers(
           device: device,
@@ -99,7 +99,7 @@ internal final class BackerDashboardProjectsViewControllerTests: TestCase {
         language: language
       ) {
         let controller = BackerDashboardProjectsViewController
-          .configuredWith(projectsType: .backed, sort: .endingSoon)
+          .configuredWith(projectsType: .backed)
         let (parent, _) = traitControllers(
           device: device,
           orientation: .portrait,
@@ -122,7 +122,7 @@ internal final class BackerDashboardProjectsViewControllerTests: TestCase {
         language: language
       ) {
         let controller = BackerDashboardProjectsViewController
-          .configuredWith(projectsType: .saved, sort: .endingSoon)
+          .configuredWith(projectsType: .saved)
         let (parent, _) = traitControllers(
           device: device,
           orientation: .portrait,

Kickstarter-Framework/Sources/Kickstarter-Framework/Kickstarter-iOS/Features/BackerDashboardPages/Controller/BackerDashboardViewController.swift

@@ -125,8 +125,8 @@ internal final class BackerDashboardViewController: UIViewController {
 
     self.viewModel.outputs.configurePagesDataSource
       .observeForControllerAction()
-      .observeValues { [weak self] tab, sort in
-        self?.configurePagesDataSource(tab: tab, sort: sort)
+      .observeValues { [weak self] tab in
+        self?.configurePagesDataSource(tab: tab)
       }
 
     self.viewModel.outputs.savedButtonTitleText
@@ -228,8 +228,8 @@ internal final class BackerDashboardViewController: UIViewController {
       |> UILabel.lens.font .~ .ksr_headline(size: 18)
   }
 
-  private func configurePagesDataSource(tab: BackerDashboardTab, sort: DiscoveryParams.Sort) {
-    self.pagesDataSource = BackerDashboardPagesDataSource(delegate: self, sort: sort)
+  private func configurePagesDataSource(tab: BackerDashboardTab) {
+    self.pagesDataSource = BackerDashboardPagesDataSource(delegate: self)
 
     self.pageViewController?.dataSource = self.pagesDataSource
     self.pageViewController?.ksr_setViewControllers(

Kickstarter-Framework/Sources/Kickstarter-Framework/Kickstarter-iOS/Features/BackerDashboardPages/Datasource/BackerDashboardPagesDataSource.swift

@@ -5,15 +5,13 @@ import UIKit
 internal final class BackerDashboardPagesDataSource: NSObject, UIPageViewControllerDataSource {
   private let viewControllers: [UIViewController]
 
-  internal init(delegate _: UIViewController, sort: DiscoveryParams.Sort) {
+  internal init(delegate _: UIViewController) {
     let backedController = BackerDashboardProjectsViewController.configuredWith(
-      projectsType: .backed,
-      sort: sort
+      projectsType: .backed
     )
 
     let savedController = BackerDashboardProjectsViewController.configuredWith(
-      projectsType: .saved,
-      sort: sort
+      projectsType: .saved
     )
 
     self.viewControllers = BackerDashboardTab.allTabs.map { tab in

Kickstarter-Framework/Sources/Kickstarter-Framework/Kickstarter-iOS/Features/BackerDashboardProjects/Controller/BackerDashboardProjectsViewController.swift

@@ -11,10 +11,10 @@ internal final class BackerDashboardProjectsViewController: UITableViewControlle
 
   private let nextPageLoadingIndicator = UIActivityIndicatorView()
 
-  internal static func configuredWith(projectsType: ProfileProjectsType, sort: DiscoveryParams.Sort)
+  internal static func configuredWith(projectsType: ProfileProjectsType)
     -> BackerDashboardProjectsViewController {
     let vc = BackerDashboardProjectsViewController()
-    vc.viewModel.inputs.configureWith(projectsType: projectsType, sort: sort)
+    vc.viewModel.inputs.configureWith(projectsType: projectsType)
     return vc
   }
 
@@ -110,8 +110,8 @@ internal final class BackerDashboardProjectsViewController: UITableViewControlle
 
     self.viewModel.outputs.goToProject
       .observeForControllerAction()
-      .observeValues { [weak self] project, projects, reftag in
-        self?.goTo(project: project, initialPlaylist: projects, refTag: reftag)
+      .observeValues { [weak self] project, reftag in
+        self?.goTo(project: project, refTag: reftag)
       }
   }
 
@@ -141,7 +141,7 @@ internal final class BackerDashboardProjectsViewController: UITableViewControlle
     self.viewModel.inputs.projectTapped(project)
   }
 
-  private func goTo(project: Project, initialPlaylist _: [Project], refTag: RefTag) {
+  private func goTo(project: Project, refTag: RefTag) {
     let projectParam = Either<Project, any ProjectPageParam>(left: project)
     let vc = ProjectPageViewController.configuredWith(
       projectOrParam: projectParam,

Library/Sources/Library/Library/ViewModels/BackerDashboardProjectsViewModel.swift

@@ -5,8 +5,8 @@ import ReactiveExtensions
 import ReactiveSwift
 
 public protocol BackerDashboardProjectsViewModelInputs {
-  /// Call to configure with the ProfileProjectsType to display and the default sort.
-  func configureWith(projectsType: ProfileProjectsType, sort: DiscoveryParams.Sort)
+  /// Call to configure with the ProfileProjectsType to display.
+  func configureWith(projectsType: ProfileProjectsType)
 
   /// Call when the user has updated.
   func currentUserUpdated()
@@ -32,7 +32,7 @@ public protocol BackerDashboardProjectsViewModelOutputs {
   var emptyStateIsVisible: Signal<(Bool, ProfileProjectsType), Never> { get }
 
   /// Emits the project, projects, and ref tag when should go to project page.
-  var goToProject: Signal<(Project, [Project], RefTag), Never> { get }
+  var goToProject: Signal<(Project, RefTag), Never> { get }
 
   /// Emits when the pull-to-refresh control is refreshing or not.
   var isRefreshing: Signal<Bool, Never> { get }
@@ -52,8 +52,7 @@ public protocol BackerDashboardProjectsViewModelType {
 public final class BackerDashboardProjectsViewModel: BackerDashboardProjectsViewModelType,
   BackerDashboardProjectsViewModelInputs, BackerDashboardProjectsViewModelOutputs {
   public init() {
-    let projectsTypeAndSort = self.configureWithProjectsTypeAndSortProperty.signal.skipNil()
-    let projectsType = projectsTypeAndSort.map(first)
+    let projectsType = self.configureWithProjectsTypeAndSortProperty.signal.skipNil()
 
     let userUpdated = Signal.merge(
       self.viewDidAppearProperty.signal.ignoreValues(),
@@ -134,12 +133,11 @@ public final class BackerDashboardProjectsViewModel: BackerDashboardProjectsView
         (projects.isEmpty, type)
       }
 
-    self.goToProject = Signal.combineLatest(projectsType, self.projects)
+    self.goToProject = projectsType
       .takePairWhen(self.projectTappedProperty.signal.skipNil())
-      .map(unpack)
-      .map { projectsType, projects, project in
+      .map { projectsType, project in
         let ref = (projectsType == .backed) ? RefTag.profileBacked : RefTag.profileSaved
-        return (project, projects, ref)
+        return (project, ref)
       }
 
     // Tracking
@@ -160,9 +158,9 @@ public final class BackerDashboardProjectsViewModel: BackerDashboardProjectsView
   }
 
   private let configureWithProjectsTypeAndSortProperty =
-    MutableProperty<(ProfileProjectsType, DiscoveryParams.Sort)?>(nil)
-  public func configureWith(projectsType: ProfileProjectsType, sort: DiscoveryParams.Sort) {
-    self.configureWithProjectsTypeAndSortProperty.value = (projectsType, sort)
+    MutableProperty<ProfileProjectsType?>(nil)
+  public func configureWith(projectsType: ProfileProjectsType) {
+    self.configureWithProjectsTypeAndSortProperty.value = projectsType
   }
 
   private let currentUserUpdatedProperty = MutableProperty(())
@@ -196,7 +194,7 @@ public final class BackerDashboardProjectsViewModel: BackerDashboardProjectsView
   }
 
   public let emptyStateIsVisible: Signal<(Bool, ProfileProjectsType), Never>
-  public let goToProject: Signal<(Project, [Project], RefTag), Never>
+  public let goToProject: Signal<(Project, RefTag), Never>
   public let isRefreshing: Signal<Bool, Never>
   public let isLoadingNextPage: Signal<Bool, Never>
   public let projects: Signal<[Project], Never>

Library/Sources/Library/Library/ViewModels/BackerDashboardViewModel.swift

@@ -56,8 +56,8 @@ public protocol BackerDashboardViewModelOutputs {
   /// Emits a string for the backer name label.
   var backerNameText: Signal<String, Never> { get }
 
-  /// Emits the initial BackerDashboardTab and a default Sort to configure the page view controller.
-  var configurePagesDataSource: Signal<(BackerDashboardTab, DiscoveryParams.Sort), Never> { get }
+  /// Emits the initial BackerDashboardTab to configure the page view controller.
+  var configurePagesDataSource: Signal<BackerDashboardTab, Never> { get }
 
   /// The currently selected tab.
   var currentSelectedTab: BackerDashboardTab { get }
@@ -99,7 +99,7 @@ public final class BackerDashboardViewModel: BackerDashboardViewModelType, Backe
   BackerDashboardViewModelOutputs {
   public init() {
     self.configurePagesDataSource = self.viewDidLoadProperty.signal
-      .map { (.backed, DiscoveryParams.Sort.endingSoon) }
+      .map { .backed }
 
     let fetchedUserEvent = Signal.merge(
       self.projectSavedProperty.signal.ignoreValues()
@@ -269,7 +269,7 @@ public final class BackerDashboardViewModel: BackerDashboardViewModelType, Backe
   public let avatarURL: Signal<URL?, Never>
   public let backedButtonTitleText: Signal<String, Never>
   public let backerNameText: Signal<String, Never>
-  public let configurePagesDataSource: Signal<(BackerDashboardTab, DiscoveryParams.Sort), Never>
+  public let configurePagesDataSource: Signal<BackerDashboardTab, Never>
   public let goToMessages: Signal<(), Never>
   public let goToSettings: Signal<(), Never>
   public let navigateToTab: Signal<BackerDashboardTab, Never>

LibraryTests/Library/ViewModels/BackerDashboardProjectsViewModelTests.swift

@@ -26,7 +26,7 @@ internal final class BackerDashboardProjectsViewModelTests: TestCase {
     self.vm.outputs.isRefreshing.observe(self.isRefreshing.observer)
     self.vm.outputs.isLoadingNextPage.observe(self.isLoadingNextPage.observer)
     self.vm.outputs.goToProject.map(first).observe(self.goToProject.observer)
-    self.vm.outputs.goToProject.map(third).observe(self.goToProjectRefTag.observer)
+    self.vm.outputs.goToProject.map(second).observe(self.goToProjectRefTag.observer)
     self.vm.outputs.projects.observe(self.projects.observer)
   }
 
@@ -49,7 +49,7 @@ internal final class BackerDashboardProjectsViewModelTests: TestCase {
     )
 
     withEnvironment(apiService: MockService(fetchBackerBackedProjectsResponse: env), currentUser: .template) {
-      self.vm.inputs.configureWith(projectsType: .backed, sort: .endingSoon)
+      self.vm.inputs.configureWith(projectsType: .backed)
       self.vm.inputs.viewDidAppear(false)
       self.vm.inputs.currentUserUpdated()
 
@@ -122,7 +122,7 @@ internal final class BackerDashboardProjectsViewModelTests: TestCase {
     let env = FetchProjectsEnvelope(type: .saved, projects: [], hasNextPage: false, totalCount: 0)
 
     withEnvironment(apiService: MockService(fetchBackerSavedProjectsResponse: env), currentUser: .template) {
-      self.vm.inputs.configureWith(projectsType: .saved, sort: .endingSoon)
+      self.vm.inputs.configureWith(projectsType: .saved)
       self.vm.inputs.viewDidAppear(false)
 
       self.projects.assertValueCount(0)
@@ -155,7 +155,7 @@ internal final class BackerDashboardProjectsViewModelTests: TestCase {
     let env = FetchProjectsEnvelope(type: .backed, projects: projects, hasNextPage: false, totalCount: 3)
 
     withEnvironment(apiService: MockService(fetchBackerBackedProjectsResponse: env), currentUser: .template) {
-      self.vm.inputs.configureWith(projectsType: .backed, sort: .endingSoon)
+      self.vm.inputs.configureWith(projectsType: .backed)
       self.vm.inputs.viewDidAppear(false)
 
       self.scheduler.advance()
@@ -188,7 +188,7 @@ internal final class BackerDashboardProjectsViewModelTests: TestCase {
     let user = User.template
 
     withEnvironment(apiService: MockService(fetchBackerBackedProjectsResponse: env), currentUser: user) {
-      self.vm.inputs.configureWith(projectsType: .backed, sort: .endingSoon)
+      self.vm.inputs.configureWith(projectsType: .backed)
       self.vm.inputs.viewDidAppear(false)
       self.vm.inputs.currentUserUpdated()
 
@@ -234,7 +234,7 @@ internal final class BackerDashboardProjectsViewModelTests: TestCase {
     let user = User.template
 
     withEnvironment(apiService: MockService(fetchBackerBackedProjectsResponse: env), currentUser: user) {
-      self.vm.inputs.configureWith(projectsType: .backed, sort: .endingSoon)
+      self.vm.inputs.configureWith(projectsType: .backed)
       self.vm.inputs.viewDidAppear(false)
       self.vm.inputs.currentUserUpdated()
 

LibraryTests/Library/ViewModels/BackerDashboardViewModelTests.swift

@@ -14,7 +14,6 @@ internal final class BackerDashboardViewModelTests: TestCase {
   private let backedButtonTitleText = TestObserver<String, Never>()
   private let backerNameText = TestObserver<String, Never>()
   private let configurePagesDataSourceTab = TestObserver<BackerDashboardTab, Never>()
-  private let configurePagesDataSourceSort = TestObserver<DiscoveryParams.Sort, Never>()
   private let goToMessages = TestObserver<(), Never>()
   private let goToProject = TestObserver<Project, Never>()
   private let goToSettings = TestObserver<(), Never>()
@@ -32,8 +31,7 @@ internal final class BackerDashboardViewModelTests: TestCase {
     self.vm.outputs.avatarURL.map { $0?.absoluteString ?? "" }.observe(self.avatarURL.observer)
     self.vm.outputs.backedButtonTitleText.observe(self.backedButtonTitleText.observer)
     self.vm.outputs.backerNameText.observe(self.backerNameText.observer)
-    self.vm.outputs.configurePagesDataSource.map(first).observe(self.configurePagesDataSourceTab.observer)
-    self.vm.outputs.configurePagesDataSource.map(second).observe(self.configurePagesDataSourceSort.observer)
+    self.vm.outputs.configurePagesDataSource.observe(self.configurePagesDataSourceTab.observer)
     self.vm.outputs.goToMessages.observe(self.goToMessages.observer)
     self.vm.outputs.goToSettings.observe(self.goToSettings.observer)
     self.vm.outputs.navigateToTab.observe(self.navigateToTab.observer)
@@ -101,12 +99,10 @@ internal final class BackerDashboardViewModelTests: TestCase {
 
   func testConfigurePagesData() {
     self.configurePagesDataSourceTab.assertValueCount(0)
-    self.configurePagesDataSourceSort.assertValueCount(0)
 
     self.vm.inputs.viewDidLoad()
 
     self.configurePagesDataSourceTab.assertValues([.backed])
-    self.configurePagesDataSourceSort.assertValues([.endingSoon])
   }
 
   func testTabNavigation() {