fixup! Update SC availability taking into account 'transferring' state

Introduce 'transferred' available state.
salemove · Dec 9, 2024 · 9cdb97d · 9cdb97d
1 parent 75698b5
commit 9cdb97d
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 24 deletions.
diff --git a/GliaWidgets/SecureConversations/ChatTranscript/SecureConversations.TranscriptModel.swift b/GliaWidgets/SecureConversations/ChatTranscript/SecureConversations.TranscriptModel.swift
@@ -146,10 +146,14 @@ extension SecureConversations {
             availability.checkSecureConversationsAvailability(for: environment.queueIds) { [weak self] result in
                 guard let self else { return }
                 switch result {
-                case let .success(.available(queueIds)):
+                case let .success(.available(.queues(queueIds))):
                     self.environment.queueIds = queueIds
                     self.isSecureConversationsAvailable = true
                     self.fileUploadListModel.isEnabled = true
+                case .success(.available(.transferred)):
+                    self.environment.queueIds = []
+                    self.isSecureConversationsAvailable = true
+                    self.fileUploadListModel.isEnabled = true
                 case .failure, .success(.unavailable(.emptyQueue)), .success(.unavailable(.unauthenticated)):
                     // For chat screen we no longer show unavailability dialog, but unavailability banner instead.
                     self.isSecureConversationsAvailable = false

diff --git a/GliaWidgets/SecureConversations/SecureConversations.Availability.swift b/GliaWidgets/SecureConversations/SecureConversations.Availability.swift
@@ -46,7 +46,7 @@ extension SecureConversations {
                 if let engagement = environment.getCurrentEngagement(),
                    engagement.status == .transferring,
                    engagement.capabilities?.text == true {
-                    completion(.success(.available(queueIds: [])))
+                    completion(.success(.available(.transferred)))
                     return
                 }
 
@@ -57,7 +57,7 @@ extension SecureConversations {
             let queueIds = filteredQueues.map { $0.id }
 
             environment.log.info("Secure Messaging is available in queues with IDs: \(queueIds).")
-            completion(.success(.available(queueIds: queueIds)))
+            completion(.success(.available(.queues(queueIds: queueIds))))
         }
 
         private var defaultPredicate: (CoreSdkClient.Queue) -> Bool {
@@ -81,7 +81,11 @@ extension SecureConversations.Availability {
 
 extension SecureConversations.Availability {
     enum Status: Equatable {
-        case available(queueIds: [String] = [])
+        enum Available: Equatable {
+            case queues(queueIds: [String])
+            case transferred
+        }
+        case available(Available)
         case unavailable(UnavailabilityReason)
 
         static func == (lhs: Status, rhs: Status) -> Bool {
@@ -94,6 +98,15 @@ extension SecureConversations.Availability {
                 return false
             }
         }
+
+        var isAvailable: Bool {
+            switch self {
+            case .available:
+                true
+            case .unavailable:
+                false
+            }
+        }
     }
 }
 

diff --git a/GliaWidgets/SecureConversations/Welcome/SecureConversations.WelcomeViewModel.swift b/GliaWidgets/SecureConversations/Welcome/SecureConversations.WelcomeViewModel.swift
@@ -22,7 +22,7 @@ extension SecureConversations {
         /// Flag indicating attachment(s) availability.
         /// By default attachments are not available, until site configurations are fetched.
         private(set) var isAttachmentsAvailable: Bool = false { didSet { reportChange() } }
-        var availabilityStatus: Availability.Status = .available(queueIds: []) { didSet { reportChange() } }
+        var availabilityStatus: Availability.Status = .available(.queues(queueIds: [])) { didSet { reportChange() } }
         var messageInputState: MessageInputState = .normal { didSet { reportChange() } }
         var sendMessageRequestState: SendMessageRequestState = .waiting { didSet { reportChange() } }
 
@@ -64,9 +64,12 @@ extension SecureConversations {
             availability.checkSecureConversationsAvailability(for: environment.queueIds) { [weak self] result in
                 guard let self else { return }
                 switch result {
-                case let .success(.available(queueIds)):
+                case let .success(.available(.queues(queueIds))):
                     self.environment.queueIds = queueIds
-                    self.availabilityStatus = .available(queueIds: queueIds)
+                    self.availabilityStatus = .available(.queues(queueIds: queueIds))
+                case .success(.available(.transferred)):
+                    self.environment.queueIds = []
+                    self.availabilityStatus = .available(.transferred)
                 case .success(.unavailable(.emptyQueue)), .failure:
                     self.availabilityStatus = .unavailable(.emptyQueue)
                     self.delegate?(.showAlert(.unavailableMessageCenter()))
@@ -178,7 +181,7 @@ extension SecureConversations.WelcomeViewModel {
     ) -> SecureConversations.WelcomeStyle {
         var style = instance.environment.welcomeStyle
 
-        if instance.availabilityStatus != .available() {
+        if !instance.availabilityStatus.isAvailable {
             style.messageTitleStyle = nil
         }
 
@@ -191,7 +194,7 @@ extension SecureConversations.WelcomeViewModel {
         var filePickerButton: WelcomeViewProps.FilePickerButton?
 
         let isFilePickerEnabled = !instance.fileUploadListModel.isLimitReached
-        if instance.availabilityStatus == .available(), instance.isAttachmentsAvailable {
+        if instance.availabilityStatus.isAvailable, instance.isAttachmentsAvailable {
             filePickerButton = WelcomeViewProps.FilePickerButton(
                 isEnabled: isFilePickerEnabled,
                 tap: Command { originView in
@@ -203,7 +206,7 @@ extension SecureConversations.WelcomeViewModel {
         return filePickerButton
     }
     static func textViewState(for instance: SecureConversations.WelcomeViewModel) -> TextViewProps? {
-        guard instance.availabilityStatus == .available() else {
+        guard instance.availabilityStatus.isAvailable else {
             return nil
         }
 
@@ -254,7 +257,7 @@ extension SecureConversations.WelcomeViewModel {
         for instance: SecureConversations.WelcomeViewModel
     ) -> SendMessageButton? {
         // Is service available?
-        guard instance.availabilityStatus == .available() else {
+        guard instance.availabilityStatus.isAvailable else {
             return nil
         }
 

diff --git a/GliaWidgetsTests/SecureConversations/AvailabilityTests.swift b/GliaWidgetsTests/SecureConversations/AvailabilityTests.swift
@@ -82,7 +82,7 @@ final class AvailabilityTests: XCTestCase {
         let result = try XCTUnwrap(receivedResult)
         switch result {
         case let .success(.available(queueIds)):
-            XCTAssertEqual(queueIds, [queueId])
+            XCTAssertEqual(queueIds, .queues(queueIds: [queueId]))
         default:
             XCTFail("Result should be `.success(.available)`")
         }
@@ -174,7 +174,7 @@ final class AvailabilityTests: XCTestCase {
         }
         let result = try XCTUnwrap(receivedResult)
         switch result {
-        case let .success(.available(queueIds)):
+        case let .success(.available(.queues(queueIds))):
             XCTAssertEqual(queueIds, [queueId])
         default:
             XCTFail("Result should be `.success(.available)`")
@@ -224,8 +224,8 @@ final class AvailabilityTests: XCTestCase {
         }
         let result = try XCTUnwrap(receivedResult)
         switch result {
-        case let .success(.available(queueIds)):
-            XCTAssertEqual(queueIds, [])
+        case let .success(status):
+            XCTAssertEqual(status, .available(.transferred))
         default:
             XCTFail("Result should be `.success(.available)`. Got `\(result)` instead.")
         }

diff --git a/GliaWidgetsTests/SecureConversations/Welcome/SecureConversations.WelcomeViewModelSpec.swift b/GliaWidgetsTests/SecureConversations/Welcome/SecureConversations.WelcomeViewModelSpec.swift
@@ -265,7 +265,7 @@ extension SecureConversationsWelcomeViewModelTests {
         }
 
         viewModel = .init(environment: environment, availability: .mock)
-        viewModel.availabilityStatus = .available()
+        viewModel.availabilityStatus = .available(.queues(queueIds: []))
 
         if case .welcome(let props) = viewModel.props() {
             XCTAssertNotNil(props.filePickerButton)
@@ -335,7 +335,7 @@ extension SecureConversationsWelcomeViewModelTests {
     }
 
     func testSendMessageButtonStateFileUploads() {
-        viewModel.availabilityStatus = .available()
+        viewModel.availabilityStatus = .available(.queues(queueIds: []))
         let uploadFile: FileUpload.Environment.UploadFile = .toSecureMessaging { file, progress, completion in
             completion(.failure(CoreSdkClient.GliaCoreError(reason: "")))
             return .mock
@@ -354,7 +354,7 @@ extension SecureConversationsWelcomeViewModelTests {
     }
 
     func testSendMessageButtonStateInProgressFileUpload() {
-        viewModel.availabilityStatus = .available()
+        viewModel.availabilityStatus = .available(.queues(queueIds: []))
         let fileUpload: FileUpload = .mock()
         fileUpload.startUpload()
         viewModel.fileUploadListModel.environment.uploader.uploads = [fileUpload]
@@ -367,7 +367,7 @@ extension SecureConversationsWelcomeViewModelTests {
     }
 
     func testSendMessageButtonStateEmptyText() {
-        viewModel.availabilityStatus = .available()
+        viewModel.availabilityStatus = .available(.queues(queueIds: []))
         viewModel.messageText = ""
 
         if case .welcome(let props) = viewModel.props() {
@@ -378,7 +378,7 @@ extension SecureConversationsWelcomeViewModelTests {
     }
 
     func testSendMessageButtonStateSuccessfulUpload() {
-        viewModel.availabilityStatus = .available()
+        viewModel.availabilityStatus = .available(.queues(queueIds: []))
         viewModel.fileUploadListModel.environment.uploader = FileUploader(maximumUploads: 100, environment: .mock)
         viewModel.messageText = ""
 
@@ -390,7 +390,7 @@ extension SecureConversationsWelcomeViewModelTests {
     }
 
     func testSendMessageButtonStateNoQueues() {
-        viewModel.availabilityStatus = .available()
+        viewModel.availabilityStatus = .available(.queues(queueIds: []))
         viewModel.messageText = "text"
         viewModel.fileUploadListModel.environment.uploader = FileUploader(maximumUploads: 100, environment: .mock)
         viewModel.environment.queueIds = []
@@ -403,7 +403,7 @@ extension SecureConversationsWelcomeViewModelTests {
     }
 
     func testSendMessageButtonStateLoadingMessageRequestState() {
-        viewModel.availabilityStatus = .available()
+        viewModel.availabilityStatus = .available(.queues(queueIds: []))
         viewModel.messageText = "text"
         viewModel.fileUploadListModel.environment.uploader = FileUploader(maximumUploads: 100, environment: .mock)
         viewModel.environment.queueIds = [""]
@@ -417,7 +417,7 @@ extension SecureConversationsWelcomeViewModelTests {
     }
 
     func testSendMessageButtonStateWaitingMessageRequestState() {
-        viewModel.availabilityStatus = .available()
+        viewModel.availabilityStatus = .available(.queues(queueIds: []))
         viewModel.messageText = "text"
         viewModel.fileUploadListModel.environment.uploader = FileUploader(maximumUploads: 100, environment: .mock)
         viewModel.environment.queueIds = [""]
@@ -623,7 +623,7 @@ extension SecureConversationsWelcomeViewModelTests {
 
         viewModel = .init(environment: .mock(queueIds: [uuid]), availability: availability)
 
-        XCTAssertEqual(viewModel.availabilityStatus, .available())
+        XCTAssertEqual(viewModel.availabilityStatus, .available(.queues(queueIds: [])))
     }
 
     func testAvailabilityUnavailableEmptyQueues() {