Merge pull request #147 from Planetable/improved-published-folders-ui

Add auto-refresh logic to dashboard window titles.

Author: YiHanCA

Planet/Labs/Published Folders/Dashboard/PFDashboardContentView.swift

@@ -107,7 +107,7 @@ struct PFDashboardContentView: NSViewRepresentable {
                 if (host == "127.0.0.1" || host == "localhost") && UInt16(port) == IPFSDaemon.shared.gatewayPort {
                     let indexPage = currentURL.appendingPathComponent("index.html")
                     do {
-                        let request = URLRequest(url: indexPage, cachePolicy: .returnCacheDataElseLoad, timeoutInterval: 0.05)
+                        let request = URLRequest(url: indexPage, cachePolicy: .returnCacheDataElseLoad, timeoutInterval: 0.1)
                         let (_, response) = try await URLSession.shared.data(for: request)
                         if let httpResponse = response as? HTTPURLResponse {
                             if httpResponse.statusCode != 200 {

Planet/Labs/Published Folders/Dashboard/PFDashboardView.swift

@@ -45,6 +45,9 @@ struct PFDashboardView: View {
                 self.contentView = PFDashboardContentView(url: self.$url)
             }
         }
+        .onReceive(serviceStore.timer, perform: { _ in
+            serviceStore.updateWindowTitles()
+        })
         .task {
             serviceStore.restoreSelectedFolderNavigation()
         }

Planet/Labs/Published Folders/Dashboard/PFDashboardWindow.swift

@@ -12,8 +12,9 @@ class PFDashboardWindow: NSWindow {
     override init(contentRect: NSRect, styleMask style: NSWindow.StyleMask, backing backingStoreType: NSWindow.BackingStoreType, defer flag: Bool) {
         super.init(contentRect: contentRect, styleMask: style, backing: backingStoreType, defer: flag)
         self.collectionBehavior = .fullScreenNone
-        self.title = "Published Folders Dashboard"
         self.titlebarAppearsTransparent = false
+        self.title = "Published Folders Dashboard"
+        self.subtitle = ""
         self.toolbarStyle = .unified
         self.contentViewController = PFDashboardContainerViewController()
         self.delegate = self

Planet/Labs/Published Folders/Dashboard/PFDashboardWindowController.swift

@@ -28,6 +28,15 @@ class PFDashboardWindowController: NSWindowController {
         NotificationCenter.default.addObserver(forName: .dashboardRefreshToolbar, object: nil, queue: .main) { [weak self] _ in
             self?.setupToolbar()
         }
+        NotificationCenter.default.addObserver(forName: .dashboardUpdateWindowTitles, object: nil, queue: .main) { [weak self] n in
+            guard let titles = n.object as? [String: String] else { return }
+            if let theTitle = titles["title"], theTitle != "" {
+                self?.window?.title = theTitle
+            }
+            if let theSubtitle = titles["subtitle"], theSubtitle != "" {
+                self?.window?.subtitle = theSubtitle
+            }
+        }
     }
 
     required init?(coder: NSCoder) {
@@ -49,18 +58,8 @@ class PFDashboardWindowController: NSWindowController {
         toolbar.allowsUserCustomization = false
         toolbar.autosavesConfiguration = true
         toolbar.displayMode = .iconOnly
-        w.title = "Published Folders Dashboard"
-        w.subtitle = ""
         w.toolbar = toolbar
         w.toolbar?.validateVisibleItems()
-        let serviceStore = PlanetPublishedServiceStore.shared
-        if let selectedID = serviceStore.selectedFolderID, let folder = serviceStore.publishedFolders.first(where: { $0.id == selectedID }) {
-            w.title = folder.url.lastPathComponent
-            w.subtitle = "Never Published"
-            if let date = folder.published {
-                w.subtitle = "Last Published: " + date.relativeDateDescription()
-            }
-        }
     }
 
     @objc func openInPublicGateway(_ sender: Any) {

Planet/Labs/Published Folders/PlanetPublishedFolders+Extension.swift

@@ -17,6 +17,7 @@ extension CGFloat {
 extension Notification.Name {
     static let dashboardInspectorIsCollapsedStatusChanged = Notification.Name("PublishedFoldersDashboardInspectorIsCollapsedStatusChangedNotification")
     static let dashboardRefreshToolbar = Notification.Name("PublishedFoldersDashboardRefreshToolbarNotification")
+    static let dashboardUpdateWindowTitles = Notification.Name("PublishedFoldersDashboardUpdateWindowTitlesNotification")
     static let dashboardLoadPreviewURL = Notification.Name("PublishedFoldersDashboardLoadPreviewURLNotification")
     static let dashboardProcessDirectoryURL = Notification.Name("PublishedFoldersDabhaordProcessDirectoryURLNotification")
     static let dashboardResetWebViewHistory = Notification.Name("PublishedFoldersDashboardResetWebViewHistoryNotification")

Planet/Labs/Published Folders/PlanetPublishedServiceStore.swift

@@ -35,6 +35,7 @@ class PlanetPublishedServiceStore: ObservableObject {
             NotificationCenter.default.post(name: .dashboardRefreshToolbar, object: nil)
             Task { @MainActor in
                 self.restoreSelectedFolderNavigation()
+                self.updateWindowTitles()
             }
         }
     }
@@ -80,13 +81,23 @@ class PlanetPublishedServiceStore: ObservableObject {
 
     func restoreSelectedFolderNavigation() {
         if let id = selectedFolderID, let folder = publishedFolders.first(where: { $0.id == id }), let _ = folder.published, let publishedLink = folder.publishedLink, let url = URL(string: "\(IPFSDaemon.shared.gateway)/ipns/\(publishedLink)") {
-            debugPrint("restore navigation for folder: \(folder.url.lastPathComponent)")
             NotificationCenter.default.post(name: .dashboardResetWebViewHistory, object: id)
             selectedFolderIDChanged = true
             NotificationCenter.default.post(name: .dashboardLoadPreviewURL, object: url)
         }
     }
 
+    func updateWindowTitles() {
+        guard let id = selectedFolderID, let folder = publishedFolders.first(where: { $0.id == id }) else { return }
+        var titles: [String: String] = [:]
+        titles["title"] = folder.url.lastPathComponent
+        titles["subtitle"] = "Never Published"
+        if let date = folder.published {
+            titles["subtitle"] = "Last Published: " + date.relativeDateDescription()
+        }
+        NotificationCenter.default.post(name: .dashboardUpdateWindowTitles, object: titles)
+    }
+    
     @MainActor
     func updateSelectedFolderNavigation(withCurrentURL currentURL: URL, canGoForward: Bool, forwardURL: URL?, canGoBackward: Bool, backwardURL: URL?) {
         guard let _ = selectedFolderID else { return }
@@ -236,8 +247,9 @@ class PlanetPublishedServiceStore: ObservableObject {
         }
         updatePublishedFolders(updatedFolders)
         NotificationCenter.default.post(name: .dashboardRefreshToolbar, object: nil)
-        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) { [weak self] in
             NotificationCenter.default.post(name: .dashboardWebViewGoHome, object: nil)
+            self?.updateWindowTitles()
         }
         debugPrint("Folder published -> \(folder.url)")
     }