Autosave entry changes in unlocked database view

crazytan · crazytan · commit afad2ef50edb · 2026-04-11T19:02:45.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@
 - Added: Save new credentials and generate strong passwords directly from AutoFill, with offline-safe queueing for Dropbox-backed databases.
 
 ### Fixes
+- Autosave entry create/edit/delete changes immediately after they are staged, remove the confusing unlocked-screen save button, and show retry-only save UI when an autosave fails
 - Remove the baked white background from the Dropbox provider glyph so it renders cleanly in dark mode
 - Show provider-specific cloud sync status during unlock, and add focused unlock coverage for cloud sync success, fallback, and failure paths
 - Fix Xcode Cloud post-clone bootstrap so clean CI machines no longer require a developer team xcconfig value just to generate the project
diff --git a/KeeForge/App/KeeForgeApp.swift b/KeeForge/App/KeeForgeApp.swift
@@ -271,11 +271,6 @@ struct DatabaseNavigationView: View {
             .navigationDestination(for: KPEntry.self) { entry in
                 EntryDetailView(entryID: entry.id, viewModel: viewModel)
             }
-            .toolbar {
-                ToolbarItem(placement: .topBarTrailing) {
-                    DatabaseSaveToolbarButton(viewModel: viewModel)
-                }
-            }
             .safeAreaInset(edge: .top, spacing: 0) {
                 VStack(spacing: 8) {
                     if let bannerText = viewModel.cloudSyncBannerText {
@@ -294,8 +289,8 @@ struct DatabaseNavigationView: View {
                         )
                     }
 
-                    if viewModel.isDirty {
-                        UnsavedChangesBanner()
+                    if viewModel.isDirty && viewModel.isSaving == false {
+                        UnsavedChangesBanner(viewModel: viewModel)
                     }
 
                     if viewModel.isReadOnly {
@@ -373,28 +368,6 @@ struct DatabaseNavigationView: View {
     }
 }
 
-private struct DatabaseSaveToolbarButton: View {
-    @Bindable var viewModel: DatabaseViewModel
-
-    var body: some View {
-        Button {
-            Task {
-                await viewModel.saveHandlingError()
-            }
-        } label: {
-            if viewModel.isSaving {
-                ProgressView()
-                    .controlSize(.small)
-                    .frame(width: 24, height: 24)
-            } else {
-                Image(systemName: "square.and.arrow.down")
-            }
-        }
-        .disabled(viewModel.isDirty == false || viewModel.isSaving)
-        .accessibilityIdentifier("database.save")
-    }
-}
-
 private struct ReadOnlyRibbon: View {
     var body: some View {
         Text("Read-only mode — toggle in the database list to enable editing.")
@@ -408,13 +381,25 @@ private struct ReadOnlyRibbon: View {
 }
 
 private struct UnsavedChangesBanner: View {
+    @Bindable var viewModel: DatabaseViewModel
+
     var body: some View {
         HStack(spacing: 8) {
             Circle()
                 .fill(Color.orange)
                 .frame(width: 8, height: 8)
-            Text("Unsaved changes")
+            Text("Changes not saved")
                 .font(.caption.weight(.medium))
+
+            Spacer(minLength: 12)
+
+            Button("Retry Save") {
+                Task {
+                    await viewModel.saveHandlingError()
+                }
+            }
+            .font(.caption.weight(.semibold))
+            .disabled(viewModel.isSaving)
         }
         .frame(maxWidth: .infinity, alignment: .leading)
         .padding(.horizontal, 16)
diff --git a/KeeForge/Views/EntryEditView.swift b/KeeForge/Views/EntryEditView.swift
@@ -14,6 +14,7 @@ struct EntryEditView: View {
     @State private var showDeleteConfirmation = false
     @State private var showPasswordGenerator = false
     @State private var editingErrorMessage: String?
+    @State private var isSubmitting = false
 
     init(
         formViewModel: EntryEditViewModel,
@@ -104,6 +105,7 @@ struct EntryEditView: View {
                     Button("Delete Entry", role: .destructive) {
                         showDeleteConfirmation = true
                     }
+                    .disabled(isSubmitting)
                     .accessibilityIdentifier("entry-edit.delete")
                 }
             }
@@ -116,14 +118,15 @@ struct EntryEditView: View {
                 Button("Cancel") {
                     cancelTapped()
                 }
+                .disabled(isSubmitting)
                 .accessibilityIdentifier("entry-edit.cancel")
             }
 
             ToolbarItem(placement: .confirmationAction) {
                 Button("Save") {
                     saveTapped()
                 }
-                .disabled(formViewModel.canSave == false)
+                .disabled(formViewModel.canSave == false || isSubmitting)
                 .accessibilityIdentifier("entry-edit.save")
             }
         }
@@ -216,7 +219,12 @@ struct EntryEditView: View {
                 )
             }
 
-            onComplete(.finished)
+            isSubmitting = true
+            Task { @MainActor in
+                await databaseViewModel.saveHandlingError()
+                isSubmitting = false
+                onComplete(.finished)
+            }
         } catch {
             editingErrorMessage = error.localizedDescription
         }
@@ -227,7 +235,12 @@ struct EntryEditView: View {
 
         do {
             try databaseViewModel.deleteEntry(entryID, sendToRecycleBin: sendToRecycleBin)
-            onComplete(.deleted)
+            isSubmitting = true
+            Task { @MainActor in
+                await databaseViewModel.saveHandlingError()
+                isSubmitting = false
+                onComplete(.deleted)
+            }
         } catch {
             editingErrorMessage = error.localizedDescription
         }
diff --git a/KeeForge/Views/EntryListView.swift b/KeeForge/Views/EntryListView.swift
@@ -53,7 +53,14 @@ struct EntryListView: View {
                         ? "The entry will be moved to the recycle bin."
                         : "This entry will be removed immediately and cannot be restored from KeeForge."),
                     primaryButton: .destructive(Text(action.sendToRecycleBin ? "Delete" : "Delete Permanently")) {
-                        try? viewModel.deleteEntry(action.entryID, sendToRecycleBin: action.sendToRecycleBin)
+                        do {
+                            try viewModel.deleteEntry(action.entryID, sendToRecycleBin: action.sendToRecycleBin)
+                            Task {
+                                await viewModel.saveHandlingError()
+                            }
+                        } catch {
+                            viewModel.presentSaveError(error)
+                        }
                     },
                     secondaryButton: .cancel()
                 )
diff --git a/KeeForge/Views/GroupListView.swift b/KeeForge/Views/GroupListView.swift
@@ -145,7 +145,14 @@ struct GroupListView: View {
                                 ? "The entry will be moved to the recycle bin."
                                 : "This entry will be removed immediately and cannot be restored from KeeForge."),
                             primaryButton: .destructive(Text(action.sendToRecycleBin ? "Delete" : "Delete Permanently")) {
-                                try? viewModel.deleteEntry(action.entryID, sendToRecycleBin: action.sendToRecycleBin)
+                                do {
+                                    try viewModel.deleteEntry(action.entryID, sendToRecycleBin: action.sendToRecycleBin)
+                                    Task {
+                                        await viewModel.saveHandlingError()
+                                    }
+                                } catch {
+                                    viewModel.presentSaveError(error)
+                                }
                             },
                             secondaryButton: .cancel()
                         )
diff --git a/KeeForgeUITests/EntryEditUITests.swift b/KeeForgeUITests/EntryEditUITests.swift
@@ -13,6 +13,9 @@ final class EntryEditUITests: KeeForgeUITestCase {
         if name.contains("testSaveConflictOffersReloadAndConflictCopy") {
             app.launchEnvironment["UI_TEST_LOCAL_SAVE_CONFLICT_COUNT"] = "2"
         }
+        if name.contains("testLockWhileDirtyPromptsConfirmationThenLocks") {
+            app.launchEnvironment["UI_TEST_LOCAL_SAVE_CONFLICT_COUNT"] = "1"
+        }
     }
 
     func testCreateEntrySavesAndShowsInList() {
@@ -23,7 +26,6 @@ final class EntryEditUITests: KeeForgeUITestCase {
             username: "ui-created-user",
             password: "created-password-123"
         )
-        persistDatabaseChanges()
         lockAndReopenVault()
 
         openEntry(named: createdEntryTitle)
@@ -44,9 +46,7 @@ final class EntryEditUITests: KeeForgeUITestCase {
         XCTAssertTrue(titleField.waitForExistence(timeout: 5))
         replaceText(in: titleField, with: editedDiscordTitle)
         app.buttons["entry-edit.save"].tap()
-
-        XCTAssertTrue(waitForUnsavedIndicator(isPresent: true))
-        persistDatabaseChanges()
+        XCTAssertTrue(waitForElementToDisappear(app.buttons["entry-edit.save"], timeout: 10))
         tapBackButton()
         tapBackButton()
         lockAndReopenVault()
@@ -68,12 +68,10 @@ final class EntryEditUITests: KeeForgeUITestCase {
         XCTAssertTrue(deleteButton.waitForExistence(timeout: 5))
         deleteButton.tap()
         app.alerts.buttons["Delete"].tap()
-
-        XCTAssertTrue(waitForUnsavedIndicator(isPresent: true))
-        persistDatabaseChanges()
+        waitForAutosaveAttempt()
 
         XCTAssertFalse(entry(named: "Twitter").exists)
-        tapBackButton()
+        lockAndReopenVault()
 
         openGroup(named: "Recycle Bin")
         XCTAssertTrue(revealElement(entry(named: "Twitter")), "Twitter entry was not moved into the recycle bin")
@@ -127,8 +125,7 @@ final class EntryEditUITests: KeeForgeUITestCase {
         useButton.tap()
 
         app.buttons["entry-edit.save"].tap()
-        XCTAssertTrue(waitForUnsavedIndicator(isPresent: true))
-        persistDatabaseChanges()
+        XCTAssertTrue(waitForElementToDisappear(app.buttons["entry-edit.save"], timeout: 10))
         lockAndReopenVault()
 
         openEntry(named: generatedPasswordEntryTitle)
@@ -160,7 +157,7 @@ final class EntryEditUITests: KeeForgeUITestCase {
         openGroup(named: "Social")
         openEntry(named: "Discord")
         editCurrentEntryTitle(to: firstConflictDiscordTitle)
-        triggerDatabaseSaveConflict()
+        XCTAssertTrue(waitForSaveConflictAlert())
 
         let reloadButton = app.buttons["save-conflict.reload"]
         let saveAsCopyButton = app.buttons["save-conflict.save-as-copy"]
@@ -176,7 +173,7 @@ final class EntryEditUITests: KeeForgeUITestCase {
         openGroup(named: "Social")
         openEntry(named: "Discord")
         editCurrentEntryTitle(to: secondConflictDiscordTitle)
-        triggerDatabaseSaveConflict()
+        XCTAssertTrue(waitForSaveConflictAlert())
 
         XCTAssertTrue(saveAsCopyButton.waitForExistence(timeout: 5))
         saveAsCopyButton.tap()
@@ -253,6 +250,7 @@ final class EntryEditUITests: KeeForgeUITestCase {
         let saveButton = app.buttons["entry-edit.save"]
         XCTAssertTrue(saveButton.waitForExistence(timeout: 5), "Entry editor save button was not visible", file: file, line: line)
         saveButton.tap()
+        XCTAssertTrue(waitForElementToDisappear(saveButton, timeout: 10), "Entry editor did not dismiss after autosave", file: file, line: line)
     }
 
     private func editCurrentEntryTitle(to title: String, file: StaticString = #filePath, line: UInt = #line) {
@@ -267,24 +265,7 @@ final class EntryEditUITests: KeeForgeUITestCase {
         let saveButton = app.buttons["entry-edit.save"]
         XCTAssertTrue(saveButton.waitForExistence(timeout: 5), "Entry editor save button was not visible", file: file, line: line)
         saveButton.tap()
-        XCTAssertTrue(waitForUnsavedIndicator(isPresent: true), "Unsaved indicator did not appear after editing", file: file, line: line)
-    }
-
-    private func triggerDatabaseSaveConflict(file: StaticString = #filePath, line: UInt = #line) {
-        let saveButton = app.buttons["database.save"]
-        XCTAssertTrue(saveButton.waitForExistence(timeout: 5), "Database save button was not visible", file: file, line: line)
-        saveButton.tap()
-
-        let alert = app.alerts["Save Conflict"]
-        XCTAssertTrue(alert.waitForExistence(timeout: 10), "Save conflict alert did not appear", file: file, line: line)
-    }
-
-    private func persistDatabaseChanges(file: StaticString = #filePath, line: UInt = #line) {
-        let saveButton = app.buttons["database.save"]
-        XCTAssertTrue(saveButton.waitForExistence(timeout: 5), "Database save button was not visible", file: file, line: line)
-        XCTAssertTrue(saveButton.isEnabled, "Database save button was disabled unexpectedly", file: file, line: line)
-        saveButton.tap()
-        XCTAssertFalse(waitForUnsavedIndicator(isPresent: true, timeout: 10), "Unsaved indicator did not clear after saving", file: file, line: line)
+        XCTAssertTrue(waitForElementToDisappear(saveButton, timeout: 10), "Entry editor did not dismiss after autosave", file: file, line: line)
     }
 
     private func lockAndReopenVault(file: StaticString = #filePath, line: UInt = #line) {
@@ -332,12 +313,35 @@ final class EntryEditUITests: KeeForgeUITestCase {
         return indicator.exists == isPresent
     }
 
+    private func waitForSaveConflictAlert(timeout: TimeInterval = 10) -> Bool {
+        app.alerts["Save Conflict"].waitForExistence(timeout: timeout)
+    }
+
+    private func waitForElementToDisappear(
+        _ element: XCUIElement,
+        timeout: TimeInterval = 5
+    ) -> Bool {
+        let deadline = Date().addingTimeInterval(timeout)
+
+        repeat {
+            if element.exists == false {
+                return true
+            }
+            RunLoop.current.run(until: Date().addingTimeInterval(0.2))
+        } while Date() < deadline
+
+        return element.exists == false
+    }
+
+    private func waitForAutosaveAttempt(timeout: TimeInterval = 2) {
+        RunLoop.current.run(until: Date().addingTimeInterval(timeout))
+    }
+
     private func tapBackButton(file: StaticString = #filePath, line: UInt = #line) {
         let navigationBar = app.navigationBars.firstMatch
         XCTAssertTrue(navigationBar.waitForExistence(timeout: 5), "Navigation bar was not visible", file: file, line: line)
 
         let excludedIdentifiers = Set([
-            "database.save",
             "entry-list.add-entry",
             "lock.button",
             "sort.menu",
diff --git a/KeeForgeUITests/KeeForgeUITestCase.swift b/KeeForgeUITests/KeeForgeUITestCase.swift
@@ -181,7 +181,17 @@ class KeeForgeUITestCase: XCTestCase {
             file: file,
             line: line
         )
-        databaseRow.tap()
+        XCTAssertTrue(
+            revealElement(databaseRow),
+            "Database row was not hittable",
+            file: file,
+            line: line
+        )
+        if databaseRow.isHittable {
+            databaseRow.tap()
+        } else {
+            databaseRow.coordinate(withNormalizedOffset: CGVector(dx: 0.5, dy: 0.5)).tap()
+        }
 
         XCTAssertTrue(
             passwordField.waitForExistence(timeout: timeout),

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ struct EntryEditView: View {`
`14`	`14`	`@State private var showDeleteConfirmation = false`
`15`	`15`	`@State private var showPasswordGenerator = false`
`16`	`16`	`@State private var editingErrorMessage: String?`
	`17`	`+ @State private var isSubmitting = false`
`17`	`18`
`18`	`19`	`init(`
`19`	`20`	`formViewModel: EntryEditViewModel,`
`@@ -104,6 +105,7 @@ struct EntryEditView: View {`
`104`	`105`	`Button("Delete Entry", role: .destructive) {`
`105`	`106`	`showDeleteConfirmation = true`
`106`	`107`	`}`
	`108`	`+ .disabled(isSubmitting)`
`107`	`109`	`.accessibilityIdentifier("entry-edit.delete")`
`108`	`110`	`}`
`109`	`111`	`}`
`@@ -116,14 +118,15 @@ struct EntryEditView: View {`
`116`	`118`	`Button("Cancel") {`
`117`	`119`	`cancelTapped()`
`118`	`120`	`}`
	`121`	`+ .disabled(isSubmitting)`
`119`	`122`	`.accessibilityIdentifier("entry-edit.cancel")`
`120`	`123`	`}`
`121`	`124`
`122`	`125`	`ToolbarItem(placement: .confirmationAction) {`
`123`	`126`	`Button("Save") {`
`124`	`127`	`saveTapped()`
`125`	`128`	`}`
`126`		`- .disabled(formViewModel.canSave == false)`
	`129`	`+ .disabled(formViewModel.canSave == false \|\| isSubmitting)`
`127`	`130`	`.accessibilityIdentifier("entry-edit.save")`
`128`	`131`	`}`
`129`	`132`	`}`
`@@ -216,7 +219,12 @@ struct EntryEditView: View {`
`216`	`219`	`)`
`217`	`220`	`}`
`218`	`221`
`219`		`- onComplete(.finished)`
	`222`	`+ isSubmitting = true`
	`223`	`+ Task { @MainActor in`
	`224`	`+ await databaseViewModel.saveHandlingError()`
	`225`	`+ isSubmitting = false`
	`226`	`+ onComplete(.finished)`
	`227`	`+ }`
`220`	`228`	`} catch {`
`221`	`229`	`editingErrorMessage = error.localizedDescription`
`222`	`230`	`}`
`@@ -227,7 +235,12 @@ struct EntryEditView: View {`
`227`	`235`
`228`	`236`	`do {`
`229`	`237`	`try databaseViewModel.deleteEntry(entryID, sendToRecycleBin: sendToRecycleBin)`
`230`		`- onComplete(.deleted)`
	`238`	`+ isSubmitting = true`
	`239`	`+ Task { @MainActor in`
	`240`	`+ await databaseViewModel.saveHandlingError()`
	`241`	`+ isSubmitting = false`
	`242`	`+ onComplete(.deleted)`
	`243`	`+ }`
`231`	`244`	`} catch {`
`232`	`245`	`editingErrorMessage = error.localizedDescription`
`233`	`246`	`}`