2015-05-20 07:06:59 +08:00
|
|
|
_ = require "underscore"
|
fix(drafts): Various improvements and fixes to drafts, draft state management
Summary:
This diff contains a few major changes:
1. Scribe is no longer used for the text editor. It's just a plain contenteditable region. The toolbar items (bold, italic, underline) still work. Scribe was causing React inconcistency issues in the following scenario:
- View thread with draft, edit draft
- Move to another thread
- Move back to thread with draft
- Move to another thread. Notice that one or more messages from thread with draft are still there.
There may be a way to fix this, but I tried for hours and there are Github Issues open on it's repository asking for React compatibility, so it may be fixed soon. For now contenteditable is working great.
2. Action.saveDraft() is no longer debounced in the DraftStore. Instead, firing that action causes the save to happen immediately, and the DraftStoreProxy has a new "DraftChangeSet" class which is responsbile for batching saves as the user interacts with the ComposerView. There are a couple big wins here:
- In the future, we may want to be able to call Action.saveDraft() in other situations and it should behave like a normal action. We may also want to expose the DraftStoreProxy as an easy way of backing interactive draft UI.
- Previously, when you added a contact to To/CC/BCC, this happened:
<input> -> Action.saveDraft -> (delay!!) -> Database -> DraftStore -> DraftStoreProxy -> View Updates
Increasing the delay to something reasonable like 200msec meant there was 200msec of lag before you saw the new view state.
To fix this, I created a new class called DraftChangeSet which is responsible for accumulating changes as they're made and firing Action.saveDraft. "Adding" a change to the change set also causes the Draft provided by the DraftStoreProxy to change immediately (the changes are a temporary layer on top of the database object). This means no delay while changes are being applied. There's a better explanation in the source!
This diff includes a few minor fixes as well:
1. Draft.state is gone—use Message.object = draft instead
2. String model attributes should never be null
3. Pre-send checks that can cancel draft send
4. Put the entire curl history and task queue into feedback reports
5. Cache localIds for extra speed
6. Move us up to latest React
Test Plan: No new tests - once we lock down this new design I'll write tests for the DraftChangeSet
Reviewers: evan
Reviewed By: evan
Differential Revision: https://review.inboxapp.com/D1125
2015-02-04 08:24:31 +08:00
|
|
|
proxyquire = require "proxyquire"
|
|
|
|
|
|
|
|
React = require "react/addons"
|
|
|
|
ReactTestUtils = React.addons.TestUtils
|
|
|
|
|
2015-03-13 05:48:56 +08:00
|
|
|
{Actions,
|
|
|
|
Contact,
|
fix(drafts): Various improvements and fixes to drafts, draft state management
Summary:
This diff contains a few major changes:
1. Scribe is no longer used for the text editor. It's just a plain contenteditable region. The toolbar items (bold, italic, underline) still work. Scribe was causing React inconcistency issues in the following scenario:
- View thread with draft, edit draft
- Move to another thread
- Move back to thread with draft
- Move to another thread. Notice that one or more messages from thread with draft are still there.
There may be a way to fix this, but I tried for hours and there are Github Issues open on it's repository asking for React compatibility, so it may be fixed soon. For now contenteditable is working great.
2. Action.saveDraft() is no longer debounced in the DraftStore. Instead, firing that action causes the save to happen immediately, and the DraftStoreProxy has a new "DraftChangeSet" class which is responsbile for batching saves as the user interacts with the ComposerView. There are a couple big wins here:
- In the future, we may want to be able to call Action.saveDraft() in other situations and it should behave like a normal action. We may also want to expose the DraftStoreProxy as an easy way of backing interactive draft UI.
- Previously, when you added a contact to To/CC/BCC, this happened:
<input> -> Action.saveDraft -> (delay!!) -> Database -> DraftStore -> DraftStoreProxy -> View Updates
Increasing the delay to something reasonable like 200msec meant there was 200msec of lag before you saw the new view state.
To fix this, I created a new class called DraftChangeSet which is responsible for accumulating changes as they're made and firing Action.saveDraft. "Adding" a change to the change set also causes the Draft provided by the DraftStoreProxy to change immediately (the changes are a temporary layer on top of the database object). This means no delay while changes are being applied. There's a better explanation in the source!
This diff includes a few minor fixes as well:
1. Draft.state is gone—use Message.object = draft instead
2. String model attributes should never be null
3. Pre-send checks that can cancel draft send
4. Put the entire curl history and task queue into feedback reports
5. Cache localIds for extra speed
6. Move us up to latest React
Test Plan: No new tests - once we lock down this new design I'll write tests for the DraftChangeSet
Reviewers: evan
Reviewed By: evan
Differential Revision: https://review.inboxapp.com/D1125
2015-02-04 08:24:31 +08:00
|
|
|
Message,
|
|
|
|
Namespace,
|
2015-03-13 05:48:56 +08:00
|
|
|
DraftStore,
|
fix(drafts): Various improvements and fixes to drafts, draft state management
Summary:
This diff contains a few major changes:
1. Scribe is no longer used for the text editor. It's just a plain contenteditable region. The toolbar items (bold, italic, underline) still work. Scribe was causing React inconcistency issues in the following scenario:
- View thread with draft, edit draft
- Move to another thread
- Move back to thread with draft
- Move to another thread. Notice that one or more messages from thread with draft are still there.
There may be a way to fix this, but I tried for hours and there are Github Issues open on it's repository asking for React compatibility, so it may be fixed soon. For now contenteditable is working great.
2. Action.saveDraft() is no longer debounced in the DraftStore. Instead, firing that action causes the save to happen immediately, and the DraftStoreProxy has a new "DraftChangeSet" class which is responsbile for batching saves as the user interacts with the ComposerView. There are a couple big wins here:
- In the future, we may want to be able to call Action.saveDraft() in other situations and it should behave like a normal action. We may also want to expose the DraftStoreProxy as an easy way of backing interactive draft UI.
- Previously, when you added a contact to To/CC/BCC, this happened:
<input> -> Action.saveDraft -> (delay!!) -> Database -> DraftStore -> DraftStoreProxy -> View Updates
Increasing the delay to something reasonable like 200msec meant there was 200msec of lag before you saw the new view state.
To fix this, I created a new class called DraftChangeSet which is responsible for accumulating changes as they're made and firing Action.saveDraft. "Adding" a change to the change set also causes the Draft provided by the DraftStoreProxy to change immediately (the changes are a temporary layer on top of the database object). This means no delay while changes are being applied. There's a better explanation in the source!
This diff includes a few minor fixes as well:
1. Draft.state is gone—use Message.object = draft instead
2. String model attributes should never be null
3. Pre-send checks that can cancel draft send
4. Put the entire curl history and task queue into feedback reports
5. Cache localIds for extra speed
6. Move us up to latest React
Test Plan: No new tests - once we lock down this new design I'll write tests for the DraftChangeSet
Reviewers: evan
Reviewed By: evan
Differential Revision: https://review.inboxapp.com/D1125
2015-02-04 08:24:31 +08:00
|
|
|
DatabaseStore,
|
2015-05-20 07:06:59 +08:00
|
|
|
NylasTestUtils,
|
2015-06-12 02:52:49 +08:00
|
|
|
NamespaceStore,
|
|
|
|
FileUploadStore,
|
|
|
|
ComponentRegistry} = require "nylas-exports"
|
|
|
|
|
|
|
|
{InjectedComponent} = require 'nylas-component-kit'
|
fix(drafts): Various improvements and fixes to drafts, draft state management
Summary:
This diff contains a few major changes:
1. Scribe is no longer used for the text editor. It's just a plain contenteditable region. The toolbar items (bold, italic, underline) still work. Scribe was causing React inconcistency issues in the following scenario:
- View thread with draft, edit draft
- Move to another thread
- Move back to thread with draft
- Move to another thread. Notice that one or more messages from thread with draft are still there.
There may be a way to fix this, but I tried for hours and there are Github Issues open on it's repository asking for React compatibility, so it may be fixed soon. For now contenteditable is working great.
2. Action.saveDraft() is no longer debounced in the DraftStore. Instead, firing that action causes the save to happen immediately, and the DraftStoreProxy has a new "DraftChangeSet" class which is responsbile for batching saves as the user interacts with the ComposerView. There are a couple big wins here:
- In the future, we may want to be able to call Action.saveDraft() in other situations and it should behave like a normal action. We may also want to expose the DraftStoreProxy as an easy way of backing interactive draft UI.
- Previously, when you added a contact to To/CC/BCC, this happened:
<input> -> Action.saveDraft -> (delay!!) -> Database -> DraftStore -> DraftStoreProxy -> View Updates
Increasing the delay to something reasonable like 200msec meant there was 200msec of lag before you saw the new view state.
To fix this, I created a new class called DraftChangeSet which is responsible for accumulating changes as they're made and firing Action.saveDraft. "Adding" a change to the change set also causes the Draft provided by the DraftStoreProxy to change immediately (the changes are a temporary layer on top of the database object). This means no delay while changes are being applied. There's a better explanation in the source!
This diff includes a few minor fixes as well:
1. Draft.state is gone—use Message.object = draft instead
2. String model attributes should never be null
3. Pre-send checks that can cancel draft send
4. Put the entire curl history and task queue into feedback reports
5. Cache localIds for extra speed
6. Move us up to latest React
Test Plan: No new tests - once we lock down this new design I'll write tests for the DraftChangeSet
Reviewers: evan
Reviewed By: evan
Differential Revision: https://review.inboxapp.com/D1125
2015-02-04 08:24:31 +08:00
|
|
|
|
2015-06-12 09:48:55 +08:00
|
|
|
ParticipantsTextField = require '../lib/participants-text-field'
|
|
|
|
|
2015-05-15 08:08:30 +08:00
|
|
|
u1 = new Contact(name: "Christine Spang", email: "spang@nylas.com")
|
|
|
|
u2 = new Contact(name: "Michael Grinich", email: "mg@nylas.com")
|
|
|
|
u3 = new Contact(name: "Evan Morikawa", email: "evan@nylas.com")
|
|
|
|
u4 = new Contact(name: "Zoë Leiper", email: "zip@nylas.com")
|
|
|
|
u5 = new Contact(name: "Ben Gotow", email: "ben@nylas.com")
|
fix(drafts): Various improvements and fixes to drafts, draft state management
Summary:
This diff contains a few major changes:
1. Scribe is no longer used for the text editor. It's just a plain contenteditable region. The toolbar items (bold, italic, underline) still work. Scribe was causing React inconcistency issues in the following scenario:
- View thread with draft, edit draft
- Move to another thread
- Move back to thread with draft
- Move to another thread. Notice that one or more messages from thread with draft are still there.
There may be a way to fix this, but I tried for hours and there are Github Issues open on it's repository asking for React compatibility, so it may be fixed soon. For now contenteditable is working great.
2. Action.saveDraft() is no longer debounced in the DraftStore. Instead, firing that action causes the save to happen immediately, and the DraftStoreProxy has a new "DraftChangeSet" class which is responsbile for batching saves as the user interacts with the ComposerView. There are a couple big wins here:
- In the future, we may want to be able to call Action.saveDraft() in other situations and it should behave like a normal action. We may also want to expose the DraftStoreProxy as an easy way of backing interactive draft UI.
- Previously, when you added a contact to To/CC/BCC, this happened:
<input> -> Action.saveDraft -> (delay!!) -> Database -> DraftStore -> DraftStoreProxy -> View Updates
Increasing the delay to something reasonable like 200msec meant there was 200msec of lag before you saw the new view state.
To fix this, I created a new class called DraftChangeSet which is responsible for accumulating changes as they're made and firing Action.saveDraft. "Adding" a change to the change set also causes the Draft provided by the DraftStoreProxy to change immediately (the changes are a temporary layer on top of the database object). This means no delay while changes are being applied. There's a better explanation in the source!
This diff includes a few minor fixes as well:
1. Draft.state is gone—use Message.object = draft instead
2. String model attributes should never be null
3. Pre-send checks that can cancel draft send
4. Put the entire curl history and task queue into feedback reports
5. Cache localIds for extra speed
6. Move us up to latest React
Test Plan: No new tests - once we lock down this new design I'll write tests for the DraftChangeSet
Reviewers: evan
Reviewed By: evan
Differential Revision: https://review.inboxapp.com/D1125
2015-02-04 08:24:31 +08:00
|
|
|
users = [u1, u2, u3, u4, u5]
|
|
|
|
NamespaceStore._current = new Namespace(
|
|
|
|
{name: u1.name, provider: "inbox", emailAddress: u1.email})
|
|
|
|
|
|
|
|
reactStub = (className) ->
|
|
|
|
React.createClass({render: -> <div className={className}>{@props.children}</div>})
|
|
|
|
|
2015-02-11 03:10:14 +08:00
|
|
|
textFieldStub = (className) ->
|
|
|
|
React.createClass
|
|
|
|
render: -> <div className={className}>{@props.children}</div>
|
|
|
|
focus: ->
|
|
|
|
|
2015-06-12 03:08:47 +08:00
|
|
|
passThroughStub = (props={}) ->
|
2015-06-12 02:52:49 +08:00
|
|
|
React.createClass
|
|
|
|
render: -> <div {...props}>{props.children}</div>
|
|
|
|
|
2015-03-13 05:48:56 +08:00
|
|
|
draftStoreProxyStub = (localId, returnedDraft) ->
|
2015-02-19 06:09:46 +08:00
|
|
|
listen: -> ->
|
2015-03-13 05:48:56 +08:00
|
|
|
draft: -> (returnedDraft ? new Message(draft: true))
|
2015-05-16 01:45:18 +08:00
|
|
|
draftLocalId: localId
|
2015-02-11 03:10:14 +08:00
|
|
|
changes:
|
|
|
|
add: ->
|
|
|
|
commit: ->
|
|
|
|
applyToModel: ->
|
fix(drafts): Various improvements and fixes to drafts, draft state management
Summary:
This diff contains a few major changes:
1. Scribe is no longer used for the text editor. It's just a plain contenteditable region. The toolbar items (bold, italic, underline) still work. Scribe was causing React inconcistency issues in the following scenario:
- View thread with draft, edit draft
- Move to another thread
- Move back to thread with draft
- Move to another thread. Notice that one or more messages from thread with draft are still there.
There may be a way to fix this, but I tried for hours and there are Github Issues open on it's repository asking for React compatibility, so it may be fixed soon. For now contenteditable is working great.
2. Action.saveDraft() is no longer debounced in the DraftStore. Instead, firing that action causes the save to happen immediately, and the DraftStoreProxy has a new "DraftChangeSet" class which is responsbile for batching saves as the user interacts with the ComposerView. There are a couple big wins here:
- In the future, we may want to be able to call Action.saveDraft() in other situations and it should behave like a normal action. We may also want to expose the DraftStoreProxy as an easy way of backing interactive draft UI.
- Previously, when you added a contact to To/CC/BCC, this happened:
<input> -> Action.saveDraft -> (delay!!) -> Database -> DraftStore -> DraftStoreProxy -> View Updates
Increasing the delay to something reasonable like 200msec meant there was 200msec of lag before you saw the new view state.
To fix this, I created a new class called DraftChangeSet which is responsible for accumulating changes as they're made and firing Action.saveDraft. "Adding" a change to the change set also causes the Draft provided by the DraftStoreProxy to change immediately (the changes are a temporary layer on top of the database object). This means no delay while changes are being applied. There's a better explanation in the source!
This diff includes a few minor fixes as well:
1. Draft.state is gone—use Message.object = draft instead
2. String model attributes should never be null
3. Pre-send checks that can cancel draft send
4. Put the entire curl history and task queue into feedback reports
5. Cache localIds for extra speed
6. Move us up to latest React
Test Plan: No new tests - once we lock down this new design I'll write tests for the DraftChangeSet
Reviewers: evan
Reviewed By: evan
Differential Revision: https://review.inboxapp.com/D1125
2015-02-04 08:24:31 +08:00
|
|
|
|
|
|
|
searchContactStub = (email) ->
|
|
|
|
_.filter(users, (u) u.email.toLowerCase() is email.toLowerCase())
|
|
|
|
|
2015-03-21 08:51:49 +08:00
|
|
|
ComposerView = proxyquire "../lib/composer-view",
|
2015-06-12 02:52:49 +08:00
|
|
|
"./file-upload": reactStub("file-upload")
|
|
|
|
"./image-file-upload": reactStub("image-file-upload")
|
2015-05-15 08:08:30 +08:00
|
|
|
"nylas-exports":
|
fix(drafts): Various improvements and fixes to drafts, draft state management
Summary:
This diff contains a few major changes:
1. Scribe is no longer used for the text editor. It's just a plain contenteditable region. The toolbar items (bold, italic, underline) still work. Scribe was causing React inconcistency issues in the following scenario:
- View thread with draft, edit draft
- Move to another thread
- Move back to thread with draft
- Move to another thread. Notice that one or more messages from thread with draft are still there.
There may be a way to fix this, but I tried for hours and there are Github Issues open on it's repository asking for React compatibility, so it may be fixed soon. For now contenteditable is working great.
2. Action.saveDraft() is no longer debounced in the DraftStore. Instead, firing that action causes the save to happen immediately, and the DraftStoreProxy has a new "DraftChangeSet" class which is responsbile for batching saves as the user interacts with the ComposerView. There are a couple big wins here:
- In the future, we may want to be able to call Action.saveDraft() in other situations and it should behave like a normal action. We may also want to expose the DraftStoreProxy as an easy way of backing interactive draft UI.
- Previously, when you added a contact to To/CC/BCC, this happened:
<input> -> Action.saveDraft -> (delay!!) -> Database -> DraftStore -> DraftStoreProxy -> View Updates
Increasing the delay to something reasonable like 200msec meant there was 200msec of lag before you saw the new view state.
To fix this, I created a new class called DraftChangeSet which is responsible for accumulating changes as they're made and firing Action.saveDraft. "Adding" a change to the change set also causes the Draft provided by the DraftStoreProxy to change immediately (the changes are a temporary layer on top of the database object). This means no delay while changes are being applied. There's a better explanation in the source!
This diff includes a few minor fixes as well:
1. Draft.state is gone—use Message.object = draft instead
2. String model attributes should never be null
3. Pre-send checks that can cancel draft send
4. Put the entire curl history and task queue into feedback reports
5. Cache localIds for extra speed
6. Move us up to latest React
Test Plan: No new tests - once we lock down this new design I'll write tests for the DraftChangeSet
Reviewers: evan
Reviewed By: evan
Differential Revision: https://review.inboxapp.com/D1125
2015-02-04 08:24:31 +08:00
|
|
|
ContactStore:
|
|
|
|
searchContacts: (email) -> searchContactStub
|
2015-03-13 05:48:56 +08:00
|
|
|
DraftStore: DraftStore
|
fix(drafts): Various improvements and fixes to drafts, draft state management
Summary:
This diff contains a few major changes:
1. Scribe is no longer used for the text editor. It's just a plain contenteditable region. The toolbar items (bold, italic, underline) still work. Scribe was causing React inconcistency issues in the following scenario:
- View thread with draft, edit draft
- Move to another thread
- Move back to thread with draft
- Move to another thread. Notice that one or more messages from thread with draft are still there.
There may be a way to fix this, but I tried for hours and there are Github Issues open on it's repository asking for React compatibility, so it may be fixed soon. For now contenteditable is working great.
2. Action.saveDraft() is no longer debounced in the DraftStore. Instead, firing that action causes the save to happen immediately, and the DraftStoreProxy has a new "DraftChangeSet" class which is responsbile for batching saves as the user interacts with the ComposerView. There are a couple big wins here:
- In the future, we may want to be able to call Action.saveDraft() in other situations and it should behave like a normal action. We may also want to expose the DraftStoreProxy as an easy way of backing interactive draft UI.
- Previously, when you added a contact to To/CC/BCC, this happened:
<input> -> Action.saveDraft -> (delay!!) -> Database -> DraftStore -> DraftStoreProxy -> View Updates
Increasing the delay to something reasonable like 200msec meant there was 200msec of lag before you saw the new view state.
To fix this, I created a new class called DraftChangeSet which is responsible for accumulating changes as they're made and firing Action.saveDraft. "Adding" a change to the change set also causes the Draft provided by the DraftStoreProxy to change immediately (the changes are a temporary layer on top of the database object). This means no delay while changes are being applied. There's a better explanation in the source!
This diff includes a few minor fixes as well:
1. Draft.state is gone—use Message.object = draft instead
2. String model attributes should never be null
3. Pre-send checks that can cancel draft send
4. Put the entire curl history and task queue into feedback reports
5. Cache localIds for extra speed
6. Move us up to latest React
Test Plan: No new tests - once we lock down this new design I'll write tests for the DraftChangeSet
Reviewers: evan
Reviewed By: evan
Differential Revision: https://review.inboxapp.com/D1125
2015-02-04 08:24:31 +08:00
|
|
|
|
|
|
|
beforeEach ->
|
2015-06-12 02:52:49 +08:00
|
|
|
# spyOn(ComponentRegistry, "findComponentsMatching").andCallFake (matching) ->
|
|
|
|
# return passThroughStub
|
|
|
|
# spyOn(ComponentRegistry, "showComponentRegions").andReturn true
|
|
|
|
|
fix(drafts): Various improvements and fixes to drafts, draft state management
Summary:
This diff contains a few major changes:
1. Scribe is no longer used for the text editor. It's just a plain contenteditable region. The toolbar items (bold, italic, underline) still work. Scribe was causing React inconcistency issues in the following scenario:
- View thread with draft, edit draft
- Move to another thread
- Move back to thread with draft
- Move to another thread. Notice that one or more messages from thread with draft are still there.
There may be a way to fix this, but I tried for hours and there are Github Issues open on it's repository asking for React compatibility, so it may be fixed soon. For now contenteditable is working great.
2. Action.saveDraft() is no longer debounced in the DraftStore. Instead, firing that action causes the save to happen immediately, and the DraftStoreProxy has a new "DraftChangeSet" class which is responsbile for batching saves as the user interacts with the ComposerView. There are a couple big wins here:
- In the future, we may want to be able to call Action.saveDraft() in other situations and it should behave like a normal action. We may also want to expose the DraftStoreProxy as an easy way of backing interactive draft UI.
- Previously, when you added a contact to To/CC/BCC, this happened:
<input> -> Action.saveDraft -> (delay!!) -> Database -> DraftStore -> DraftStoreProxy -> View Updates
Increasing the delay to something reasonable like 200msec meant there was 200msec of lag before you saw the new view state.
To fix this, I created a new class called DraftChangeSet which is responsible for accumulating changes as they're made and firing Action.saveDraft. "Adding" a change to the change set also causes the Draft provided by the DraftStoreProxy to change immediately (the changes are a temporary layer on top of the database object). This means no delay while changes are being applied. There's a better explanation in the source!
This diff includes a few minor fixes as well:
1. Draft.state is gone—use Message.object = draft instead
2. String model attributes should never be null
3. Pre-send checks that can cancel draft send
4. Put the entire curl history and task queue into feedback reports
5. Cache localIds for extra speed
6. Move us up to latest React
Test Plan: No new tests - once we lock down this new design I'll write tests for the DraftChangeSet
Reviewers: evan
Reviewed By: evan
Differential Revision: https://review.inboxapp.com/D1125
2015-02-04 08:24:31 +08:00
|
|
|
# The NamespaceStore isn't set yet in the new window, populate it first.
|
|
|
|
NamespaceStore.populateItems().then ->
|
|
|
|
new Promise (resolve, reject) ->
|
|
|
|
draft = new Message
|
|
|
|
from: [NamespaceStore.current().me()]
|
|
|
|
date: (new Date)
|
2015-02-07 06:41:59 +08:00
|
|
|
draft: true
|
fix(drafts): Various improvements and fixes to drafts, draft state management
Summary:
This diff contains a few major changes:
1. Scribe is no longer used for the text editor. It's just a plain contenteditable region. The toolbar items (bold, italic, underline) still work. Scribe was causing React inconcistency issues in the following scenario:
- View thread with draft, edit draft
- Move to another thread
- Move back to thread with draft
- Move to another thread. Notice that one or more messages from thread with draft are still there.
There may be a way to fix this, but I tried for hours and there are Github Issues open on it's repository asking for React compatibility, so it may be fixed soon. For now contenteditable is working great.
2. Action.saveDraft() is no longer debounced in the DraftStore. Instead, firing that action causes the save to happen immediately, and the DraftStoreProxy has a new "DraftChangeSet" class which is responsbile for batching saves as the user interacts with the ComposerView. There are a couple big wins here:
- In the future, we may want to be able to call Action.saveDraft() in other situations and it should behave like a normal action. We may also want to expose the DraftStoreProxy as an easy way of backing interactive draft UI.
- Previously, when you added a contact to To/CC/BCC, this happened:
<input> -> Action.saveDraft -> (delay!!) -> Database -> DraftStore -> DraftStoreProxy -> View Updates
Increasing the delay to something reasonable like 200msec meant there was 200msec of lag before you saw the new view state.
To fix this, I created a new class called DraftChangeSet which is responsible for accumulating changes as they're made and firing Action.saveDraft. "Adding" a change to the change set also causes the Draft provided by the DraftStoreProxy to change immediately (the changes are a temporary layer on top of the database object). This means no delay while changes are being applied. There's a better explanation in the source!
This diff includes a few minor fixes as well:
1. Draft.state is gone—use Message.object = draft instead
2. String model attributes should never be null
3. Pre-send checks that can cancel draft send
4. Put the entire curl history and task queue into feedback reports
5. Cache localIds for extra speed
6. Move us up to latest React
Test Plan: No new tests - once we lock down this new design I'll write tests for the DraftChangeSet
Reviewers: evan
Reviewed By: evan
Differential Revision: https://review.inboxapp.com/D1125
2015-02-04 08:24:31 +08:00
|
|
|
namespaceId: NamespaceStore.current().id
|
|
|
|
|
|
|
|
DatabaseStore.persistModel(draft).then ->
|
|
|
|
DatabaseStore.localIdForModel(draft).then(resolve).catch(reject)
|
|
|
|
.catch(reject)
|
|
|
|
|
2015-02-11 03:10:14 +08:00
|
|
|
describe "A blank composer view", ->
|
|
|
|
beforeEach ->
|
|
|
|
@composer = ReactTestUtils.renderIntoDocument(
|
2015-05-08 06:28:44 +08:00
|
|
|
<ComposerView localId="test123" />
|
2015-02-11 03:10:14 +08:00
|
|
|
)
|
|
|
|
@composer.setState
|
|
|
|
body: ""
|
|
|
|
|
|
|
|
it 'should render into the document', ->
|
|
|
|
expect(ReactTestUtils.isCompositeComponentWithType @composer, ComposerView).toBe true
|
|
|
|
|
|
|
|
describe "testing keyboard inputs", ->
|
2015-03-13 05:48:56 +08:00
|
|
|
it "shows and focuses on bcc field", ->
|
2015-02-11 03:10:14 +08:00
|
|
|
|
2015-03-13 05:48:56 +08:00
|
|
|
it "shows and focuses on cc field", ->
|
2015-02-17 09:09:28 +08:00
|
|
|
|
2015-03-13 05:48:56 +08:00
|
|
|
it "shows and focuses on bcc field when already open", ->
|
2015-02-17 09:09:28 +08:00
|
|
|
|
2015-03-13 05:48:56 +08:00
|
|
|
describe "populated composer", ->
|
|
|
|
# This will setup the mocks necessary to make the composer element (once
|
|
|
|
# mounted) think it's attached to the given draft. This mocks out the
|
|
|
|
# proxy system used by the composer.
|
|
|
|
DRAFT_LOCAL_ID = "local-123"
|
|
|
|
useDraft = (draftAttributes={}) ->
|
2015-03-26 03:41:48 +08:00
|
|
|
@draft = new Message _.extend({draft: true, body: ""}, draftAttributes)
|
2015-05-16 01:45:18 +08:00
|
|
|
draft = @draft
|
|
|
|
proxy = draftStoreProxyStub(DRAFT_LOCAL_ID, @draft)
|
|
|
|
spyOn(DraftStore, "sessionForLocalId").andCallFake -> new Promise (resolve, reject) -> resolve(proxy)
|
|
|
|
spyOn(ComposerView.prototype, "componentWillMount").andCallFake ->
|
|
|
|
@_prepareForDraft(DRAFT_LOCAL_ID)
|
|
|
|
@_setupSession(proxy)
|
2015-02-17 09:09:28 +08:00
|
|
|
|
2015-03-13 05:48:56 +08:00
|
|
|
useFullDraft = ->
|
|
|
|
useDraft.call @,
|
|
|
|
from: [u1]
|
|
|
|
to: [u2]
|
|
|
|
cc: [u3, u4]
|
|
|
|
bcc: [u5]
|
|
|
|
subject: "Test Message 1"
|
|
|
|
body: "Hello <b>World</b><br/> This is a test"
|
2015-02-11 03:10:14 +08:00
|
|
|
|
2015-03-13 05:48:56 +08:00
|
|
|
makeComposer = ->
|
|
|
|
@composer = ReactTestUtils.renderIntoDocument(
|
|
|
|
<ComposerView localId={DRAFT_LOCAL_ID} />
|
|
|
|
)
|
2015-02-11 03:10:14 +08:00
|
|
|
|
2015-03-13 05:48:56 +08:00
|
|
|
describe "When displaying info from a draft", ->
|
|
|
|
beforeEach ->
|
|
|
|
useFullDraft.apply(@)
|
|
|
|
makeComposer.call(@)
|
2015-02-11 03:10:14 +08:00
|
|
|
|
2015-03-13 05:48:56 +08:00
|
|
|
it "attaches the draft to the proxy", ->
|
|
|
|
expect(@draft).toBeDefined()
|
|
|
|
expect(@composer._proxy.draft()).toBe @draft
|
|
|
|
|
|
|
|
it "set the state based on the draft", ->
|
|
|
|
expect(@composer.state.from).toBeUndefined()
|
|
|
|
expect(@composer.state.to).toEqual [u2]
|
|
|
|
expect(@composer.state.cc).toEqual [u3, u4]
|
|
|
|
expect(@composer.state.bcc).toEqual [u5]
|
|
|
|
expect(@composer.state.subject).toEqual "Test Message 1"
|
|
|
|
expect(@composer.state.body).toEqual "Hello <b>World</b><br/> This is a test"
|
|
|
|
|
|
|
|
describe "when deciding whether or not to show the subject", ->
|
2015-03-11 09:27:10 +08:00
|
|
|
it "shows the subject when the subject is empty", ->
|
2015-03-13 05:48:56 +08:00
|
|
|
useDraft.call @, subject: ""
|
|
|
|
makeComposer.call @
|
2015-03-11 09:27:10 +08:00
|
|
|
expect(@composer._shouldShowSubject()).toBe true
|
|
|
|
|
|
|
|
it "shows the subject when the subject looks like a fwd", ->
|
2015-03-13 05:48:56 +08:00
|
|
|
useDraft.call @, subject: "Fwd: This is the message"
|
|
|
|
makeComposer.call @
|
2015-03-11 09:27:10 +08:00
|
|
|
expect(@composer._shouldShowSubject()).toBe true
|
|
|
|
|
|
|
|
it "shows the subject when the subject looks like a fwd", ->
|
2015-03-13 05:48:56 +08:00
|
|
|
useDraft.call @, subject: "fwd foo"
|
|
|
|
makeComposer.call @
|
2015-03-11 09:27:10 +08:00
|
|
|
expect(@composer._shouldShowSubject()).toBe true
|
|
|
|
|
|
|
|
it "doesn't show subject when subject has fwd text in it", ->
|
2015-03-13 05:48:56 +08:00
|
|
|
useDraft.call @, subject: "Trick fwd"
|
|
|
|
makeComposer.call @
|
2015-03-11 09:27:10 +08:00
|
|
|
expect(@composer._shouldShowSubject()).toBe false
|
|
|
|
|
|
|
|
it "doesn't show the subject otherwise", ->
|
2015-03-13 05:48:56 +08:00
|
|
|
useDraft.call @, subject: "Foo bar baz"
|
|
|
|
makeComposer.call @
|
2015-03-11 09:27:10 +08:00
|
|
|
expect(@composer._shouldShowSubject()).toBe false
|
|
|
|
|
2015-03-13 05:48:56 +08:00
|
|
|
describe "when deciding whether or not to show cc and bcc", ->
|
|
|
|
it "doesn't show cc when there's no one to cc", ->
|
|
|
|
useDraft.call @, cc: []
|
|
|
|
makeComposer.call @
|
|
|
|
expect(@composer.state.showcc).toBe false
|
|
|
|
|
|
|
|
it "shows cc when populated", ->
|
|
|
|
useDraft.call @, cc: [u1,u2]
|
|
|
|
makeComposer.call @
|
|
|
|
expect(@composer.state.showcc).toBe true
|
|
|
|
|
|
|
|
it "doesn't show bcc when there's no one to bcc", ->
|
|
|
|
useDraft.call @, bcc: []
|
|
|
|
makeComposer.call @
|
|
|
|
expect(@composer.state.showbcc).toBe false
|
|
|
|
|
|
|
|
it "shows bcc when populated", ->
|
|
|
|
useDraft.call @, bcc: [u2,u3]
|
|
|
|
makeComposer.call @
|
|
|
|
expect(@composer.state.showbcc).toBe true
|
|
|
|
|
2015-06-02 06:12:18 +08:00
|
|
|
describe "when focus() is called", ->
|
|
|
|
describe "if a field name is provided", ->
|
|
|
|
it "should focus that field", ->
|
2015-06-06 02:02:44 +08:00
|
|
|
useDraft.call(@, cc: [u2])
|
2015-06-02 06:12:18 +08:00
|
|
|
makeComposer.call(@)
|
|
|
|
spyOn(@composer.refs['textFieldCc'], 'focus')
|
|
|
|
@composer.focus('textFieldCc')
|
|
|
|
advanceClock(1000)
|
|
|
|
expect(@composer.refs['textFieldCc'].focus).toHaveBeenCalled()
|
|
|
|
|
|
|
|
describe "if the draft is a forward", ->
|
|
|
|
it "should focus the to field", ->
|
|
|
|
useDraft.call(@, {subject: 'Fwd: This is a test'})
|
|
|
|
makeComposer.call(@)
|
|
|
|
spyOn(@composer.refs['textFieldTo'], 'focus')
|
|
|
|
@composer.focus()
|
|
|
|
advanceClock(1000)
|
|
|
|
expect(@composer.refs['textFieldTo'].focus).toHaveBeenCalled()
|
|
|
|
|
|
|
|
describe "if the draft is a normal message", ->
|
|
|
|
it "should focus on the body", ->
|
|
|
|
useDraft.call(@)
|
|
|
|
makeComposer.call(@)
|
|
|
|
spyOn(@composer.refs['contentBody'], 'focus')
|
|
|
|
@composer.focus()
|
|
|
|
advanceClock(1000)
|
|
|
|
expect(@composer.refs['contentBody'].focus).toHaveBeenCalled()
|
|
|
|
|
2015-06-12 09:48:55 +08:00
|
|
|
describe "when emptying cc fields", ->
|
|
|
|
|
|
|
|
it "focuses on to when bcc is emptied and there's no cc field", ->
|
|
|
|
useDraft.call(@, bcc: [u1])
|
|
|
|
makeComposer.call(@)
|
|
|
|
spyOn(@composer.refs['textFieldTo'], 'focus')
|
|
|
|
spyOn(@composer.refs['textFieldBcc'], 'focus')
|
|
|
|
|
|
|
|
bcc = ReactTestUtils.scryRenderedComponentsWithTypeAndProps(@composer, ParticipantsTextField, field: "bcc")[0]
|
|
|
|
bcc.props.onEmptied()
|
|
|
|
|
|
|
|
expect(@composer.state.showbcc).toBe false
|
|
|
|
advanceClock(1000)
|
|
|
|
expect(@composer.refs['textFieldTo'].focus).toHaveBeenCalled()
|
|
|
|
expect(@composer.refs['textFieldCc']).not.toBeDefined()
|
|
|
|
expect(@composer.refs['textFieldBcc']).not.toBeDefined()
|
|
|
|
|
|
|
|
it "focuses on cc when bcc is emptied and cc field is available", ->
|
|
|
|
useDraft.call(@, cc: [u2], bcc: [u1])
|
|
|
|
makeComposer.call(@)
|
|
|
|
spyOn(@composer.refs['textFieldTo'], 'focus')
|
|
|
|
spyOn(@composer.refs['textFieldCc'], 'focus')
|
|
|
|
spyOn(@composer.refs['textFieldBcc'], 'focus')
|
|
|
|
|
|
|
|
bcc = ReactTestUtils.scryRenderedComponentsWithTypeAndProps(@composer, ParticipantsTextField, field: "bcc")[0]
|
|
|
|
|
|
|
|
bcc.props.onEmptied()
|
|
|
|
expect(@composer.state.showbcc).toBe false
|
|
|
|
advanceClock(1000)
|
|
|
|
expect(@composer.refs['textFieldTo'].focus).not.toHaveBeenCalled()
|
|
|
|
expect(@composer.refs['textFieldCc'].focus).toHaveBeenCalled()
|
|
|
|
expect(@composer.refs['textFieldBcc']).not.toBeDefined()
|
|
|
|
|
|
|
|
it "focuses on to when cc is emptied", ->
|
|
|
|
useDraft.call(@, cc: [u1], bcc: [u2])
|
|
|
|
makeComposer.call(@)
|
|
|
|
spyOn(@composer.refs['textFieldTo'], 'focus')
|
|
|
|
spyOn(@composer.refs['textFieldCc'], 'focus')
|
|
|
|
spyOn(@composer.refs['textFieldBcc'], 'focus')
|
|
|
|
|
|
|
|
cc = ReactTestUtils.scryRenderedComponentsWithTypeAndProps(@composer, ParticipantsTextField, field: "cc")[0]
|
|
|
|
cc.props.onEmptied()
|
|
|
|
|
|
|
|
expect(@composer.state.showcc).toBe false
|
|
|
|
advanceClock(1000)
|
|
|
|
expect(@composer.refs['textFieldTo'].focus).toHaveBeenCalled()
|
|
|
|
expect(@composer.refs['textFieldCc']).not.toBeDefined()
|
|
|
|
expect(@composer.refs['textFieldBcc'].focus).not.toHaveBeenCalled()
|
|
|
|
|
2015-03-13 05:48:56 +08:00
|
|
|
describe "When sending a message", ->
|
|
|
|
beforeEach ->
|
2015-05-20 03:07:08 +08:00
|
|
|
spyOn(atom, "isMainWindow").andReturn true
|
2015-03-13 05:48:56 +08:00
|
|
|
remote = require('remote')
|
|
|
|
@dialog = remote.require('dialog')
|
|
|
|
spyOn(remote, "getCurrentWindow")
|
|
|
|
spyOn(@dialog, "showMessageBox")
|
|
|
|
spyOn(Actions, "sendDraft")
|
|
|
|
|
2015-06-01 23:24:32 +08:00
|
|
|
it "doesn't send twice", ->
|
|
|
|
useFullDraft.call(@)
|
|
|
|
makeComposer.call(@)
|
|
|
|
@composer._sendDraft()
|
|
|
|
@composer._sendDraft()
|
|
|
|
expect(Actions.sendDraft.calls.length).toBe 1
|
|
|
|
|
2015-03-13 05:48:56 +08:00
|
|
|
it "shows a warning if there are no recipients", ->
|
|
|
|
useDraft.call @, subject: "no recipients"
|
|
|
|
makeComposer.call(@)
|
|
|
|
@composer._sendDraft()
|
|
|
|
expect(Actions.sendDraft).not.toHaveBeenCalled()
|
|
|
|
expect(@dialog.showMessageBox).toHaveBeenCalled()
|
|
|
|
dialogArgs = @dialog.showMessageBox.mostRecentCall.args[1]
|
|
|
|
expect(dialogArgs.buttons).toEqual ['Edit Message']
|
|
|
|
|
2015-05-16 01:53:22 +08:00
|
|
|
it "shows a warning if the body of the email is empty", ->
|
|
|
|
useDraft.call @, to: [u1], body: ""
|
|
|
|
makeComposer.call(@)
|
|
|
|
@composer._sendDraft()
|
|
|
|
expect(Actions.sendDraft).not.toHaveBeenCalled()
|
|
|
|
expect(@dialog.showMessageBox).toHaveBeenCalled()
|
|
|
|
dialogArgs = @dialog.showMessageBox.mostRecentCall.args[1]
|
|
|
|
expect(dialogArgs.buttons).toEqual ['Cancel', 'Send Anyway']
|
|
|
|
|
|
|
|
it "shows a warning if the body of the email is all quoted text", ->
|
|
|
|
useDraft.call @,
|
|
|
|
to: [u1]
|
|
|
|
subject: "Hello World"
|
|
|
|
body: "<br><br><blockquote class='gmail_quote'>This is my quoted text!</blockquote>"
|
|
|
|
makeComposer.call(@)
|
|
|
|
@composer._sendDraft()
|
|
|
|
expect(Actions.sendDraft).not.toHaveBeenCalled()
|
|
|
|
expect(@dialog.showMessageBox).toHaveBeenCalled()
|
|
|
|
dialogArgs = @dialog.showMessageBox.mostRecentCall.args[1]
|
|
|
|
expect(dialogArgs.buttons).toEqual ['Cancel', 'Send Anyway']
|
|
|
|
|
|
|
|
it "does not show a warning if the body of the email is all quoted text, but the email is a forward", ->
|
|
|
|
useDraft.call @,
|
|
|
|
to: [u1]
|
|
|
|
subject: "Fwd: Hello World"
|
|
|
|
body: "<br><br><blockquote class='gmail_quote'>This is my quoted text!</blockquote>"
|
|
|
|
makeComposer.call(@)
|
|
|
|
@composer._sendDraft()
|
|
|
|
expect(Actions.sendDraft).toHaveBeenCalled()
|
|
|
|
|
2015-03-13 05:48:56 +08:00
|
|
|
it "shows a warning if there's no subject", ->
|
|
|
|
useDraft.call @, to: [u1], subject: ""
|
|
|
|
makeComposer.call(@)
|
|
|
|
@composer._sendDraft()
|
|
|
|
expect(Actions.sendDraft).not.toHaveBeenCalled()
|
|
|
|
expect(@dialog.showMessageBox).toHaveBeenCalled()
|
|
|
|
dialogArgs = @dialog.showMessageBox.mostRecentCall.args[1]
|
|
|
|
expect(dialogArgs.buttons).toEqual ['Cancel', 'Send Anyway']
|
|
|
|
|
|
|
|
it "doesn't show a warning if requirements are satisfied", ->
|
|
|
|
useFullDraft.apply(@); makeComposer.call(@)
|
|
|
|
@composer._sendDraft()
|
|
|
|
expect(Actions.sendDraft).toHaveBeenCalled()
|
|
|
|
expect(@dialog.showMessageBox).not.toHaveBeenCalled()
|
|
|
|
|
|
|
|
describe "Checking for attachments", ->
|
|
|
|
warn = (body) ->
|
|
|
|
useDraft.call @, subject: "Subject", to: [u1], body: body
|
|
|
|
makeComposer.call(@); @composer._sendDraft()
|
|
|
|
expect(Actions.sendDraft).not.toHaveBeenCalled()
|
|
|
|
expect(@dialog.showMessageBox).toHaveBeenCalled()
|
|
|
|
dialogArgs = @dialog.showMessageBox.mostRecentCall.args[1]
|
|
|
|
expect(dialogArgs.buttons).toEqual ['Cancel', 'Send Anyway']
|
|
|
|
|
|
|
|
noWarn = (body) ->
|
2015-03-14 03:55:52 +08:00
|
|
|
useDraft.call @, subject: "Subject", to: [u1], body: body
|
2015-03-13 05:48:56 +08:00
|
|
|
makeComposer.call(@); @composer._sendDraft()
|
|
|
|
expect(Actions.sendDraft).toHaveBeenCalled()
|
|
|
|
expect(@dialog.showMessageBox).not.toHaveBeenCalled()
|
|
|
|
|
|
|
|
it "warns", -> warn.call(@, "Check out the attached file")
|
|
|
|
it "warns", -> warn.call(@, "I've added an attachment")
|
|
|
|
it "warns", -> warn.call(@, "I'm going to attach the file")
|
2015-03-14 03:55:52 +08:00
|
|
|
it "warns", -> warn.call(@, "Hey attach me <div class='gmail_quote'>sup</div>")
|
2015-03-13 05:48:56 +08:00
|
|
|
|
|
|
|
it "doesn't warn", -> noWarn.call(@, "sup yo")
|
|
|
|
it "doesn't warn", -> noWarn.call(@, "Look at the file")
|
2015-03-14 03:55:52 +08:00
|
|
|
it "doesn't warn", -> noWarn.call(@, "Hey there <div class='gmail_quote'>attach</div>")
|
2015-03-13 05:48:56 +08:00
|
|
|
|
|
|
|
it "doesn't show a warning if you've attached a file", ->
|
|
|
|
useDraft.call @,
|
|
|
|
subject: "Subject"
|
|
|
|
to: [u1]
|
|
|
|
body: "Check out attached file"
|
2015-06-12 02:52:49 +08:00
|
|
|
files: [{id: "123", object: "file", filename:"abc"}]
|
2015-03-13 05:48:56 +08:00
|
|
|
makeComposer.call(@); @composer._sendDraft()
|
|
|
|
expect(Actions.sendDraft).toHaveBeenCalled()
|
|
|
|
expect(@dialog.showMessageBox).not.toHaveBeenCalled()
|
|
|
|
|
|
|
|
it "bypasses the warning if force bit is set", ->
|
|
|
|
useDraft.call @, to: [u1], subject: ""
|
|
|
|
makeComposer.call(@)
|
|
|
|
@composer._sendDraft(force: true)
|
|
|
|
expect(Actions.sendDraft).toHaveBeenCalled()
|
|
|
|
expect(@dialog.showMessageBox).not.toHaveBeenCalled()
|
|
|
|
|
|
|
|
it "sends when you click the send button", ->
|
|
|
|
useFullDraft.apply(@); makeComposer.call(@)
|
2015-04-25 02:33:10 +08:00
|
|
|
sendBtn = React.findDOMNode(@composer.refs.sendButton)
|
2015-03-13 05:48:56 +08:00
|
|
|
ReactTestUtils.Simulate.click sendBtn
|
|
|
|
expect(Actions.sendDraft).toHaveBeenCalledWith(DRAFT_LOCAL_ID)
|
|
|
|
expect(Actions.sendDraft.calls.length).toBe 1
|
|
|
|
|
|
|
|
simulateDraftStore = ->
|
2015-05-20 03:07:08 +08:00
|
|
|
spyOn(DraftStore, "isSendingDraft").andReturn true
|
2015-03-13 05:48:56 +08:00
|
|
|
DraftStore.trigger()
|
|
|
|
|
|
|
|
it "doesn't send twice if you double click", ->
|
|
|
|
useFullDraft.apply(@); makeComposer.call(@)
|
2015-04-25 02:33:10 +08:00
|
|
|
sendBtn = React.findDOMNode(@composer.refs.sendButton)
|
2015-03-13 05:48:56 +08:00
|
|
|
ReactTestUtils.Simulate.click sendBtn
|
|
|
|
simulateDraftStore()
|
|
|
|
ReactTestUtils.Simulate.click sendBtn
|
|
|
|
expect(Actions.sendDraft).toHaveBeenCalledWith(DRAFT_LOCAL_ID)
|
|
|
|
expect(Actions.sendDraft.calls.length).toBe 1
|
|
|
|
|
|
|
|
it "disables the composer once sending has started", ->
|
|
|
|
useFullDraft.apply(@); makeComposer.call(@)
|
2015-04-25 02:33:10 +08:00
|
|
|
sendBtn = React.findDOMNode(@composer.refs.sendButton)
|
2015-03-13 05:48:56 +08:00
|
|
|
cover = ReactTestUtils.findRenderedDOMComponentWithClass(@composer, "composer-cover")
|
2015-04-25 02:33:10 +08:00
|
|
|
expect(React.findDOMNode(cover).style.display).toBe "none"
|
2015-03-13 05:48:56 +08:00
|
|
|
ReactTestUtils.Simulate.click sendBtn
|
|
|
|
simulateDraftStore()
|
2015-04-25 02:33:10 +08:00
|
|
|
expect(React.findDOMNode(cover).style.display).toBe "block"
|
2015-03-13 05:48:56 +08:00
|
|
|
expect(@composer.state.isSending).toBe true
|
|
|
|
|
|
|
|
it "re-enables the composer if sending threw an error", ->
|
2015-05-20 03:07:08 +08:00
|
|
|
sending = null
|
|
|
|
spyOn(DraftStore, "isSendingDraft").andCallFake => return sending
|
2015-03-13 05:48:56 +08:00
|
|
|
useFullDraft.apply(@); makeComposer.call(@)
|
2015-04-25 02:33:10 +08:00
|
|
|
sendBtn = React.findDOMNode(@composer.refs.sendButton)
|
2015-03-13 05:48:56 +08:00
|
|
|
ReactTestUtils.Simulate.click sendBtn
|
2015-05-20 03:07:08 +08:00
|
|
|
|
|
|
|
sending = true
|
|
|
|
DraftStore.trigger()
|
|
|
|
|
2015-03-13 05:48:56 +08:00
|
|
|
expect(@composer.state.isSending).toBe true
|
2015-05-20 03:07:08 +08:00
|
|
|
|
|
|
|
sending = false
|
2015-03-13 05:48:56 +08:00
|
|
|
DraftStore.trigger()
|
2015-05-20 03:07:08 +08:00
|
|
|
|
2015-03-13 05:48:56 +08:00
|
|
|
expect(@composer.state.isSending).toBe false
|
|
|
|
|
|
|
|
describe "when sending a message with keyboard inputs", ->
|
|
|
|
beforeEach ->
|
|
|
|
useFullDraft.apply(@)
|
|
|
|
makeComposer.call(@)
|
|
|
|
spyOn(@composer, "_sendDraft")
|
2015-05-22 05:41:30 +08:00
|
|
|
NylasTestUtils.loadKeymap("internal_packages/composer/keymaps/composer")
|
2015-03-13 05:48:56 +08:00
|
|
|
|
|
|
|
it "sends the draft on cmd-enter", ->
|
2015-05-20 07:06:59 +08:00
|
|
|
NylasTestUtils.keyPress("cmd-enter", React.findDOMNode(@composer))
|
2015-03-13 05:48:56 +08:00
|
|
|
expect(@composer._sendDraft).toHaveBeenCalled()
|
|
|
|
|
|
|
|
it "does not send the draft on enter if the button isn't in focus", ->
|
2015-05-20 07:06:59 +08:00
|
|
|
NylasTestUtils.keyPress("enter", React.findDOMNode(@composer))
|
2015-03-13 05:48:56 +08:00
|
|
|
expect(@composer._sendDraft).not.toHaveBeenCalled()
|
|
|
|
|
|
|
|
it "sends the draft on enter when the button is in focus", ->
|
|
|
|
sendBtn = ReactTestUtils.findRenderedDOMComponentWithClass(@composer, "btn-send")
|
2015-05-20 07:06:59 +08:00
|
|
|
NylasTestUtils.keyPress("enter", React.findDOMNode(sendBtn))
|
2015-03-13 05:48:56 +08:00
|
|
|
expect(@composer._sendDraft).toHaveBeenCalled()
|
|
|
|
|
|
|
|
it "doesn't let you send twice", ->
|
|
|
|
sendBtn = ReactTestUtils.findRenderedDOMComponentWithClass(@composer, "btn-send")
|
2015-05-20 07:06:59 +08:00
|
|
|
NylasTestUtils.keyPress("enter", React.findDOMNode(sendBtn))
|
2015-03-13 05:48:56 +08:00
|
|
|
expect(@composer._sendDraft).toHaveBeenCalled()
|
|
|
|
|
2015-05-20 07:12:39 +08:00
|
|
|
describe "when scrolling to track your cursor", ->
|
|
|
|
it "it tracks when you're at the end of the text", ->
|
|
|
|
|
|
|
|
it "it doesn't track when typing in the middle of the body", ->
|
|
|
|
|
|
|
|
it "it doesn't track when typing in the middle of the body", ->
|
2015-03-13 05:48:56 +08:00
|
|
|
|
|
|
|
describe "When composing a new message", ->
|
|
|
|
it "Can add someone in the to field", ->
|
fix(drafts): Various improvements and fixes to drafts, draft state management
Summary:
This diff contains a few major changes:
1. Scribe is no longer used for the text editor. It's just a plain contenteditable region. The toolbar items (bold, italic, underline) still work. Scribe was causing React inconcistency issues in the following scenario:
- View thread with draft, edit draft
- Move to another thread
- Move back to thread with draft
- Move to another thread. Notice that one or more messages from thread with draft are still there.
There may be a way to fix this, but I tried for hours and there are Github Issues open on it's repository asking for React compatibility, so it may be fixed soon. For now contenteditable is working great.
2. Action.saveDraft() is no longer debounced in the DraftStore. Instead, firing that action causes the save to happen immediately, and the DraftStoreProxy has a new "DraftChangeSet" class which is responsbile for batching saves as the user interacts with the ComposerView. There are a couple big wins here:
- In the future, we may want to be able to call Action.saveDraft() in other situations and it should behave like a normal action. We may also want to expose the DraftStoreProxy as an easy way of backing interactive draft UI.
- Previously, when you added a contact to To/CC/BCC, this happened:
<input> -> Action.saveDraft -> (delay!!) -> Database -> DraftStore -> DraftStoreProxy -> View Updates
Increasing the delay to something reasonable like 200msec meant there was 200msec of lag before you saw the new view state.
To fix this, I created a new class called DraftChangeSet which is responsible for accumulating changes as they're made and firing Action.saveDraft. "Adding" a change to the change set also causes the Draft provided by the DraftStoreProxy to change immediately (the changes are a temporary layer on top of the database object). This means no delay while changes are being applied. There's a better explanation in the source!
This diff includes a few minor fixes as well:
1. Draft.state is gone—use Message.object = draft instead
2. String model attributes should never be null
3. Pre-send checks that can cancel draft send
4. Put the entire curl history and task queue into feedback reports
5. Cache localIds for extra speed
6. Move us up to latest React
Test Plan: No new tests - once we lock down this new design I'll write tests for the DraftChangeSet
Reviewers: evan
Reviewed By: evan
Differential Revision: https://review.inboxapp.com/D1125
2015-02-04 08:24:31 +08:00
|
|
|
|
2015-03-13 05:48:56 +08:00
|
|
|
it "Can add someone in the cc field", ->
|
fix(drafts): Various improvements and fixes to drafts, draft state management
Summary:
This diff contains a few major changes:
1. Scribe is no longer used for the text editor. It's just a plain contenteditable region. The toolbar items (bold, italic, underline) still work. Scribe was causing React inconcistency issues in the following scenario:
- View thread with draft, edit draft
- Move to another thread
- Move back to thread with draft
- Move to another thread. Notice that one or more messages from thread with draft are still there.
There may be a way to fix this, but I tried for hours and there are Github Issues open on it's repository asking for React compatibility, so it may be fixed soon. For now contenteditable is working great.
2. Action.saveDraft() is no longer debounced in the DraftStore. Instead, firing that action causes the save to happen immediately, and the DraftStoreProxy has a new "DraftChangeSet" class which is responsbile for batching saves as the user interacts with the ComposerView. There are a couple big wins here:
- In the future, we may want to be able to call Action.saveDraft() in other situations and it should behave like a normal action. We may also want to expose the DraftStoreProxy as an easy way of backing interactive draft UI.
- Previously, when you added a contact to To/CC/BCC, this happened:
<input> -> Action.saveDraft -> (delay!!) -> Database -> DraftStore -> DraftStoreProxy -> View Updates
Increasing the delay to something reasonable like 200msec meant there was 200msec of lag before you saw the new view state.
To fix this, I created a new class called DraftChangeSet which is responsible for accumulating changes as they're made and firing Action.saveDraft. "Adding" a change to the change set also causes the Draft provided by the DraftStoreProxy to change immediately (the changes are a temporary layer on top of the database object). This means no delay while changes are being applied. There's a better explanation in the source!
This diff includes a few minor fixes as well:
1. Draft.state is gone—use Message.object = draft instead
2. String model attributes should never be null
3. Pre-send checks that can cancel draft send
4. Put the entire curl history and task queue into feedback reports
5. Cache localIds for extra speed
6. Move us up to latest React
Test Plan: No new tests - once we lock down this new design I'll write tests for the DraftChangeSet
Reviewers: evan
Reviewed By: evan
Differential Revision: https://review.inboxapp.com/D1125
2015-02-04 08:24:31 +08:00
|
|
|
|
2015-03-13 05:48:56 +08:00
|
|
|
it "Can add someone in the bcc field", ->
|
fix(drafts): Various improvements and fixes to drafts, draft state management
Summary:
This diff contains a few major changes:
1. Scribe is no longer used for the text editor. It's just a plain contenteditable region. The toolbar items (bold, italic, underline) still work. Scribe was causing React inconcistency issues in the following scenario:
- View thread with draft, edit draft
- Move to another thread
- Move back to thread with draft
- Move to another thread. Notice that one or more messages from thread with draft are still there.
There may be a way to fix this, but I tried for hours and there are Github Issues open on it's repository asking for React compatibility, so it may be fixed soon. For now contenteditable is working great.
2. Action.saveDraft() is no longer debounced in the DraftStore. Instead, firing that action causes the save to happen immediately, and the DraftStoreProxy has a new "DraftChangeSet" class which is responsbile for batching saves as the user interacts with the ComposerView. There are a couple big wins here:
- In the future, we may want to be able to call Action.saveDraft() in other situations and it should behave like a normal action. We may also want to expose the DraftStoreProxy as an easy way of backing interactive draft UI.
- Previously, when you added a contact to To/CC/BCC, this happened:
<input> -> Action.saveDraft -> (delay!!) -> Database -> DraftStore -> DraftStoreProxy -> View Updates
Increasing the delay to something reasonable like 200msec meant there was 200msec of lag before you saw the new view state.
To fix this, I created a new class called DraftChangeSet which is responsible for accumulating changes as they're made and firing Action.saveDraft. "Adding" a change to the change set also causes the Draft provided by the DraftStoreProxy to change immediately (the changes are a temporary layer on top of the database object). This means no delay while changes are being applied. There's a better explanation in the source!
This diff includes a few minor fixes as well:
1. Draft.state is gone—use Message.object = draft instead
2. String model attributes should never be null
3. Pre-send checks that can cancel draft send
4. Put the entire curl history and task queue into feedback reports
5. Cache localIds for extra speed
6. Move us up to latest React
Test Plan: No new tests - once we lock down this new design I'll write tests for the DraftChangeSet
Reviewers: evan
Reviewed By: evan
Differential Revision: https://review.inboxapp.com/D1125
2015-02-04 08:24:31 +08:00
|
|
|
|
2015-03-13 05:48:56 +08:00
|
|
|
describe "When replying to a message", ->
|
fix(drafts): Various improvements and fixes to drafts, draft state management
Summary:
This diff contains a few major changes:
1. Scribe is no longer used for the text editor. It's just a plain contenteditable region. The toolbar items (bold, italic, underline) still work. Scribe was causing React inconcistency issues in the following scenario:
- View thread with draft, edit draft
- Move to another thread
- Move back to thread with draft
- Move to another thread. Notice that one or more messages from thread with draft are still there.
There may be a way to fix this, but I tried for hours and there are Github Issues open on it's repository asking for React compatibility, so it may be fixed soon. For now contenteditable is working great.
2. Action.saveDraft() is no longer debounced in the DraftStore. Instead, firing that action causes the save to happen immediately, and the DraftStoreProxy has a new "DraftChangeSet" class which is responsbile for batching saves as the user interacts with the ComposerView. There are a couple big wins here:
- In the future, we may want to be able to call Action.saveDraft() in other situations and it should behave like a normal action. We may also want to expose the DraftStoreProxy as an easy way of backing interactive draft UI.
- Previously, when you added a contact to To/CC/BCC, this happened:
<input> -> Action.saveDraft -> (delay!!) -> Database -> DraftStore -> DraftStoreProxy -> View Updates
Increasing the delay to something reasonable like 200msec meant there was 200msec of lag before you saw the new view state.
To fix this, I created a new class called DraftChangeSet which is responsible for accumulating changes as they're made and firing Action.saveDraft. "Adding" a change to the change set also causes the Draft provided by the DraftStoreProxy to change immediately (the changes are a temporary layer on top of the database object). This means no delay while changes are being applied. There's a better explanation in the source!
This diff includes a few minor fixes as well:
1. Draft.state is gone—use Message.object = draft instead
2. String model attributes should never be null
3. Pre-send checks that can cancel draft send
4. Put the entire curl history and task queue into feedback reports
5. Cache localIds for extra speed
6. Move us up to latest React
Test Plan: No new tests - once we lock down this new design I'll write tests for the DraftChangeSet
Reviewers: evan
Reviewed By: evan
Differential Revision: https://review.inboxapp.com/D1125
2015-02-04 08:24:31 +08:00
|
|
|
|
2015-03-13 05:48:56 +08:00
|
|
|
describe "When replying all to a message", ->
|
fix(drafts): Various improvements and fixes to drafts, draft state management
Summary:
This diff contains a few major changes:
1. Scribe is no longer used for the text editor. It's just a plain contenteditable region. The toolbar items (bold, italic, underline) still work. Scribe was causing React inconcistency issues in the following scenario:
- View thread with draft, edit draft
- Move to another thread
- Move back to thread with draft
- Move to another thread. Notice that one or more messages from thread with draft are still there.
There may be a way to fix this, but I tried for hours and there are Github Issues open on it's repository asking for React compatibility, so it may be fixed soon. For now contenteditable is working great.
2. Action.saveDraft() is no longer debounced in the DraftStore. Instead, firing that action causes the save to happen immediately, and the DraftStoreProxy has a new "DraftChangeSet" class which is responsbile for batching saves as the user interacts with the ComposerView. There are a couple big wins here:
- In the future, we may want to be able to call Action.saveDraft() in other situations and it should behave like a normal action. We may also want to expose the DraftStoreProxy as an easy way of backing interactive draft UI.
- Previously, when you added a contact to To/CC/BCC, this happened:
<input> -> Action.saveDraft -> (delay!!) -> Database -> DraftStore -> DraftStoreProxy -> View Updates
Increasing the delay to something reasonable like 200msec meant there was 200msec of lag before you saw the new view state.
To fix this, I created a new class called DraftChangeSet which is responsible for accumulating changes as they're made and firing Action.saveDraft. "Adding" a change to the change set also causes the Draft provided by the DraftStoreProxy to change immediately (the changes are a temporary layer on top of the database object). This means no delay while changes are being applied. There's a better explanation in the source!
This diff includes a few minor fixes as well:
1. Draft.state is gone—use Message.object = draft instead
2. String model attributes should never be null
3. Pre-send checks that can cancel draft send
4. Put the entire curl history and task queue into feedback reports
5. Cache localIds for extra speed
6. Move us up to latest React
Test Plan: No new tests - once we lock down this new design I'll write tests for the DraftChangeSet
Reviewers: evan
Reviewed By: evan
Differential Revision: https://review.inboxapp.com/D1125
2015-02-04 08:24:31 +08:00
|
|
|
|
2015-03-13 05:48:56 +08:00
|
|
|
describe "When forwarding a message", ->
|
fix(drafts): Various improvements and fixes to drafts, draft state management
Summary:
This diff contains a few major changes:
1. Scribe is no longer used for the text editor. It's just a plain contenteditable region. The toolbar items (bold, italic, underline) still work. Scribe was causing React inconcistency issues in the following scenario:
- View thread with draft, edit draft
- Move to another thread
- Move back to thread with draft
- Move to another thread. Notice that one or more messages from thread with draft are still there.
There may be a way to fix this, but I tried for hours and there are Github Issues open on it's repository asking for React compatibility, so it may be fixed soon. For now contenteditable is working great.
2. Action.saveDraft() is no longer debounced in the DraftStore. Instead, firing that action causes the save to happen immediately, and the DraftStoreProxy has a new "DraftChangeSet" class which is responsbile for batching saves as the user interacts with the ComposerView. There are a couple big wins here:
- In the future, we may want to be able to call Action.saveDraft() in other situations and it should behave like a normal action. We may also want to expose the DraftStoreProxy as an easy way of backing interactive draft UI.
- Previously, when you added a contact to To/CC/BCC, this happened:
<input> -> Action.saveDraft -> (delay!!) -> Database -> DraftStore -> DraftStoreProxy -> View Updates
Increasing the delay to something reasonable like 200msec meant there was 200msec of lag before you saw the new view state.
To fix this, I created a new class called DraftChangeSet which is responsible for accumulating changes as they're made and firing Action.saveDraft. "Adding" a change to the change set also causes the Draft provided by the DraftStoreProxy to change immediately (the changes are a temporary layer on top of the database object). This means no delay while changes are being applied. There's a better explanation in the source!
This diff includes a few minor fixes as well:
1. Draft.state is gone—use Message.object = draft instead
2. String model attributes should never be null
3. Pre-send checks that can cancel draft send
4. Put the entire curl history and task queue into feedback reports
5. Cache localIds for extra speed
6. Move us up to latest React
Test Plan: No new tests - once we lock down this new design I'll write tests for the DraftChangeSet
Reviewers: evan
Reviewed By: evan
Differential Revision: https://review.inboxapp.com/D1125
2015-02-04 08:24:31 +08:00
|
|
|
|
2015-03-13 05:48:56 +08:00
|
|
|
describe "When changing the subject of a message", ->
|
2015-06-12 02:52:49 +08:00
|
|
|
|
|
|
|
describe "A draft with files (attachments) and uploads", ->
|
|
|
|
beforeEach ->
|
|
|
|
@file1 =
|
|
|
|
id: "f_1"
|
|
|
|
object: "file"
|
|
|
|
filename: "f1.pdf"
|
|
|
|
size: 1230
|
|
|
|
|
|
|
|
@file2 =
|
|
|
|
id: "f_2"
|
|
|
|
object: "file"
|
|
|
|
filename: "f2.jpg"
|
|
|
|
size: 4560
|
|
|
|
|
|
|
|
@file3 =
|
|
|
|
id: "f_3"
|
|
|
|
object: "file"
|
|
|
|
filename: "f3.png"
|
|
|
|
size: 7890
|
|
|
|
|
|
|
|
@up1 =
|
|
|
|
uploadId: 4
|
|
|
|
messageLocalId: DRAFT_LOCAL_ID
|
|
|
|
filePath: "/foo/bar/f4.bmp"
|
|
|
|
fileName: "f4.bmp"
|
|
|
|
fileSize: 1024
|
|
|
|
|
|
|
|
@up2 =
|
|
|
|
uploadId: 5
|
|
|
|
messageLocalId: DRAFT_LOCAL_ID
|
|
|
|
filePath: "/foo/bar/f5.zip"
|
|
|
|
fileName: "f5.zip"
|
|
|
|
fileSize: 1024
|
|
|
|
|
|
|
|
spyOn(Actions, "fetchFile")
|
|
|
|
spyOn(FileUploadStore, "linkedUpload")
|
|
|
|
spyOn(FileUploadStore, "uploadsForMessage").andReturn [@up1, @up2]
|
|
|
|
|
|
|
|
useDraft.call @, files: [@file1, @file2]
|
|
|
|
makeComposer.call @
|
|
|
|
|
|
|
|
it 'preloads attached image files', ->
|
|
|
|
expect(Actions.fetchFile).toHaveBeenCalled()
|
|
|
|
expect(Actions.fetchFile.calls.length).toBe 1
|
|
|
|
expect(Actions.fetchFile.calls[0].args[0]).toBe @file2
|
|
|
|
|
|
|
|
it 'renders the non image file as an attachment', ->
|
|
|
|
els = ReactTestUtils.scryRenderedComponentsWithTypeAndProps(@composer, InjectedComponent, matching: role: "Attachment")
|
|
|
|
expect(els.length).toBe 1
|
|
|
|
|
|
|
|
it 'renders the image file as an attachment', ->
|
|
|
|
els = ReactTestUtils.scryRenderedComponentsWithTypeAndProps(@composer, InjectedComponent, matching: role: "Attachment:Image")
|
|
|
|
expect(els.length).toBe 1
|
|
|
|
|
|
|
|
it 'renders the non image upload as a FileUpload', ->
|
|
|
|
els = ReactTestUtils.scryRenderedDOMComponentsWithClass(@composer, "file-upload")
|
|
|
|
expect(els.length).toBe 1
|
|
|
|
|
|
|
|
it 'renders the image upload as an ImageFileUpload', ->
|
|
|
|
els = ReactTestUtils.scryRenderedDOMComponentsWithClass(@composer, "image-file-upload")
|
|
|
|
expect(els.length).toBe 1
|