Merge pull request #2077 from appirio-tech/revert-2071-mil-53-issue-2039

Revert "messages by same user with time gap of 10min + show separately with a…"

Author: gondzo

src/components/ActionCard/CommentMobile.jsx

@@ -8,25 +8,20 @@ import PropTypes from 'prop-types'
 import _ from 'lodash'
 import moment from 'moment'
 import { Link } from 'react-router-dom'
-import cn from 'classnames'
-
 import UserWithName from '../User/UserWithName'
 import { POST_TIME_FORMAT } from '../../config/constants.js'
 
 import './CommentMobile.scss'
 
-const CommentMobile = ({ messageId, author, date, children, noInfo }) => {
+const CommentMobile = ({ messageId, author, date, children }) => {
   const messageLink = window.location.pathname.substr(0, window.location.pathname.indexOf('#')) + `#comment-${messageId}`
 
   return (
-    <div styleName={cn('comment', {'is-bundled' : noInfo})} id={`comment-${messageId}`}>
-      {
-        !noInfo &&
-        <div styleName="header">
-          <UserWithName {..._.pick(author, 'firstName', 'lastName', 'photoURL')} size="40" />
-          <Link styleName="date" to={messageLink}>{moment(date).format(POST_TIME_FORMAT)}</Link>
-        </div>
-      }
+    <div styleName="comment" id={`comment-${messageId}`}>
+      <div styleName="header">
+        <UserWithName {..._.pick(author, 'firstName', 'lastName', 'photoURL')} size="40" />
+        <Link styleName="date" to={messageLink}>{moment(date).format(POST_TIME_FORMAT)}</Link>
+      </div>
       <div styleName="text" className="draftjs-post">{children}</div>
     </div>
   )
@@ -36,8 +31,7 @@ CommentMobile.propTypes = {
   messageId: PropTypes.string.isRequired,
   author: PropTypes.any.isRequired,
   date: PropTypes.any.isRequired,
-  children: PropTypes.node.isRequired,
-  noInfo: PropTypes.bool
+  children: PropTypes.node.isRequired
 }
 
 export default CommentMobile

src/components/ActionCard/CommentMobile.scss

@@ -5,17 +5,6 @@
   border-radius: 4px;
   margin-top: 3 * $base-unit;
   padding: 2 * $base-unit 2 * $base-unit 3 * $base-unit 2 * $base-unit;
-
-  &.is-bundled {
-    margin-top: 0;
-    padding-top: 0;
-    padding-bottom: 0;
-  }
-
-
-  &:not(.is-bundled) + .comment.is-bundled {
-    margin-top: -15px;
-  }
 }
 
 .header {

src/components/Feed/FeedComments.jsx

@@ -7,7 +7,7 @@ import cn from 'classnames'
 import {markdownToHTML} from '../../helpers/markdownToState'
 import MediaQuery from 'react-responsive'
 import CommentMobile from '../ActionCard/CommentMobile'
-import { SCREEN_BREAKPOINT_MD, POSTS_BUNDLE_TIME_DIFF } from '../../config/constants'
+import { SCREEN_BREAKPOINT_MD } from '../../config/constants'
 
 import './FeedComments.scss'
 
@@ -61,7 +61,6 @@ class FeedComments extends React.Component {
     }
 
     const desktopBlocks = []
-    const mobileBlocks = []
 
     if (hasMoreComments) {
       desktopBlocks.push(
@@ -73,12 +72,10 @@ class FeedComments extends React.Component {
       )
     }
 
-    comments && comments.forEach((item, idx) => { 
+    comments && comments.forEach((item, idx) => {
       const createdAt = moment(item.createdAt)
       const prevComment = comments[idx - 1]
-      const timeDiffPrevComment = prevComment && moment(item.createdAt).diff(prevComment.createdAt)
-      const isSameAuthor = prevComment && prevComment.author.userId === item.author.userId &&
-            timeDiffPrevComment && timeDiffPrevComment <= POSTS_BUNDLE_TIME_DIFF
+      const isSameAuthor = prevComment && prevComment.author.userId === item.author.userId
       const isSameDay = prevComment && moment(prevComment.createdAt).isSame(createdAt, 'day')
       const isFirstUnread = prevComment && !prevComment.unread && item.unread
 
@@ -103,7 +100,7 @@ class FeedComments extends React.Component {
           key={idx}
           message={item}
           author={item.author}
-          date={item.createdAt}
+          date={item.date}
           edited={item.edited}
           active={item.unread}
           self={item.author && item.author.userId === currentUser.userId}
@@ -118,18 +115,6 @@ class FeedComments extends React.Component {
           <div dangerouslySetInnerHTML={{__html: markdownToHTML(item.content)}} />
         </Comment>
       )
-
-      mobileBlocks.push(
-        <CommentMobile
-          key={idx}
-          messageId={item.id.toString()}
-          author={item.author}
-          date={item.createdAt}
-          noInfo={isSameAuthor}
-        >
-          <div dangerouslySetInnerHTML={{__html: markdownToHTML(item.content)}} />
-        </CommentMobile>
-      )
     })
 
     return (
@@ -164,7 +149,16 @@ class FeedComments extends React.Component {
                   </a>
                 </div>
               }
-              {mobileBlocks}
+              {comments.map((item, idx) => (
+                <CommentMobile
+                  key={idx}
+                  messageId={item.id.toString()}
+                  author={item.author}
+                  date={item.date}
+                >
+                  <div dangerouslySetInnerHTML={{__html: markdownToHTML(item.content)}} />
+                </CommentMobile>
+              ))}
             </div>
           ))}
         </MediaQuery>

src/config/constants.js

@@ -537,7 +537,4 @@ export const NOTIFICATION_SETTINGS_PERIODS = [
 ]
 
 // date time formats
-export const POST_TIME_FORMAT = 'h:mm a'
-
-// max time difference between consecutive posts to bundle posts by same user
-export const POSTS_BUNDLE_TIME_DIFF = 1000 * 60 * 10 // 10 min difference
+export const POST_TIME_FORMAT = 'h:mm a'