Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 11 Projects Releases Packages Wiki Activity Actions 8

Render errors in room member list view.

Browse source
This commit is contained in:
Benoit Marty 2024-07-17 10:58:58 +02:00
parent 79660dab51
commit 9636611ce8
4 changed files with 159 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

39
features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt
View file

@ -31,6 +31,7 @@ import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject import dagger.assisted.AssistedInject
import io.element.android.features.roomdetails.impl.members.moderation.RoomMembersModerationEvents import io.element.android.features.roomdetails.impl.members.moderation.RoomMembersModerationEvents
import io.element.android.features.roomdetails.impl.members.moderation.RoomMembersModerationPresenter import io.element.android.features.roomdetails.impl.members.moderation.RoomMembersModerationPresenter
import io.element.android.libraries.architecture.AsyncData
import io.element.android.libraries.architecture.Presenter import io.element.android.libraries.architecture.Presenter
import io.element.android.libraries.core.coroutine.CoroutineDispatchers import io.element.android.libraries.core.coroutine.CoroutineDispatchers
import io.element.android.libraries.designsystem.theme.components.SearchBarResultState import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
@ -59,10 +60,10 @@ class RoomMemberListPresenter @AssistedInject constructor(
@Composable @Composable
override fun present(): RoomMemberListState { override fun present(): RoomMemberListState {
val coroutineScope = rememberCoroutineScope() val coroutineScope = rememberCoroutineScope()
var roomMembers by remember { mutableStateOf(RoomMembers.loading()) } var roomMembers: AsyncData<RoomMembers> by remember { mutableStateOf(AsyncData.Loading()) }
var searchQuery by rememberSaveable { mutableStateOf("") } var searchQuery by rememberSaveable { mutableStateOf("") }
var searchResults by remember { var searchResults by remember {
mutableStateOf<SearchBarResultState<RoomMembers>>(SearchBarResultState.Initial()) mutableStateOf<SearchBarResultState<AsyncData<RoomMembers>>>(SearchBarResultState.Initial())
} }
var isSearchActive by rememberSaveable { mutableStateOf(false) } var isSearchActive by rememberSaveable { mutableStateOf(false) }
@ -82,6 +83,12 @@ class RoomMemberListPresenter @AssistedInject constructor(
if (membersState is MatrixRoomMembersState.Unknown) { if (membersState is MatrixRoomMembersState.Unknown) {
return@LaunchedEffect return@LaunchedEffect
} }
val _membersState = membersState
if (_membersState is MatrixRoomMembersState.Error && _membersState.roomMembers().orEmpty().isEmpty()) {
// Cannot fetch members and no cached members, display the error
roomMembers = AsyncData.Failure(_membersState.failure)
return@LaunchedEffect
}
withContext(coroutineDispatchers.io) { withContext(coroutineDispatchers.io) {
val members = membersState.roomMembers().orEmpty().groupBy { it.membership } val members = membersState.roomMembers().orEmpty().groupBy { it.membership }
val info = room.roomInfoFlow.first() val info = room.roomInfoFlow.first()
@ -90,14 +97,18 @@ class RoomMemberListPresenter @AssistedInject constructor(
// This result will come from the timeline loading membership events and it'll be wrong. // This result will come from the timeline loading membership events and it'll be wrong.
return@withContext return@withContext
} }
roomMembers = RoomMembers( val result = RoomMembers(
invited = members.getOrDefault(RoomMembershipState.INVITE, emptyList()).toImmutableList(), invited = members.getOrDefault(RoomMembershipState.INVITE, emptyList()).toImmutableList(),
joined = members.getOrDefault(RoomMembershipState.JOIN, emptyList()) joined = members.getOrDefault(RoomMembershipState.JOIN, emptyList())
.sortedWith(PowerLevelRoomMemberComparator()) .sortedWith(PowerLevelRoomMemberComparator())
.toImmutableList(), .toImmutableList(),
banned = members.getOrDefault(RoomMembershipState.BAN, emptyList()).sortedBy { it.userId.value }.toImmutableList(), banned = members.getOrDefault(RoomMembershipState.BAN, emptyList()).sortedBy { it.userId.value }.toImmutableList(),
isLoading = membersState is MatrixRoomMembersState.Pending,
) )
roomMembers = if (membersState is MatrixRoomMembersState.Pending) {
AsyncData.Loading(result)
} else {
AsyncData.Success(result)
}
} }
} }
@ -110,15 +121,19 @@ class RoomMemberListPresenter @AssistedInject constructor(
if (results.isEmpty()) { if (results.isEmpty()) {
SearchBarResultState.NoResultsFound() SearchBarResultState.NoResultsFound()
} else { } else {
val result = RoomMembers(
invited = results.getOrDefault(RoomMembershipState.INVITE, emptyList()).toImmutableList(),
joined = results.getOrDefault(RoomMembershipState.JOIN, emptyList())
.sortedWith(PowerLevelRoomMemberComparator())
.toImmutableList(),
banned = results.getOrDefault(RoomMembershipState.BAN, emptyList()).sortedBy { it.userId.value }.toImmutableList(),
)
SearchBarResultState.Results( SearchBarResultState.Results(
RoomMembers( if (membersState is MatrixRoomMembersState.Pending) {
invited = results.getOrDefault(RoomMembershipState.INVITE, emptyList()).toImmutableList(), AsyncData.Loading(result)
joined = results.getOrDefault(RoomMembershipState.JOIN, emptyList()) } else {
.sortedWith(PowerLevelRoomMemberComparator()) AsyncData.Success(result)
.toImmutableList(), }
banned = results.getOrDefault(RoomMembershipState.BAN, emptyList()).sortedBy { it.userId.value }.toImmutableList(),
isLoading = membersState is MatrixRoomMembersState.Pending,
)
) )
} }
} }

18
features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListState.kt
View file

@ -17,15 +17,15 @@
package io.element.android.features.roomdetails.impl.members package io.element.android.features.roomdetails.impl.members
import io.element.android.features.roomdetails.impl.members.moderation.RoomMembersModerationState import io.element.android.features.roomdetails.impl.members.moderation.RoomMembersModerationState
import io.element.android.libraries.architecture.AsyncData
import io.element.android.libraries.designsystem.theme.components.SearchBarResultState import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
import io.element.android.libraries.matrix.api.room.RoomMember import io.element.android.libraries.matrix.api.room.RoomMember
import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.ImmutableList
import kotlinx.collections.immutable.persistentListOf
data class RoomMemberListState( data class RoomMemberListState(
val roomMembers: RoomMembers, val roomMembers: AsyncData<RoomMembers>,
val searchQuery: String, val searchQuery: String,
val searchResults: SearchBarResultState<RoomMembers>, val searchResults: SearchBarResultState<AsyncData<RoomMembers>>,
val isSearchActive: Boolean, val isSearchActive: Boolean,
val canInvite: Boolean, val canInvite: Boolean,
val moderationState: RoomMembersModerationState, val moderationState: RoomMembersModerationState,
@ -36,14 +36,4 @@ data class RoomMembers(
val invited: ImmutableList<RoomMember>, val invited: ImmutableList<RoomMember>,
val joined: ImmutableList<RoomMember>, val joined: ImmutableList<RoomMember>,
val banned: ImmutableList<RoomMember>, val banned: ImmutableList<RoomMember>,
val isLoading: Boolean, )
) {
companion object {
fun loading() = RoomMembers(
invited = persistentListOf(),
joined = persistentListOf(),
banned = persistentListOf(),
isLoading = true,
)
}
}

81
features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListStateProvider.kt
View file

@ -19,6 +19,7 @@ package io.element.android.features.roomdetails.impl.members
import androidx.compose.ui.tooling.preview.PreviewParameterProvider import androidx.compose.ui.tooling.preview.PreviewParameterProvider
import io.element.android.features.roomdetails.impl.members.moderation.RoomMembersModerationState import io.element.android.features.roomdetails.impl.members.moderation.RoomMembersModerationState
import io.element.android.features.roomdetails.impl.members.moderation.aRoomMembersModerationState import io.element.android.features.roomdetails.impl.members.moderation.aRoomMembersModerationState
import io.element.android.libraries.architecture.AsyncData
import io.element.android.libraries.designsystem.theme.components.SearchBarResultState import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
import io.element.android.libraries.matrix.api.core.UserId import io.element.android.libraries.matrix.api.core.UserId
import io.element.android.libraries.matrix.api.room.RoomMember import io.element.android.libraries.matrix.api.room.RoomMember
@ -29,14 +30,15 @@ internal class RoomMemberListStateProvider : PreviewParameterProvider<RoomMember
override val values: Sequence<RoomMemberListState> override val values: Sequence<RoomMemberListState>
get() = sequenceOf( get() = sequenceOf(
aRoomMemberListState( aRoomMemberListState(
roomMembers = RoomMembers( roomMembers = AsyncData.Success(
invited = persistentListOf(aVictor(), aWalter()), RoomMembers(
joined = persistentListOf(anAlice(), aBob(), aWalter()), invited = persistentListOf(aVictor(), aWalter()),
banned = persistentListOf(), joined = persistentListOf(anAlice(), aBob(), aWalter()),
isLoading = false, banned = persistentListOf(),
)
) )
), ),
aRoomMemberListState(roomMembers = RoomMembers.loading()), aRoomMemberListState(roomMembers = AsyncData.Loading()),
aRoomMemberListState().copy(canInvite = true), aRoomMemberListState().copy(canInvite = true),
aRoomMemberListState().copy(isSearchActive = false), aRoomMemberListState().copy(isSearchActive = false),
aRoomMemberListState().copy(isSearchActive = true), aRoomMemberListState().copy(isSearchActive = true),
@ -45,11 +47,12 @@ internal class RoomMemberListStateProvider : PreviewParameterProvider<RoomMember
isSearchActive = true, isSearchActive = true,
searchQuery = "@someone:matrix.org", searchQuery = "@someone:matrix.org",
searchResults = SearchBarResultState.Results( searchResults = SearchBarResultState.Results(
RoomMembers( AsyncData.Success(
invited = persistentListOf(aVictor()), RoomMembers(
joined = persistentListOf(anAlice()), invited = persistentListOf(aVictor()),
banned = persistentListOf(), joined = persistentListOf(anAlice()),
isLoading = false, banned = persistentListOf(),
)
) )
), ),
), ),
@ -58,6 +61,9 @@ internal class RoomMemberListStateProvider : PreviewParameterProvider<RoomMember
searchQuery = "something-with-no-results", searchQuery = "something-with-no-results",
searchResults = SearchBarResultState.NoResultsFound() searchResults = SearchBarResultState.NoResultsFound()
), ),
aRoomMemberListState(
roomMembers = AsyncData.Failure(Exception("Error details")),
),
) )
} }
@ -65,37 +71,40 @@ internal class RoomMemberListStateBannedProvider : PreviewParameterProvider<Room
override val values: Sequence<RoomMemberListState> override val values: Sequence<RoomMemberListState>
get() = sequenceOf( get() = sequenceOf(
aRoomMemberListState( aRoomMemberListState(
roomMembers = RoomMembers( roomMembers = AsyncData.Success(
invited = persistentListOf(), RoomMembers(
joined = persistentListOf(), invited = persistentListOf(),
banned = persistentListOf( joined = persistentListOf(),
aRoomMember(userId = UserId("@alice:example.com"), displayName = "Alice"), banned = persistentListOf(
aRoomMember(userId = UserId("@bob:example.com"), displayName = "Bob"), aRoomMember(userId = UserId("@alice:example.com"), displayName = "Alice"),
aRoomMember(userId = UserId("@charlie:example.com"), displayName = "Charlie"), aRoomMember(userId = UserId("@bob:example.com"), displayName = "Bob"),
), aRoomMember(userId = UserId("@charlie:example.com"), displayName = "Charlie"),
isLoading = false, ),
)
), ),
moderationState = aRoomMembersModerationState(canDisplayBannedUsers = true), moderationState = aRoomMembersModerationState(canDisplayBannedUsers = true),
), ),
aRoomMemberListState( aRoomMemberListState(
roomMembers = RoomMembers( roomMembers = AsyncData.Loading(
invited = persistentListOf(), RoomMembers(
joined = persistentListOf(), invited = persistentListOf(),
banned = persistentListOf( joined = persistentListOf(),
aRoomMember(userId = UserId("@alice:example.com"), displayName = "Alice"), banned = persistentListOf(
aRoomMember(userId = UserId("@bob:example.com"), displayName = "Bob"), aRoomMember(userId = UserId("@alice:example.com"), displayName = "Alice"),
aRoomMember(userId = UserId("@charlie:example.com"), displayName = "Charlie"), aRoomMember(userId = UserId("@bob:example.com"), displayName = "Bob"),
), aRoomMember(userId = UserId("@charlie:example.com"), displayName = "Charlie"),
isLoading = true, ),
)
), ),
moderationState = aRoomMembersModerationState(canDisplayBannedUsers = true), moderationState = aRoomMembersModerationState(canDisplayBannedUsers = true),
), ),
aRoomMemberListState( aRoomMemberListState(
roomMembers = RoomMembers( roomMembers = AsyncData.Success(
invited = persistentListOf(), RoomMembers(
joined = persistentListOf(), invited = persistentListOf(),
banned = persistentListOf(), joined = persistentListOf(),
isLoading = false, banned = persistentListOf(),
)
), ),
moderationState = aRoomMembersModerationState(canDisplayBannedUsers = true), moderationState = aRoomMembersModerationState(canDisplayBannedUsers = true),
) )
@ -103,8 +112,8 @@ internal class RoomMemberListStateBannedProvider : PreviewParameterProvider<Room
} }
internal fun aRoomMemberListState( internal fun aRoomMemberListState(
roomMembers: RoomMembers = RoomMembers.loading(), roomMembers: AsyncData<RoomMembers> = AsyncData.Loading(),
searchResults: SearchBarResultState<RoomMembers> = SearchBarResultState.Initial(), searchResults: SearchBarResultState<AsyncData<RoomMembers>> = SearchBarResultState.Initial(),
moderationState: RoomMembersModerationState = aRoomMembersModerationState(), moderationState: RoomMembersModerationState = aRoomMembersModerationState(),
) = RoomMemberListState( ) = RoomMemberListState(
roomMembers = roomMembers, roomMembers = roomMembers,

130
features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt
View file

@ -53,6 +53,7 @@ import androidx.compose.ui.unit.dp
import io.element.android.compound.theme.ElementTheme import io.element.android.compound.theme.ElementTheme
import io.element.android.features.roomdetails.impl.R import io.element.android.features.roomdetails.impl.R
import io.element.android.features.roomdetails.impl.members.moderation.RoomMembersModerationView import io.element.android.features.roomdetails.impl.members.moderation.RoomMembersModerationView
import io.element.android.libraries.architecture.AsyncData
import io.element.android.libraries.designsystem.components.avatar.AvatarSize import io.element.android.libraries.designsystem.components.avatar.AvatarSize
import io.element.android.libraries.designsystem.components.button.BackButton import io.element.android.libraries.designsystem.components.button.BackButton
import io.element.android.libraries.designsystem.preview.ElementPreview import io.element.android.libraries.designsystem.preview.ElementPreview
@ -128,7 +129,6 @@ fun RoomMemberListView(
if (!state.isSearchActive) { if (!state.isSearchActive) {
RoomMemberList( RoomMemberList(
isLoading = state.roomMembers.isLoading,
roomMembers = state.roomMembers, roomMembers = state.roomMembers,
showMembersCount = true, showMembersCount = true,
canDisplayBannedUsersControls = state.moderationState.canDisplayBannedUsers, canDisplayBannedUsersControls = state.moderationState.canDisplayBannedUsers,
@ -149,8 +149,7 @@ fun RoomMemberListView(
@OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class) @OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class)
@Composable @Composable
private fun RoomMemberList( private fun RoomMemberList(
isLoading: Boolean, roomMembers: AsyncData<RoomMembers>,
roomMembers: RoomMembers,
showMembersCount: Boolean, showMembersCount: Boolean,
selectedSection: SelectedSection, selectedSection: SelectedSection,
onSelectedSectionChange: (SelectedSection) -> Unit, onSelectedSectionChange: (SelectedSection) -> Unit,
@ -183,7 +182,7 @@ private fun RoomMemberList(
} }
} }
AnimatedVisibility( AnimatedVisibility(
visible = isLoading, visible = roomMembers.isLoading(),
enter = fadeIn() + expandVertically(), enter = fadeIn() + expandVertically(),
exit = fadeOut() + shrinkVertically(), exit = fadeOut() + shrinkVertically(),
) { ) {
@ -191,47 +190,72 @@ private fun RoomMemberList(
} }
} }
} }
when (selectedSection) { when (roomMembers) {
SelectedSection.MEMBERS -> { is AsyncData.Failure -> failureItem(roomMembers.error)
if (roomMembers.invited.isNotEmpty()) { is AsyncData.Loading,
roomMemberListSection( is AsyncData.Success -> memberItems(
headerText = { stringResource(id = R.string.screen_room_member_list_pending_header_title) }, roomMembers = roomMembers.dataOrNull() ?: return@LazyColumn,
members = roomMembers.invited, selectedSection = selectedSection,
onMemberSelected = { onSelectUser(it) } onSelectUser = onSelectUser,
) showMembersCount = showMembersCount,
} )
if (roomMembers.joined.isNotEmpty()) { AsyncData.Uninitialized -> Unit
roomMemberListSection( }
headerText = { }
if (showMembersCount) { }
val memberCount = roomMembers.joined.count()
pluralStringResource(id = R.plurals.screen_room_member_list_header_title, count = memberCount, memberCount) private fun LazyListScope.memberItems(
} else { roomMembers: RoomMembers,
stringResource(id = R.string.screen_room_member_list_room_members_header_title) selectedSection: SelectedSection,
} onSelectUser: (RoomMember) -> Unit,
}, showMembersCount: Boolean,
members = roomMembers.joined, ) {
onMemberSelected = { onSelectUser(it) } when (selectedSection) {
) SelectedSection.MEMBERS -> {
} if (roomMembers.invited.isNotEmpty()) {
roomMemberListSection(
headerText = { stringResource(id = R.string.screen_room_member_list_pending_header_title) },
members = roomMembers.invited,
onMemberSelected = { onSelectUser(it) }
)
} }
SelectedSection.BANNED -> { // Banned users if (roomMembers.joined.isNotEmpty()) {
if (roomMembers.banned.isNotEmpty()) { roomMemberListSection(
roomMemberListSection( headerText = {
headerText = null, if (showMembersCount) {
members = roomMembers.banned, val memberCount = roomMembers.joined.count()
onMemberSelected = { onSelectUser(it) } pluralStringResource(id = R.plurals.screen_room_member_list_header_title, count = memberCount, memberCount)
) } else {
} else { stringResource(id = R.string.screen_room_member_list_room_members_header_title)
item {
Box(Modifier.fillParentMaxSize().padding(horizontal = 16.dp)) {
Text(
modifier = Modifier.padding(bottom = 56.dp).align(Alignment.Center),
text = stringResource(id = R.string.screen_room_member_list_banned_empty),
color = ElementTheme.colors.textSecondary,
textAlign = TextAlign.Center,
)
} }
},
members = roomMembers.joined,
onMemberSelected = { onSelectUser(it) }
)
}
}
SelectedSection.BANNED -> { // Banned users
if (roomMembers.banned.isNotEmpty()) {
roomMemberListSection(
headerText = null,
members = roomMembers.banned,
onMemberSelected = { onSelectUser(it) }
)
} else {
item {
Box(
Modifier
.fillParentMaxSize()
.padding(horizontal = 16.dp)
) {
Text(
modifier = Modifier
.padding(bottom = 56.dp)
.align(Alignment.Center),
text = stringResource(id = R.string.screen_room_member_list_banned_empty),
color = ElementTheme.colors.textSecondary,
textAlign = TextAlign.Center,
)
} }
} }
} }
@ -239,9 +263,22 @@ private fun RoomMemberList(
} }
} }
private fun LazyListScope.failureItem(failure: Throwable) {
item {
Text(
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp, vertical = 32.dp),
text = stringResource(id = CommonStrings.error_unknown) + "\n\n" + failure.localizedMessage,
color = ElementTheme.colors.textCriticalPrimary,
textAlign = TextAlign.Center,
)
}
}
private fun LazyListScope.roomMemberListSection( private fun LazyListScope.roomMemberListSection(
headerText: @Composable (() -> String)?, headerText: @Composable (() -> String)?,
members: ImmutableList<RoomMember>, members: ImmutableList<RoomMember>?,
onMemberSelected: (RoomMember) -> Unit, onMemberSelected: (RoomMember) -> Unit,
) { ) {
headerText?.let { headerText?.let {
@ -254,7 +291,7 @@ private fun LazyListScope.roomMemberListSection(
) )
} }
} }
items(members) { matrixUser -> items(members.orEmpty()) { matrixUser ->
RoomMemberListItem( RoomMemberListItem(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
roomMember = matrixUser, roomMember = matrixUser,
@ -320,7 +357,7 @@ private fun RoomMemberListTopBar(
@Composable @Composable
private fun RoomMemberSearchBar( private fun RoomMemberSearchBar(
query: String, query: String,
state: SearchBarResultState<RoomMembers>, state: SearchBarResultState<AsyncData<RoomMembers>>,
active: Boolean, active: Boolean,
placeHolderTitle: String, placeHolderTitle: String,
onActiveChange: (Boolean) -> Unit, onActiveChange: (Boolean) -> Unit,
@ -339,7 +376,6 @@ private fun RoomMemberSearchBar(
resultState = state, resultState = state,
resultHandler = { results -> resultHandler = { results ->
RoomMemberList( RoomMemberList(
isLoading = false,
roomMembers = results, roomMembers = results,
showMembersCount = false, showMembersCount = false,
onSelectUser = { onSelectUser(it) }, onSelectUser = { onSelectUser(it) },