Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
199 changes: 87 additions & 112 deletions apple/TablePro/Core/Coordinators/FilterCoordinator.swift

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apple/TablePro/Core/Coordinators/FindCoordinator.swift
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ final class FindCoordinator {
guard parent.tabManager.selectedTabId == tabID else { return }
let columns = serverSearchableColumns(in: parent.tabSessionRegistry.tableRows(for: tabID))
guard !columns.isEmpty else { return }
parent.filterCoordinator.applyCrossColumnSearch(term: term, columns: columns)
parent.filterCoordinator.applyCrossColumnSearch(term: term, columns: columns, forTab: tabID)
}

func serverSearchableColumns(in rows: TableRows) -> [String] {
Expand Down
29 changes: 12 additions & 17 deletions apple/TablePro/Core/Coordinators/PaginationCoordinator.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ final class PaginationCoordinator: ObservableObject {
// MARK: - Pagination

func goToNextPage() {
guard canSeek, let (tab, tabIndex) = parent.tabManager.selectedTabAndIndex else { return }
guard canSeek, let (tab, _) = parent.tabManager.selectedTabAndIndex else { return }
let loadedRowCount = parent.tabSessionRegistry.tableRows(for: tab.id).rows.count
guard tab.pagination.canGoToNextPage(loadedRowCount: loadedRowCount) else { return }
paginateAfterConfirmation(tabIndex: tabIndex) { $0.goToNextPage(loadedRowCount: loadedRowCount) }
paginateAfterConfirmation(tabId: tab.id) { $0.goToNextPage(loadedRowCount: loadedRowCount) }
}

func goToPreviousPage() {
Expand Down Expand Up @@ -80,9 +80,8 @@ final class PaginationCoordinator: ObservableObject {
),
confirmTitle: String(localized: "Show All")
) { [weak self] in
guard let self,
let tabIndex = parent.tabManager.tabs.firstIndex(where: { $0.id == tabId }) else { return }
paginateAfterConfirmation(tabIndex: tabIndex) { pagination in
guard let self, parent.tabManager.tabs.contains(where: { $0.id == tabId }) else { return }
paginateAfterConfirmation(tabId: tabId) { pagination in
pagination.updatePageSize(max(total, 1))
pagination.goToFirstPage()
}
Expand Down Expand Up @@ -116,32 +115,28 @@ final class PaginationCoordinator: ObservableObject {
where condition: (PaginationState) -> Bool = { _ in true },
mutate: @escaping (inout PaginationState) -> Void
) {
guard let (tab, tabIndex) = parent.tabManager.selectedTabAndIndex,
guard let (tab, _) = parent.tabManager.selectedTabAndIndex,
condition(tab.pagination) else { return }
paginateAfterConfirmation(tabIndex: tabIndex, mutate: mutate)
paginateAfterConfirmation(tabId: tab.id, mutate: mutate)
}

private func paginateAfterConfirmation(
tabIndex: Int,
tabId: UUID,
mutate: @escaping (inout PaginationState) -> Void
) {
let tabId = parent.tabManager.tabs[tabIndex].id
parent.confirmDiscardChangesIfNeeded(action: .pagination) { [weak self] confirmed in
parent.confirmDiscardChangesIfNeeded(forTab: tabId, action: .pagination) { [weak self] confirmed in
guard let self, confirmed else { return }
guard parent.tabManager.mutate(tabId: tabId, { tab in
mutate(&tab.pagination)
tab.paginationVersion += 1
}) else { return }
reloadCurrentPage()
reloadPage(ofTab: tabId)
}
}

private func reloadCurrentPage() {
guard let tabIndex = parent.tabManager.selectedTabIndex,
tabIndex < parent.tabManager.tabs.count else { return }

parent.rebuildTableQuery(at: tabIndex)
parent.runQuery(viewport: .firstRow)
private func reloadPage(ofTab tabId: UUID) {
parent.rebuildTableQuery(forTab: tabId)
parent.runQuery(onTab: tabId, viewport: .firstRow)
}

// MARK: - Cancel Current Query
Expand Down
Loading
Loading