Improved error message actions

zotero · Aug 21, 2024 · 52c87a3 · 52c87a3
1 parent 1d2b98f
commit 52c87a3
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 6 deletions.
diff --git a/Zotero/Assets/en.lproj/Localizable.strings b/Zotero/Assets/en.lproj/Localizable.strings
@@ -57,6 +57,8 @@
 "back" = "Back";
 "forward" = "Forward";
 "go_to_settings" = "Go to Settings";
+"close_without_saving" = "Close without saving";
+"stay" = "Stay";
 
 "beta_wipe_title" = "Resync Required";
 "beta_wipe_message" = "Due to a beta update, your data must be redownloaded from zotero.org.";

diff --git a/Zotero/Extensions/Localizable.swift b/Zotero/Extensions/Localizable.swift
@@ -34,6 +34,8 @@ internal enum L10n {
   ///   Created by Michal Rentka on 21/04/2020.
   ///   Copyright © 2020 Corporation for Digital Scholarship. All rights reserved.
   internal static let close = L10n.tr("Localizable", "close", fallback: "Close")
+  /// Close without saving
+  internal static let closeWithoutSaving = L10n.tr("Localizable", "close_without_saving", fallback: "Close without saving")
   /// Copy
   internal static let copy = L10n.tr("Localizable", "copy", fallback: "Copy")
   /// Create
@@ -120,6 +122,8 @@ internal enum L10n {
   internal static let share = L10n.tr("Localizable", "share", fallback: "Share")
   /// Size
   internal static let size = L10n.tr("Localizable", "size", fallback: "Size")
+  /// Stay
+  internal static let stay = L10n.tr("Localizable", "stay", fallback: "Stay")
   /// Support and Feedback
   internal static let supportFeedback = L10n.tr("Localizable", "support_feedback", fallback: "Support and Feedback")
   /// Title

diff --git a/Zotero/Scenes/General/NoteEditorCoordinator.swift b/Zotero/Scenes/General/NoteEditorCoordinator.swift
@@ -14,7 +14,7 @@ import CocoaLumberjackSwift
 protocol NoteEditorCoordinatorDelegate: AnyObject {
     func show(url: URL)
     func showTagPicker(libraryId: LibraryIdentifier, selected: Set<String>, picked: @escaping ([Tag]) -> Void)
-    func show(error: Error)
+    func show(error: Error, isClosing: Bool)
 }
 
 final class NoteEditorCoordinator: NSObject, Coordinator {
@@ -100,9 +100,16 @@ extension NoteEditorCoordinator: NoteEditorCoordinatorDelegate {
         detailCoordinator.show(url: url)
     }
 
-    func show(error: any Error) {
+    func show(error: any Error, isClosing: Bool) {
         let controller = UIAlertController(title: L10n.error, message: error.localizedDescription, preferredStyle: .alert)
-        controller.addAction(UIAlertAction(title: L10n.ok, style: .cancel))
+        if !isClosing {
+            controller.addAction(UIAlertAction(title: L10n.ok, style: .cancel))
+        } else {
+            controller.addAction(UIAlertAction(title: L10n.stay, style: .cancel))
+            controller.addAction(UIAlertAction(title: L10n.closeWithoutSaving, style: .destructive, handler: { [weak self] _ in
+                self?.navigationController?.dismiss(animated: true)
+            }))
+        }
         navigationController?.present(controller, animated: true)
     }
 }
diff --git a/Zotero/Scenes/General/ViewModels/NoteEditorActionHandler.swift b/Zotero/Scenes/General/ViewModels/NoteEditorActionHandler.swift
@@ -277,8 +277,12 @@ struct NoteEditorActionHandler: ViewModelActionHandler, BackgroundDbProcessingAc
         func store(error: Swift.Error, key: String) {
             update(viewModel: viewModel) { state in
                 state.error = error
-                state.isClosing = false
-                state.changes = [.saved, .closing]
+                if !state.isClosing {
+                    state.changes = .saved
+                } else {
+                    state.isClosing = false
+                    state.changes = [.saved, .closing]
+                }
             }
         }
 

diff --git a/Zotero/Scenes/General/Views/NoteEditorViewController.swift b/Zotero/Scenes/General/Views/NoteEditorViewController.swift
@@ -200,7 +200,7 @@ final class NoteEditorViewController: UIViewController {
         }
 
         if let error = state.error {
-            coordinatorDelegate?.show(error: error)
+            coordinatorDelegate?.show(error: error, isClosing: state.changes.contains(.closing))
         }
 
         func debounceSave() {