Merge pull request #633 from appirio-tech/dev

Promoting to prod before Products MVP

Author: vikasrohit

src/components/ActionCard/ActionCard.scss

@@ -140,6 +140,7 @@
     border-radius: 4px;
     padding: $base-unit*2;
     margin-bottom: -10px;
+    width: calc(100% - 40px);
 
     &:before {
       content: '';
@@ -166,6 +167,8 @@
       font-size: 13px;
       color: #47474f;
       line-height: $base-unit*4;
+      width: 100%;
+      overflow-x: auto;
     }
 
     .comment-read-more {

src/components/Feed/FeedComments.jsx

@@ -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}

src/components/MessageDetails/MessageDetails.jsx

@@ -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 }

src/projects/detail/containers/FeedContainer.js

@@ -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

src/projects/detail/containers/MessagesContainer.js

@@ -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