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

Perform validations to avoid crash on data cleanup (#1075)

Browse source 
* Perform validations to avoid crash on data cleanup

* Remove postId from postsInChannel
This commit is contained in:
enahum 2017-10-31 16:23:27 -03:00 committed by Jarred Witt
parent eaf128b2a0
commit a471379cb2
1 changed files with 47 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
app/store/middleware.js
View file

@ -36,7 +36,17 @@ export function messageRetention() {
function resetStateForNewVersion(action) {
const {payload} = action;
const lastChannelForTeam = getLastChannelForTeam(payload);
const currentUserId = payload.entities.users.currentUserId;
let users = {};
if (payload.entities.users) {
const currentUserId = payload.entities.users.currentUserId;
users = {
currentUserId,
profiles: {
[currentUserId]: payload.entities.users.profiles[currentUserId]
}
};
}
const nextState = {
app: {
@ -50,12 +60,7 @@ function resetStateForNewVersion(action) {
teams: payload.entities.teams.teams,
myMembers: payload.entities.teams.myMembers
},
users: {
currentUserId,
profiles: {
[currentUserId]: payload.entities.users.profiles[currentUserId]
}
},
users,
preferences: payload.entities.preferences,
search: {
recent: payload.entities.search.recent
@ -125,7 +130,7 @@ function cleanupState(action, keepCurrent = false) {
// we need to check that the channel id is not already included
// the reason it can be included is cause at least one of the last channels viewed
// in a team can be a DM or GM and the id can be duplicate
if (!nextEntitites.posts.postsInChannel[id]) {
if (!nextEntitites.posts.postsInChannel[id] && payload.entities.posts.postsInChannel[id]) {
let postIds;
if (keepCurrent && currentChannelId === id) {
postIds = payload.entities.posts.postsInChannel[id];
@ -143,30 +148,45 @@ function cleanupState(action, keepCurrent = false) {
postIdsToKeep.forEach((postId) => {
const post = payload.entities.posts.posts[postId];
const skip = keepCurrent && currentChannelId === post.channel_id;
if (!skip && retentionPeriod && (Date.now() - post.create_at) / (1000 * 3600 * 24) > retentionPeriod) {
const postsInChannel = nextEntitites.posts.postsInChannel[post.channel_id];
const index = postsInChannel.indexOf(postId);
if (index !== -1) {
postsInChannel.splice(index, 1);
if (post) {
const skip = keepCurrent && currentChannelId === post.channel_id;
if (!skip && retentionPeriod && (Date.now() - post.create_at) / (1000 * 3600 * 24) > retentionPeriod) {
const postsInChannel = nextEntitites.posts.postsInChannel[post.channel_id] || [];
const index = postsInChannel.indexOf(postId);
if (index !== -1) {
postsInChannel.splice(index, 1);
}
return;
}
return;
}
nextEntitites.posts.posts[postId] = post;
nextEntitites.posts.posts[postId] = post;
const reaction = payload.entities.posts.reactions[postId];
if (reaction) {
nextEntitites.posts.reactions[postId] = reaction;
}
const reaction = payload.entities.posts.reactions[postId];
if (reaction) {
nextEntitites.posts.reactions[postId] = reaction;
}
const fileIds = payload.entities.files.fileIdsByPostId[postId];
if (fileIds) {
nextEntitites.files.fileIdsByPostId[postId] = fileIds;
fileIds.forEach((fileId) => {
nextEntitites.files.files[fileId] = payload.entities.files.files[fileId];
});
const fileIds = payload.entities.files.fileIdsByPostId[postId];
if (fileIds) {
nextEntitites.files.fileIdsByPostId[postId] = fileIds;
fileIds.forEach((fileId) => {
nextEntitites.files.files[fileId] = payload.entities.files.files[fileId];
});
}
} else {
// If the post is not in the store we need to remove it from the postsInChannel
const channelIds = Object.keys(nextEntitites.posts.postsInChannel);
for (let i = 0; i < channelIds.length; i++) {
const channelId = channelIds[i];
const posts = nextEntitites.posts.postsInChannel[channelId];
const index = posts.indexOf(postId);
if (index !== -1) {
posts.splice(index, 1);
break;
}
}
}
});