Improve note editor save callback for new notes

zotero · May 8, 2024 · 2101643 · 2101643
1 parent c713e19
commit 2101643
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Zotero/Scenes/Detail/DetailCoordinator.swift b/Zotero/Scenes/Detail/DetailCoordinator.swift
@@ -1005,9 +1005,9 @@ extension DetailCoordinator: DetailNoteEditorCoordinatorDelegate {
             DDLogInfo("DetailCoordinator: show note creation")
             amendedSaveCallback = { [weak self] key, result in
                 switch result {
-                case .success(let note):
+                case .success((let note, let isCreated)):
                     // If indeed a new note is created inform open items controller about it.
-                    if let self, let openItemsController = controllers.userControllers?.openItemsController {
+                    if isCreated, let self, let openItemsController = controllers.userControllers?.openItemsController {
                         openItemsController.open(.note(libraryId: library.identifier, key: note.key), for: sessionIdentifier)
                         openItemsController.setOpenItemsUserActivity(from: navigationController, libraryId: library.identifier, title: note.title)
                     }

diff --git a/Zotero/Scenes/Detail/ItemDetail/ViewModels/ItemDetailActionHandler.swift b/Zotero/Scenes/Detail/ItemDetail/ViewModels/ItemDetailActionHandler.swift
@@ -360,7 +360,7 @@ struct ItemDetailActionHandler: ViewModelActionHandler, BackgroundDbProcessingAc
             }
         }
         switch result {
-        case .success(let note):
+        case .success((let note, _)):
             update(viewModel: viewModel) { state in
                 if let oldIndex {
                     state.notes[oldIndex] = note

diff --git a/Zotero/Scenes/General/NoteEditorCoordinator.swift b/Zotero/Scenes/General/NoteEditorCoordinator.swift
@@ -21,7 +21,7 @@ protocol NoteEditorCoordinatorDelegate: AnyObject {
 }
 
 final class NoteEditorCoordinator: NSObject, Coordinator {
-    typealias SaveResult = Result<Note, Error>
+    typealias SaveResult = Result<(note: Note, isCreated: Bool), Error>
     typealias SaveCallback = (_ key: String?, _ result: SaveResult) -> Void
 
     weak var parentCoordinator: Coordinator?

diff --git a/Zotero/Scenes/General/ViewModels/NoteEditorActionHandler.swift b/Zotero/Scenes/General/ViewModels/NoteEditorActionHandler.swift
@@ -102,7 +102,7 @@ struct NoteEditorActionHandler: ViewModelActionHandler, BackgroundDbProcessingAc
                         update(viewModel: viewModel) { state in
                             state.kind = .edit(key: note.key)
                         }
-                        saveCallback(note.key, .success(note))
+                        saveCallback(note.key, .success((note: note, isCreated: true)))
 
                     case .failure(let error):
                         DDLogError("NoteEditorActionHandler: can't create item note: \(error)")
@@ -119,7 +119,7 @@ struct NoteEditorActionHandler: ViewModelActionHandler, BackgroundDbProcessingAc
                         DDLogError("NoteEditorActionHandler: can't update existing note: \(error)")
                         saveCallback(key, .failure(error))
                     } else {
-                        saveCallback(key, .success(note))
+                        saveCallback(key, .success((note: note, isCreated: false)))
                     }
                 }
             }