Skip to content

Promoting to prod before Products MVP #633

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 8 commits into from
Mar 1, 2017
Merged

Promoting to prod before Products MVP #633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3e61fac
Merge branch 'hotfix/analytics-fix' into dev
Feb 9, 2017
c0b20a1
Github issue#619, Dashboard: comment post overflowing container
Feb 14, 2017
fe4cd46
Merge pull request #620 from appirio-tech/feature/dashboard_post_over…
Feb 14, 2017
6537df5
Merge branch 'hotfix/project_loading_issue_due_to_undeifned_user' int…
Feb 28, 2017
11c92d6
Github issue#625, Project 908: Dashboard stuck in infinite loop
Mar 1, 2017
f30f092
Merge pull request #631 from appirio-tech/feature/copy_update_for_mis…
Mar 1, 2017
8e4e694
Github issue#623, Allow comments for System generated messages / stat…
Mar 1, 2017
aca4069
Merge pull request #632 from appirio-tech/feature/allow_comments_on_s…
Mar 1, 2017
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
3 changes: 3 additions & 0 deletions src/components/ActionCard/ActionCard.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@
border-radius: 4px;
padding: $base-unit*2;
margin-bottom: -10px;
width: calc(100% - 40px);

&:before {
content: '';
Expand All @@ -166,6 +167,8 @@
font-size: 13px;
color: #47474f;
line-height: $base-unit*4;
width: 100%;
overflow-x: auto;
}

.comment-read-more {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Feed/FeedComments.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class FeedComments extends React.Component {
<Comment
key={idx}
avatarUrl={ _.get(item, 'author.photoURL', null) }
authorName={ item.author ? (item.author.firstName + ' ' + item.author.lastName) : 'Not Available' }
authorName={ item.author ? (item.author.firstName + ' ' + item.author.lastName) : 'Connect user' }
date={moment(item.date).fromNow()}
active={item.unread}
self={ item.author && item.author.userId === currentUser.userId}
Expand Down
2 changes: 1 addition & 1 deletion src/components/MessageDetails/MessageDetails.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class MessageDetails extends React.Component {
<Comment
key={idx}
avatarUrl={ _.get(item, 'author.photoURL', null) }
authorName={ item.author ? (item.author.firstName + ' ' + item.author.lastName) : 'Not Available' }
authorName={ item.author ? (item.author.firstName + ' ' + item.author.lastName) : 'Connect user' }
date={moment(item.date).fromNow()}
active={item.unread}
self={ item.author && item.author.userId === currentUser.userId }
Expand Down
4 changes: 2 additions & 2 deletions src/projects/detail/containers/FeedContainer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,12 @@ class FeedView extends React.Component {
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'])
// Github issue##623, allow comments on all posts (including system posts)
item.allowComments = true
if (isSystemUser(item.userId)) {
item.user = SYSTEM_USER
item.allowComments = false
} else {
item.user = allMembers[item.userId]
item.allowComments = true
}
item.unread = !feed.read
// item.html = posts[feed.postIds[0]].body
Expand Down
4 changes: 2 additions & 2 deletions src/projects/detail/containers/MessagesContainer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,12 @@ class MessagesView extends React.Component {
const { allMembers } = this.props
const item = _.pick(feed, ['id', 'date', 'read', 'tag', 'title', 'totalPosts', 'userId', 'reference', 'referenceId', 'postIds', 'isAddingComment', 'isLoadingComments', 'error'])
item.isActive = isActive
// Github issue##623, allow comments on all posts (including system posts)
item.allowComments = true
if (isSystemUser(item.userId)) {
item.user = SYSTEM_USER
item.allowComments = false
} else {
item.user = allMembers[item.userId]
item.allowComments = true
}
item.unread = !feed.read
// item.html = posts[feed.postIds[0]].body
Expand Down