SW/mattermost-mobile
2
0
Fork 0
forked from Ivasoft/mattermost-mobile
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MM-24693 Add since query param to the getGroups api request (#5163)

Browse Source 
* Added since query param to the getGroups api request

* Update app/actions/views/channel.js

Co-authored-by: Hossein <hahmadia@users.noreply.github.com>

* Replaced lastConnectAt with lastDisconnectAt

* Reverted client4.ts file

* Updated client file

* Fetches all groups enabled/disabled

Co-authored-by: Hossein <hahmadia@users.noreply.github.com>
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
This commit is contained in:
Anurag Shivarathri
2021-04-27 23:21:19 +05:30
committed by GitHub
parent 9d605fdce9
commit e7d5f2c194
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/actions/views/channel.js
View File

@@ -632,7 +632,7 @@ function setLoadMorePostsVisible(visible) {
};
}
function loadGroupData() {
function loadGroupData(isReconnect = false) {
return async (dispatch, getState) => {
const state = getState();
const actions = [];
@@ -665,9 +665,10 @@ function loadGroupData() {
});
}
} else {
const getGroupsSince = isReconnect ? (state.websocket?.lastDisconnectAt || 0) : undefined;
const [getAllGroupsAssociatedToChannelsInTeam, getGroups] = await Promise.all([ //eslint-disable-line no-await-in-loop
Client4.getAllGroupsAssociatedToChannelsInTeam(team.id, true),
Client4.getGroups(true, 0, 0),
Client4.getGroups(false, 0, 0, getGroupsSince),
]);
if (getAllGroupsAssociatedToChannelsInTeam.groups) {
@@ -713,7 +714,7 @@ function loadGroupData() {
};
}
export function loadChannelsForTeam(teamId, skipDispatch = false) {
export function loadChannelsForTeam(teamId, skipDispatch = false, isReconnect = false) {
return async (dispatch, getState) => {
const state = getState();
const currentUserId = getCurrentUserId(state);
@@ -784,7 +785,7 @@ export function loadChannelsForTeam(teamId, skipDispatch = false) {
dispatch(loadUnreadChannelPosts(data.channels, data.channelMembers));
}
dispatch(loadGroupData());
dispatch(loadGroupData(isReconnect));
}
return {data};

2
app/actions/websocket/index.ts
View File

@@ -155,7 +155,7 @@ export function doReconnect(now: number) {
const currentTeamMembership = me.teamMembers.find((tm: TeamMembership) => tm.team_id === currentTeamId && tm.delete_at === 0);
if (currentTeamMembership) {
const {data: myData}: any = await dispatch(loadChannelsForTeam(currentTeamId, true));
const {data: myData}: any = await dispatch(loadChannelsForTeam(currentTeamId, true, true));
if (myData?.channels && myData?.channelMembers) {
actions.push({

4
app/client/rest/groups.ts
View File

@@ -15,9 +15,9 @@ export interface ClientGroupsMix {
}
const ClientGroups = (superclass: any) => class extends superclass {
getGroups = async (filterAllowReference = false, page = 0, perPage = PER_PAGE_DEFAULT) => {
getGroups = async (filterAllowReference = false, page = 0, perPage = PER_PAGE_DEFAULT, since = 0) => {
return this.doFetch(
`${this.getBaseRoute()}/groups${buildQueryString({filter_allow_reference: filterAllowReference, page, per_page: perPage})}`,
`${this.getBaseRoute()}/groups${buildQueryString({filter_allow_reference: filterAllowReference, page, per_page: perPage, since})}`,
{method: 'get'},
);
};