fix(message-review): filter out empty messages (#718)

Author: bchrobot

src/components/IncomingMessageList/MessageColumn/MessageList.jsx

@@ -25,11 +25,31 @@ class MessageList extends Component {
   }
 
   render() {
+    const messageContainerStyle = {
+      flex: "1 1 auto",
+      height: "0px",
+      overflowY: "scroll"
+    };
+
+    if (this.props.messages.length === 0) {
+      return (
+        <div style={messageContainerStyle}>
+          <p
+            style={{
+              backgroundColor: "#EEEEEE",
+              margin: "0 60px",
+              padding: "10px 0",
+              textAlign: "center"
+            }}
+          >
+            No messages yet
+          </p>
+        </div>
+      );
+    }
+
     return (
-      <div
-        ref="messageWindow"
-        style={{ flex: "1 1 auto", height: "0px", overflowY: "scroll" }}
-      >
+      <div ref="messageWindow" style={messageContainerStyle}>
         {this.props.messages.map((message, index) => {
           const isFromContact = message.isFromContact;
           const containerStyle = {

src/components/IncomingMessageList/index.jsx

@@ -162,20 +162,15 @@ export class IncomingMessageList extends Component {
           overflow: "scroll",
           whiteSpace: "pre-line"
         },
-        render: (columnKey, row) => {
-          if (row.messages && row.messages.length > 0) {
-            return (
-              <FlatButton
-                onClick={event => {
-                  event.stopPropagation();
-                  this.handleOpenConversation(row.index);
-                }}
-                icon={<ActionOpenInNew />}
-              />
-            );
-          }
-          return "";
-        }
+        render: (columnKey, row) => (
+          <FlatButton
+            onClick={event => {
+              event.stopPropagation();
+              this.handleOpenConversation(row.index);
+            }}
+            icon={<ActionOpenInNew />}
+          />
+        )
       }
     ];
   };

src/server/api/conversations.js

@@ -288,11 +288,12 @@ export async function getConversations(
 
       const conversation = _.omit(firstRow, messageFields);
 
-      if (firstRow) {
+      if (firstRow.created_at) {
         conversation.updated_at = firstRow.created_at;
       }
 
       conversation.messages = contactMessages
+        .filter(messageRow => messageRow.mess_id !== null)
         // Sort ASC to display most recent _messages_ last
         .sort((messageA, messageB) => messageA.created_at - messageB.created_at)
         .map(message => {