Skip to content

[FIX] Fetch members on RoomMembersView #3403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
diegolmello merged 5 commits into from
Sep 28, 2021
Merged

[FIX] Fetch members on RoomMembersView #3403

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1b5759c
[FIX] Fetch members on RoomMembersView
reinaldonetof Sep 24, 2021
998bdb9
needed to add a conditional to the response
reinaldonetof Sep 24, 2021
62aa33e
result back properly from rocketchat lib
reinaldonetof Sep 24, 2021
493bbfa
Merge branch 'develop' into fix.roommembers-fetch
reinaldonetof Sep 24, 2021
338986f
Merge branch 'develop' into fix.roommembers-fetch
diegolmello Sep 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions app/lib/rocketchat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1039,7 +1039,7 @@ const RocketChat = {
}
return this.post('subscriptions.read', { rid: roomId });
},
getRoomMembers({ rid, allUsers, roomType, type, filter, skip = 0, limit = 10 }) {
async getRoomMembers({ rid, allUsers, roomType, type, filter, skip = 0, limit = 10 }) {
const serverVersion = reduxStore.getState().server.version;
if (compareServerVersion(serverVersion, '3.16.0', methods.greaterThanOrEqualTo)) {
const params = {
Expand All @@ -1050,10 +1050,12 @@ const RocketChat = {
...(filter && { filter })
};
// RC 3.16.0
return this.sdk.get(`${this.roomTypeToApiType(roomType)}.members`, params);
const result = await this.sdk.get(`${this.roomTypeToApiType(roomType)}.members`, params);
return result?.members;
}
// RC 0.42.0
return this.methodCallWrapper('getUsersOfRoom', rid, allUsers, { skip, limit });
const result = await this.methodCallWrapper('getUsersOfRoom', rid, allUsers, { skip, limit });
return result?.records;
},
methodCallWrapper(method, ...params) {
const { API_Use_REST_For_DDP_Calls } = reduxStore.getState().settings;
Expand Down
6 changes: 2 additions & 4 deletions app/views/RoomMembersView/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,6 @@ class RoomMembersView extends React.Component {
fetchMembers = async () => {
const { rid, members, isLoading, allUsers, end, room, filtering } = this.state;
const { t } = room;
let newMembers;
if (isLoading || end) {
return;
}
Expand All @@ -449,11 +448,10 @@ class RoomMembersView extends React.Component {
skip: members.length,
limit: PAGE_SIZE
});
newMembers = membersResult.members;
this.setState({
members: members.concat(newMembers || []),
members: members.concat(membersResult || []),
isLoading: false,
end: newMembers.length < PAGE_SIZE
end: membersResult?.length < PAGE_SIZE
});
this.setHeader();
} catch (e) {
Expand Down