diff options
| author | Christian Cleberg <[email protected]> | 2026-04-12 22:52:33 -0500 |
|---|---|---|
| committer | Christian Cleberg <[email protected]> | 2026-04-12 22:52:33 -0500 |
| commit | 72f860e0e171f6aac4e7d896e7a571147dbcb5c5 (patch) | |
| tree | c62c9c9325292f65e6f72372a38b35760cc937b1 /Hutch/Views/Repositories | |
| parent | 576bb6c2432a15f5138771c06019b55fd2244e15 (diff) | |
| download | hutch-72f860e0e171f6aac4e7d896e7a571147dbcb5c5.tar.gz hutch-72f860e0e171f6aac4e7d896e7a571147dbcb5c5.tar.bz2 hutch-72f860e0e171f6aac4e7d896e7a571147dbcb5c5.zip | |
feat: add search and recent queries
Implements: https://todo.sr.ht/~ccleberg/hutch/47
Implements: https://todo.sr.ht/~ccleberg/hutch/48
Diffstat (limited to 'Hutch/Views/Repositories')
| -rw-r--r-- | Hutch/Views/Repositories/RepositoryListView.swift | 53 | ||||
| -rw-r--r-- | Hutch/Views/Repositories/RepositoryListViewModel.swift | 36 |
2 files changed, 85 insertions, 4 deletions
diff --git a/Hutch/Views/Repositories/RepositoryListView.swift b/Hutch/Views/Repositories/RepositoryListView.swift index d176e4b..f5ca716 100644 --- a/Hutch/Views/Repositories/RepositoryListView.swift +++ b/Hutch/Views/Repositories/RepositoryListView.swift @@ -4,6 +4,7 @@ struct RepositoryListView: View { @Environment(AppState.self) private var appState @State private var viewModel: RepositoryListViewModel? @State private var searchTask: Task<Void, Never>? + @State private var immediateSearchTask: Task<Void, Never>? @State private var showCreateRepositorySheet = false @State private var createdRepository: RepositorySummary? @@ -68,6 +69,17 @@ struct RepositoryListView: View { @Bindable var vm = viewModel List { + if viewModel.isSearching { + HStack(spacing: 12) { + ProgressView() + .controlSize(.small) + Text("Searching repositories…") + .font(.footnote) + .foregroundStyle(.secondary) + } + .listRowSeparator(.hidden) + } + ForEach(viewModel.repositories) { repo in NavigationLink(value: repo) { RepositoryRowView( @@ -92,7 +104,28 @@ struct RepositoryListView: View { } .themedList() .listStyle(.plain) - .searchable(text: $vm.searchText, placement: .navigationBarDrawer(displayMode: .always), prompt: "Search repositories") + .searchable( + text: $vm.searchText, + placement: .navigationBarDrawer(displayMode: .always), + prompt: "Search repositories by name, owner, or description" + ) + .searchSuggestions { + if viewModel.searchText.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty { + RecentSearchSuggestions( + title: "Recent Repository Searches", + entries: viewModel.recentSearches + ) { query in + searchTask?.cancel() + immediateSearchTask?.cancel() + vm.searchText = query + immediateSearchTask = Task { + await viewModel.loadRepositories(search: query) + } + } onClear: { + viewModel.clearRecentSearches() + } + } + } .overlay { if viewModel.isLoading, viewModel.repositories.isEmpty { SRHTLoadingStateView(message: "Loading repositories…") @@ -110,7 +143,11 @@ struct RepositoryListView: View { description: Text("You don't have any repositories yet.") ) } else { - ContentUnavailableView.search + ContentUnavailableView( + "No Repository Matches", + systemImage: "magnifyingglass", + description: Text("No repositories matched “\(viewModel.searchText)”.") + ) } } } @@ -124,9 +161,21 @@ struct RepositoryListView: View { .task { await viewModel.loadRepositories() } + .onSubmit(of: .search) { + let query = viewModel.searchText.trimmingCharacters(in: .whitespacesAndNewlines) + guard !query.isEmpty else { return } + + searchTask?.cancel() + immediateSearchTask?.cancel() + viewModel.recordRecentSearch(query) + immediateSearchTask = Task { + await viewModel.loadRepositories(search: query) + } + } .onChange(of: viewModel.searchText) { oldValue, newValue in // Cancel previous search task searchTask?.cancel() + immediateSearchTask?.cancel() // Clear results immediately when search text is cleared if newValue.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty { diff --git a/Hutch/Views/Repositories/RepositoryListViewModel.swift b/Hutch/Views/Repositories/RepositoryListViewModel.swift index 7a65441..0cfc8c3 100644 --- a/Hutch/Views/Repositories/RepositoryListViewModel.swift +++ b/Hutch/Views/Repositories/RepositoryListViewModel.swift @@ -25,9 +25,11 @@ enum RepositoryCreationService: String, CaseIterable, Identifiable, Sendable { @Observable @MainActor final class RepositoryListViewModel { + private static let searchHistoryScopeID = "repositories" private(set) var repositories: [RepositorySummary] = [] private(set) var latestBuildStatuses: [String: RepositoryBuildStatus] = [:] + private(set) var recentSearches: [ScopedSearchHistoryEntry] private(set) var isLoading = false private(set) var isLoadingMore = false private(set) var isRefreshing = false @@ -42,6 +44,7 @@ final class RepositoryListViewModel { private(set) var hasLoadedSearchIndex = false private var searchIndex: [RepositorySummary] = [] private let client: SRHTClient + private let defaults: UserDefaults private var buildStatusTask: Task<Void, Never>? private static let gitCacheKey = "git.repositories" @@ -49,8 +52,13 @@ final class RepositoryListViewModel { private static let buildsCacheKey = "builds.repository-status" private static let minimumRemoteSearchLength = 3 - init(client: SRHTClient) { + init(client: SRHTClient, defaults: UserDefaults = .standard) { self.client = client + self.defaults = defaults + self.recentSearches = ScopedSearchHistoryStore.load( + scopeID: Self.searchHistoryScopeID, + defaults: defaults + ) } // MARK: - Queries @@ -302,6 +310,26 @@ final class RepositoryListViewModel { isSearching = false } + func recordRecentSearch(_ query: String) { + ScopedSearchHistoryStore.record( + query: query, + scopeID: Self.searchHistoryScopeID, + defaults: defaults + ) + recentSearches = ScopedSearchHistoryStore.load( + scopeID: Self.searchHistoryScopeID, + defaults: defaults + ) + } + + func clearRecentSearches() { + ScopedSearchHistoryStore.clear( + scopeID: Self.searchHistoryScopeID, + defaults: defaults + ) + recentSearches = [] + } + // MARK: - Private /// Page shape matching the GraphQL response without generic constraints that @@ -696,9 +724,13 @@ final class RepositoryListViewModel { } static func filterRepositories(_ repositories: [RepositorySummary], matching query: String) -> [RepositorySummary] { - let lowercasedQuery = query.lowercased() + let lowercasedQuery = query.trimmingCharacters(in: .whitespacesAndNewlines).lowercased() + guard !lowercasedQuery.isEmpty else { return repositories } + return repositories.filter { repo in repo.name.lowercased().contains(lowercasedQuery) || + repo.owner.canonicalName.lowercased().contains(lowercasedQuery) || + repo.defaultBranchName?.lowercased().contains(lowercasedQuery) ?? false || repo.description?.lowercased().contains(lowercasedQuery) ?? false } } |
