From 88c5de4f2bf2613f34f76bbd6df27dd55e1baf97 Mon Sep 17 00:00:00 2001
From: Juan Tejada <juans.tejada@gmail.com>
Date: Fri, 25 Mar 2016 14:00:31 -0700
Subject: [PATCH] update(open-tracking): Only display icon when last message
 has metadata

---
 .../open-tracking/lib/open-tracking-icon.jsx     | 13 +++++++------
 .../spec/open-tracking-icon-spec.jsx             | 16 ++++------------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/internal_packages/open-tracking/lib/open-tracking-icon.jsx b/internal_packages/open-tracking/lib/open-tracking-icon.jsx
index f7e8c8a0b..8428840c8 100644
--- a/internal_packages/open-tracking/lib/open-tracking-icon.jsx
+++ b/internal_packages/open-tracking/lib/open-tracking-icon.jsx
@@ -1,3 +1,4 @@
+import _ from 'underscore';
 import {React} from 'nylas-exports'
 import {RetinaImg} from 'nylas-component-kit'
 import {PLUGIN_ID} from './open-tracking-constants'
@@ -22,12 +23,12 @@ export default class OpenTrackingIcon extends React.Component {
   _getStateFromThread(thread) {
     const messages = thread.metadata;
     if ((messages || []).length === 0) { return {opened: false, hasMetadata: false} }
-    const metadataObjs = messages
-      .map(msg => msg.metadataForPluginId(PLUGIN_ID))
-      .filter(meta => meta && meta.open_count != null);
+    const last = _.last(_.filter(messages, m => !m.draft))
+    const meta = last.metadataForPluginId(PLUGIN_ID)
+    const hasMetadata = meta && meta.open_count != null
     return {
-      hasMetadata: metadataObjs.length > 0,
-      opened: metadataObjs.length > 0 && metadataObjs.every(m => m.open_count > 0),
+      hasMetadata,
+      opened: hasMetadata && meta.open_count > 0,
     };
   }
 
@@ -44,7 +45,7 @@ export default class OpenTrackingIcon extends React.Component {
     const title = this.state.opened ? "This message has been read at least once" : "This message has not been read";
     return (
       <div title={title} className="open-tracking-icon">
-        {this.state.hasMetadata ? this._renderImage() : ""}
+        {this.state.hasMetadata ? this._renderImage() : null}
       </div>
     );
   }
diff --git a/internal_packages/open-tracking/spec/open-tracking-icon-spec.jsx b/internal_packages/open-tracking/spec/open-tracking-icon-spec.jsx
index 89a194111..64f73f233 100644
--- a/internal_packages/open-tracking/spec/open-tracking-icon-spec.jsx
+++ b/internal_packages/open-tracking/spec/open-tracking-icon-spec.jsx
@@ -40,7 +40,7 @@ describe("Open tracking icon", () => {
 
   describe("With messages and metadata", () => {
     beforeEach(() => {
-      this.messages = [new Message(), new Message(), new Message()];
+      this.messages = [new Message(), new Message(), new Message({draft: true})];
       this.thread.metadata.push(...this.messages);
     });
 
@@ -50,7 +50,8 @@ describe("Open tracking icon", () => {
       expect(icon.children.length).toEqual(0);
     });
 
-    it("shows an unopened icon if one message has metadata and is unopened", () => {
+    it("shows an unopened icon if last non draft message has metadata and is unopened", () => {
+      addOpenMetadata(this.messages[0], 1);
       addOpenMetadata(this.messages[1], 0);
       const icon = find(makeIcon(this.thread), "open-tracking-icon");
       expect(icon.children.length).toEqual(1);
@@ -58,20 +59,11 @@ describe("Open tracking icon", () => {
       expect(icon.querySelector("img.opened")).toBeNull();
     });
 
-    it("shows an unopened icon if only some messages are unopened", () => {
+    it("shows an opened icon if last non draft message with metadata is opened", () => {
       addOpenMetadata(this.messages[0], 0);
       addOpenMetadata(this.messages[1], 1);
       const icon = find(makeIcon(this.thread), "open-tracking-icon");
       expect(icon.children.length).toEqual(1);
-      expect(icon.querySelector("img.unopened")).not.toBeNull();
-      expect(icon.querySelector("img.opened")).toBeNull();
-    });
-
-    it("shows an opened icon if all messages with metadata are opened", () => {
-      addOpenMetadata(this.messages[1], 1);
-      addOpenMetadata(this.messages[2], 1);
-      const icon = find(makeIcon(this.thread), "open-tracking-icon");
-      expect(icon.children.length).toEqual(1);
       expect(icon.querySelector("img.unopened")).toBeNull();
       expect(icon.querySelector("img.opened")).not.toBeNull();
     });