Simplify note update by staying on the edit screen

Author: adborbas

Modules/Sources/Yosemite/Stores/BookingStore.swift

@@ -347,44 +347,27 @@ private extension BookingStore {
         note: String,
         onCompletion: @escaping (Error?) -> Void
     ) {
-        updateBookingNoteLocally(
-            siteID: siteID,
-            bookingID: bookingID,
-            note: note
-        ) { [weak self] previousNote in
-            guard let self else {
-                return onCompletion(UpdateBookingStatusError.undefinedState)
-            }
-
-            Task { @MainActor in
-                do {
-                    if let remoteBooking = try await self.remote.updateBooking(
-                        from: siteID,
-                        bookingID: bookingID,
-                        attendanceStatus: nil,
-                        bookingStatus: nil,
-                        note: note,
-                    ) {
-                        await self.upsertStoredBookingsInBackground(
-                            readOnlyBookings: [remoteBooking],
-                            readOnlyOrders: [],
-                            siteID: siteID
-                        )
+        Task { @MainActor in
+            do {
+                if let remoteBooking = try await self.remote.updateBooking(
+                    from: siteID,
+                    bookingID: bookingID,
+                    attendanceStatus: nil,
+                    bookingStatus: nil,
+                    note: note,
+                ) {
+                    await self.upsertStoredBookingsInBackground(
+                        readOnlyBookings: [remoteBooking],
+                        readOnlyOrders: [],
+                        siteID: siteID
+                    )
 
-                        onCompletion(nil)
-                    } else {
-                        return onCompletion(UpdateBookingStatusError.missingRemoteBooking)
-                    }
-                } catch {
-                    /// Revert Optimistic Update
-                    self.updateBookingNoteLocally(
-                        siteID: siteID,
-                        bookingID: bookingID,
-                        note: note
-                    ) { _ in
-                        onCompletion(error)
-                    }
+                    onCompletion(nil)
+                } else {
+                    return onCompletion(UpdateBookingStatusError.missingRemoteBooking)
                 }
+            } catch {
+                return onCompletion(error)
             }
         }
     }
@@ -417,33 +400,6 @@ private extension BookingStore {
         }, on: .main)
     }
 
-    func updateBookingNoteLocally(
-        siteID: Int64,
-        bookingID: Int64,
-        note: String?,
-        onCompletion: @escaping (String?) -> Void
-    ) {
-        storageManager.performAndSave({ storage -> String? in
-            guard let booking = storage.loadBooking(
-                siteID: siteID,
-                bookingID: bookingID
-            ) else {
-                return note
-            }
-
-            let oldNote = booking.note
-            booking.note = note
-            return oldNote
-        }, completion: { result in
-            switch result {
-            case .success(let status):
-                onCompletion(status)
-            case .failure:
-                onCompletion(note)
-            }
-        }, on: .main)
-    }
-
     /// Cancels a booking by updating its status to cancelled.
     func cancelBooking(
         siteID: Int64,

WooCommerce/Classes/ViewModels/Booking Details/BookingDetailsViewModel.swift

@@ -252,22 +252,30 @@ extension BookingDetailsViewModel {
         stores.dispatch(action)
     }
 
-    func updateNote(to newNote: String) {
-        let action = BookingAction.updateBookingNote(
-            siteID: booking.siteID,
-            bookingID: booking.bookingID,
-            note: newNote
-        ) { [weak self] error in
-            if let error, let self {
-                DDLogError("⛔️ Error updating booking note: \(error)")
-                displayErrorNotice(
-                    messageFormat: Localization.bookingNoteUpdateFailedMessage
-                ) { [weak self] in
-                    self?.updateNote(to: newNote)
+    @MainActor
+    func updateNote(to newNote: String) async -> MultilineCommitResult {
+        await withCheckedContinuation { continuation in
+            let action = BookingAction.updateBookingNote(
+                siteID: booking.siteID,
+                bookingID: booking.bookingID,
+                note: newNote
+            ) { [booking] error in
+                if let error {
+                    DDLogError("⛔️ Error updating booking note: \(error)")
+                    let message = String.localizedStringWithFormat(
+                        Localization.bookingNoteUpdateFailedMessage,
+                        booking.bookingID
+                    )
+
+                    continuation.resume(returning: .failure(message: message))
+                    return
                 }
+
+                continuation.resume(returning: .success)
             }
+
+            stores.dispatch(action)
         }
-        stores.dispatch(action)
     }
 
     private func displayErrorNotice(
@@ -283,8 +291,7 @@ extension BookingDetailsViewModel {
             message: text,
             feedbackType: .error,
             actionTitle: Localization.retryActionTitle
-        ) { [weak self] in
-            guard let self else { return }
+        ) {
             retry()
         }
     }

WooCommerce/Classes/ViewRelated/Bookings/Booking Details/BookingDetailsView.swift

@@ -245,7 +245,7 @@ private extension BookingDetailsView {
         MultilineEditableTextRow(value: viewModel.note,
                                  placeholder: Localization.bookingNotesRowText,
                                  detailTitle: Localization.bookingNoteNavbarText) { newNote in
-            viewModel.updateNote(to: newNote)
+            return await viewModel.updateNote(to: newNote)
         }
     }
 }

WooCommerce/Classes/ViewRelated/ReusableViews/SwiftUI Components/MultilineEditableTextRow/MultilineEditableTextDetailView.swift

@@ -1,17 +1,25 @@
 import SwiftUI
 
+enum MultilineCommitResult {
+    case success
+    case failure(message: String)
+}
+
 struct MultilineEditableTextDetailView: View {
     @Environment(\.dismiss) private var dismiss
 
     @Binding var text: String
     @State private var editedText: String
     @State private var showDiscardChangesDialog = false
     @FocusState private var isFocused: Bool
+    @State private var notice: Notice?
+    @State private var isSaving = false
+    @State private var errorMessage: String?
 
     let title: String?
-    let onCommit: ((String) -> Void)?
+    let onCommit: (String) async -> MultilineCommitResult
 
-    init(text: Binding<String>, title: String? = nil, onCommit: ((String) -> Void)? = nil) {
+    init(text: Binding<String>, title: String? = nil, onCommit: @escaping (String) async -> MultilineCommitResult) {
         self._text = text
         self._editedText = State(initialValue: text.wrappedValue)
         self.title = title
@@ -31,6 +39,7 @@ struct MultilineEditableTextDetailView: View {
         .toolbar { toolbar }
         .wooNavigationBarStyle()
         .onAppear { isFocused = true }
+        .notice($notice)
     }
 
     private var toolbar: some ToolbarContent {
@@ -54,17 +63,42 @@ struct MultilineEditableTextDetailView: View {
 
             if editedText != text {
                 ToolbarItem(placement: .primaryAction) {
-                    Button(Localization.doneButtonTitle) {
-                        text = editedText
-                        onCommit?(editedText)
-                        dismiss()
+                    if isSaving {
+                        ProgressView()
+                    } else {
+                        Button(Localization.doneButtonTitle) {
+                            Task {
+                                await handleDoneTapped()
+                            }
+                        }
+                        .fontWeight(.medium)
+                        .disabled(isSaving)
                     }
-                    .fontWeight(.medium)
                 }
             }
         }
     }
 
+    private func handleDoneTapped() async {
+        guard !isSaving else { return }
+
+        isSaving = true
+        let newText = editedText
+        switch await onCommit(newText) {
+        case .success:
+            text = newText
+            isSaving = false
+            dismiss()
+        case .failure(let message):
+            isSaving = false
+
+            notice = Notice(
+                message: message,
+                feedbackType: .error,
+            )
+        }
+    }
+
     private func handleBackButtonTap() {
         if editedText != text {
             showDiscardChangesDialog = true

WooCommerce/Classes/ViewRelated/ReusableViews/SwiftUI Components/MultilineEditableTextRow/MultilineEditableTextRow.swift

@@ -4,12 +4,12 @@ struct MultilineEditableTextRow: View {
     @State var value: String
     let placeholder: String
     let detailTitle: String?
-    let onCommit: ((String) -> Void)?
+    let onCommit: (String) async -> MultilineCommitResult
 
     init(value: String,
          placeholder: String,
          detailTitle: String? = nil,
-         onCommit: ((String) -> Void)? = nil
+         onCommit: @escaping (String) async -> MultilineCommitResult
     ) {
         self._value = State(initialValue: value)
         self.placeholder = placeholder
@@ -64,7 +64,9 @@ fileprivate extension MultilineEditableTextRow {
     @Previewable @State var text: String = ""
 
     NavigationStack {
-        MultilineEditableTextRow(value: text, placeholder: "Add note")
+        MultilineEditableTextRow(value: text, placeholder: "Add note") { _ in
+            return .success
+        }
             .padding(.horizontal, 16)
     }
     .preferredColorScheme(.dark)