review

Author: ethanndickson

Coder-Desktop/Coder-Desktop/State.swift

@@ -63,14 +63,6 @@ class AppState: ObservableObject {
         }
     }
 
-    // Temporary feature flag
-    @Published var showFileSyncUI: Bool = UserDefaults.standard.bool(forKey: Keys.showFileSyncUI) {
-        didSet {
-            guard persistent else { return }
-            UserDefaults.standard.set(showFileSyncUI, forKey: Keys.showFileSyncUI)
-        }
-    }
-
     func tunnelProviderProtocol() -> NETunnelProviderProtocol? {
         if !hasSession { return nil }
         let proto = NETunnelProviderProtocol()
@@ -172,8 +164,6 @@ class AppState: ObservableObject {
         static let literalHeaders = "LiteralHeaders"
         static let stopVPNOnQuit = "StopVPNOnQuit"
         static let startVPNOnLaunch = "StartVPNOnLaunch"
-
-        static let showFileSyncUI = "showFileSyncUI"
     }
 }
 

Coder-Desktop/Coder-Desktop/Views/FileSync/FileSyncConfig.swift

@@ -1,69 +1,12 @@
 import SwiftUI
 import VPNLib
 
-struct FileSyncRow: Identifiable {
-    var id = UUID()
-    var localPath: URL
-    var workspace: String
-    // This is a string as to be host-OS agnostic
-    var remotePath: String
-    var status: FileSyncStatus
-    var size: String
-}
-
-enum FileSyncStatus {
-    case unknown
-    case error(String)
-    case okay
-    case paused
-    case needsAttention(String)
-    case working(String)
-
-    var color: Color {
-        switch self {
-        case .okay:
-            .white
-        case .paused:
-            .secondary
-        case .unknown:
-            .red
-        case .error:
-            .red
-        case .needsAttention:
-            .orange
-        case .working:
-            .white
-        }
-    }
-
-    var description: String {
-        switch self {
-        case .unknown:
-            "Unknown"
-        case let .error(msg):
-            msg
-        case .okay:
-            "OK"
-        case .paused:
-            "Paused"
-        case let .needsAttention(msg):
-            msg
-        case let .working(msg):
-            msg
-        }
-    }
-
-    var body: some View {
-        Text(description).foregroundColor(color)
-    }
-}
-
 struct FileSyncConfig<VPN: VPNService, FS: FileSyncDaemon>: View {
     @EnvironmentObject var vpn: VPN
 
-    @State private var selection: FileSyncRow.ID?
+    @State private var selection: FileSyncSession.ID?
     @State private var addingNewSession: Bool = false
-    @State private var items: [FileSyncRow] = []
+    @State private var items: [FileSyncSession] = []
 
     var body: some View {
         Group {

Coder-Desktop/Coder-Desktop/Views/FileSync/FileSyncSessionModal.swift

@@ -2,7 +2,7 @@ import SwiftUI
 import VPNLib
 
 struct FileSyncSessionModal<VPN: VPNService, FS: FileSyncDaemon>: View {
-    var existingSession: FileSyncRow?
+    var existingSession: FileSyncSession?
     @Environment(\.dismiss) private var dismiss
     @EnvironmentObject private var vpn: VPN
     @EnvironmentObject private var fileSync: FS

Coder-Desktop/Coder-Desktop/Views/Settings/GeneralTab.swift

@@ -18,11 +18,6 @@ struct GeneralTab: View {
                     Text("Start Coder Connect on launch")
                 }
             }
-            Section {
-                Toggle(isOn: $state.showFileSyncUI) {
-                    Text("Show experimental File Sync UI")
-                }
-            }
         }.formStyle(.grouped)
     }
 }

Coder-Desktop/Coder-Desktop/Views/VPN/VPNMenu.swift

@@ -62,19 +62,21 @@ struct VPNMenu<VPN: VPNService, FS: FileSyncDaemon>: View {
                     }.buttonStyle(.plain)
                     TrayDivider()
                 }
-                if state.showFileSyncUI, vpn.state == .connected {
-                    Button {
-                        openWindow(id: .fileSync)
-                    } label: {
-                        ButtonRowView {
-                            HStack {
-                                StatusDot(color: fileSync.state.color)
-                                Text("Configure file sync")
+                #if DEBUG
+                    if vpn.state == .connected {
+                        Button {
+                            openWindow(id: .fileSync)
+                        } label: {
+                            ButtonRowView {
+                                HStack {
+                                    StatusDot(color: fileSync.state.color)
+                                    Text("Configure file sync")
+                                }
                             }
-                        }
-                    }.buttonStyle(.plain)
-                    TrayDivider()
-                }
+                        }.buttonStyle(.plain)
+                        TrayDivider()
+                    }
+                #endif
                 if vpn.state == .failed(.systemExtensionError(.needsUserApproval)) {
                     Button {
                         openSystemExtensionSettings()

Coder-Desktop/VPNLib/FileSync/FileSyncDaemon.swift

@@ -15,15 +15,6 @@ public protocol FileSyncDaemon: ObservableObject {
     func createSession(with: FileSyncSession) async throws
 }
 
-public struct FileSyncSession {
-    public let id: String
-    public let name: String
-    public let localPath: URL
-    public let workspace: String
-    public let agent: String
-    public let remotePath: URL
-}
-
 @MainActor
 public class MutagenDaemon: FileSyncDaemon {
     private let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "mutagen")

Coder-Desktop/VPNLib/FileSync/FileSyncSession.swift

@@ -0,0 +1,58 @@
+import SwiftUI
+
+public struct FileSyncSession: Identifiable {
+    public let id: String
+    public let localPath: URL
+    public let workspace: String
+    // This is a string as to be host-OS agnostic
+    public let remotePath: String
+    public let status: FileSyncStatus
+    public let size: String
+}
+
+public enum FileSyncStatus {
+    case unknown
+    case error(String)
+    case ok
+    case paused
+    case needsAttention(String)
+    case working(String)
+
+    public var color: Color {
+        switch self {
+        case .ok:
+            .white
+        case .paused:
+            .secondary
+        case .unknown:
+            .red
+        case .error:
+            .red
+        case .needsAttention:
+            .orange
+        case .working:
+            .white
+        }
+    }
+
+    public var description: String {
+        switch self {
+        case .unknown:
+            "Unknown"
+        case let .error(msg):
+            msg
+        case .ok:
+            "Watching"
+        case .paused:
+            "Paused"
+        case let .needsAttention(msg):
+            msg
+        case let .working(msg):
+            msg
+        }
+    }
+
+    public var body: some View {
+        Text(description).foregroundColor(color)
+    }
+}