[PM-21125] Enable navigation to view send (#1588)

Author: matt-livefront

BitwardenShared/UI/Tools/Send/Send/SendList/SendListItemRowView.swift

@@ -41,6 +41,9 @@ enum SendListItemRowAction: Equatable, Sendable {
 
     /// The item was pressed.
     case sendListItemPressed(SendListItem)
+
+    /// The view send button was tapped.
+    case viewSend(_ sendView: SendView)
 }
 
 // MARK: - SendListItemRowEffect
@@ -155,6 +158,9 @@ struct SendListItemRowView: View {
                     await store.perform(.copyLinkPressed(sendView))
                 }
                 .accessibilityIdentifier("Copy")
+                Button(Localizations.view) {
+                    store.send(.viewSend(sendView))
+                }
                 Button(Localizations.edit) {
                     store.send(.editPressed(sendView))
                 }

BitwardenShared/UI/Tools/Send/Send/SendList/SendListProcessor.swift

@@ -100,10 +100,12 @@ final class SendListProcessor: StateProcessor<SendListState, SendListAction, Sen
             case let .sendListItemPressed(item):
                 switch item.itemType {
                 case let .send(sendView):
-                    coordinator.navigate(to: .editItem(sendView), context: self)
+                    coordinator.navigate(to: .viewItem(sendView), context: self)
                 case let .group(type, _):
                     coordinator.navigate(to: .group(type))
                 }
+            case let .viewSend(sendView):
+                coordinator.navigate(to: .viewItem(sendView), context: self)
             }
         case let .toastShown(toast):
             state.toast = toast

BitwardenShared/UI/Tools/Send/Send/SendList/SendListProcessorTests.swift

@@ -476,14 +476,14 @@ class SendListProcessorTests: BitwardenTestCase { // swiftlint:disable:this type
         XCTAssertEqual(coordinator.routes.last, .editItem(sendView))
     }
 
-    /// `receive(_:)` with `.sendListItemRow(.sendListItemPressed())` navigates to the edit send route.
+    /// `receive(_:)` with `.sendListItemRow(.sendListItemPressed())` navigates to the view send route.
     @MainActor
     func test_receive_sendListItemRow_sendListItemPressed_withSendView() {
         let sendView = SendView.fixture()
         let item = SendListItem(sendView: sendView)!
         subject.receive(.sendListItemRow(.sendListItemPressed(item)))
 
-        XCTAssertEqual(coordinator.routes.last, .editItem(sendView))
+        XCTAssertEqual(coordinator.routes.last, .viewItem(sendView))
     }
 
     /// `receive(_:)` with `.sendListItemRow(.sendListItemPressed())` navigates to the group send route.
@@ -495,6 +495,15 @@ class SendListProcessorTests: BitwardenTestCase { // swiftlint:disable:this type
         XCTAssertEqual(coordinator.routes.last, .group(.file))
     }
 
+    /// `receive(_:)` with `.sendListItemRow(.viewSend())` navigates to the view send route.
+    @MainActor
+    func test_receive_sendListItemRow_viewSend() {
+        let sendView = SendView.fixture()
+        subject.receive(.sendListItemRow(.viewSend(sendView)))
+
+        XCTAssertEqual(coordinator.routes.last, .viewItem(sendView))
+    }
+
     /// `receive(_:)` with `.toastShown` updates the toast value in the state.
     @MainActor
     func test_receive_toastShown() {

BitwardenShared/UI/Tools/Send/SendItem/SendItemCoordinator.swift

@@ -12,6 +12,8 @@ final class SendItemCoordinator: Coordinator, HasStackNavigator {
     // MARK: Types
 
     typealias Module = FileSelectionModule
+        & NavigatorBuilderModule
+        & SendItemModule
 
     typealias Services = HasAuthRepository
         & HasErrorAlertServices.ErrorAlertServices
@@ -77,6 +79,8 @@ final class SendItemCoordinator: Coordinator, HasStackNavigator {
             delegate?.sendItemCancelled()
         case .deleted:
             delegate?.sendItemDeleted()
+        case let .dismiss(dismissAction):
+            stackNavigator?.dismiss(completion: dismissAction?.action)
         case let .complete(sendView):
             delegate?.sendItemCompleted(with: sendView)
         case let .edit(sendView):
@@ -95,6 +99,22 @@ final class SendItemCoordinator: Coordinator, HasStackNavigator {
 
     // MARK: Private methods
 
+    /// Present a child `SendItemCoordinator` on top of the existing coordinator.
+    ///
+    /// Presenting a view on top of an already presented view within the same coordinator causes
+    /// problems when dismissing only the top view. So instead, present a new coordinator and
+    /// show the view to navigate to within that coordinator's navigator.
+    ///
+    /// - Parameter route: The route to navigate to in the presented coordinator.
+    ///
+    private func presentChildSendItemCoordinator(route: SendItemRoute, context: AnyObject?) {
+        let navigationController = module.makeNavigationController()
+        let coordinator = module.makeSendItemCoordinator(delegate: self, stackNavigator: navigationController)
+        coordinator.navigate(to: route, context: context)
+        coordinator.start()
+        stackNavigator?.present(navigationController)
+    }
+
     /// Shows the add item screen.
     ///
     /// - Parameter content: Optional content to pre-fill the add item screen.
@@ -131,14 +151,19 @@ final class SendItemCoordinator: Coordinator, HasStackNavigator {
     /// - Parameter sendView: The send to edit.
     ///
     private func showEditItem(for sendView: SendView) {
-        let state = AddEditSendItemState(sendView: sendView)
-        let processor = AddEditSendItemProcessor(
-            coordinator: asAnyCoordinator(),
-            services: services,
-            state: state
-        )
-        let view = AddEditSendItemView(store: Store(processor: processor))
-        stackNavigator?.replace(view)
+        guard let stackNavigator else { return }
+        if stackNavigator.isEmpty {
+            let state = AddEditSendItemState(sendView: sendView)
+            let processor = AddEditSendItemProcessor(
+                coordinator: asAnyCoordinator(),
+                services: services,
+                state: state
+            )
+            let view = AddEditSendItemView(store: Store(processor: processor))
+            stackNavigator.replace(view)
+        } else {
+            presentChildSendItemCoordinator(route: .edit(sendView), context: nil)
+        }
     }
 
     /// Navigates to the specified `FileSelectionRoute`.
@@ -193,3 +218,39 @@ final class SendItemCoordinator: Coordinator, HasStackNavigator {
 extension SendItemCoordinator: HasErrorAlertServices {
     var errorAlertServices: ErrorAlertServices { services }
 }
+
+// MARK: - SendItemDelegate
+
+extension SendItemCoordinator: SendItemDelegate {
+    func handle(_ authAction: AuthAction) async {
+        await delegate?.handle(authAction)
+    }
+
+    func sendItemCancelled() {
+        stackNavigator?.dismiss()
+    }
+
+    func sendItemCompleted(with sendView: SendView) {
+        // The dismiss and share sheet presentation needs to occur here rather than passing it onto
+        // the delegate to handle the case where the edit view is presented on the view Send view.
+        // The edit view is dismissed and the share sheet is presented on the view Send view.
+        Task {
+            do {
+                guard let url = try await self.services.sendRepository.shareURL(for: sendView) else {
+                    navigate(to: .dismiss(nil))
+                    return
+                }
+                navigate(to: .dismiss(DismissAction {
+                    self.navigate(to: .share(url: url))
+                }))
+            } catch {
+                services.errorReporter.log(error: error)
+                navigate(to: .dismiss(nil))
+            }
+        }
+    }
+
+    func sendItemDeleted() {
+        delegate?.sendItemDeleted()
+    }
+}

BitwardenShared/UI/Tools/Send/SendItem/SendItemCoordinatorTests.swift

@@ -1,4 +1,6 @@
+import BitwardenKitMocks
 import BitwardenSdk
+import TestHelpers
 import XCTest
 
 @testable import BitwardenShared
@@ -9,6 +11,7 @@ class SendItemCoordinatorTests: BitwardenTestCase {
     // MARK: Properties
 
     var delegate: MockSendItemDelegate!
+    var errorReporter: MockErrorReporter!
     var module: MockAppModule!
     var sendRepository: MockSendRepository!
     var stackNavigator: MockStackNavigator!
@@ -19,20 +22,25 @@ class SendItemCoordinatorTests: BitwardenTestCase {
     override func setUp() {
         super.setUp()
         delegate = MockSendItemDelegate()
+        errorReporter = MockErrorReporter()
         module = MockAppModule()
         sendRepository = MockSendRepository()
         stackNavigator = MockStackNavigator()
         subject = SendItemCoordinator(
             delegate: delegate,
             module: module,
-            services: ServiceContainer.withMocks(sendRepository: sendRepository),
+            services: ServiceContainer.withMocks(
+                errorReporter: errorReporter,
+                sendRepository: sendRepository
+            ),
             stackNavigator: stackNavigator
         )
     }
 
     override func tearDown() {
         super.tearDown()
         delegate = nil
+        errorReporter = nil
         module = nil
         sendRepository = nil
         stackNavigator = nil
@@ -125,6 +133,15 @@ class SendItemCoordinatorTests: BitwardenTestCase {
         XCTAssertEqual(delegate.sendItemCompletedSendView, sendView)
     }
 
+    /// `navigate(to:)` with `.dismiss` dismisses the current modally presented screen.
+    @MainActor
+    func test_navigateTo_dismiss() throws {
+        subject.navigate(to: .dismiss())
+
+        let action = try XCTUnwrap(stackNavigator.actions.last)
+        XCTAssertEqual(action.type, .dismissedWithCompletionHandler)
+    }
+
     /// `navigate(to:)` with `.edit` shows the edit screen.
     @MainActor
     func test_navigateTo_edit() throws {
@@ -138,6 +155,19 @@ class SendItemCoordinatorTests: BitwardenTestCase {
         XCTAssertEqual(view.store.state.mode, .edit)
     }
 
+    /// `navigate(to:)` with `.edit` with a non empty stack presents a new send item coordinator.
+    @MainActor
+    func test_navigateTo_edit_presentsCoordinator() throws {
+        stackNavigator.isEmpty = false
+
+        subject.navigate(to: .edit(.fixture()), context: nil)
+
+        let action = try XCTUnwrap(stackNavigator.actions.last)
+        XCTAssertEqual(action.type, .presented)
+        XCTAssertTrue(action.view is UINavigationController)
+        XCTAssertEqual(module.sendItemCoordinator.routes, [.edit(.fixture())])
+    }
+
     /// `navigate(to:)` with `.fileSelection` and with a file selection delegate presents the file
     /// selection screen.
     @MainActor
@@ -169,4 +199,78 @@ class SendItemCoordinatorTests: BitwardenTestCase {
         let view = try XCTUnwrap(action.view as? ViewSendItemView)
         XCTAssertEqual(view.store.state.sendView, sendView)
     }
+
+    /// `handle(_:)` calls `handle(_:)` on the delegate.
+    @MainActor
+    func test_sendItemDelegate_handleAuthAction() async {
+        let action = AuthAction.logout(userId: "1", userInitiated: true)
+        await subject.handle(action)
+        XCTAssertEqual(delegate.handledAuthActions, [action])
+    }
+
+    /// `sendItemCancelled()` dismisses the presented view.
+    @MainActor
+    func test_sendItemDelegate_sendItemCancelled() throws {
+        subject.sendItemCancelled()
+
+        let action = try XCTUnwrap(stackNavigator.actions.last)
+        XCTAssertEqual(action.type, .dismissed)
+    }
+
+    /// `sendItemCompleted(with:)` dismisses the view and presents the share sheet.
+    @MainActor
+    func test_sendItemDelegate_sendItemCompleted() throws {
+        sendRepository.shareURLResult = .success(.example)
+
+        subject.sendItemCompleted(with: .fixture())
+
+        waitFor { stackNavigator.actions.count == 2 }
+
+        XCTAssertEqual(stackNavigator.actions.count, 2)
+
+        let shareAction = try XCTUnwrap(stackNavigator.actions[0])
+        XCTAssertEqual(shareAction.type, .presented)
+        XCTAssertTrue(shareAction.view is UIActivityViewController)
+
+        let dismissAction = try XCTUnwrap(stackNavigator.actions[1])
+        XCTAssertEqual(dismissAction.type, .dismissedWithCompletionHandler)
+    }
+
+    /// `sendItemCompleted(with:)` logs an error if generating the share URL fails.
+    @MainActor
+    func test_sendItemDelegate_sendItemCompleted_error() throws {
+        sendRepository.shareURLResult = .failure(BitwardenTestError.example)
+
+        subject.sendItemCompleted(with: .fixture())
+
+        waitFor { !stackNavigator.actions.isEmpty }
+
+        XCTAssertEqual(stackNavigator.actions.count, 1)
+
+        let action = try XCTUnwrap(stackNavigator.actions.last)
+        XCTAssertEqual(action.type, .dismissedWithCompletionHandler)
+        XCTAssertEqual(errorReporter.errors as? [BitwardenTestError], [.example])
+    }
+
+    /// `sendItemCompleted(with:)` dismisses the view if the share URL is `nil`.
+    @MainActor
+    func test_sendItemDelegate_sendItemCompleted_nilURL() throws {
+        sendRepository.shareURLResult = .success(nil)
+
+        subject.sendItemCompleted(with: .fixture())
+
+        waitFor { !stackNavigator.actions.isEmpty }
+
+        XCTAssertEqual(stackNavigator.actions.count, 1)
+
+        let action = try XCTUnwrap(stackNavigator.actions.last)
+        XCTAssertEqual(action.type, .dismissedWithCompletionHandler)
+    }
+
+    /// `sendItemDeleted()` calls `sendItemDeleted()` on the delegate.
+    @MainActor
+    func test_sendItemDelegate_sendItemDeleted() {
+        subject.sendItemDeleted()
+        XCTAssertTrue(delegate.didSendItemDeleted)
+    }
 }

BitwardenShared/UI/Tools/Send/SendItem/SendItemRoute.swift

@@ -40,6 +40,13 @@ public enum SendItemRoute: Equatable, Hashable {
     /// A route specifying that the send item flow completed by deleting a send.
     case deleted
 
+    /// A route that dismisses a presented sheet.
+    ///
+    /// - Parameter action: An optional `DismissAction` that is executed after the sheet has been
+    ///   dismissed.
+    ///
+    case dismiss(_ action: DismissAction? = nil)
+
     /// A route to the edit item screen for the provided send.
     ///
     /// - Parameter sendView: The `SendView` to edit.