Skip to content

Github #166, Messaging: unposted content alert #580

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
vikasrohit merged 1 commit into from
Dec 12, 2016
Merged

Github #166, Messaging: unposted content alert #580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion src/projects/detail/containers/FeedContainer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ class FeedView extends React.Component {
return hasThread || hasComment
}

mapFeed(feed, showAll = false) {
mapFeed(feed, showAll = false, resetNewComment = false) {
const { allMembers } = this.props
const item = _.pick(feed, ['id', 'date', 'read', 'tag', 'title', 'totalPosts', 'userId', 'reference', 'referenceId', 'postIds', 'isAddingComment', 'isLoadingComments', 'error'])
if (isSystemUser(item.userId)) {
Expand Down Expand Up @@ -117,6 +117,10 @@ class FeedView extends React.Component {
})
}
item.newComment = ''
if (!resetNewComment) {
const feedFromState = _.find(this.state.feeds, f => feed.id === f.id)
item.newComment = feedFromState ? feedFromState.newComment : ''
}
item.hasMoreComments = item.comments.length !== item.totalComments
return item
}
Expand Down
6 changes: 5 additions & 1 deletion src/projects/detail/containers/MessagesContainer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ class MessagesView extends React.Component {
return hasThread || hasMessage
}

mapFeed(feed, isActive, showAll = false) {
mapFeed(feed, isActive, showAll = false, resetNewMessage = false) {
const { allMembers } = this.props
const item = _.pick(feed, ['id', 'date', 'read', 'tag', 'title', 'totalPosts', 'userId', 'reference', 'referenceId', 'postIds', 'isAddingComment', 'isLoadingComments', 'error'])
item.isActive = isActive
Expand Down Expand Up @@ -126,6 +126,10 @@ class MessagesView extends React.Component {
})
}
item.newMessage = ''
if (!resetNewMessage) {
const threadFromState = _.find(this.state.threads, t => feed.id === t.id)
item.newMessage = threadFromState ? threadFromState.newMessage : ''
}
item.hasMoreMessages = item.messages.length < item.totalComments
return item
}
Expand Down