Optimize invites list (part 2) (#1268)

* Optimise invites list * Fix failing tests * Cleanup * Add weak self * Refactor ReportContentViewModelTests
2026-11-05 11:58:32 +00:00 · 2023-07-11 10:08:27 +02:00
parent 5ae227179c
commit 98dabe8500
11 changed files with 120 additions and 88 deletions
@@ -21,6 +21,10 @@ enum InvitesScreenViewModelAction {
 struct InvitesScreenViewState: BindableState {
    var invites: [InvitesScreenRoomDetails] = []
    var bindings: InvitesScreenViewStateBindings = .init()
+
+    // ideally we wanted to derive this state from `invites` being `Optional.none`.
+    // But we needed to make it a non optional array due to a strange crash in release builds (https://github.com/vector-im/element-x-ios/pull/1120)
+    var isLoading = true
 }

 struct InvitesScreenViewStateBindings {
@@ -28,7 +28,7 @@ class InvitesScreenViewModel: InvitesScreenViewModelType, InvitesScreenViewModel
    private let previouslySeenInvites: Set<String>
    private let actionsSubject: PassthroughSubject<InvitesScreenViewModelAction, Never> = .init()
    @CancellableTask private var fetchInvitersTask: Task<Void, Never>?
-    
+
    var actions: AnyPublisher<InvitesScreenViewModelAction, Never> {
        actionsSubject.eraseToAnyPublisher()
    }
@@ -75,62 +75,57 @@ class InvitesScreenViewModel: InvitesScreenViewModelType, InvitesScreenViewModel
        }
        
        inviteSummaryProvider.roomListPublisher
-            .receive(on: DispatchQueue.main)
+            .removeDuplicates()
            .sink { [weak self] roomSummaries in
                guard let self else { return }
-                
-                let invites = self.buildInvites(from: roomSummaries)
-                appSettings.seenInvites = Set(invites.map(\.roomDetails.id))
-                self.state.invites = invites

-                fetchInviters(invites: invites)
+                fetchInvitersTask = Task { [weak self] in
+                    guard let self else { return }
+                    let fullInvites = await self.buildInvites(from: roomSummaries)
+                    guard !Task.isCancelled else { return }
+                    self.state.invites = fullInvites
+                    self.state.isLoading = false
+                    self.appSettings.seenInvites = Set(fullInvites.map(\.roomDetails.id))
+                }
            }
            .store(in: &cancellables)
    }
-    
-    private func buildInvites(from summaries: [RoomSummary]) -> [InvitesScreenRoomDetails] {
-        summaries.compactMap { summary in
-            guard case .filled(let details) = summary else {
-                return nil
-            }
-            return InvitesScreenRoomDetails(roomDetails: details, isUnread: !previouslySeenInvites.contains(details.id))
-        }
-    }

-    private func fetchInviters(invites: [InvitesScreenRoomDetails]) {
-        fetchInvitersTask = Task { [weak self] in
-            await withTaskGroup(of: (String, RoomMemberProxyProtocol)?.self) { group in
-                for invite in invites {
-                    group.addTask { [weak self] in
-                        let roomID = invite.roomDetails.id
-                        guard let inviter = await self?.fetchInviter(for: roomID) else {
+    private func buildInvites(from summaries: [RoomSummary]) async -> [InvitesScreenRoomDetails] {
+        await Task.detached {
+            let invites: [InvitesScreenRoomDetails] = summaries.compactMap { summary in
+                guard case .filled(let details) = summary else {
+                    return nil
+                }
+                return InvitesScreenRoomDetails(roomDetails: details, isUnread: !self.previouslySeenInvites.contains(details.id))
+            }
+
+            // fetch the inviters...
+            return await withTaskGroup(of: (Int, RoomMemberProxyProtocol)?.self) { [clientProxy = self.clientProxy] group in
+                var invitesWithInviters = invites
+
+                for inviteIndex in 0..<invites.count {
+                    group.addTask {
+                        let roomID = invites[inviteIndex].roomDetails.id
+                        guard let inviter = await clientProxy.roomForIdentifier(roomID)?.inviter() else {
                            return nil
                        }
-                        return (roomID, inviter)
+                        return (inviteIndex, inviter)
                    }
                }

                for await result in group {
-                    guard let self, !Task.isCancelled else {
-                        break
-                    }
-
-                    guard let (roomID, inviter) = result else {
+                    guard let (inviteIndex, inviter) = result else {
                        continue
                    }

-                    guard let inviteIndex = self.state.invites.firstIndex(where: { $0.roomDetails.id == roomID }) else {
-                        return
-                    }
-
-                    self.state.invites[inviteIndex].inviter = inviter
+                    invitesWithInviters[inviteIndex].inviter = inviter
                }
+
+                return invitesWithInviters
            }
        }
-    }
-
-    private func fetchInviter(for roomID: String) async -> RoomMemberProxyProtocol? {
-        await clientProxy.roomForIdentifier(roomID)?.inviter()
+        .value
    }

    private func startDeclineFlow(invite: InvitesScreenRoomDetails) {
@@ -20,6 +20,23 @@ struct InvitesScreen: View {
    @ObservedObject var context: InvitesScreenViewModel.Context
    
    var body: some View {
+        Group {
+            if context.viewState.isLoading {
+                ProgressView()
+            } else {
+                mainContent
+            }
+        }
+        .background(Color.compound.bgCanvasDefault.ignoresSafeArea())
+        .navigationTitle(L10n.actionInvitesList)
+        .alert(item: $context.alertInfo)
+        .track(screen: .invites)
+    }
+    
+    // MARK: - Private
+
+    @ViewBuilder
+    private var mainContent: some View {
        ScrollView {
            if !context.viewState.invites.isEmpty {
                LazyVStack(spacing: 0) {
@@ -34,14 +51,8 @@ struct InvitesScreen: View {
                noInvitesContent
            }
        }
-        .background(Color.compound.bgCanvasDefault.ignoresSafeArea())
-        .navigationTitle(L10n.actionInvitesList)
-        .alert(item: $context.alertInfo)
-        .track(screen: .invites)
    }
    
-    // MARK: - Private
-    
    private var noInvitesContent: some View {
        Text(L10n.screenInvitesEmptyList)
            .font(.compound.bodyLG)