toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

[MM-24463] Run message retention cleanup off of pre-existing state (#4222)

Browse source 
* MM-24463 Run message retention cleanup off of pre-existing state

Instead of a reconstructed "zero" state.

Only posts in channels, searched posts and flag posts are recalculated (as per data retention policy, if applicable). The rest of state is cloned from existing state.

* Mark hydrationComplete only if _persist state is undefined

Co-authored-by: Elias Nahum <nahumhbl@gmail.com>
This commit is contained in:
Amit Uttam 2020-04-23 10:28:30 -03:00
parent bb557ff4fa
commit b3d274b6c7
No known key found for this signature in database
GPG key ID: B3D4CC224111BC5D
3 changed files with 29 additions and 177 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

196
app/store/middlewares/helpers.js
View file

@ -3,139 +3,6 @@
import DeviceInfo from 'react-native-device-info';
import initialState from '@store/initial_state';
export function resetStateForNewVersion(payload) {
const lastChannelForTeam = getLastChannelForTeam(payload);
let general = initialState.entities.general;
if (payload.entities.general) {
general = payload.entities.general;
}
let teams = initialState.entities.teams;
if (payload.entities.teams) {
teams = {
currentTeamId: payload.entities.teams.currentTeamId,
teams: payload.entities.teams.teams,
myMembers: payload.entities.teams.myMembers,
};
}
let users = initialState.entities.users;
if (payload.entities.users) {
const currentUserId = payload.entities.users.currentUserId;
if (currentUserId) {
users = {
currentUserId,
profiles: {
[currentUserId]: payload.entities.users.profiles[currentUserId],
},
};
}
}
let preferences = initialState.entities.preferences;
if (payload.entities.preferences) {
preferences = payload.entities.preferences;
}
let roles = initialState.entities.roles;
if (payload.entities.roles) {
roles = payload.entities.roles;
}
let search = initialState.entities.search;
if (payload.entities.search && payload.entities.search.recent) {
search = {
recent: payload.entities.search.recent,
};
}
let channelDrafts = initialState.views.channel.drafts;
if (payload.views.channel && payload.views.channel.drafts) {
channelDrafts = payload.views.channel.drafts;
}
let i18n = initialState.views.i18n;
if (payload.views.i18n) {
i18n = payload.views.i18n;
}
let lastTeamId = initialState.views.team.lastTeamId;
if (payload.views.team && payload.views.team.lastTeamId) {
lastTeamId = payload.views.team.lastTeamId;
}
const currentChannelId = lastChannelForTeam[lastTeamId] && lastChannelForTeam[lastTeamId].length ? lastChannelForTeam[lastTeamId][0] : '';
let channels = initialState.entities.channels;
if (payload.entities.channels && currentChannelId) {
channels = {
currentChannelId,
channels: {
[currentChannelId]: payload.entities.channels.channels[currentChannelId],
},
myMembers: {
[currentChannelId]: payload.entities.channels.myMembers[currentChannelId],
},
};
}
let threadDrafts = initialState.views.thread.drafts;
if (payload.views.thread && payload.views.thread.drafts) {
threadDrafts = payload.views.thread.drafts;
}
let selectServer = initialState.views.selectServer;
if (payload.views.selectServer) {
selectServer = payload.views.selectServer;
}
let recentEmojis = initialState.views.recentEmojis;
if (payload.views.recentEmojis) {
recentEmojis = payload.views.recentEmojis;
}
const nextState = {
_persist: {
rehydrated: true,
},
app: {
...payload.app,
},
entities: {
channels,
general,
teams,
users,
preferences,
search,
roles,
},
views: {
channel: {
drafts: channelDrafts,
},
i18n,
team: {
lastTeamId,
lastChannelForTeam,
},
thread: {
drafts: threadDrafts,
},
selectServer,
recentEmojis,
},
websocket: {
lastConnectAt: payload.websocket?.lastConnectAt,
lastDisconnectAt: payload.websocket?.lastDisconnectAt,
},
};
return nextState;
}
export function getLastChannelForTeam(payload) {
if (payload?.views?.team?.lastChannelForTeam) {
const lastChannelForTeam = {...payload.views.team.lastChannelForTeam};
@ -154,10 +21,12 @@ export function getLastChannelForTeam(payload) {
}
export function cleanUpState(payload, keepCurrent = false) {
const resetPayload = resetStateForNewVersion(payload);
const {currentChannelId} = payload.entities.channels;
const nextState = Object.assign({}, payload);
const lastTeamId = payload.views?.team?.lastTeamId;
const lastChannelForTeam = getLastChannelForTeam(payload);
const currentChannelId = lastChannelForTeam[lastTeamId] && lastChannelForTeam[lastTeamId].length ? lastChannelForTeam[lastTeamId][0] : '';
const {lastChannelForTeam} = resetPayload.views.team;
const nextEntities = {
posts: {
posts: {},
@ -175,9 +44,9 @@ export function cleanUpState(payload, keepCurrent = false) {
};
let retentionPeriod = 0;
if (resetPayload.entities.general && resetPayload.entities.general.dataRetentionPolicy &&
resetPayload.entities.general.dataRetentionPolicy.message_deletion_enabled) {
retentionPeriod = resetPayload.entities.general.dataRetentionPolicy.message_retention_cutoff;
if (payload.entities.general && payload.entities.general.dataRetentionPolicy &&
payload.entities.general.dataRetentionPolicy.message_deletion_enabled) {
retentionPeriod = payload.entities.general.dataRetentionPolicy.message_retention_cutoff;
}
const postIdsToKeep = [];
@ -203,6 +72,12 @@ export function cleanUpState(payload, keepCurrent = false) {
}
}
const nextSearch = {
...payload.entities.search,
results: searchResults,
flagged: flaggedPosts,
};
postIdsToKeep.forEach((postId) => {
const post = payload.entities.posts.posts[postId];
@ -261,38 +136,21 @@ export function cleanUpState(payload, keepCurrent = false) {
nextEntities.posts.pendingPostIds = nextPendingPostIds;
}
const nextState = {
app: resetPayload.app,
entities: {
...nextEntities,
channels: payload.entities.channels,
emojis: payload.entities.emojis,
general: resetPayload.entities.general,
preferences: resetPayload.entities.preferences,
search: {
...resetPayload.entities.search,
results: searchResults,
flagged: flaggedPosts,
},
teams: resetPayload.entities.teams,
users: payload.entities.users,
roles: resetPayload.entities.roles,
},
views: {
announcement: payload.views.announcement,
...resetPayload.views,
channel: {
...resetPayload.views.channel,
...payload.views.channel,
},
},
websocket: {
lastConnectAt: payload.websocket?.lastConnectAt,
lastDisconnectAt: payload.websocket?.lastDisconnectAt,
},
nextState.views.root = {
// eslint-disable-next-line no-underscore-dangle
hydrationComplete: !nextState._persist,
};
nextState.errors = payload.errors;
// eslint-disable-next-line no-underscore-dangle
nextState._persist = {
rehydrated: true,
};
nextState.entities = {
...nextState.entities,
...nextEntities,
search: nextSearch,
};
return nextState;
}

8
app/store/middlewares/message_retention.js
View file

@ -10,7 +10,7 @@ import {
LOGGER_JAVASCRIPT_WARNING,
} from '@utils/sentry';
import {cleanUpState, resetStateForNewVersion} from './helpers';
import {cleanUpState} from './helpers';
export default function messageRetention(store) {
return (next) => (action) => {
@ -45,12 +45,6 @@ export default function messageRetention(store) {
return next(action);
}
// When a new version of the app has been detected
if (previousVersion !== version || previousBuild !== build) {
action.payload = resetStateForNewVersion(action.payload);
return next(action);
}
// Keep only the last 60 messages for the last 5 viewed channels in each team
// and apply data retention on those posts if applies
try {

2
ios/Podfile.lock
View file

@ -526,7 +526,7 @@ SPEC CHECKSUMS:
jail-monkey: d7c5048b2336f22ee9c9e0efa145f1f917338ea9
libwebp: 946cb3063cea9236285f7e9a8505d806d30e07f3
MMKV: 7bb6c30f9ff2ea45bc2398c86e66dd1cb63cfe20
MMKVCore: f1e0aad4fc330e7cbfbdff16720017bf0973db5a
MMKVCore: f455d4bf01bb5257511c1062fdbc3d7ebdec216b
Permission-Camera: 8f0e5decca5f28f70f28a8dc31f012c9bad40ad8
Permission-PhotoLibrary: b209bf23b784c9e1409a57d81c6d11ab1d3079c1
RCTRequired: b153add4da6e7dbc44aebf93f3cf4fcae392ddf1