feat: refresh journals when panel opens

Author: tmm

Horizon/AppDelegate.swift

@@ -84,6 +84,7 @@ extension AppDelegate {
             preferencesWindowController.show(preferencePane: .account)
             return
         }
+        store.fetchJournals()
         panel.makeKeyAndOrderFront(nil)
     }
 

Horizon/Models/Journal.swift

@@ -2,7 +2,7 @@
 
 import Foundation
 
-struct Journal: Codable, Identifiable {
+struct Journal: Codable, Identifiable, Equatable {
     var id: Int
     var entryTemplate: String?
     var entryTemplateActive: Bool

Horizon/Publish/PublishView.swift

@@ -24,16 +24,15 @@ struct PublishView: View {
 
             HStack {
                 Picker(selection: $viewModel.selectedJournalId, label: Text("Journal")) {
-                    ForEach(viewModel.journals) {
+                    ForEach(store.journals) {
                         Text($0.title)
                     }
                 }
                 .disabled(viewModel.networkActive)
-                .onChange(of: viewModel.selectedJournalId) { journalId in
-                    viewModel.maybeSetEntryToTemplate(journalId: journalId)
-                }
-                .onChange(of: store.token) { _ in viewModel.fetchJournals() }
-                .onAppear(perform: viewModel.fetchJournals)
+                .onChange(of: viewModel.selectedJournalId, perform: viewModel.maybeSetEntryToTemplate)
+                .onChange(of: store.journals, perform: viewModel.maybeSetSelectedJournalId)
+                .onChange(of: store.token) { _ in store.fetchJournals() }
+                .onAppear(perform: store.fetchJournals)
 
                 if let fileName = viewModel.file?.name {
                     HStack {

Horizon/Publish/PublishViewModel.swift

@@ -21,13 +21,10 @@ class PublishViewModel: ObservableObject, Identifiable {
     @Published
     var selectedJournalId: Int = 0 {
         didSet {
-            previousSelectedJournal = journals.first { $0.id == oldValue }
+            previousSelectedJournal = store.journals.first { $0.id == oldValue }
         }
     }
 
-    @Published
-    var journals = [Journal]()
-
     @Published
     var isFileBrowserOpen = false
 
@@ -37,7 +34,7 @@ class PublishViewModel: ObservableObject, Identifiable {
     var disabled: Bool { networkActive || (entry.isEmpty && file == nil ) }
     var wordCount: Int { entry.split { $0 == " " || $0.isNewline }.count }
 
-    var selectedJournal: Journal? { journals.first { $0.id == self.selectedJournalId } }
+    var selectedJournal: Journal? { store.journals.first { $0.id == self.selectedJournalId } }
     var previousSelectedJournal: Journal?
 
     init(
@@ -52,41 +49,6 @@ class PublishViewModel: ObservableObject, Identifiable {
         reset()
     }
 
-    func fetchJournals() {
-        guard let token = store.token else { return }
-
-        networkActive = true
-
-        Futureland
-            .journals(token: token)
-            .sink(receiveCompletion: { completion in
-                switch completion {
-                case .finished:
-                    break
-                case .failure(let error):
-                    print(error)
-                }
-                self.networkActive = false
-            }, receiveValue: { journals in
-                print(journals)
-                let sortedJournals = journals.sorted { (a, b) -> Bool in
-                    guard let lastEntryAtA = a.lastEntryAt else { return false }
-                    guard let lastEntryAtB = b.lastEntryAt else { return true }
-                    return lastEntryAtA > lastEntryAtB
-                }
-                self.journals = sortedJournals
-
-                // Check if a journal is already selected
-                let selectedJournal = sortedJournals.first { $0.id == self.selectedJournalId }
-                if selectedJournal != nil { return }
-
-                // Select first journal if none are selected
-                guard let journal = sortedJournals.first else { return }
-                self.selectedJournalId = journal.id
-            })
-            .store(in: &disposables)
-    }
-
     func publish() {
         guard let token = store.token else { return }
 
@@ -171,16 +133,10 @@ extension PublishViewModel {
             guard fileUrl.startAccessingSecurityScopedResource() else { return }
 
             // Get file data
-            guard let data = try? Data(contentsOf: fileUrl) else {
-                print("Unable to read data")
-                return
-            }
+            guard let data = try? Data(contentsOf: fileUrl) else { return }
 
             // Get mime type
-            guard let mimeType = getMimeTypeFor(fileUrl: fileUrl) else {
-                print("Unable to get mime type")
-                return
-            }
+            guard let mimeType = getMimeTypeFor(fileUrl: fileUrl) else { return }
 
             file = File(name: fileUrl.lastPathComponent, data: data, mimeType: mimeType)
             fileUrl.stopAccessingSecurityScopedResource()
@@ -193,13 +149,9 @@ extension PublishViewModel {
 // MARK: Entry template
 extension PublishViewModel {
     func maybeSetEntryToTemplate(journalId id: Int) {
-        if entry != previousSelectedJournal?.entryTemplate ?? "" {
-            return
-        }
+        if entry != previousSelectedJournal?.entryTemplate ?? "" { return }
 
-        guard let journal = journals.first(where: { $0.id == id }) else {
-            return
-        }
+        guard let journal = store.journals.first(where: { $0.id == id }) else { return }
 
         guard let template = journal.entryTemplate else {
             entry = ""
@@ -210,4 +162,14 @@ extension PublishViewModel {
             entry = template
         }
     }
+    
+    func maybeSetSelectedJournalId(journals: [Journal]) {
+        // Check if a journal is already selected
+        let selectedJournal = journals.first { $0.id == self.selectedJournalId }
+        if selectedJournal != nil { return }
+
+        // Select first journal if none are selected
+        guard let journal = journals.first else { return }
+        self.selectedJournalId = journal.id
+    }
 }

Horizon/Store.swift

@@ -1,5 +1,6 @@
 // By Tom Meagher on 1/29/21 at 22:21
 
+import Alamofire
 import Combine
 import Foundation
 import KeychainAccess
@@ -8,6 +9,11 @@ import SwiftUI
 let keychain = Keychain()
 
 class Store: ObservableObject {
+    private var disposables = Set<AnyCancellable>()
+    
+    @Published
+    var journals = [Journal]()
+    
     @Published
     var token: String? {
         didSet {
@@ -29,6 +35,32 @@ class Store: ObservableObject {
         guard let user: User = keychainGet(key: "User") else { return }
         self.user = user
     }
+    
+    func fetchJournals() {
+        guard let token = token else { return }
+        Futureland
+            .journals(token: token)
+            .sink(
+                receiveCompletion: { completion in
+                    switch completion {
+                    case .finished:
+                        break
+                    case .failure(let error):
+                        print(error)
+                    }
+                },
+                receiveValue: { journals in
+                    let sortedJournals = journals.sorted { (a, b) -> Bool in
+                        guard let lastEntryAtA = a.lastEntryAt else { return false }
+                        guard let lastEntryAtB = b.lastEntryAt else { return true }
+                        return lastEntryAtA > lastEntryAtB
+                    }
+                    self.journals = sortedJournals
+                    print(sortedJournals)
+                }
+            )
+            .store(in: &disposables)
+    }
 }
 
 extension Store {