- Notifications
You must be signed in to change notification settings - Fork3
feat: add remote folder picker to file sync GUI#127
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes fromall commits
Commits
Show all changes
6 commits Select commitHold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
9 changes: 9 additions & 0 deletionsCoder-Desktop/Coder-Desktop/Info.plist
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
232 changes: 232 additions & 0 deletionsCoder-Desktop/Coder-Desktop/Views/FileSync/FilePicker.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,232 @@ | ||
| import CoderSDK | ||
| import Foundation | ||
| import SwiftUI | ||
| struct FilePicker: View { | ||
| @Environment(\.dismiss) var dismiss | ||
| @StateObject private var model: FilePickerModel | ||
| @State private var selection: FilePickerEntryModel? | ||
| @Binding var outputAbsPath: String | ||
| let inspection = Inspection<Self>() | ||
| init( | ||
| host: String, | ||
| outputAbsPath: Binding<String> | ||
| ) { | ||
| _model = StateObject(wrappedValue: FilePickerModel(host: host)) | ||
| _outputAbsPath = outputAbsPath | ||
| } | ||
| var body: some View { | ||
| VStack(spacing: 0) { | ||
| if model.rootIsLoading { | ||
| Spacer() | ||
| ProgressView() | ||
| .controlSize(.large) | ||
| Spacer() | ||
| } else if let loadError = model.error { | ||
| Text("\(loadError.description)") | ||
| .font(.headline) | ||
| .foregroundColor(.red) | ||
| .multilineTextAlignment(.center) | ||
| .frame(maxWidth: .infinity, maxHeight: .infinity) | ||
| .padding() | ||
| } else { | ||
| List(selection: $selection) { | ||
| ForEach(model.rootEntries) { entry in | ||
| FilePickerEntry(entry: entry).tag(entry) | ||
| } | ||
| }.contextMenu( | ||
| forSelectionType: FilePickerEntryModel.self, | ||
| menu: { _ in }, | ||
| primaryAction: { selections in | ||
ethanndickson marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| // Per the type of `selection`, this will only ever be a set of | ||
| // one entry. | ||
| selections.forEach { entry in withAnimation { entry.isExpanded.toggle() } } | ||
| } | ||
| ).listStyle(.sidebar) | ||
| } | ||
| Divider() | ||
| HStack { | ||
| Spacer() | ||
| Button("Cancel", action: { dismiss() }).keyboardShortcut(.cancelAction) | ||
| Button("Select", action: submit).keyboardShortcut(.defaultAction).disabled(selection == nil) | ||
| }.padding(20) | ||
| } | ||
| .onAppear { | ||
| model.loadRoot() | ||
| } | ||
| .onReceive(inspection.notice) { inspection.visit(self, $0) } // ViewInspector | ||
| } | ||
| private func submit() { | ||
| guard let selection else { return } | ||
| outputAbsPath = selection.absolute_path | ||
| dismiss() | ||
| } | ||
| } | ||
| @MainActor | ||
| class FilePickerModel: ObservableObject { | ||
| @Published var rootEntries: [FilePickerEntryModel] = [] | ||
| @Published var rootIsLoading: Bool = false | ||
| @Published var error: ClientError? | ||
| // It's important that `AgentClient` is a reference type (class) | ||
| // as we were having performance issues with a struct (unless it was a binding). | ||
| let client: AgentClient | ||
| init(host: String) { | ||
| client = AgentClient(agentHost: host) | ||
| } | ||
| func loadRoot() { | ||
| error = nil | ||
| rootIsLoading = true | ||
| Task { | ||
| defer { rootIsLoading = false } | ||
| do throws(ClientError) { | ||
| rootEntries = try await client | ||
| .listAgentDirectory(.init(path: [], relativity: .root)) | ||
| .toModels(client: client) | ||
| } catch { | ||
| self.error = error | ||
| } | ||
| } | ||
| } | ||
| } | ||
| struct FilePickerEntry: View { | ||
| @ObservedObject var entry: FilePickerEntryModel | ||
| var body: some View { | ||
| Group { | ||
| if entry.dir { | ||
| directory | ||
| } else { | ||
| Label(entry.name, systemImage: "doc") | ||
| .help(entry.absolute_path) | ||
| .selectionDisabled() | ||
| .foregroundColor(.secondary) | ||
| } | ||
| } | ||
| } | ||
| private var directory: some View { | ||
| DisclosureGroup(isExpanded: $entry.isExpanded) { | ||
| if let entries = entry.entries { | ||
| ForEach(entries) { entry in | ||
| FilePickerEntry(entry: entry).tag(entry) | ||
| } | ||
| } | ||
| } label: { | ||
| Label { | ||
| Text(entry.name) | ||
| ZStack { | ||
| ProgressView().controlSize(.small).opacity(entry.isLoading && entry.error == nil ? 1 : 0) | ||
| Image(systemName: "exclamationmark.triangle.fill") | ||
| .opacity(entry.error != nil ? 1 : 0) | ||
| } | ||
| } icon: { | ||
| Image(systemName: "folder") | ||
| }.help(entry.error != nil ? entry.error!.description : entry.absolute_path) | ||
| } | ||
| } | ||
| } | ||
| @MainActor | ||
| class FilePickerEntryModel: Identifiable, Hashable, ObservableObject { | ||
| nonisolated let id: [String] | ||
| let name: String | ||
| // Components of the path as an array | ||
| let path: [String] | ||
| let absolute_path: String | ||
| let dir: Bool | ||
| let client: AgentClient | ||
| @Published var entries: [FilePickerEntryModel]? | ||
| @Published var isLoading = false | ||
| @Published var error: ClientError? | ||
| @Published private var innerIsExpanded = false | ||
ethanndickson marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| var isExpanded: Bool { | ||
| get { innerIsExpanded } | ||
| set { | ||
| if !newValue { | ||
| withAnimation { self.innerIsExpanded = false } | ||
ethanndickson marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| } else { | ||
| Task { | ||
| self.loadEntries() | ||
| } | ||
| } | ||
| } | ||
| } | ||
| init( | ||
| name: String, | ||
| client: AgentClient, | ||
| absolute_path: String, | ||
| path: [String], | ||
| dir: Bool = false, | ||
| entries: [FilePickerEntryModel]? = nil | ||
| ) { | ||
| self.name = name | ||
| self.client = client | ||
| self.path = path | ||
| self.dir = dir | ||
| self.absolute_path = absolute_path | ||
| self.entries = entries | ||
| // Swift Arrays are copy on write | ||
| id = path | ||
| } | ||
| func loadEntries() { | ||
| self.error = nil | ||
| withAnimation { isLoading = true } | ||
| Task { | ||
| defer { | ||
| withAnimation { | ||
| isLoading = false | ||
| innerIsExpanded = true | ||
| } | ||
| } | ||
| do throws(ClientError) { | ||
| entries = try await client | ||
| .listAgentDirectory(.init(path: path, relativity: .root)) | ||
| .toModels(client: client) | ||
| } catch { | ||
| self.error = error | ||
| } | ||
| } | ||
| } | ||
| nonisolated static func == (lhs: FilePickerEntryModel, rhs: FilePickerEntryModel) -> Bool { | ||
| lhs.id == rhs.id | ||
| } | ||
| nonisolated func hash(into hasher: inout Hasher) { | ||
| hasher.combine(id) | ||
| } | ||
| } | ||
| extension LSResponse { | ||
| @MainActor | ||
| func toModels(client: AgentClient) -> [FilePickerEntryModel] { | ||
| contents.compactMap { entry in | ||
| // Filter dotfiles from the picker | ||
| guard !entry.name.hasPrefix(".") else { return nil } | ||
| return FilePickerEntryModel( | ||
| name: entry.name, | ||
| client: client, | ||
| absolute_path: entry.absolute_path_string, | ||
| path: self.absolute_path + [entry.name], | ||
| dir: entry.is_dir, | ||
| entries: nil | ||
| ) | ||
| } | ||
| } | ||
| } | ||
15 changes: 14 additions & 1 deletionCoder-Desktop/Coder-Desktop/Views/FileSync/FileSyncSessionModal.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.