Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-09-10 22:54:45 +08:00
Code Issues Projects Releases Packages Wiki Activity

update(open-tracking): Only display icon when last message has metadata

Browse source
This commit is contained in:
Juan Tejada 2016-03-25 14:00:31 -07:00
parent 1efa7ffaca
commit 88c5de4f2b
2 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
internal_packages/open-tracking/lib/open-tracking-icon.jsx
View file

@ -1,3 +1,4 @@
import _ from 'underscore';
import {React} from 'nylas-exports' import {React} from 'nylas-exports'
import {RetinaImg} from 'nylas-component-kit' import {RetinaImg} from 'nylas-component-kit'
import {PLUGIN_ID} from './open-tracking-constants' import {PLUGIN_ID} from './open-tracking-constants'
@ -22,12 +23,12 @@ export default class OpenTrackingIcon extends React.Component {
_getStateFromThread(thread) { _getStateFromThread(thread) {
const messages = thread.metadata; const messages = thread.metadata;
if ((messages || []).length === 0) { return {opened: false, hasMetadata: false} } if ((messages || []).length === 0) { return {opened: false, hasMetadata: false} }
const metadataObjs = messages const last = _.last(_.filter(messages, m => !m.draft))
.map(msg => msg.metadataForPluginId(PLUGIN_ID)) const meta = last.metadataForPluginId(PLUGIN_ID)
.filter(meta => meta && meta.open_count != null); const hasMetadata = meta && meta.open_count != null
return { return {
hasMetadata: metadataObjs.length > 0, hasMetadata,
opened: metadataObjs.length > 0 && metadataObjs.every(m => m.open_count > 0), 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"; const title = this.state.opened ? "This message has been read at least once" : "This message has not been read";
return ( return (
<div title={title} className="open-tracking-icon"> <div title={title} className="open-tracking-icon">
{this.state.hasMetadata ? this._renderImage() : ""} {this.state.hasMetadata ? this._renderImage() : null}
</div> </div>
); );
} }

16
internal_packages/open-tracking/spec/open-tracking-icon-spec.jsx
View file

@ -40,7 +40,7 @@ describe("Open tracking icon", () => {
describe("With messages and metadata", () => { describe("With messages and metadata", () => {
beforeEach(() => { 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); this.thread.metadata.push(...this.messages);
}); });
@ -50,7 +50,8 @@ describe("Open tracking icon", () => {
expect(icon.children.length).toEqual(0); 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); addOpenMetadata(this.messages[1], 0);
const icon = find(makeIcon(this.thread), "open-tracking-icon"); const icon = find(makeIcon(this.thread), "open-tracking-icon");
expect(icon.children.length).toEqual(1); expect(icon.children.length).toEqual(1);
@ -58,20 +59,11 @@ describe("Open tracking icon", () => {
expect(icon.querySelector("img.opened")).toBeNull(); 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[0], 0);
addOpenMetadata(this.messages[1], 1); addOpenMetadata(this.messages[1], 1);
const icon = find(makeIcon(this.thread), "open-tracking-icon"); const icon = find(makeIcon(this.thread), "open-tracking-icon");
expect(icon.children.length).toEqual(1); 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.unopened")).toBeNull();
expect(icon.querySelector("img.opened")).not.toBeNull(); expect(icon.querySelector("img.opened")).not.toBeNull();
}); });